aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-01-18 19:45:59 +0200
committerLeonardo Arena <rnalrd@alpinelinux.org>2013-02-07 11:00:43 +0000
commit082abc22bb171b674f4fdabc9811968af08267ae (patch)
treeb9bd09ae6cad9c933d62824dd92571d5cb8f1660
parent8763ff9212ebef945bf6248a4236cdce2a451f77 (diff)
downloadalpine_aports-082abc22bb171b674f4fdabc9811968af08267ae.tar.bz2
alpine_aports-082abc22bb171b674f4fdabc9811968af08267ae.tar.xz
alpine_aports-082abc22bb171b674f4fdabc9811968af08267ae.zip
main/awall: upgrade to 0.2.13
remove upstreamed patch (cherry picked from commit 84e1f0b6e0c286bab73f8e5cf938873e1a029686) Signed-off-by: Leonardo Arena <rnalrd@alpinelinux.org>
-rw-r--r--main/awall/0001-filter-fix-warning-about-m-state-in-newer-iptables.patch29
-rw-r--r--main/awall/APKBUILD6
2 files changed, 2 insertions, 33 deletions
diff --git a/main/awall/0001-filter-fix-warning-about-m-state-in-newer-iptables.patch b/main/awall/0001-filter-fix-warning-about-m-state-in-newer-iptables.patch
deleted file mode 100644
index 1955b89f56..0000000000
--- a/main/awall/0001-filter-fix-warning-about-m-state-in-newer-iptables.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 9396a7492e2fd7a1180732123ff45ec11691b575 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Fri, 28 Dec 2012 14:22:56 +0100
4Subject: [PATCH] filter: fix warning about -m state in newer iptables
5
6Fixes this warning when using recent iptables:
7WARNING: The state match is obsolete. Use conntrack instead.
8
9ref #1497
10---
11 awall/modules/filter.lua | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/awall/modules/filter.lua b/awall/modules/filter.lua
15index a635939..b697ae5 100644
16--- a/awall/modules/filter.lua
17+++ b/awall/modules/filter.lua
18@@ -202,7 +202,7 @@ defrules = {}
19 local fchains = {{chain='FORWARD'}, {chain='INPUT'}, {chain='OUTPUT'}}
20
21 local dar = combinations(fchains,
22- {{opts='-m state --state RELATED,ESTABLISHED'}})
23+ {{opts='-m conntrack --ctstate RELATED,ESTABLISHED'}})
24 for i, chain in ipairs({'INPUT', 'OUTPUT'}) do
25 table.insert(dar,
26 {chain=chain,
27--
281.8.0.3
29
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index ec6a9056c4..1a913ec3e4 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
1# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> 1# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
2# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> 2# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
3pkgname=awall 3pkgname=awall
4pkgver=0.2.12 4pkgver=0.2.13
5pkgrel=1 5pkgrel=1
6pkgdesc="Alpine Wall" 6pkgdesc="Alpine Wall"
7url=http://git.alpinelinux.org/cgit/kunkku/awall/ 7url=http://git.alpinelinux.org/cgit/kunkku/awall/
@@ -11,7 +11,6 @@ replaces="awall-nat"
11depends="bind-tools ip6tables ipset iptables lua lua-alt-getopt lua-filesystem lua-json4 lua-pc lua-signal lua-sleep lua-stringy xtables-addons" 11depends="bind-tools ip6tables ipset iptables lua lua-alt-getopt lua-filesystem lua-json4 lua-pc lua-signal lua-sleep lua-stringy xtables-addons"
12subpackages=$pkgname-masquerade 12subpackages=$pkgname-masquerade
13source="${url}snapshot/awall-${pkgver}.tar.bz2 13source="${url}snapshot/awall-${pkgver}.tar.bz2
14 0001-filter-fix-warning-about-m-state-in-newer-iptables.patch
15 " 14 "
16 15
17_builddir=$srcdir/awall-${pkgver} 16_builddir=$srcdir/awall-${pkgver}
@@ -44,5 +43,4 @@ masquerade() {
44 done 43 done
45} 44}
46 45
47md5sums="4ed8fb1e6d4584706288ddb02fc6ecf7 awall-0.2.12.tar.bz2 46md5sums="bfc78c6e792bace575e447c9fd02d3d9 awall-0.2.13.tar.bz2"
48017fc1b37ed798caf145c5e5eb0aa0ab 0001-filter-fix-warning-about-m-state-in-newer-iptables.patch"