packages: assign PKG_CPE_ID for all missing packages

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

diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile
index 1a2cdcdd98473d6a306929df368b1cca2a140ef8..d7358e32d036c36d90a8cb179f74b12d5b05b7a9 100644 (file)
--- a/package/libs/libpcap/Makefile
+++ b/package/libs/libpcap/Makefile
@@ -8,22 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpcap
-PKG_VERSION:=1.9.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.10.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \
-        http://www.tcpdump.org/release/
-PKG_HASH:=635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
+PKG_SOURCE_URL:=https://www.tcpdump.org/release/
+PKG_HASH:=ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:tcpdump:libpcap
 
-CMAKE_INSTALL:=1
 PKG_ASLR_PIE_REGULAR:=1
-PKG_BUILD_PARALLEL:=1
 
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
+PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_rpcapd
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -46,14 +45,32 @@ define Package/libpcap/config
        source "$(SOURCE)/Config.in"
 endef
 
+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
+
+ifdef CONFIG_PACKAGE_rpcapd
+       CMAKE_OPTIONS += \
+               -DENABLE_REMOTE=ON
+endif
+
 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 \
@@ -65,15 +82,24 @@ CMAKE_OPTIONS += \
        -DBDEBUG=OFF \
        -DYYDEBUG=OFF \
 
-CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_USB)       ,,-DDISABLE_USB=ON)
-CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_BT)        ,,-DDISABLE_BLUETOOTH=ON)
-CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_NETFILTER) ,,-DPCAP_SUPPORT_NETFILTER=OFF)
-
-CMAKE_OPTIONS += $(if $(CONFIG_IPV6),-DINET6=ON,-DINET6=OFF)
+define Build/InstallDev
+       $(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/
 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))