Changeset 330
- Timestamp:
- 02/20/06 10:20:44 (3 years ago)
- Files:
-
- nepenthes/trunk/CHANGES (modified) (2 diffs)
- nepenthes/trunk/Makefile.am (modified) (2 diffs)
- nepenthes/trunk/Makefile.in (modified) (13 diffs)
- nepenthes/trunk/aclocal.m4 (modified) (55 diffs)
- nepenthes/trunk/conf/nepenthes.conf.dist (modified) (4 diffs)
- nepenthes/trunk/config.guess (modified) (50 diffs)
- nepenthes/trunk/config.sub (modified) (30 diffs)
- nepenthes/trunk/configure (modified) (191 diffs)
- nepenthes/trunk/configure.ac (modified) (2 diffs)
- nepenthes/trunk/depcomp (modified) (6 diffs)
- nepenthes/trunk/install-sh (modified) (3 diffs)
- nepenthes/trunk/ltmain.sh (modified) (23 diffs)
- nepenthes/trunk/missing (modified) (4 diffs)
- nepenthes/trunk/modules/Makefile.am (modified) (1 diff)
- nepenthes/trunk/modules/Makefile.in (modified) (6 diffs)
- nepenthes/trunk/modules/download-creceive/CReceiveDialogue.cpp (modified) (1 diff)
- nepenthes/trunk/modules/download-creceive/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/download-creceive/download-creceive.cpp (modified) (1 diff)
- nepenthes/trunk/modules/download-csend/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/download-curl/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/download-curl/download-curl.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/download-ftp/CTRLDialogue.cpp (modified) (6 diffs)
- nepenthes/trunk/modules/download-ftp/CTRLDialogue.hpp (modified) (2 diffs)
- nepenthes/trunk/modules/download-ftp/FILEDialogue.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/download-ftp/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/download-ftp/download-ftp.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/download-link/LinkDialogue.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/download-link/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/download-nepenthes/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/download-tftp/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/download-tftp/TFTPDialogue.cpp (modified) (4 diffs)
- nepenthes/trunk/modules/log-download/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/log-irc/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/log-irc/log-irc.conf.dist (modified) (2 diffs)
- nepenthes/trunk/modules/module-portwatch/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/shellcode-generic/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_bielefeld_connect.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_bind.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_connect.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_connect_trans.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_link_bind_trans.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_link_trans.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_linkxor.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_mainz_bind.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_stuttgart.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_url.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_wuerzburg.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/sch_generic_xor.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellcode-generic/shellcode-generic.conf.dist (modified) (1 diff)
- nepenthes/trunk/modules/shellemu-winnt/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/shellemu-winnt/VFS.cpp (modified) (8 diffs)
- nepenthes/trunk/modules/shellemu-winnt/VFSCommandCMD.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/shellemu-winnt/VFSCommandDir.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellemu-winnt/VFSCommandECHO.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellemu-winnt/VFSCommandFTP.cpp (modified) (12 diffs)
- nepenthes/trunk/modules/shellemu-winnt/VFSCommandREDIR.cpp (modified) (4 diffs)
- nepenthes/trunk/modules/shellemu-winnt/VFSCommandRREDIR.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/shellemu-winnt/VFSCommandTFTP.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/shellemu-winnt/VFSDir.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellemu-winnt/VFSFile.cpp (modified) (1 diff)
- nepenthes/trunk/modules/shellemu-winnt/WinNTShellDialogue.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/shellemu-winnt/WinNTShellDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/submit-file/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/submit-file/submit-file.cpp (modified) (1 diff)
- nepenthes/trunk/modules/submit-nepenthes/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/submit-norman/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/submit-xmlrpc/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/submit-xmlrpc/XMLRPCDialogue.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/submit-xmlrpc/submit-xmlrpc.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-asn1/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-asn1/SMBDialogue.cpp (modified) (4 diffs)
- nepenthes/trunk/modules/vuln-asn1/SMBDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-asn1/sch_asn1_iis.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/vuln-asn1/sch_asn1_smb_bind.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/vuln-bagle/BagleDialogue.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-bagle/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-dameware (added)
- nepenthes/trunk/modules/vuln-dameware/DWDialogue.cpp (added)
- nepenthes/trunk/modules/vuln-dameware/DWDialogue.hpp (added)
- nepenthes/trunk/modules/vuln-dameware/Makefile.am (added)
- nepenthes/trunk/modules/vuln-dameware/Makefile.in (added)
- nepenthes/trunk/modules/vuln-dameware/vuln-dameware.conf.dist (added)
- nepenthes/trunk/modules/vuln-dameware/vuln-dameware.cpp (added)
- nepenthes/trunk/modules/vuln-dameware/vuln-dameware.hpp (added)
- nepenthes/trunk/modules/vuln-dcom/DCOMDialogue.cpp (modified) (4 diffs)
- nepenthes/trunk/modules/vuln-dcom/DCOMDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-dcom/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-dcom/sch_dcom_oc192_bind.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-iis/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-iis/sch_iis_thc_bind.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-iis/sch_iis_thc_connect.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-kuang2/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-kuang2/vuln-kuang2.cpp (modified) (8 diffs)
- nepenthes/trunk/modules/vuln-kuang2/vuln-kuang2.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-lsass/LSASSDialogue.cpp (modified) (8 diffs)
- nepenthes/trunk/modules/vuln-lsass/LSASSDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-lsass/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-lsass/sch_lsass_hod_bind.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-lsass/sch_lsass_hod_connect.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-msmq/MSMQDialogue.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-msmq/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-msmq/sch_msmq_hod_bind.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-mssql/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-mydoom/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-netbiosname/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-netdde/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-netdde/NETDDEDialogue.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/vuln-netdde/NETDDEDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-netdde/sch_netdde_hod_bind.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-netdde/sch_netdde_hod_connect.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-optix/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-optix/OPTIXShellDialogue.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-pnp/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-pnp/PNPDialogue.cpp (modified) (8 diffs)
- nepenthes/trunk/modules/vuln-pnp/PNPDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-sasserftpd/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-sasserftpd/SasserFTPDDialogue.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/vuln-sasserftpd/SasserFTPDDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-sasserftpd/sch_sasserftpd_mandragore_bind.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-sasserftpd/sch_sasserftpd_mandragore_connect.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-sub7/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-upnp/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-upnp/UPNPDialogue.cpp (modified) (3 diffs)
- nepenthes/trunk/modules/vuln-upnp/UPNPDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-veritas/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-veritas/VERITASDialogue.cpp (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-veritas/VERITASDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-wins/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/vuln-wins/WINSDialogue.cpp (modified) (5 diffs)
- nepenthes/trunk/modules/vuln-wins/WINSDialogue.hpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-wins/sch_wins_hs_bind.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-wins/sch_wins_hs_connect.cpp (modified) (1 diff)
- nepenthes/trunk/modules/vuln-wins/sch_wins_zuc_connect.cpp (modified) (1 diff)
- nepenthes/trunk/modules/x-1/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/x-2/Makefile.am (modified) (1 diff)
- nepenthes/trunk/modules/x-2/Makefile.in (modified) (3 diffs)
- nepenthes/trunk/modules/x-2/x-2.conf.dist (added)
- nepenthes/trunk/modules/x-2/x-2.cpp (modified) (4 diffs)
- nepenthes/trunk/modules/x-3/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/x-4/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/x-5/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/x-6/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/modules/x-7/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/nepenthes-core/Makefile.in (modified) (5 diffs)
- nepenthes/trunk/nepenthes-core/include/Dialogue.hpp (modified) (3 diffs)
- nepenthes/trunk/nepenthes-core/include/Download.hpp (modified) (3 diffs)
- nepenthes/trunk/nepenthes-core/include/DownloadManager.hpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/include/Makefile.in (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/include/Nepenthes.hpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/include/Socket.hpp (modified) (3 diffs)
- nepenthes/trunk/nepenthes-core/include/TCPSocket.hpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/include/Utilities.hpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/src/DNSManager.cpp (modified) (3 diffs)
- nepenthes/trunk/nepenthes-core/src/Download.cpp (modified) (2 diffs)
- nepenthes/trunk/nepenthes-core/src/DownloadManager.cpp (modified) (4 diffs)
- nepenthes/trunk/nepenthes-core/src/FILESocket.cpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/src/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/nepenthes-core/src/Nepenthes.cpp (modified) (3 diffs)
- nepenthes/trunk/nepenthes-core/src/POLLSocket.cpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/src/RAWSocket.cpp (modified) (7 diffs)
- nepenthes/trunk/nepenthes-core/src/ShellcodeManager.cpp (modified) (3 diffs)
- nepenthes/trunk/nepenthes-core/src/Socket.cpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/src/SocketManager.cpp (modified) (16 diffs)
- nepenthes/trunk/nepenthes-core/src/SubmitManager.cpp (modified) (1 diff)
- nepenthes/trunk/nepenthes-core/src/TCPSocket.cpp (modified) (15 diffs)
- nepenthes/trunk/nepenthes-core/src/UDPSocket.cpp (modified) (2 diffs)
- nepenthes/trunk/nepenthes-core/src/Utilities.cpp (modified) (3 diffs)
- nepenthes/trunk/tools/Makefile.in (modified) (5 diffs)
- nepenthes/trunk/tools/bdiffm/Makefile.in (modified) (2 diffs)
- nepenthes/trunk/tools/mkcarray/Makefile.in (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
nepenthes/trunk/CHANGES
r321 r330 1 Version 0.1.2 2 ============= 3 Bugfix release/minor features. 4 5 * Utilities 6 * hexdump uses nepenthes.utilites.hexdump_path as pathinfo now 7 8 * shellemu-wint 9 * VFSCommandFTP uses new DownloadFlags 10 11 * Download 12 * added DownloadFlags so we can handle broken ftpds better 13 * added ::addFlag(uint8_t ) & ::getFlags() 14 15 * DownloadManager 16 * download() now takes uint8_t downloadflags as argument 17 18 * download-ftp 19 * bind to port 0 to avoid collision 20 * rewrote quite everything to handle broken ftp daemons better, including the new DownloadFlags 21 22 * Socket 23 * changed SS_NULL to SS_CONNECTED 24 * added SS_CONNECTING 25 26 27 * TCPSocket 28 * set localip on accept() Sockets, so we can use this info further 29 * bind ConnectSockets before connecting, so we use the same ip for reverseconnect shells 30 * uses SS_CONNECTING for connect sockets 31 * overloads setState(), so if they are in state SS_CONNECTING and goto SS_CONNECTED they 32 can call Dialogue::connectionEstablished() for their dialogues 33 34 * some changes in the TCPSockets internal Dialogue handling prevent nepenthes recognizing 35 the same shellcode in more than one dialogue, resulting in more than one download per exploit 36 37 38 * vuln-dameware 39 * created 40 41 * Dialogue 42 * added ::dump() 43 * added ::connectionEstablished() 44 45 46 * many vuln-* modules 47 * added CL_ASSIGN_AND_DONE handling 48 49 50 * many shellcodehandlers using downloadhandler 51 * added valid downloadflag usage 52 53 54 1 55 Version 0.1.1 2 56 ============= … … 71 125 * download-ftp 72 126 * bind to port 0 to avoid collision 127 128 * Socket 129 * changed SS_NULL to SS_CONNECTED 130 * added SS_CONNECTING 73 131 74 132 * TCPSocket 75 133 * set localip on accept() Sockets, so we can use this info further 76 134 * bind ConnectSockets before connecting, so we use the same ip for reverseconnect shells 77 135 * uses SS_CONNECTING for connect sockets 136 * overloads setState(), so if they are in state SS_CONNECTING and goto SS_CONNECTED they 137 can call Dialogue::connectionEstablished() for their dialogues 138 78 139 79 140 * submit-xmlrpc 80 141 * created 142 * depends on vuln-lsass 81 143 144 * vuln-dameware 145 * created 146 147 * Dialogue 148 * added dump() 149 * added connectionEstablished 150 82 151 83 152 Version 0.1.0 nepenthes/trunk/Makefile.am
r321 r330 12 12 doc_DATA = doc/README doc/README.VFS doc/logo-shaded.svg 13 13 14 sysconf_DATA = conf/nepenthes.conf.dist14 #sysconf_DATA = conf/nepenthes.conf.dist 15 15 16 16 AM_CXXFLAGS = '' … … 24 24 #endifdef 25 25 26 # $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes .conf.dist26 # $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf.dist 27 27 28 28 install-data-local: 29 29 $(mkinstalldirs) $(DESTDIR)$(sysconfdir) 30 if [ ! -e $(DESTDIR)$(sysconfdir)/nepenthes.conf ]; then \ 31 $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes.conf; \ 30 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/nepenthes 31 $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf.dist; \ 32 if [ ! -e $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf ]; then \ 33 $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf; \ 32 34 fi 33 35 for src in `find modules -name '*.conf.dist'`; do \ 34 $(INSTALL_DATA) "$$src" $(DESTDIR)$(sysconfdir) ; \36 $(INSTALL_DATA) "$$src" $(DESTDIR)$(sysconfdir)/nepenthes ; \ 35 37 done 36 38 for src in `find modules -name '*.conf.dist'`; do \ 37 dst="$(DESTDIR)$(sysconfdir)/ `basename "$$src" | perl -npe 's/\.dist$$//'`" ; \39 dst="$(DESTDIR)$(sysconfdir)/nepenthes/`basename "$$src" | perl -npe 's/\.dist$$//'`" ; \ 38 40 if [ ! -e "$$dst" ] ; then \ 39 41 $(INSTALL_DATA) "$$src" "$$dst" ; \ nepenthes/trunk/Makefile.in
r321 r330 1 # Makefile.in generated by automake 1.9. 4from Makefile.am.1 # Makefile.in generated by automake 1.9.6 from Makefile.am. 2 2 # @configure_input@ 3 3 4 4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004 Free Software Foundation, Inc.5 # 2003, 2004, 2005 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 69 69 esac; 70 70 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 71 am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(sysconfdir)"71 am__installdirs = "$(DESTDIR)$(docdir)" 72 72 docDATA_INSTALL = $(INSTALL_DATA) 73 sysconfDATA_INSTALL = $(INSTALL_DATA) 74 DATA = $(doc_DATA) $(sysconf_DATA) 73 DATA = $(doc_DATA) 75 74 ETAGS = etags 76 75 CTAGS = ctags … … 196 195 docdir = $(prefix)/share/doc 197 196 doc_DATA = doc/README doc/README.VFS doc/logo-shaded.svg 198 sysconf_DATA = conf/nepenthes.conf.dist 197 198 #sysconf_DATA = conf/nepenthes.conf.dist 199 199 AM_CXXFLAGS = '' 200 200 all: config.h … … 279 279 rm -f "$(DESTDIR)$(docdir)/$$f"; \ 280 280 done 281 install-sysconfDATA: $(sysconf_DATA)282 @$(NORMAL_INSTALL)283 test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"284 @list='$(sysconf_DATA)'; for p in $$list; do \285 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \286 f=$(am__strip_dir) \287 echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \288 $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \289 done290 291 uninstall-sysconfDATA:292 @$(NORMAL_UNINSTALL)293 @list='$(sysconf_DATA)'; for p in $$list; do \294 f=$(am__strip_dir) \295 echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \296 rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \297 done298 281 299 282 # This directory's subdirectories are mostly independent; you can cd … … 304 287 # (2) otherwise, pass the desired values on the `make' command line. 305 288 $(RECURSIVE_TARGETS): 306 @set fnord $$MAKEFLAGS; amf=$$2; \ 289 @failcom='exit 1'; \ 290 for f in x $$MAKEFLAGS; do \ 291 case $$f in \ 292 *=* | --[!k]*);; \ 293 *k*) failcom='fail=yes';; \ 294 esac; \ 295 done; \ 307 296 dot_seen=no; \ 308 297 target=`echo $@ | sed s/-recursive//`; \ … … 316 305 fi; \ 317 306 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 318 || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \307 || eval $$failcom; \ 319 308 done; \ 320 309 if test "$$dot_seen" = "no"; then \ … … 324 313 mostlyclean-recursive clean-recursive distclean-recursive \ 325 314 maintainer-clean-recursive: 326 @set fnord $$MAKEFLAGS; amf=$$2; \ 315 @failcom='exit 1'; \ 316 for f in x $$MAKEFLAGS; do \ 317 case $$f in \ 318 *=* | --[!k]*);; \ 319 *k*) failcom='fail=yes';; \ 320 esac; \ 321 done; \ 327 322 dot_seen=no; \ 328 323 case "$@" in \ … … 345 340 fi; \ 346 341 (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ 347 || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \342 || eval $$failcom; \ 348 343 done && test -z "$$fail" 349 344 tags-recursive: … … 564 559 installdirs: installdirs-recursive 565 560 installdirs-am: 566 for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(sysconfdir)"; do \561 for dir in "$(DESTDIR)$(docdir)"; do \ 567 562 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 568 563 done … … 613 608 install-data-am: install-data-local install-docDATA 614 609 615 install-exec-am: install-sysconfDATA610 install-exec-am: 616 611 617 612 install-info: install-info-recursive … … 639 634 ps-am: 640 635 641 uninstall-am: uninstall-docDATA uninstall-info-am \ 642 uninstall-sysconfDATA 636 uninstall-am: uninstall-docDATA uninstall-info-am 643 637 644 638 uninstall-info: uninstall-info-recursive … … 654 648 install-data-local install-docDATA install-exec \ 655 649 install-exec-am install-info install-info-am install-man \ 656 install-strip install-sysconfDATA installcheck installcheck-am \ 657 installdirs installdirs-am maintainer-clean \ 658 maintainer-clean-generic maintainer-clean-recursive \ 659 mostlyclean mostlyclean-generic mostlyclean-libtool \ 660 mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ 661 uninstall uninstall-am uninstall-docDATA uninstall-info-am \ 662 uninstall-sysconfDATA 650 install-strip installcheck installcheck-am installdirs \ 651 installdirs-am maintainer-clean maintainer-clean-generic \ 652 maintainer-clean-recursive mostlyclean mostlyclean-generic \ 653 mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ 654 tags tags-recursive uninstall uninstall-am uninstall-docDATA \ 655 uninstall-info-am 663 656 664 657 … … 671 664 #endifdef 672 665 673 # $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes .conf.dist666 # $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf.dist 674 667 675 668 install-data-local: 676 669 $(mkinstalldirs) $(DESTDIR)$(sysconfdir) 677 if [ ! -e $(DESTDIR)$(sysconfdir)/nepenthes.conf ]; then \ 678 $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes.conf; \ 670 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/nepenthes 671 $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf.dist; \ 672 if [ ! -e $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf ]; then \ 673 $(INSTALL_DATA) $(srcdir)/conf/nepenthes.conf.dist $(DESTDIR)$(sysconfdir)/nepenthes/nepenthes.conf; \ 679 674 fi 680 675 for src in `find modules -name '*.conf.dist'`; do \ 681 $(INSTALL_DATA) "$$src" $(DESTDIR)$(sysconfdir) ; \676 $(INSTALL_DATA) "$$src" $(DESTDIR)$(sysconfdir)/nepenthes ; \ 682 677 done 683 678 for src in `find modules -name '*.conf.dist'`; do \ 684 dst="$(DESTDIR)$(sysconfdir)/ `basename "$$src" | perl -npe 's/\.dist$$//'`" ; \679 dst="$(DESTDIR)$(sysconfdir)/nepenthes/`basename "$$src" | perl -npe 's/\.dist$$//'`" ; \ 685 680 if [ ! -e "$$dst" ] ; then \ 686 681 $(INSTALL_DATA) "$$src" "$$dst" ; \ nepenthes/trunk/aclocal.m4
r321 r330 1 # generated automatically by aclocal 1.9. 4-*- Autoconf -*-2 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 4 # Free Software Foundation, Inc.1 # generated automatically by aclocal 1.9.6 -*- Autoconf -*- 2 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 4 # 2005 Free Software Foundation, Inc. 5 5 # This file is free software; the Free Software Foundation 6 6 # gives unlimited permission to copy and/or distribute it, … … 15 15 16 16 # serial 47 AC_PROG_LIBTOOL 17 # Debian $Rev$ 17 18 18 19 … … 192 193 fi 193 194 194 cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`195 196 195 # Only perform the check for file, if the check method requires it 197 196 case $deplibs_check_method in … … 219 218 test -z "$pic_mode" && pic_mode=default 220 219 221 # Check if we have a version mismatch between libtool.m4 and ltmain.sh.222 #223 # Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.224 # We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually225 # calls AC_LIBTOOL_CONFIG and creates libtool.226 #227 _LT_VERSION_CHECK228 229 220 # Use C for the default configuration in the libtool script 230 221 tagname= … … 232 223 _LT_AC_TAGCONFIG 233 224 ])# AC_LIBTOOL_SETUP 234 235 236 # _LT_VERSION_CHECK237 # -----------------238 AC_DEFUN([_LT_VERSION_CHECK],239 [AC_MSG_CHECKING([for correct ltmain.sh version])240 if test -z "$ltmain"; then241 AC_MSG_RESULT(no)242 echo243 echo "*** [Gentoo] sanity check failed! ***"244 echo "*** \$ltmain is not defined, please check the patch for consistency! ***"245 echo246 exit 1247 fi248 gentoo_lt_version="1.5.10"249 gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`250 if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then251 AC_MSG_RESULT(no)252 echo253 echo "*** [Gentoo] sanity check failed! ***"254 echo "*** libtool.m4 and ltmain.sh have a version mismatch! ***"255 echo "*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***"256 echo257 echo "Please run:"258 echo259 echo " libtoolize --copy --force"260 echo261 echo "if appropriate, please contact the maintainer of this"262 echo "package (or your distribution) for help."263 echo264 exit 1265 else266 AC_MSG_RESULT(yes)267 fi268 ])# _LT_VERSION_CHECK269 225 270 226 … … 354 310 # The HP-UX ksh and POSIX shell print the target directory to stdout 355 311 # if CDPATH is set. 356 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 312 if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi 357 313 358 314 if test -z "$ECHO"; then … … 569 525 ;; 570 526 571 *-*-linux*)572 # Test if the compiler is 64bit573 echo 'int i;' > conftest.$ac_ext574 lt_cv_cc_64bit_output=no575 if AC_TRY_EVAL(ac_compile); then576 case `/usr/bin/file conftest.$ac_objext` in577 *"ELF 64"*)578 lt_cv_cc_64bit_output=yes579 ;;580 esac581 fi582 rm -rf conftest*583 ;;584 585 527 *-*-sco3.2v5*) 586 528 # On SCO OpenServer 5, we need -belf to get full-featured binaries. … … 727 669 ;; 728 670 729 netbsd* | freebsd* | openbsd* | darwin* )730 # This has been around since 386BSD, at least. Likely further.731 if test -x /sbin/sysctl; then732 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`733 elif test -x /usr/sbin/sysctl; then734 lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`735 else736 lt_cv_sys_max_cmd_len=65536 # usable default for *BSD737 fi738 # And add a safety zone739 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`740 ;;741 742 671 *) 743 672 # If test is not a shell built-in, we'll probably end up computing a 744 673 # maximum length that is only half of the actual maximum length, but 745 674 # we can't tell. 746 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} 747 while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ 675 while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ 748 676 = "XX$teststring") >/dev/null 2>&1 && 749 677 new_result=`expr "X$teststring" : ".*" 2>&1` && … … 1079 1007 _LT_AC_TAGVAR(hardcode_action, $1)= 1080 1008 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ 1081 test -n "$_LT_AC_TAGVAR(runpath_var ,$1)" || \1082 test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" ="Xyes" ; then1009 test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ 1010 test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then 1083 1011 1084 1012 # We can hardcode non-existant directories. … … 1247 1175 ;; 1248 1176 1249 bsdi [[45]]*)1177 bsdi4*) 1250 1178 version_type=linux 1251 1179 need_version=no … … 1308 1236 ;; 1309 1237 esac 1310 ;;1311 1312 linux*)1313 if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then1314 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'1315 supports_anon_versioning=no1316 case `$LD -v 2>/dev/null` in1317 *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.111318 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...1319 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...1320 *\ 2.11.*) ;; # other 2.11 versions1321 *) supports_anon_versioning=yes ;;1322 esac1323 if test $supports_anon_versioning = yes; then1324 archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~1325 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~1326 $echo "local: *; };" >> $output_objdir/$libname.ver~1327 $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'1328 else1329 $archive_expsym_cmds="$archive_cmds"1330 fi1331 else1332 ld_shlibs=no1333 fi1334 1238 ;; 1335 1239 … … 1536 1440 fi 1537 1441 1538 case $host_cpu:$lt_cv_cc_64bit_output in1539 powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)1540 sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"1541 sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"1542 ;;1543 esac1544 1545 1442 # We used to test for /lib/ld.so.1 and disable shared libraries on 1546 1443 # powerpc, because MkLinux only supported shared libraries with the … … 1550 1447 # assume the GNU/Linux dynamic linker is in use. 1551 1448 dynamic_linker='GNU/Linux ld.so' 1552 1553 # Find out which ABI we are using (multilib Linux x86_64 hack). 1554 libsuff= 1555 case "$host_cpu" in 1556 x86_64*) 1557 echo '[#]line __oline__ "configure"' > conftest.$ac_ext 1558 if AC_TRY_EVAL(ac_compile); then 1559 case `/usr/bin/file conftest.$ac_objext` in 1560 *64-bit*) 1561 libsuff=64 1562 ;; 1563 esac 1564 fi 1565 rm -rf conftest* 1566 ;; 1567 *) 1568 ;; 1569 esac 1570 sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" 1571 sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" 1449 ;; 1450 1451 netbsdelf*-gnu) 1452 version_type=linux 1453 need_lib_prefix=no 1454 need_version=no 1455 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 1456 soname_spec='${libname}${release}${shared_ext}$major' 1457 shlibpath_var=LD_LIBRARY_PATH 1458 shlibpath_overrides_runpath=no 1459 hardcode_into_libs=yes 1460 dynamic_linker='NetBSD ld.elf_so' 1572 1461 ;; 1573 1462 … … 1622 1511 version_type=sunos 1623 1512 need_lib_prefix=no 1624 need_version= no1513 need_version=yes 1625 1514 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' 1626 1515 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' … … 1788 1677 case $tagname in 1789 1678 CXX) 1790 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 1791 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 1792 (test "X$CXX" != "Xg++"))) ; then 1679 if test -n "$CXX" && test "X$CXX" != "Xno"; then 1793 1680 AC_LIBTOOL_LANG_CXX_CONFIG 1794 1681 else … … 2195 2082 esac 2196 2083 reload_cmds='$LD$reload_flag -o $output$reload_objs' 2197 case $host_os in2198 darwin*)2199 if test "$GCC" = yes; then2200 reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'2201 else2202 reload_cmds='$LD$reload_flag -o $output$reload_objs'2203 fi2204 ;;2205 esac2206 2084 ])# AC_PROG_LD_RELOAD_FLAG 2207 2085 … … 2237 2115 ;; 2238 2116 2239 bsdi [[45]]*)2117 bsdi4*) 2240 2118 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' 2241 2119 lt_cv_file_magic_cmd='/usr/bin/file -L' … … 2313 2191 ;; 2314 2192 2315 netbsd* )2193 netbsd* | netbsdelf*-gnu | knetbsd*-gnu) 2316 2194 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then 2317 2195 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' … … 2332 2210 2333 2211 openbsd*) 2212 lt_cv_file_magic_cmd=/usr/bin/file 2213 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` 2334 2214 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 2335 lt_cv_deplibs_check_method=' match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'2215 lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' 2336 2216 else 2337 lt_cv_deplibs_check_method=' match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'2217 lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' 2338 2218 fi 2339 2219 ;; … … 2525 2405 AC_DEFUN([_LT_AC_LANG_CXX], 2526 2406 [AC_REQUIRE([AC_PROG_CXX]) 2527 AC_REQUIRE([ _LT_AC_PROG_CXXCPP])2407 AC_REQUIRE([AC_PROG_CXXCPP]) 2528 2408 _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) 2529 2409 ])# _LT_AC_LANG_CXX 2530 2410 2531 # _LT_AC_PROG_CXXCPP2532 # ---------------2533 AC_DEFUN([_LT_AC_PROG_CXXCPP],2534 [2535 AC_REQUIRE([AC_PROG_CXX])2536 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&2537 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||2538 (test "X$CXX" != "Xg++"))) ; then2539 AC_PROG_CXXCPP2540 fi2541 ])# _LT_AC_PROG_CXXCPP2542 2411 2543 2412 # AC_LIBTOOL_F77 … … 2675 2544 test "$enable_shared" = yes && enable_static=no 2676 2545 fi
