From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/iptables/Makefile | 12 ++++++++---- package/iptables/files/iptables.postinst | 7 +++++++ package/iptables/ipkg/ip6tables.control | 5 ----- package/iptables/ipkg/iptables-extra.control | 5 ----- package/iptables/ipkg/iptables-mod-conntrack.control | 5 ----- package/iptables/ipkg/iptables-mod-extra.control | 5 ----- package/iptables/ipkg/iptables-mod-filter.control | 5 ----- package/iptables/ipkg/iptables-mod-imq.control | 5 ----- package/iptables/ipkg/iptables-mod-ipopt.control | 5 ----- package/iptables/ipkg/iptables-mod-ipsec.control | 5 ----- package/iptables/ipkg/iptables-mod-nat.control | 5 ----- package/iptables/ipkg/iptables-mod-ulog.control | 5 ----- package/iptables/ipkg/iptables-utils.control | 5 ----- package/iptables/ipkg/iptables.control | 4 ---- package/iptables/ipkg/iptables.postinst | 7 ------- 15 files changed, 15 insertions(+), 70 deletions(-) create mode 100644 package/iptables/files/iptables.postinst delete mode 100644 package/iptables/ipkg/ip6tables.control delete mode 100644 package/iptables/ipkg/iptables-extra.control delete mode 100644 package/iptables/ipkg/iptables-mod-conntrack.control delete mode 100644 package/iptables/ipkg/iptables-mod-extra.control delete mode 100644 package/iptables/ipkg/iptables-mod-filter.control delete mode 100644 package/iptables/ipkg/iptables-mod-imq.control delete mode 100644 package/iptables/ipkg/iptables-mod-ipopt.control delete mode 100644 package/iptables/ipkg/iptables-mod-ipsec.control delete mode 100644 package/iptables/ipkg/iptables-mod-nat.control delete mode 100644 package/iptables/ipkg/iptables-mod-ulog.control delete mode 100644 package/iptables/ipkg/iptables-utils.control delete mode 100644 package/iptables/ipkg/iptables.control delete mode 100644 package/iptables/ipkg/iptables.postinst (limited to 'package/iptables') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 150d5d68e..409eaceba 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,19 +9,23 @@ PKG_NAME:= iptables PKG_VERSION:= 1.4.3.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 545698693b636cfc844aafc6729fd48a -MASTER_SITES:= http://www.netfilter.org/projects/iptables/files/ \ +PKG_DESCR:= The netfilter firewalling software +PKG_SECTION:= net +PKG_URL:= http://www.netfilter.org +PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk include ${LINUX_DIR}/.config -$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_IPV6),y) -$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) endif CONFIGURE_STYLE:= gnu diff --git a/package/iptables/files/iptables.postinst b/package/iptables/files/iptables.postinst new file mode 100644 index 000000000..fd2865a31 --- /dev/null +++ b/package/iptables/files/iptables.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh + +if [ -f $IPKG_INSTROOT/etc/init.d/S45firewall ]; then + add_rcconf iptables firewall NO +fi + diff --git a/package/iptables/ipkg/ip6tables.control b/package/iptables/ipkg/ip6tables.control deleted file mode 100644 index c6d63936e..000000000 --- a/package/iptables/ipkg/ip6tables.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ip6tables -Priority: optional -Depends: kmod-ip6tables -Section: net -Description: The netfilter firewalling software for IPv6 diff --git a/package/iptables/ipkg/iptables-extra.control b/package/iptables/ipkg/iptables-extra.control deleted file mode 100644 index afd4235c4..000000000 --- a/package/iptables/ipkg/iptables-extra.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-extra -Priority: optional -Section: net -Depends: iptables, iptables-mod-conntrack, iptables-mod-extra, iptables-mod-filter, iptables-mod-ipopt, iptables-mod-ipsec, iptables-mod-nat, iptables-mod-ulog -Description: Other extra Iptables extensions (meta-package) diff --git a/package/iptables/ipkg/iptables-mod-conntrack.control b/package/iptables/ipkg/iptables-mod-conntrack.control deleted file mode 100644 index 840992e67..000000000 --- a/package/iptables/ipkg/iptables-mod-conntrack.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-conntrack -Priority: optional -Section: net -Depends: iptables, kmod-ipt-conntrack -Description: Iptables (IPv4) extensions for connection tracking diff --git a/package/iptables/ipkg/iptables-mod-extra.control b/package/iptables/ipkg/iptables-mod-extra.control deleted file mode 100644 index f26b4a458..000000000 --- a/package/iptables/ipkg/iptables-mod-extra.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-extra -Priority: optional -Section: net -Depends: iptables, kmod-ipt-extra -Description: Other extra Iptables (IPv4) extensions diff --git a/package/iptables/ipkg/iptables-mod-filter.control b/package/iptables/ipkg/iptables-mod-filter.control deleted file mode 100644 index 43ec79955..000000000 --- a/package/iptables/ipkg/iptables-mod-filter.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-filter -Priority: optional -Section: net -Depends: iptables, kmod-ipt-filter -Description: Iptables (IPv4) extension for packet content inspection diff --git a/package/iptables/ipkg/iptables-mod-imq.control b/package/iptables/ipkg/iptables-mod-imq.control deleted file mode 100644 index d1e46d28a..000000000 --- a/package/iptables/ipkg/iptables-mod-imq.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-imq -Priority: optional -Section: net -Depends: kmod-imq -Description: Iptables (IPv4) extensions for Intermediate Queuing Device QoS-support diff --git a/package/iptables/ipkg/iptables-mod-ipopt.control b/package/iptables/ipkg/iptables-mod-ipopt.control deleted file mode 100644 index 51ec6b20a..000000000 --- a/package/iptables/ipkg/iptables-mod-ipopt.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-ipopt -Priority: optional -Section: net -Depends: iptables, kmod-ipt-ipopt -Description: Iptables (IPv4) extensions for matching/changing IP packet options diff --git a/package/iptables/ipkg/iptables-mod-ipsec.control b/package/iptables/ipkg/iptables-mod-ipsec.control deleted file mode 100644 index 4b4d2e638..000000000 --- a/package/iptables/ipkg/iptables-mod-ipsec.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-ipsec -Priority: optional -Section: net -Depends: iptables, kmod-ipt-ipsec -Description: Iptables (IPv4) extensions for matching special IPsec packets diff --git a/package/iptables/ipkg/iptables-mod-nat.control b/package/iptables/ipkg/iptables-mod-nat.control deleted file mode 100644 index 2ebbb1cf7..000000000 --- a/package/iptables/ipkg/iptables-mod-nat.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-nat -Priority: optional -Section: net -Depends: iptables, kmod-ipt-nat -Description: Iptables (IPv4) extensions for different NAT targets diff --git a/package/iptables/ipkg/iptables-mod-ulog.control b/package/iptables/ipkg/iptables-mod-ulog.control deleted file mode 100644 index 3fcd26fed..000000000 --- a/package/iptables/ipkg/iptables-mod-ulog.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-mod-ulog -Priority: optional -Section: net -Depends: iptables, kmod-ipt-ulog -Description: Iptables (IPv4) extension for user-space packet logging diff --git a/package/iptables/ipkg/iptables-utils.control b/package/iptables/ipkg/iptables-utils.control deleted file mode 100644 index aff5f4d77..000000000 --- a/package/iptables/ipkg/iptables-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iptables-utils -Priority: optional -Section: net -Depends: iptables -Description: iptables-save and iptables-restore for Iptables (IPv4) diff --git a/package/iptables/ipkg/iptables.control b/package/iptables/ipkg/iptables.control deleted file mode 100644 index 40a6523b7..000000000 --- a/package/iptables/ipkg/iptables.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: iptables -Priority: optional -Section: net -Description: The netfilter firewalling software for IPv4 diff --git a/package/iptables/ipkg/iptables.postinst b/package/iptables/ipkg/iptables.postinst deleted file mode 100644 index fd2865a31..000000000 --- a/package/iptables/ipkg/iptables.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh - -if [ -f $IPKG_INSTROOT/etc/init.d/S45firewall ]; then - add_rcconf iptables firewall NO -fi - -- cgit v1.2.3