Changeset 22620


Ignore:
Timestamp:
2010-08-13T17:13:18+02:00 (6 years ago)
Author:
acoul
Message:

net/nmap: update nmap to 5.35DC1

Location:
packages/net/nmap
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/nmap/Makefile

    r21480 r22620  
    99 
    1010PKG_NAME:=nmap 
    11 PKG_VERSION:=4.20 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=5.35DC1 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist 
    16 PKG_MD5SUM:=ea50419f99472200c4184a304e3831ea 
     16PKG_MD5SUM:=5bc2f8629f26716aa78d4bfe474a5d3a 
    1717 
    1818PKG_INSTALL:=1 
     
    3535        --without-openssl \ 
    3636        --without-nmapfe \ 
    37         --with-libdnet="$(STAGING_DIR)/usr" \ 
     37        --without-liblua \ 
     38        --with-libdnet=included \ 
    3839        --with-libpcap="$(STAGING_DIR)/usr" \ 
    39         --with-libpcre="$(STAGING_DIR)/usr" \ 
    4040 
    4141CONFIGURE_VARS += \ 
    4242        CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ 
    4343        CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ 
     44        LDFLAGS="$$$$LDFLAGS -lm" \ 
    4445        LIBS="-nodefaultlibs -luClibc++ $(LIBGCC_S)" \ 
    4546 
  • packages/net/nmap/patches/001-cross_compile.patch

    r6526 r22620  
    1 # 
    2 # Just assume pcap version is recent enough when cross-compiling 
    3 # 
    4 diff -ruN nmap-4.01-old/configure nmap-4.01-new/configure 
    5 --- nmap-4.01-old/configure     2006-02-02 03:18:42.000000000 +0100 
    6 +++ nmap-4.01-new/configure     2006-10-23 22:08:15.000000000 +0200 
    7 @@ -5865,8 +5865,8 @@ 
    8    echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5 
    9  echo $ECHO_N "checking if libpcap version is recent enough... $ECHO_C" >&6 
    10    if test "$cross_compiling" = yes; then 
    11 -  echo "$as_me:$LINENO: result: no" >&5 
    12 -echo "${ECHO_T}no" >&6; have_libpcap=no 
    13 +  echo "$as_me:$LINENO: result: yes" >&5 
    14 +echo "${ECHO_T}yes" >&6; have_libpcap=yes 
    15  else 
    16    cat >conftest.$ac_ext <<_ACEOF 
    17  /* confdefs.h.  */ 
     1--- a/output.cc 
     2+++ b/output.cc 
     3@@ -2240,7 +2240,7 @@ struct data_file_record { 
     4  
     5   /* Compares this record to another. First compare the directory names, then 
     6      compare the file names. */ 
     7-  bool operator<(const struct data_file_record &other) { 
     8+  bool operator<(const struct data_file_record &other) const { 
     9     int cmp; 
     10  
     11     cmp = dir.compare(other.dir); 
  • packages/net/nmap/patches/002-no_strip.patch

    r15247 r22620  
    1 diff -urN nmap-4.01.old/Makefile.in nmap-4.01.dev/Makefile.in 
    2 --- nmap-4.01.old/Makefile.in   2006-02-09 19:22:27.000000000 -0700 
    3 +++ nmap-4.01.dev/Makefile.in   2006-03-29 23:14:12.000000000 -0700 
    4 @@ -152,7 +152,7 @@ 
    5   
    6  install-nmap: $(TARGET) 
    7         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) 
    8 -       $(INSTALL) -c -m 755 -s nmap $(DESTDIR)$(bindir)/nmap 
    9 +       $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap 
    10         $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1 
    11         $(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/ 
    12         $(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/ 
     1--- a/ncat/Makefile.in 
     2+++ b/ncat/Makefile.in 
     3@@ -136,7 +136,7 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Make 
     4 install: $(TARGET) 
     5        @echo Installing Ncat; 
     6        $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)/man1 
     7-       $(INSTALL) -c -m 755 -s ncat $(DESTDIR)$(bindir)/ncat 
     8+       $(INSTALL) -c -m 755 ncat $(DESTDIR)$(bindir)/ncat 
     9        if [ -n "$(DATAFILES)" ]; then \ 
     10                $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \ 
     11        fi 
Note: See TracChangeset for help on using the changeset viewer.