diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-12-31 10:55:50 +0000 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-03-15 15:55:56 +0000 |
commit | d7613bd02f54ac149a62563174627f5083637f67 (patch) | |
tree | ca075582d3b1253ebaf1ab0c5587321defa66d13 /package/network/utils/iptables/Makefile | |
parent | e09a5efcdbf514751dd5afa78833d2c8d078d87e (diff) | |
download | upstream-d7613bd02f54ac149a62563174627f5083637f67.tar.gz upstream-d7613bd02f54ac149a62563174627f5083637f67.tar.bz2 upstream-d7613bd02f54ac149a62563174627f5083637f67.zip |
iptables: update to 1.8.4
Bump to iptable 1.8.4 and address packaging issue as mentioned in the
original bump/revert cycle.
"This reverts commit 10cbc896c0a26aecff37261450c21f29fb5b99db.
The updated iptables package does not build due to the following error
encountered on the buildbots:
cp: cannot stat '.../iptables-1.8.4/ipkg-install/usr/lib/libiptc.so.*': No such file or directory
The changelog mentions "build: remove -Wl,--no-as-needed and libiptc.so" so
it appears as if further packaging changes are needed beyond a simple
version bump."
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/utils/iptables/Makefile')
-rw-r--r-- | package/network/utils/iptables/Makefile | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index 7e8e6f7eaa..616274ebdd 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.8.3 -PKG_RELEASE:=2 +PKG_VERSION:=1.8.4 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://netfilter.org/projects/iptables/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80 +PKG_HASH:=993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c PKG_FIXUP:=autoreconf PKG_FLAGS:=nonshared @@ -487,15 +487,6 @@ define Package/ip6tables-mod-nat/description iptables extensions for IPv6-NAT targets. endef -define Package/libiptc -$(call Package/iptables/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libip4tc +libip6tc +libxtables - ABI_VERSION:=0 - TITLE:=IPv4/IPv6 firewall - shared libiptc library (nf compatibility stub) -endef - define Package/libip4tc $(call Package/iptables/Default) SECTION:=libs @@ -629,11 +620,6 @@ define Package/ip6tables-nft/install $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables{,-restore}-translate $(1)/usr/sbin/ endef -define Package/libiptc/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so.* $(1)/usr/lib/ -endef - define Package/libip4tc/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip4tc.so.* $(1)/usr/lib/ @@ -699,7 +685,6 @@ $(eval $(call BuildPackage,ip6tables)) $(eval $(call BuildPackage,ip6tables-nft)) $(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m))) $(eval $(call BuildPlugin,ip6tables-mod-nat,$(IPT_NAT6-m))) -$(eval $(call BuildPackage,libiptc)) $(eval $(call BuildPackage,libip4tc)) $(eval $(call BuildPackage,libip6tc)) $(eval $(call BuildPackage,libxtables)) |