From f3cc98651b738ac7f2dc56ea772afa9f874b9d3b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 7 Apr 2014 17:23:11 +0200
Subject: allow to enable daemons on startup via menuconfig

---
 package/iptables/Makefile             | 20 ++++++++++++++------
 package/iptables/files/firewall6.init |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'package/iptables')

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index d9fa9fd2a..fe2d9404b 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		iptables
 PKG_VERSION:=		1.4.21
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		536d048c8e8eeebcd9757d0863ebb0c0
-PKG_DESCR:=		The netfilter firewalling software
+PKG_DESCR:=		netfilter firewalling software
 PKG_SECTION:=		firewall
 PKG_DEPENDS:=		kmod-ip-nf-iptables kmod-nf-conntrack
 PKG_DEPENDS+=		kmod-nf-conntrack-ipv4 kmod-full-nat
@@ -22,13 +22,19 @@ 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},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(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}))
 
 TARGET_LDFLAGS+=	-fPIC
 CONFIGURE_ARGS+=	--enable-devel
@@ -41,9 +47,11 @@ iptables-install:
 	${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib
-	${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin}
-	${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IPTABLES}/etc
-	${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin
-	${CP} ${WRKINST}/usr/lib/libip6tc.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
diff --git a/package/iptables/files/firewall6.init b/package/iptables/files/firewall6.init
index bedb639a9..162b98a4f 100755
--- a/package/iptables/files/firewall6.init
+++ b/package/iptables/files/firewall6.init
@@ -1,5 +1,5 @@
 #!/bin/sh
-#PKG iptables
+#PKG ip6tables
 #INIT 45
 . /etc/rc.conf
 
-- 
cgit v1.2.3