From bdcb19554ef258df89b9c3ab2109b2acadd16866 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 12 Jul 2013 14:11:48 +0200 Subject: update to latest stable version --- package/nmap/Makefile | 8 +-- package/nmap/patches/patch-Target_cc | 15 +++++ package/nmap/patches/patch-configure | 93 ----------------------------- package/nmap/patches/patch-ncat_Makefile_in | 11 ---- package/nmap/patches/patch-ncat_configure | 93 ----------------------------- package/nmap/patches/patch-nmap_dns_h | 13 ---- package/nmap/patches/patch-output_cc | 25 ++++---- package/nmap/patches/patch-output_h | 22 +++++++ package/nmap/patches/patch-portlist_cc | 18 ++++++ package/nmap/patches/patch-scan_engine_cc | 10 ---- package/nmap/patches/patch-tcpip_cc | 10 ---- package/nmap/patches/patch-traceroute_cc | 24 -------- 12 files changed, 74 insertions(+), 268 deletions(-) create mode 100644 package/nmap/patches/patch-Target_cc delete mode 100644 package/nmap/patches/patch-configure delete mode 100644 package/nmap/patches/patch-ncat_Makefile_in delete mode 100644 package/nmap/patches/patch-ncat_configure delete mode 100644 package/nmap/patches/patch-nmap_dns_h create mode 100644 package/nmap/patches/patch-output_h create mode 100644 package/nmap/patches/patch-portlist_cc delete mode 100644 package/nmap/patches/patch-scan_engine_cc delete mode 100644 package/nmap/patches/patch-tcpip_cc delete mode 100644 package/nmap/patches/patch-traceroute_cc (limited to 'package') diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 20f17289f..d259260d9 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nmap -PKG_VERSION:= 5.00 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 32d27de32166c02d670bb4a086185886 +PKG_VERSION:= 6.25 +PKG_RELEASE:= 1 +PKG_MD5SUM:= fcc80f94ff3adcb11eedf91092ea6f5e PKG_DESCR:= utility for network exploration or security auditing PKG_SECTION:= net PKG_DEPENDS:= libdnet libpcap libpcre @@ -37,9 +37,9 @@ CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ --without-ndiff \ --without-liblua \ - --with-libdnet="${STAGING_TARGET_DIR}/usr" \ --with-libpcap="${STAGING_TARGET_DIR}/usr" \ --with-libpcre="${STAGING_TARGET_DIR}/usr" +XAKE_FLAGS+= GCC_HONOUR_COPTS=s post-install: ${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap diff --git a/package/nmap/patches/patch-Target_cc b/package/nmap/patches/patch-Target_cc new file mode 100644 index 000000000..4358b4509 --- /dev/null +++ b/package/nmap/patches/patch-Target_cc @@ -0,0 +1,15 @@ +--- nmap-6.25.orig/Target.cc 2012-08-14 18:36:25.000000000 +0200 ++++ nmap-6.25/Target.cc 2013-07-12 13:59:19.000000000 +0200 +@@ -162,10 +162,12 @@ void Target::Recycle() { + + Target::~Target() { + FreeInternal(); ++#ifndef NOLUA + while (!scriptResults.empty()) { + scriptResults.front().clear(); + scriptResults.pop_front(); + } ++#endif + } + + void Target::FreeInternal() { diff --git a/package/nmap/patches/patch-configure b/package/nmap/patches/patch-configure deleted file mode 100644 index 2ddd025f1..000000000 --- a/package/nmap/patches/patch-configure +++ /dev/null @@ -1,93 +0,0 @@ ---- nmap-5.00.orig/configure 2009-06-24 23:35:54.000000000 +0200 -+++ nmap-5.00/configure 2009-07-20 20:36:51.023261444 +0200 -@@ -7074,90 +7074,6 @@ if test $needs_cpp_precomp = yes; then - CXXFLAGS="-no-cpp-precomp $CXXFLAGS" - fi - --if test $have_libpcap = yes; then -- if test "${LIBPCAP_INC+set}" = "set"; then -- _cflags=$CXXFLAGS -- _ldflags=$LDFLAGS -- -- CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS" -- LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS" -- fi -- -- # link with -lpcap for the purposes of this test -- LIBS_OLD="$LIBS" -- LIBS="$LIBS -lpcap" -- { $as_echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5 --$as_echo_n "checking if libpcap version is recent enough... " >&6; } -- if test "$cross_compiling" = yes; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --#include --extern char pcap_version[]; --int main() { -- int major, minor1, minor2; -- sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2); -- if (major > 0) -- exit(0); -- if (minor1 < 9) -- exit(1); -- if (minor2 < 4) -- exit(1); -- exit(0); --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; }; have_libpcap=yes --else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --{ $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; }; have_libpcap=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- --LIBS="$LIBS_OLD" --fi - - LIBPCAP_LIBS="-lpcap" - if test $have_libpcap = yes; then diff --git a/package/nmap/patches/patch-ncat_Makefile_in b/package/nmap/patches/patch-ncat_Makefile_in deleted file mode 100644 index e7bbafe5a..000000000 --- a/package/nmap/patches/patch-ncat_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- nmap-5.00.orig/ncat/Makefile.in 2009-04-29 06:14:04.000000000 +0200 -+++ nmap-5.00/ncat/Makefile.in 2009-08-28 16:01:37.061874972 +0200 -@@ -126,7 +126,7 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Make - install: $(TARGET) - @echo Installing Ncat; - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)/man1 -- $(INSTALL) -c -m 755 -s ncat $(DESTDIR)$(bindir)/ncat -+ $(INSTALL) -c -m 755 ncat $(DESTDIR)$(bindir)/ncat - $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/ - $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1 - diff --git a/package/nmap/patches/patch-ncat_configure b/package/nmap/patches/patch-ncat_configure deleted file mode 100644 index 1b7371f50..000000000 --- a/package/nmap/patches/patch-ncat_configure +++ /dev/null @@ -1,93 +0,0 @@ ---- nmap-5.00.orig/ncat/configure 2009-06-11 08:15:24.000000000 +0200 -+++ nmap-5.00/ncat/configure 2009-07-20 20:47:33.391408119 +0200 -@@ -7044,90 +7044,6 @@ fi - fi - - --if test $have_libpcap = yes; then -- if test "${LIBPCAP_INC+set}" = "set"; then -- _cflags=$CXXFLAGS -- _ldflags=$LDFLAGS -- -- CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS" -- LDFLAGS="-L$LIBPCAP_LIB $LDFLAGS" -- fi -- -- # link with -lpcap for the purposes of this test -- LIBS_OLD="$LIBS" -- LIBS="$LIBS -lpcap" -- { $as_echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5 --$as_echo_n "checking if libpcap version is recent enough... " >&6; } -- if test "$cross_compiling" = yes; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --#include --extern char pcap_version[]; --int main() { -- int major, minor1, minor2; -- sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2); -- if (major > 0) -- exit(0); -- if (minor1 < 9) -- exit(1); -- if (minor2 < 4) -- exit(1); -- exit(0); --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; }; have_libpcap=yes --else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --{ $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; }; have_libpcap=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- --LIBS="$LIBS_OLD" --fi - - PCAP_LIBS="-lpcap" - if test $have_libpcap = yes; then diff --git a/package/nmap/patches/patch-nmap_dns_h b/package/nmap/patches/patch-nmap_dns_h deleted file mode 100644 index 31fb4f536..000000000 --- a/package/nmap/patches/patch-nmap_dns_h +++ /dev/null @@ -1,13 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nmap-5.00.orig/nmap_dns.h 2009-06-24 23:35:54.000000000 +0200 -+++ nmap-5.00/nmap_dns.h 2009-07-20 20:33:41.191399691 +0200 -@@ -86,6 +86,9 @@ - * * - ***************************************************************************/ - -+#include -+#include -+ - class Target; - - #include diff --git a/package/nmap/patches/patch-output_cc b/package/nmap/patches/patch-output_cc index 38058b98a..f43036e11 100644 --- a/package/nmap/patches/patch-output_cc +++ b/package/nmap/patches/patch-output_cc @@ -1,12 +1,17 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nmap-5.00.orig/output.cc 2009-06-24 23:35:54.000000000 +0200 -+++ nmap-5.00/output.cc 2009-07-20 20:33:41.267403513 +0200 -@@ -1966,7 +1966,7 @@ struct data_file_record { +--- nmap-6.25.orig/output.cc 2012-11-29 04:19:52.000000000 +0100 ++++ nmap-6.25/output.cc 2013-07-12 14:06:38.000000000 +0200 +@@ -2613,6 +2613,7 @@ void printdatafilepaths() { + } + } + ++#ifndef NOLUA + /*This is a helper function to determine the ordering of the script results + based on their id */ + bool comparescriptids(ScriptResult first, ScriptResult second){ +@@ -2625,5 +2626,6 @@ bool comparescriptids(ScriptResult first + else + return false; + } ++#endif - /* Compares this record to another. First compare the directory names, then - compare the file names. */ -- bool operator<(const struct data_file_record& other) { -+ bool operator<(const struct data_file_record& other) const { - int cmp; - cmp = dir.compare(other.dir); diff --git a/package/nmap/patches/patch-output_h b/package/nmap/patches/patch-output_h new file mode 100644 index 000000000..8dd3e4651 --- /dev/null +++ b/package/nmap/patches/patch-output_h @@ -0,0 +1,22 @@ +--- nmap-6.25.orig/output.h 2012-08-14 18:36:25.000000000 +0200 ++++ nmap-6.25/output.h 2013-07-12 14:06:07.000000000 +0200 +@@ -226,6 +226,10 @@ std::string protect_xml(const std::strin + void printscriptresults(ScriptResults *scriptResults, stype scantype); + + void printhostscriptresults(Target *currenths); ++ ++/*This is a helper function to determine the ordering of the script results ++ based on their id */ ++bool comparescriptids(ScriptResult first, ScriptResult second); + #endif + + /* Print a table with traceroute hops. */ +@@ -253,8 +257,4 @@ void printfinaloutput(); + were found. */ + void printdatafilepaths(); + +-/*This is a helper function to determine the ordering of the script results +- based on their id */ +-bool comparescriptids(ScriptResult first, ScriptResult second); +- + #endif /* OUTPUT_H */ diff --git a/package/nmap/patches/patch-portlist_cc b/package/nmap/patches/patch-portlist_cc new file mode 100644 index 000000000..a974ca013 --- /dev/null +++ b/package/nmap/patches/patch-portlist_cc @@ -0,0 +1,18 @@ +--- nmap-6.25.orig/portlist.cc 2012-10-11 06:45:50.000000000 +0200 ++++ nmap-6.25/portlist.cc 2013-07-12 14:10:04.000000000 +0200 +@@ -144,6 +144,7 @@ void Port::freeService(bool del_service) + } + } + ++#ifndef NOLUA + void Port::freeScriptResults(void) + { + while (!scriptResults.empty()) { +@@ -151,6 +152,7 @@ void Port::freeScriptResults(void) + scriptResults.pop_front(); + } + } ++#endif + + /* Fills in namebuf (as long as there is space in buflen) with the + Name nmap normal output will use to describe the port. This takes diff --git a/package/nmap/patches/patch-scan_engine_cc b/package/nmap/patches/patch-scan_engine_cc deleted file mode 100644 index b7c7f6743..000000000 --- a/package/nmap/patches/patch-scan_engine_cc +++ /dev/null @@ -1,10 +0,0 @@ ---- nmap-5.00.orig/scan_engine.cc 2009-06-24 23:35:54.000000000 +0200 -+++ nmap-5.00/scan_engine.cc 2009-07-20 21:04:40.819619295 +0200 -@@ -104,6 +104,7 @@ - #include "Target.h" - #include "targets.h" - #include "utils.h" -+#include "sctp.h" - #include - #include - #include diff --git a/package/nmap/patches/patch-tcpip_cc b/package/nmap/patches/patch-tcpip_cc deleted file mode 100644 index b2156efd4..000000000 --- a/package/nmap/patches/patch-tcpip_cc +++ /dev/null @@ -1,10 +0,0 @@ ---- nmap-5.00.orig/tcpip.cc 2009-06-24 23:35:54.000000000 +0200 -+++ nmap-5.00/tcpip.cc 2009-07-20 20:58:55.362028065 +0200 -@@ -99,6 +99,7 @@ - #include "NmapOps.h" - #include "Target.h" - #include "utils.h" -+#include "sctp.h" - - #if HAVE_SYS_TIME_H - #include diff --git a/package/nmap/patches/patch-traceroute_cc b/package/nmap/patches/patch-traceroute_cc deleted file mode 100644 index 130d4d0fc..000000000 --- a/package/nmap/patches/patch-traceroute_cc +++ /dev/null @@ -1,24 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nmap-5.00.orig/traceroute.cc 2009-06-24 23:35:54.000000000 +0200 -+++ nmap-5.00/traceroute.cc 2009-07-20 21:07:42.902998599 +0200 -@@ -170,6 +170,7 @@ - #include "protocols.h" - #include "timing.h" - #include "utils.h" -+#include "sctp.h" - #include - #include - -@@ -905,9 +906,12 @@ Traceroute::outputTarget (Target * t) { - tg = TraceGroups[t->v4host ().s_addr]; - - /* sort into ttl order */ -+ /* quick hack - for (it = tg->TraceProbes.begin (); it != tg->TraceProbes.end (); ++it) - sortedProbes[it->second->ttl] = it->second; - sortedProbes.swap (tg->TraceProbes); -+ */ -+ - - /* clean up and consolidate traces */ - tg->consolidateHops (); -- cgit v1.2.3