diff options
author | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
---|---|---|
committer | wbx <wbx@hydrogenium.(none)> | 2009-05-17 14:41:34 +0200 |
commit | 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch) | |
tree | b9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/nmap/patches |
Initial import
Diffstat (limited to 'package/nmap/patches')
-rw-r--r-- | package/nmap/patches/patch-configure | 99 | ||||
-rw-r--r-- | package/nmap/patches/patch-nmap_dns_h | 13 | ||||
-rw-r--r-- | package/nmap/patches/patch-output_cc | 12 | ||||
-rw-r--r-- | package/nmap/patches/patch-traceroute_cc | 16 |
4 files changed, 140 insertions, 0 deletions
diff --git a/package/nmap/patches/patch-configure b/package/nmap/patches/patch-configure new file mode 100644 index 000000000..378c086e2 --- /dev/null +++ b/package/nmap/patches/patch-configure @@ -0,0 +1,99 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- nmap-4.76.orig/configure 2008-09-09 01:37:03.000000000 +0200 ++++ nmap-4.76/configure 2008-12-14 18:54:23.000000000 +0100 +@@ -4035,7 +4035,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA= + + + if test -n "$GXX"; then +- CXXFLAGS="$CXXFLAGS -Wall " ++ CXXFLAGS="$CXXFLAGS " + fi + + { echo "$as_me:$LINENO: checking whether the compiler is gcc 4 or greater" >&5 +@@ -6656,86 +6656,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" +- { echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5 +-echo $ECHO_N "checking if libpcap version is recent enough... $ECHO_C" >&6; } +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-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 <stdio.h> +-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; }; have_libpcap=yes +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; }; have_libpcap=no +-fi +-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 + PCAP_DEPENDS="" diff --git a/package/nmap/patches/patch-nmap_dns_h b/package/nmap/patches/patch-nmap_dns_h new file mode 100644 index 000000000..2868f42ba --- /dev/null +++ b/package/nmap/patches/patch-nmap_dns_h @@ -0,0 +1,13 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- nmap-4.76.orig/nmap_dns.h 2008-08-21 11:24:35.000000000 +0200 ++++ nmap-4.76/nmap_dns.h 2008-12-14 19:40:58.000000000 +0100 +@@ -95,6 +95,9 @@ + * * + ***************************************************************************/ + ++#include <list> ++#include <string> ++ + class Target; + + void nmap_mass_rdns(Target ** targets, int num_targets); diff --git a/package/nmap/patches/patch-output_cc b/package/nmap/patches/patch-output_cc new file mode 100644 index 000000000..cdabf2449 --- /dev/null +++ b/package/nmap/patches/patch-output_cc @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- nmap-4.76.orig/output.cc 2008-09-10 20:32:35.000000000 +0200 ++++ nmap-4.76/output.cc 2008-10-29 13:29:04.000000000 +0100 +@@ -2003,7 +2003,7 @@ struct data_file_record { + + /* 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-traceroute_cc b/package/nmap/patches/patch-traceroute_cc new file mode 100644 index 000000000..79514733b --- /dev/null +++ b/package/nmap/patches/patch-traceroute_cc @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- nmap-4.76.orig/traceroute.cc 2008-09-06 06:12:34.000000000 +0200 ++++ nmap-4.76/traceroute.cc 2008-10-29 13:42:16.000000000 +0100 +@@ -850,9 +850,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 (); |