diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-14 14:53:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-11-14 14:53:53 +0000 |
| commit | 4d9a1fe10fa4d2f00152b08e06378c0081c38e40 (patch) | |
| tree | b2eb7a15b6b20a0ade5b455ca8dd5fb278a203be | |
| parent | 5486d4bb1cd6d9b9abb79989dafdc9abb29664e9 (diff) | |
| download | aports-4d9a1fe10fa4d2f00152b08e06378c0081c38e40.tar.bz2 aports-4d9a1fe10fa4d2f00152b08e06378c0081c38e40.tar.xz | |
main/shorewall-common: fix some deprecated iptables usage
Fix a a few occurences of:
Using intrapositioned negation (`--option ! this`) is deprecated in
favor of extrapositioned (`! --option this`)
Earlier it warned the above. Now it no longer works
| -rw-r--r-- | main/shorewall-common/APKBUILD | 2 | ||||
| -rw-r--r-- | main/shorewall-common/shorewall-iptables-deprecated.patch | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/main/shorewall-common/APKBUILD b/main/shorewall-common/APKBUILD index f243b9548e..2577191a5d 100644 --- a/main/shorewall-common/APKBUILD +++ b/main/shorewall-common/APKBUILD @@ -10,6 +10,7 @@ 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-iptables-deprecated.patch shorewall.initd " @@ -34,4 +35,5 @@ package() { } md5sums="4da98c58a00f1cf1d8c31bdb5db40e96 shorewall-common-4.2.11.tar.bz2 3b120e6e040bd7d8fc85cf30dfeb32a0 shorewall-common-ipset.patch +575c645d8b880f29e483b9a4933ac59d shorewall-iptables-deprecated.patch 71fb6da1f50f5c6e9dd35b60b3629531 shorewall.initd" diff --git a/main/shorewall-common/shorewall-iptables-deprecated.patch b/main/shorewall-common/shorewall-iptables-deprecated.patch new file mode 100644 index 0000000000..eff0511a00 --- /dev/null +++ b/main/shorewall-common/shorewall-iptables-deprecated.patch @@ -0,0 +1,22 @@ +--- ./lib.config.orig ++++ ./lib.config +@@ -924,6 +924,9 @@ + +*) + echo "-m set $(get_set_flags $1 src)" + ;; ++ !*) ++ echo "! -s ${1#!}" ++ ;; + *) + echo "-s $1" + ;; +@@ -951,6 +954,9 @@ + ;; + +*) + echo "-m set $(get_set_flags $1 dst)" ++ ;; ++ !*) ++ echo "! -d ${1#!}" + ;; + *) + echo "-d $1" |