aboutsummaryrefslogtreecommitdiffstats
path: root/main/awall
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-01-18 19:45:59 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-01-18 19:46:42 +0200
commit84e1f0b6e0c286bab73f8e5cf938873e1a029686 (patch)
tree16a729cc0535a0b5469d39684ea20adea641e428 /main/awall
parentda422d63cf72f05137326de21e931e64108f9636 (diff)
downloadaports-84e1f0b6e0c286bab73f8e5cf938873e1a029686.tar.bz2
aports-84e1f0b6e0c286bab73f8e5cf938873e1a029686.tar.xz
main/awall: upgrade to 0.2.13
remove upstreamed patch
Diffstat (limited to 'main/awall')
-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 @@
-From 9396a7492e2fd7a1180732123ff45ec11691b575 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 28 Dec 2012 14:22:56 +0100
-Subject: [PATCH] filter: fix warning about -m state in newer iptables
-
-Fixes this warning when using recent iptables:
-WARNING: The state match is obsolete. Use conntrack instead.
-
-ref #1497
----
- awall/modules/filter.lua | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/awall/modules/filter.lua b/awall/modules/filter.lua
-index a635939..b697ae5 100644
---- a/awall/modules/filter.lua
-+++ b/awall/modules/filter.lua
-@@ -202,7 +202,7 @@ defrules = {}
- local fchains = {{chain='FORWARD'}, {chain='INPUT'}, {chain='OUTPUT'}}
-
- local dar = combinations(fchains,
-- {{opts='-m state --state RELATED,ESTABLISHED'}})
-+ {{opts='-m conntrack --ctstate RELATED,ESTABLISHED'}})
- for i, chain in ipairs({'INPUT', 'OUTPUT'}) do
- table.insert(dar,
- {chain=chain,
---
-1.8.0.3
-
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 @@
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
pkgname=awall
-pkgver=0.2.12
+pkgver=0.2.13
pkgrel=1
pkgdesc="Alpine Wall"
url=http://git.alpinelinux.org/cgit/kunkku/awall/
@@ -11,7 +11,6 @@ replaces="awall-nat"
depends="bind-tools ip6tables ipset iptables lua lua-alt-getopt lua-filesystem lua-json4 lua-pc lua-signal lua-sleep lua-stringy xtables-addons"
subpackages=$pkgname-masquerade
source="${url}snapshot/awall-${pkgver}.tar.bz2
- 0001-filter-fix-warning-about-m-state-in-newer-iptables.patch
"
_builddir=$srcdir/awall-${pkgver}
@@ -44,5 +43,4 @@ masquerade() {
done
}
-md5sums="4ed8fb1e6d4584706288ddb02fc6ecf7 awall-0.2.12.tar.bz2
-017fc1b37ed798caf145c5e5eb0aa0ab 0001-filter-fix-warning-about-m-state-in-newer-iptables.patch"
+md5sums="bfc78c6e792bace575e447c9fd02d3d9 awall-0.2.13.tar.bz2"