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

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

Revision: 6700
          http://sourceforge.net/p/astlinux/code/6700
Author:   abelbeck
Date:     2014-09-08 15:08:46 +0000 (Mon, 08 Sep 2014)
Log Message:
-----------
libpcap / tcpdump version bumps to 1.6.2 / 4.6.2

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

Modified: branches/1.0/package/libpcap/libpcap.mk
===================================================================
--- branches/1.0/package/libpcap/libpcap.mk	2014-09-08 14:15:01 UTC (rev 6699)
+++ branches/1.0/package/libpcap/libpcap.mk	2014-09-08 15:08:46 UTC (rev 6700)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBPCAP_VERSION = 1.4.0
+LIBPCAP_VERSION = 1.6.2
 LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_SOURCE = libpcap-$(LIBPCAP_VERSION).tar.gz
 LIBPCAP_INSTALL_STAGING = YES
@@ -18,6 +18,20 @@
 LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 
+# On purpose, not compatible with bluez5
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+LIBPCAP_DEPENDENCIES += bluez_utils
+else
+LIBPCAP_CONF_OPT += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+LIBPCAP_CONF_OPT += --enable-dbus
+LIBPCAP_DEPENDENCIES += dbus
+else
+LIBPCAP_CONF_OPT += --disable-dbus
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 LIBPCAP_CONF_OPT += --enable-canusb
 LIBPCAP_DEPENDENCIES += libusb

Modified: branches/1.0/package/tcpdump/tcpdump.mk
===================================================================
--- branches/1.0/package/tcpdump/tcpdump.mk	2014-09-08 14:15:01 UTC (rev 6699)
+++ branches/1.0/package/tcpdump/tcpdump.mk	2014-09-08 15:08:46 UTC (rev 6700)
@@ -6,7 +6,7 @@
 # Copyright (C) 2001-2003 by Erik Andersen <and...@co...>
 # Copyright (C) 2002 by Tim Riker <Ti...@Ri...>
 
-TCPDUMP_VERSION = 4.4.0
+TCPDUMP_VERSION = 4.6.2
 TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_SOURCE = tcpdump-$(TCPDUMP_VERSION).tar.gz
 

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