diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-10-13 07:43:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-10-13 07:43:08 +0000 |
| commit | 7ccf5d526950166104a3767cb754384702babe2c (patch) | |
| tree | b8b64b84f10c8e21179a9726d50be6cc76d5ea7a | |
| parent | 1e46ca977586cb2932102eaab67372e9126ae6a8 (diff) | |
| download | aports-7ccf5d526950166104a3767cb754384702babe2c.tar.bz2 aports-7ccf5d526950166104a3767cb754384702babe2c.tar.xz | |
main/shorewall-common: add patch for ipset
From Harry.
http://lists.alpinelinux.org/alpine-devel/0092.html
| -rw-r--r-- | main/shorewall-common/APKBUILD | 17 | ||||
| -rw-r--r-- | main/shorewall-common/shorewall-common-ipset.patch | 22 |
2 files changed, 36 insertions, 3 deletions
diff --git a/main/shorewall-common/APKBUILD b/main/shorewall-common/APKBUILD index 2ff5722748..f243b9548e 100644 --- a/main/shorewall-common/APKBUILD +++ b/main/shorewall-common/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=shorewall-common pkgver=4.2.11 -pkgrel=0 +pkgrel=1 pkgdesc="Shoreline Firewall is an iptables-based firewall for Linux." url="http://www.shorewall.net/" arch="noarch" @@ -9,18 +9,29 @@ license="GPL-2" depends="iptables iproute2" subpackages="$pkgname-doc" source="http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$pkgver/shorewall-common-$pkgver.tar.bz2 + shorewall-common-ipset.patch shorewall.initd " +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { return 0 } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$_builddir" PREFIX="${pkgdir}" ./install.sh || return 1 install -Dm755 "$srcdir"/shorewall.initd "$pkgdir"/etc/init.d/shorewall } md5sums="4da98c58a00f1cf1d8c31bdb5db40e96 shorewall-common-4.2.11.tar.bz2 +3b120e6e040bd7d8fc85cf30dfeb32a0 shorewall-common-ipset.patch 71fb6da1f50f5c6e9dd35b60b3629531 shorewall.initd" diff --git a/main/shorewall-common/shorewall-common-ipset.patch b/main/shorewall-common/shorewall-common-ipset.patch new file mode 100644 index 0000000000..8c6ff72aac --- /dev/null +++ b/main/shorewall-common/shorewall-common-ipset.patch @@ -0,0 +1,22 @@ +--- shorewall-common-4.2.11.orig/lib.cli ++++ shorewall-common-4.2.11/lib.cli +@@ -315,8 +315,6 @@ + grep 'loadmodule ip_set' ${VARDIR}/.modules >> $f + echo "__EOF__" >> $f + echo >> $f +- echo "ipset -U :all: :all:" >> $f +- echo "ipset -U :all: :default:" >> $f + echo "ipset -F" >> $f + echo "ipset -X" >> $f + echo "ipset -R << __EOF__" >> $f +--- shorewall-common-4.2.11.orig/lib.config ++++ shorewall-common-4.2.11/lib.config +@@ -884,7 +884,7 @@ + ;; + esac + +- echo "--set ${setname#+} $options" ++ echo "--match-set ${setname#+} $options" + } + + # |