aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-01-12 12:57:44 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-01-12 12:57:44 +0000
commit3bfd8b770f4e8a8589f323fc07a5f8b441e246b6 (patch)
tree207dc62c0686727a31571cf9785d39305b3be852 /main
parent9d27b545363aaa4ae70e1cba8dd0db73a12183ce (diff)
downloadaports-3bfd8b770f4e8a8589f323fc07a5f8b441e246b6.tar.bz2
aports-3bfd8b770f4e8a8589f323fc07a5f8b441e246b6.tar.xz
main/xtables-addons-vanilla: add replaces hardened
this should fix when you have xtables-hardened installed, but not the xtables-vanilla and do apk upgrade -U -a, which gives: ERROR: unsatisfiable constraints: xtables-addons-vanilla-4.14.13-r2: conflicts: xtables-addons-hardened-4.9.73-r1[xtables-addons-grsec=4.14.13-r2] xtables-addons-hardened-4.9.73-r1: conflicts: xtables-addons-vanilla-4.14.13-r2[xtables-addons-grsec=4.9.73-r1]
Diffstat (limited to 'main')
-rw-r--r--main/xtables-addons-vanilla/APKBUILD3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/xtables-addons-vanilla/APKBUILD b/main/xtables-addons-vanilla/APKBUILD
index 32c8feb225..4ddd4a299d 100644
--- a/main/xtables-addons-vanilla/APKBUILD
+++ b/main/xtables-addons-vanilla/APKBUILD
@@ -8,7 +8,7 @@ _kver=4.14.13
_kpkgrel=2
_realver=2.14
-_mypkgrel=0
+_mypkgrel=1
_kernelver=$_kver-r$_kpkgrel
_abi_release=${_kver}-${_kpkgrel}-${_flavor}
@@ -27,6 +27,7 @@ install_if="linux-$_flavor=$_kernelver $_realname"
subpackages=
source="http://downloads.sourceforge.net/$_realname/$_realname-$_realver.tar.xz"
provides="$_realname-grsec=${pkgver}-r${pkgrel}"
+replaces="$_realname-hardened"
builddir="$srcdir/$_realname-$_realver"
options="!check"