main/linux-hardened (and friends): update pkgrel, drop linux-grsec provides as it creates a loop with fake package

12 files changed, 12 insertions, 16 deletions

diff --git a/community/virtualbox-guest-modules-hardened/APKBUILD b/community/virtualbox-guest-modules-hardened/APKBUILD
index 2b01cfc48b..7c9d2fd797 100644
--- a/community/virtualbox-guest-modules-hardened/APKBUILD
+++ b/community/virtualbox-guest-modules-hardened/APKBUILD
@@ -4,7 +4,7 @@
 _flavor=${FLAVOR:-hardened}
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 # when chaning _ver we *must* bump _mypkgrel
 _ver=5.1.14
diff --git a/main/dahdi-linux-hardened/APKBUILD b/main/dahdi-linux-hardened/APKBUILD
index c9ed2a3fd3..882d2157d3 100644
--- a/main/dahdi-linux-hardened/APKBUILD
+++ b/main/dahdi-linux-hardened/APKBUILD
@@ -4,7 +4,7 @@
 _flavor=hardened
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 _mypkgrel=0
 
 _kpkgver="$_kver-r$_kpkgrel"
diff --git a/main/devicemaster-linux-hardened/APKBUILD b/main/devicemaster-linux-hardened/APKBUILD
index c743a69f43..82b8283b68 100644
--- a/main/devicemaster-linux-hardened/APKBUILD
+++ b/main/devicemaster-linux-hardened/APKBUILD
@@ -3,7 +3,7 @@
 _flavor=hardened
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 _mypkgrel=0
 
 _kpkgver="$_kver-r$_kpkgrel"
diff --git a/main/drbd9-hardened/APKBUILD b/main/drbd9-hardened/APKBUILD
index 97102fc0b8..8d1f2a3191 100644
--- a/main/drbd9-hardened/APKBUILD
+++ b/main/drbd9-hardened/APKBUILD
@@ -6,7 +6,7 @@ _name=$_usname-$_flavor
 
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 _usver=9.0.6
 # upstream now also has a -rel in the tar-balls
diff --git a/main/linux-hardened/APKBUILD b/main/linux-hardened/APKBUILD
index 971e423b25..8f17e8ba51 100644
--- a/main/linux-hardened/APKBUILD
+++ b/main/linux-hardened/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel with hardening patches"
 url="http://alpinelinux.org"
 depends="mkinitfs"
@@ -140,15 +140,11 @@ _package() {
 # main flavor installs in $pkgdir
 package() {
 	depends="$depends linux-firmware"
-	provides="linux-grsec=${pkgver}-r${pkgrel}"
-
 	_package hardened "$pkgdir"
 }
 
 # subflavors install in $subpkgdir
 virthardened() {
-	provides="linux-virtgrsec=${pkgver}-r${pkgrel}"
-
 	_package virthardened "$subpkgdir"
 }
 
diff --git a/main/spl-hardened/APKBUILD b/main/spl-hardened/APKBUILD
index a692486ad7..4fb35e8d25 100644
--- a/main/spl-hardened/APKBUILD
+++ b/main/spl-hardened/APKBUILD
@@ -6,7 +6,7 @@ _name=$_realname-$_flavor
 
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 _realver=0.6.5.9
 _mypkgrel=0
diff --git a/main/xtables-addons-hardened/APKBUILD b/main/xtables-addons-hardened/APKBUILD
index 4f4d80d23a..679a39e093 100644
--- a/main/xtables-addons-hardened/APKBUILD
+++ b/main/xtables-addons-hardened/APKBUILD
@@ -5,7 +5,7 @@ _realname=xtables-addons
 _name=$_realname-$_flavor
 
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 _realver=2.12
 _mypkgrel=0
diff --git a/main/zfs-hardened/APKBUILD b/main/zfs-hardened/APKBUILD
index 5db25486d8..ccf823d43a 100644
--- a/main/zfs-hardened/APKBUILD
+++ b/main/zfs-hardened/APKBUILD
@@ -7,7 +7,7 @@ _name=$_realname-$_flavor
 
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 _realver=0.6.5.9
 _mypkgrel=0
diff --git a/testing/ipt-netflow-hardened/APKBUILD b/testing/ipt-netflow-hardened/APKBUILD
index 08fb015e4e..48907211eb 100644
--- a/testing/ipt-netflow-hardened/APKBUILD
+++ b/testing/ipt-netflow-hardened/APKBUILD
@@ -3,7 +3,7 @@
 _flavor=hardened
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 # when chaning _ver we *must* bump _mypkgrel
 _ver=2.2
diff --git a/testing/sch-cake-hardened/APKBUILD b/testing/sch-cake-hardened/APKBUILD
index d179350db6..e92daf2502 100644
--- a/testing/sch-cake-hardened/APKBUILD
+++ b/testing/sch-cake-hardened/APKBUILD
@@ -6,7 +6,7 @@ _realname=sch-cake
 _name=$_realname-$_flavor
 
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 _gitver=9789742cfc596d48583ba4cdbc8f38d026121fa6
 _mypkgrel=0
diff --git a/testing/virtualbox-additions-hardened/APKBUILD b/testing/virtualbox-additions-hardened/APKBUILD
index 8e7e374275..883d7834a7 100644
--- a/testing/virtualbox-additions-hardened/APKBUILD
+++ b/testing/virtualbox-additions-hardened/APKBUILD
@@ -3,7 +3,7 @@
 _flavor=hardened
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 # when chaning _ver we *must* bump _mypkgrel
 _ver=5.1.14
diff --git a/testing/wireguard-hardened/APKBUILD b/testing/wireguard-hardened/APKBUILD
index 6740ad9e17..bc95ef38dc 100644
--- a/testing/wireguard-hardened/APKBUILD
+++ b/testing/wireguard-hardened/APKBUILD
@@ -4,7 +4,7 @@
 _flavor=${FLAVOR:-hardened}
 _kpkg=linux-$_flavor
 _kver=4.9.24
-_kpkgrel=1
+_kpkgrel=2
 
 # when changing _ver we *must* bump _mypkgrel
 _ver=0.0.20170421