diff options
| author | psykose <alice@ayaya.dev> | 2023-06-10 15:33:34 +0000 |
|---|---|---|
| committer | psykose <alice@ayaya.dev> | 2023-06-10 17:38:05 +0200 |
| commit | c6be6ae362935156c6b5487964b0d29c546a3726 (patch) | |
| tree | 22885d6a9d0a5a5f29b0b5de0ff6c752b55df2ef | |
| parent | dc795d4292c33443aa238c64fc2ea23963863468 (diff) | |
| download | aports-c6be6ae362935156c6b5487964b0d29c546a3726.zip | |
main/iptables: remove pre-upgrade workaround
since it's pre-upgrade, it will be before the accompanying init.d
changes are present (most likely), so it will just run the non-failure-
handling save that truncates rules
| -rw-r--r-- | main/iptables/APKBUILD | 4 | ||||
| -rw-r--r-- | main/iptables/iptables.pre-upgrade | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD index eb75cf11436..0d6f174c254 100644 --- a/main/iptables/APKBUILD +++ b/main/iptables/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iptables pkgver=1.8.9 -pkgrel=5 +pkgrel=6 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="https://www.netfilter.org/projects/iptables/index.html" arch="all" license="GPL-2.0-or-later" depends_dev="linux-headers" -install="$pkgname.pre-upgrade $pkgname.post-upgrade" +install="$pkgname.post-upgrade" makedepends="$depends_dev libnftnl-dev bison flex autoconf automake" subpackages=" iptables-legacy diff --git a/main/iptables/iptables.pre-upgrade b/main/iptables/iptables.pre-upgrade deleted file mode 100644 index 2cb9ca63018..00000000000 --- a/main/iptables/iptables.pre-upgrade +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -ver_old=$2 - -# this should be iptables-openrc.pre-upgrade theoretically, but then it would upgrade before this -if [ "$(apk version -t "$ver_old" '1.8.9-r4')" = '<' ]; then - # rc-service might just not exist at all, but then this does nothing and - # silently fails, which is fine - rc-service --ifstarted iptables save 2>/dev/null - rc-service --ifstarted ip6tables save 2>/dev/null -fi - -exit 0 |