main/linux-hardened: brick every alpine install with this one simple trick!!! (err, switch back to being linux-grsec provider)

main/linux-grsec: drop transitional package now that the APK bug is fixed

{main,community,testing}/*-hardened: rebuild due to above

13 files changed, 16 insertions, 31 deletions

diff --git a/community/virtualbox-guest-modules-hardened/APKBUILD b/community/virtualbox-guest-modules-hardened/APKBUILD
index 7c9d2fd797..0f821dd353 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=2
+_kpkgrel=3
 
 # 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 882d2157d3..53fe12c08c 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=2
+_kpkgrel=3
 _mypkgrel=0
 
 _kpkgver="$_kver-r$_kpkgrel"
diff --git a/main/devicemaster-linux-hardened/APKBUILD b/main/devicemaster-linux-hardened/APKBUILD
index 82b8283b68..670bf7f46e 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=2
+_kpkgrel=3
 _mypkgrel=0
 
 _kpkgver="$_kver-r$_kpkgrel"
diff --git a/main/drbd9-hardened/APKBUILD b/main/drbd9-hardened/APKBUILD
index 8d1f2a3191..b7422fa542 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=2
+_kpkgrel=3
 
 _usver=9.0.6
 # upstream now also has a -rel in the tar-balls
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
deleted file mode 100644
index 7aba24b573..0000000000
--- a/main/linux-grsec/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=linux-grsec
-pkgver=4.9.24
-pkgrel=1
-pkgdesc="transitional package for linux-hardened"
-url="http://alpinelinux.org/"
-arch="x86 x86_64 armhf"
-license="GPL"
-depends="linux-hardened>=4.9.24-r1"
-makedepends=""
-install=""
-subpackages=""
-source=""
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
diff --git a/main/linux-hardened/APKBUILD b/main/linux-hardened/APKBUILD
index 8f17e8ba51..d0639baa69 100644
--- a/main/linux-hardened/APKBUILD
+++ b/main/linux-hardened/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux kernel with hardening patches"
 url="http://alpinelinux.org"
 depends="mkinitfs"
@@ -140,11 +140,15 @@ _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 4fb35e8d25..edebdf381b 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=2
+_kpkgrel=3
 
 _realver=0.6.5.9
 _mypkgrel=0
diff --git a/main/xtables-addons-hardened/APKBUILD b/main/xtables-addons-hardened/APKBUILD
index 679a39e093..fa035d64cc 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=2
+_kpkgrel=3
 
 _realver=2.12
 _mypkgrel=0
diff --git a/main/zfs-hardened/APKBUILD b/main/zfs-hardened/APKBUILD
index ccf823d43a..b3585642cf 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=2
+_kpkgrel=3
 
 _realver=0.6.5.9
 _mypkgrel=0
diff --git a/testing/ipt-netflow-hardened/APKBUILD b/testing/ipt-netflow-hardened/APKBUILD
index 48907211eb..aedd29b6b1 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=2
+_kpkgrel=3
 
 # 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 e92daf2502..2a5f535574 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=2
+_kpkgrel=3
 
 _gitver=9789742cfc596d48583ba4cdbc8f38d026121fa6
 _mypkgrel=0
diff --git a/testing/virtualbox-additions-hardened/APKBUILD b/testing/virtualbox-additions-hardened/APKBUILD
index 883d7834a7..a1d36dc1a1 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=2
+_kpkgrel=3
 
 # when chaning _ver we *must* bump _mypkgrel
 _ver=5.1.14
diff --git a/testing/wireguard-hardened/APKBUILD b/testing/wireguard-hardened/APKBUILD
index bc95ef38dc..af3b9cedbb 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=2
+_kpkgrel=3
 
 # when changing _ver we *must* bump _mypkgrel
 _ver=0.0.20170421