X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fnetwork%2Futils%2Febtables%2FMakefile;h=ebbdcb035f816cf571f5f5538d600fec667c39f5;hb=e8725a932e16eaf6ec51add8c084d959cbe32ff2;hp=7a3a82569d8d4d0b3bdd303f8a39f733f1fa2ecc;hpb=9e9696afc8f295b5abd1a8bc0b1826d7ec5e54ca;p=openwrt%2Fstaging%2Fstintel.git

diff --git a/package/network/utils/ebtables/Makefile b/package/network/utils/ebtables/Makefile
index 7a3a82569d..ebbdcb035f 100644
--- a/package/network/utils/ebtables/Makefile
+++ b/package/network/utils/ebtables/Makefile
@@ -8,42 +8,49 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables
-PKG_SOURCE_DATE:=2015-10-28
+PKG_SOURCE_DATE:=2018-06-27
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://git.netfilter.org/ebtables
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4c3e5cd3dbae3ea773e9dcca7cf019b2713af70d
-PKG_MIRROR_HASH:=997a877da02d6e2141e6d31c5d4dd005737facecfdbea07308c0e1286db8591c
+PKG_SOURCE_VERSION:=48cff25dfea5b37e16ba5dc6601e98ab140f5f99
+PKG_MIRROR_HASH:=160f5087b403173d5d1e93880d28b89dab98e828ba3f545315bf1cb88afe5a46
 
 PKG_LICENSE:=GPL-2.0
+PKG_CPE_ID:=cpe:/a:netfilter:ebtables
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/ebtables
+define Package/ebtables-legacy
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=Firewall
   DEPENDS:=+kmod-ebtables
   TITLE:=Ethernet bridge firewall administration utility
   URL:=http://ebtables.sourceforge.net/
+  PROVIDES:=ebtables
+  ALTERNATIVES:=\
+    200:/usr/sbin/ebtables:/usr/sbin/ebtables-legacy
 endef
 
-define Package/ebtables-utils
-  $(call Package/ebtables)
-  DEPENDS += ebtables
+define Package/ebtables-legacy-utils
+  $(call Package/ebtables-legacy)
+  DEPENDS:=ebtables-legacy
   TITLE:=ebtables save/restore utilities
+  PROVIDES:=ebtables-utils
+  ALTERNATIVES:=\
+    200:/usr/sbin/ebtables-restore:/usr/sbin/ebtables-legacy-restore
 endef
 
-define Package/ebtables/description
+define Package/ebtables-legacy/description
 	The ebtables program is a filtering tool for a bridging firewall. The
 	filtering is focussed on the Link Layer Ethernet frame fields. Apart
 	from filtering, it also gives the ability to alter the Ethernet MAC
 	addresses and implement a brouter.
 endef
 
-define Package/ebtables-utils/description
-	$(call Package/ebtables/description)
+define Package/ebtables-legacy-utils/description
+	$(call Package/ebtables-legacy/description)
 endef
 
 MAKE_VARS += EXT_LIBSI="$(LIBGCC_S)"
@@ -52,21 +59,22 @@ MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LIBDIR="/usr/lib/ebtables"
 
-define Package/ebtables/install
+define Package/ebtables-legacy/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/ethertypes $(1)/etc/
 	$(INSTALL_DIR) $(1)/usr/lib/ebtables
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib*.so $(1)/usr/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/extensions/*.so $(1)/usr/lib/ebtables/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/ebtables-legacy
 endef
 
-define Package/ebtables-utils/install
+define Package/ebtables-legacy-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-save $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-restore $(1)/usr/sbin/
+	#ebtables-save depends on perl and is just broken
+	#$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-save $(1)/usr/sbin/ebtables-legacy-save
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-restore $(1)/usr/sbin/ebtables-legacy-restore
 endef
 
-$(eval $(call BuildPackage,ebtables))
-$(eval $(call BuildPackage,ebtables-utils))
+$(eval $(call BuildPackage,ebtables-legacy))
+$(eval $(call BuildPackage,ebtables-legacy-utils))