[Astlinux-commits] SF.net SVN: astlinux:[5810] branches/1.0/package

[<abe...@us...>]

Revision: 5810
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5810&view=rev
Author:   abelbeck
Date:     2012-12-16 15:07:52 +0000 (Sun, 16 Dec 2012)
Log Message:
-----------
tcpdump, version bump to 4.3.0
libpcap, version bump to 1.3.0
Note: Must disable CANUSB in libpcap, causes USB related kernel panics, and --disable-canusb or --enable-canusb=no do not work so a patch is necessary to disable canusb

Modified Paths:
--------------
    branches/1.0/package/libpcap/libpcap.mk
    branches/1.0/package/tcpdump/tcpdump.mk

Added Paths:
-----------
    branches/1.0/package/libpcap/libpcap-disable-canusb.patch

Added: branches/1.0/package/libpcap/libpcap-disable-canusb.patch
===================================================================
--- branches/1.0/package/libpcap/libpcap-disable-canusb.patch	                        (rev 0)
+++ branches/1.0/package/libpcap/libpcap-disable-canusb.patch	2012-12-16 15:07:52 UTC (rev 5810)
@@ -0,0 +1,16 @@
+--- libpcap-1.3.0/configure.in.orig	2012-12-16 08:12:01.000000000 -0600
++++ libpcap-1.3.0/configure.in	2012-12-16 08:15:17.000000000 -0600
+@@ -1395,10 +1395,10 @@
+ fi
+ 
+ AC_ARG_ENABLE([canusb],
+-[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])]
+-,enable_canusb=yes)
++[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=no, if support available@:>@])]
++,enable_canusb=no)
+ 
+-if test "x$enable_canusb" != "xno" ; then
++if test "x$enable_canusb" = "xyes" ; then
+ 	dnl check for canusb support
+ 	case "$host_os" in
+ 	linux*)

Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk	2012-12-15 17:58:42 UTC (rev 5809)
+++ branches/1.0/package/libpcap/libpcap.mk	2012-12-16 15:07:52 UTC (rev 5810)
@@ -4,15 +4,21 @@
 #
 #############################################################
 
-LIBPCAP_VERSION = 1.2.1
+LIBPCAP_VERSION = 1.3.0
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz
 LIBPCAP_INSTALL_STAGING = YES
-# doesn't have an install-strip
-LIBPCAP_INSTALL_TARGET_OPT= DESTDIR="$(TARGET_DIR)" \
-	$(if $(BR2_PREFER_STATIC_LIB),install,install-shared)
-LIBPCAP_INSTALL_STAGING_OPT= DESTDIR="$(STAGING_DIR)" install \
-	$(if $(BR2_PREFER_STATIC_LIB),,install-shared)
+
+# The configure.in file contains the necessary code to handle
+# --enable-shared/--disable-shared properly, but the configure script
+# bundled with the libpcap tarball is not up-to-date with the
+# configure.in file. In order to get proper handling of
+# --enable-shared/--disable-shared, which is needed when doing a
+# static library build, we autoreconfigure this package. This can be
+# removed when bumping libpcap, after checking that the bundled
+# configure script correctly handles --enable-shared/--disable-shared.
+LIBPCAP_AUTORECONF = YES
+
 LIBPCAP_DEPENDENCIES = zlib
 LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
 		  ac_cv_header_linux_wireless_h=yes # configure misdetects this

Modified: branches/1.0/package/tcpdump/tcpdump.mk
===================================================================
--- branches/1.0/package/tcpdump/tcpdump.mk	2012-12-15 17:58:42 UTC (rev 5809)
+++ branches/1.0/package/tcpdump/tcpdump.mk	2012-12-16 15:07:52 UTC (rev 5810)
@@ -6,10 +6,11 @@
 # Copyright (C) 2001-2003 by Erik Andersen <and...@co...>
 # Copyright (C) 2002 by Tim Riker <Ti...@Ri...>
 
-TCPDUMP_VERSION = 4.2.1
+TCPDUMP_VERSION = 4.3.0
 TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
-TCPDUMP_CONF_ENV = ac_cv_linux_vers=2
+
+TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
 TCPDUMP_CONF_OPT = --without-crypto \
 		$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 TCPDUMP_DEPENDENCIES = zlib libpcap

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.