libpcap: update to 1.10.4

[openwrt/staging/dedeckeh.git] / package / libs / libpcap / Makefile

diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile
index 41e0d6f51cedafd7e754a1c8c7344b5abf1348d4..107c00aa03165d7a99ce14357570a177a2df40bd 100644 (file)
--- a/package/libs/libpcap/Makefile
+++ b/package/libs/libpcap/Makefile
@@ -8,22 +8,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
-PKG_VERSION:=1.5.3
+PKG_VERSION:=1.10.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.tcpdump.org/release/
-PKG_MD5SUM:=7e7321fb3aff2f2bb05c8229f3795d4a
-PKG_FIXUP:=patch-libtool
+PKG_SOURCE_URL:=https://www.tcpdump.org/release/
+PKG_HASH:=ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_ASLR_PIE_REGULAR:=1
+
+PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_rpcapd
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libpcap
   SECTION:=libs
@@ -31,6 +32,7 @@ define Package/libpcap
   TITLE:=Low-level packet capture library
   URL:=http://www.tcpdump.org/
   MENU:=1
+  ABI_VERSION:=1
 endef
 
 define Package/libpcap/description
@@ -42,58 +44,61 @@ define Package/libpcap/config
        source "$(SOURCE)/Config.in"
 endef
 
-TARGET_CFLAGS += \
-       -ffunction-sections \
-       -fdata-sections
-
-CONFIGURE_VARS += \
-       ac_cv_linux_vers=$(LINUX_VERSION) \
-       ac_cv_header_libusb_1_0_libusb_h=no \
-       ac_cv_netfilter_can_compile=no
-
-
-CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
-       --disable-yydebug \
-       --with-build-cc="$(HOSTCC)" \
-       --with-pcap=linux \
-       --without-septel \
-       --without-dag \
-       --without-libnl \
-       --without-snf \
-       --disable-can \
-       --disable-canusb \
-       --disable-dbus \
-       --disable-bluetooth
-
-ifeq ($(CONFIG_IPV6),y)
-CONFIGURE_ARGS += \
-       --enable-ipv6
-endif
+define Package/rpcapd
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Capture daemon to be controlled by a remote libpcap application
+  URL:=http://www.tcpdump.org/
+  DEPENDS+= +libpcap
+endef
 
-MAKE_FLAGS += \
-       CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include"
+ifdef CONFIG_PACKAGE_rpcapd
+       CMAKE_OPTIONS += \
+               -DENABLE_REMOTE=ON
+endif
 
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(if $(CONFIG_PCAP_HAS_USB),,$(SED) '/^#define PCAP_SUPPORT_USB/D' $(PKG_BUILD_DIR)/config.h)
-       $(if $(CONFIG_PCAP_HAS_USB),,$(SED) 's/pcap-usb-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
-       $(if $(CONFIG_PCAP_HAS_BT),,$(SED) '/^#define PCAP_SUPPORT_BT/D' $(PKG_BUILD_DIR)/config.h)
-       $(if $(CONFIG_PCAP_HAS_BT),,$(SED) 's/pcap-bt-linux.c *//' $(PKG_BUILD_DIR)/Makefile)
-endef
+CMAKE_OPTIONS += \
+       -DBUILD_SHARED_LIBS=ON \
+       -DBUILD_WITH_LIBNL=OFF \
+       -DINET6=O$(if $(CONFIG_IPV6),N,FF) \
+       -DPCAP_SUPPORT_NETFILTER=O$(if $(CONFIG_PCAP_HAS_NETFILTER),N,FF)
+
+# grep 'option(DISABLE_' CMakeLists.txt | cut -f2 -d'(' | cut -f1 -d' ' | sort --unique
+CMAKE_OPTIONS += \
+       -DDISABLE_BLUETOOTH=O$(if $(CONFIG_PCAP_HAS_BT),FF,N) \
+       -DDISABLE_DAG=ON \
+       -DDISABLE_DBUS=ON \
+       -DDISABLE_DPDK=ON \
+       -DDISABLE_LINUX_USBMON=O$(if $(CONFIG_PCAP_HAS_USB),FF,N) \
+       -DDISABLE_NETMAP=ON \
+       -DDISABLE_RDMA=ON \
+       -DDISABLE_SEPTEL=ON \
+       -DDISABLE_SNF=ON \
+       -DDISABLE_TC=ON \
+
+# Debugging options
+CMAKE_OPTIONS += \
+       -DBDEBUG=OFF \
+       -DYYDEBUG=OFF \
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(1)/usr/include/
-
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(1)/usr/lib/
+       $(call Build/InstallDev/cmake,$(1))
+       $(SED) \
+               's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+               $(1)/usr/bin/pcap-config
+       $(INSTALL_DIR) $(2)/bin
+       $(LN) ../../usr/bin/pcap-config $(2)/bin/pcap-config
 endef
 
 define Package/libpcap/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
+endef
+
+define Package/rpcapd/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rpcapd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,libpcap))
+$(eval $(call BuildPackage,rpcapd))