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

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

Revision: 7007
          http://sourceforge.net/p/astlinux/code/7007
Author:   abelbeck
Date:     2015-03-15 15:30:20 +0000 (Sun, 15 Mar 2015)
Log Message:
-----------
libpcap / tcpdump version bumps to 1.7.2 / 4.7.3

Modified Paths:
--------------
    branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch
    branches/1.0/package/libpcap/libpcap.mk
    branches/1.0/package/tcpdump/tcpdump.mk

Modified: branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch
===================================================================
--- branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch	2015-03-15 14:19:23 UTC (rev 7006)
+++ branches/1.0/package/libpcap/libpcap-remove-libnl-include-path.patch	2015-03-15 15:30:20 UTC (rev 7007)
@@ -1,16 +1,25 @@
 Remove hardcoded path to libnl3 include directory
 
 Signed-off-by: Thomas Petazzoni <tho...@fr...>
+[Gustavo: update for 1.7.2]
 
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -445,7 +445,6 @@
+diff -Nura libpcap-1.7.2.orig/configure.in libpcap-1.7.2/configure.in
+--- libpcap-1.7.2.orig/configure.in	2015-03-14 08:02:05.538706347 -0300
++++ libpcap-1.7.2/configure.in	2015-03-14 08:17:22.637519050 -0300
+@@ -461,14 +461,13 @@
+ 			#
+ 			# Yes, we have libnl 3.x.
+ 			#
+-			LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS"
++			LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
  			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
  			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
  			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS -I/usr/include/libnl3"
+-			V_INCLS="$V_INCLS ${incdir}"
  			have_any_nl="yes"
- 		])
+-		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
++		],[], -lnl-genl-3 -lnl-3 )
  
+ 		if test x$have_any_nl = xno ; then
+ 			#

Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk	2015-03-15 14:19:23 UTC (rev 7006)
+++ branches/1.0/package/libpcap/libpcap.mk	2015-03-15 15:30:20 UTC (rev 7007)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBPCAP_VERSION = 1.6.2
+LIBPCAP_VERSION = 1.7.2
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz
 LIBPCAP_INSTALL_STAGING = YES
@@ -12,12 +12,19 @@
 
 # We're patching configure.in
 LIBPCAP_AUTORECONF = YES
-LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
-		ac_cv_header_linux_wireless_h=yes \
-		CFLAGS="$(LIBPCAP_CFLAGS)"
+LIBPCAP_CONF_ENV = \
+	ac_cv_linux_vers=2 \
+	ac_cv_header_linux_wireless_h=yes \
+	CFLAGS="$(LIBPCAP_CFLAGS)"
 LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
+# Omit -rpath from pcap-config output
+define LIBPCAP_CONFIG_REMOVE_RPATH
+	$(SED) 's/^V_RPATH_OPT=.*/V_RPATH_OPT=""/g' $(@D)/pcap-config
+endef
+LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH
+
 # On purpose, not compatible with bluez5
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
 LIBPCAP_DEPENDENCIES += bluez_utils

Modified: branches/1.0/package/tcpdump/tcpdump.mk
===================================================================
--- branches/1.0/package/tcpdump/tcpdump.mk	2015-03-15 14:19:23 UTC (rev 7006)
+++ branches/1.0/package/tcpdump/tcpdump.mk	2015-03-15 15:30:20 UTC (rev 7007)
@@ -3,16 +3,19 @@
 # tcpdump
 #
 #############################################################
-# Copyright (C) 2001-2003 by Erik Andersen <and...@co...>
-# Copyright (C) 2002 by Tim Riker <Ti...@Ri...>
 
-TCPDUMP_VERSION = 4.6.2
+TCPDUMP_VERSION = 4.7.3
 TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
 
-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_CONF_ENV = \
+	ac_cv_linux_vers=2 \
+	td_cv_buggygetaddrinfo=no \
+	PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
+TCPDUMP_CONF_OPT = \
+	--without-crypto \
+	--with-system-libpcap \
+	$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 TCPDUMP_DEPENDENCIES = zlib libpcap
 
 # make install installs an unneeded extra copy of the tcpdump binary

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