summaryrefslogtreecommitdiff
path: root/package/iptables/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-15 16:34:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-15 16:34:38 +0200
commitda074de37f3f49ff70644bf37178e31d1ca0f065 (patch)
tree1b94a3d8d019ec0bfa397d33fe72f78153a7acf1 /package/iptables/Makefile
parent12117c47fa424fbb41fd105434e0b80f0f3cac62 (diff)
remove subpackage ip6tables
Diffstat (limited to 'package/iptables/Makefile')
-rw-r--r--package/iptables/Makefile25
1 files changed, 9 insertions, 16 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 477619c78..654278503 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= iptables
PKG_VERSION:= 1.4.21
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0
PKG_DESCR:= netfilter firewalling software
PKG_SECTION:= firewall
+PKG_DEPENDS:= libnetfilter_conntrack
PKG_BUILDDEP:= autotool libnetfilter_conntrack
PKG_URL:= http://www.netfilter.org/
PKG_SITES:= http://www.netfilter.org/projects/iptables/files/
@@ -16,19 +17,13 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_SUBPKGS:= IPTABLES IP6TABLES
-PKGSD_IPTABLES:= iptables for IPv4
-PKGSD_IP6TABLES:= iptables for IPv6
-PKGSS_IP6TABLES:= iptables
-
include ${TOPDIR}/mk/package.mk
# right now default extensions are builtin
# use --disable-static in CONFIGURE_ARGS to change and optimize package
#include ${LINUX_DIR}/.config
-$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_IPTABLES},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_IP6TABLES},${PKGSD_IP6TABLES},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
AUTOTOOL_STYLE:= autoreconf
TARGET_LDFLAGS+= -fPIC
@@ -37,16 +32,14 @@ CONFIGURE_ARGS+= --enable-devel
iptables-install:
${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc
- ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin
- ${CP} ${WRKINST}/usr/sbin/xtables* ${IDIR_IPTABLES}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/iptables ${IDIR_IPTABLES}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/iptables-{save,restore} \
+ ${IDIR_IPTABLES}/usr/sbin
+ ${CP} ${WRKINST}/usr/sbin/xtables-multi ${IDIR_IPTABLES}/usr/sbin
${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib
${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib
-ip6tables-install:
- ${INSTALL_DIR} ${IDIR_IP6TABLES}/{usr/lib,etc,usr/sbin}
- ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IP6TABLES}/etc
- ${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin
- ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib
-
include ${TOPDIR}/mk/pkg-bottom.mk