spoofer: use protobuf-compat instead of protobuf

The package is not actively-maintained and doesn't compile with modern
Protobuf. Switch it to compat version.

Signed-off-by: George Sapkin <redacted>

diff --git a/net/spoofer/Makefile b/net/spoofer/Makefile
index 0ff984f92453d381a8d545a0884ed2d3acadca3a..a9e8f35c1250632ab1c8b77d709b8df4da390b10 100644 (file)
--- a/net/spoofer/Makefile
+++ b/net/spoofer/Makefile
@@ -1,15 +1,13 @@
 #
 # Copyright (C) 2018-2020 The Regents of the University of California
 #
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
-#
+# SPDX-License-Identifier: GPL-3.0-only
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=spoofer
 PKG_VERSION:=1.4.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.caida.org/projects/spoofer/downloads
@@ -21,7 +19,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=protobuf/host
+PKG_BUILD_DEPENDS:=protobuf-compat/host
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,7 +28,7 @@ define Package/spoofer
   CATEGORY:=Network
   TITLE:=Measure your ISP's resistance to spoofed IP packets
   URL:=https://spoofer.caida.org/
-  DEPENDS:=+protobuf-lite +libpcap +libpthread +libopenssl
+  DEPENDS:=+protobuf-compat-lite +libpcap +libpthread +libopenssl
 endef
 
 define Package/spoofer/description
@@ -46,16 +44,20 @@ that has a newer bundled certificate.
 
 endef
 
+# with-protobuf doesn't seem to work without setting the flags explicitly
 CONFIGURE_ARGS += \
        --enable-prober \
        --disable-manager
 
 CONFIGURE_VARS += \
-       PROTOC=$(STAGING_DIR_HOSTPKG)/bin/protoc
+       PKG_CONFIG_PATH="$(STAGING_DIR)/usr/protobuf-compat/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
+       PROTOBUFCPPFLAGS="-I$(STAGING_DIR)/usr/protobuf-compat/include" \
+       PROTOBUFLDFLAGS="-L$(STAGING_DIR)/usr/protobuf-compat/lib" \
+       PROTOC="$(STAGING_DIR_HOSTPKG)/bin/protoc-compat"
 
 define Package/spoofer/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin//spoofer-prober $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/spoofer-prober $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt-files/spoofer $(1)/usr/bin
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/openwrt-files/initscript $(1)/etc/init.d/spoofer