diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-28 14:28:38 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-28 14:06:11 +0000 |
| commit | 78f82234bda9bfe7be6c088227517848e954f560 (patch) | |
| tree | 99a756301d41342cc2ce31c0de1adb057889bbc7 | |
| parent | fb500251bba4e4ab8ac5431d1a9660d40c22e9b8 (diff) | |
| download | aports-78f82234bda9bfe7be6c088227517848e954f560.tar.bz2 aports-78f82234bda9bfe7be6c088227517848e954f560.tar.xz | |
main/awall: fix warning about -m state
fixes #1497
(cherry picked from commit 0e83c2ead081c11b763dda91333916a00d49170e)
| -rw-r--r-- | main/awall/0001-filter-fix-warning-about-m-state-in-newer-iptables.patch | 29 | ||||
| -rw-r--r-- | main/awall/APKBUILD | 16 |
2 files changed, 41 insertions, 4 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 new file mode 100644 index 0000000000..1955b89f56 --- /dev/null +++ b/main/awall/0001-filter-fix-warning-about-m-state-in-newer-iptables.patch @@ -0,0 +1,29 @@ +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 e910801a3e..ec6a9056c4 100644 --- a/main/awall/APKBUILD +++ b/main/awall/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=awall pkgver=0.2.12 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Wall" url=http://git.alpinelinux.org/cgit/kunkku/awall/ arch=noarch @@ -10,12 +10,19 @@ license=GPL-2 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" +source="${url}snapshot/awall-${pkgver}.tar.bz2 + 0001-filter-fix-warning-about-m-state-in-newer-iptables.patch + " _builddir=$srcdir/awall-${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() { @@ -37,4 +44,5 @@ masquerade() { done } -md5sums="4ed8fb1e6d4584706288ddb02fc6ecf7 awall-0.2.12.tar.bz2" +md5sums="4ed8fb1e6d4584706288ddb02fc6ecf7 awall-0.2.12.tar.bz2 +017fc1b37ed798caf145c5e5eb0aa0ab 0001-filter-fix-warning-about-m-state-in-newer-iptables.patch" |