aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2020-01-04 16:35:25 +0100
committerJakub Jirutka <jakub@jirutka.cz>2020-01-04 17:21:42 +0100
commitdab236940f129a48042019da078f305e7ed1a7c4 (patch)
treea593edb6ccbb82238734cda61ed8e91e9b5ad58d
parenta10b3fd6ba2179dbf83a0bbb68a0ad4484325129 (diff)
downloadaports-dab236940f129a48042019da078f305e7ed1a7c4.tar.bz2
aports-dab236940f129a48042019da078f305e7ed1a7c4.tar.xz
main/nftables: install config snippets to /usr/share instead of /etc
Splitting basic nftables rules into so many files makes it just confusing and most of them are not actually useful for typical users. It's better to keep /etc clean and provide simple one-file ruleset, as e.g. Arch Linux does.
-rw-r--r--main/nftables/APKBUILD4
-rw-r--r--main/nftables/nftables.post-upgrade4
2 files changed, 6 insertions, 2 deletions
diff --git a/main/nftables/APKBUILD b/main/nftables/APKBUILD
index 2b06b5cb76..7d886692e5 100644
--- a/main/nftables/APKBUILD
+++ b/main/nftables/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=nftables
pkgver=0.9.3
-pkgrel=1
+pkgrel=2
pkgdesc="Netfilter tables userspace tools"
url="https://netfilter.org/projects/nftables"
arch="all"
@@ -38,7 +38,7 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --sysconfdir=/etc \
+ --sysconfdir=/usr/share \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
diff --git a/main/nftables/nftables.post-upgrade b/main/nftables/nftables.post-upgrade
index cab85d0923..c360ec44f3 100644
--- a/main/nftables/nftables.post-upgrade
+++ b/main/nftables/nftables.post-upgrade
@@ -13,3 +13,7 @@ if [ "$(apk version -t "$ver_old" "0.8.3-r1")" = "<" ]; then
cp -a "$old_file" "$new_file"
fi
fi
+
+if [ "$(apk version -t "$ver_old" "0.9.3-r2")" = "<" ]; then
+ echo '* Note that /etc/nftables/ was moved to /usr/share/nftables/.' >&2
+fi