main/linux-grsec: rename to linux-hardened (no functional change, just to allow us to orphan linux-grsec)

7 files changed, 22 insertions, 18 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-hardened/APKBUILD
index bd4959ff78..971e423b25 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-hardened/APKBUILD
@@ -1,31 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
-_mainflavor=grsec
+_mainflavor=hardened
 pkgname=linux-$_mainflavor
 pkgver=4.9.24
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=0
-pkgdesc="Linux kernel with grsecurity"
-url=http://grsecurity.net
+pkgrel=1
+pkgdesc="Linux kernel with hardening patches"
+url="http://alpinelinux.org"
 depends="mkinitfs"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers mpfr-dev
 	mpc1-dev elfutils-dev"
-options="!strip"
+options="!strip !check"
 install=
 source="https://kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz
 	https://kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz
 	http://dev.alpinelinux.org/~ncopa/grsec/grsecurity-3.1-$pkgver-201704220732.patch
 
 	zfs-fix.patch
-	config-grsec.x86
-	config-grsec.x86_64
-	config-grsec.armhf
+	config-hardened.x86
+	config-hardened.x86_64
+	config-hardened.armhf
 
-	config-virtgrsec.x86
-	config-virtgrsec.x86_64
+	config-virthardened.x86
+	config-virthardened.x86_64
 	"
 subpackages="$pkgname-dev:_dev"
 _flavors=
@@ -140,12 +140,16 @@ _package() {
 # main flavor installs in $pkgdir
 package() {
 	depends="$depends linux-firmware"
-	_package grsec "$pkgdir"
+	provides="linux-grsec=${pkgver}-r${pkgrel}"
+
+	_package hardened "$pkgdir"
 }
 
 # subflavors install in $subpkgdir
-virtgrsec() {
-	_package virtgrsec "$subpkgdir"
+virthardened() {
+	provides="linux-virtgrsec=${pkgver}-r${pkgrel}"
+
+	_package virthardened "$subpkgdir"
 }
 
 _dev() {
@@ -202,8 +206,8 @@ sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a
 c5619f95e6f838175491c1f8ba1fe13b37200984dfd241af3fcbb063de4d3b18948ffc0fda7bb594a92f0ec3332d35a2a255e830a7e1d68a5ecb8da57a8bd44b  patch-4.9.24.xz
 e7e9e8f88be6bff9957097001bf4eea1044be6943b1ffc7fb30a0ce7c8b5927b8191a02bda860aa4ef77eeed059e81268f7fdebef0f4f6ce2401f1f8c6809d2c  grsecurity-3.1-4.9.24-201704220732.patch
 5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d  zfs-fix.patch
-e0f8793210d3974a748bd7b1cd71cf7adc3672d279a1d51bbf1a7417161fadaf377bff43fa51b943c89051c62cf608af263137e5c5f904cf70391b94d60cb14d  config-grsec.x86
-adab5e5165c139e219a49b5aa386e64a8778548fe41d34d62a4ca1fceae36a3001d570695a425b9e10f96a14fa67288ffde3d012165e23aeccc087fd6a79989f  config-grsec.x86_64
-0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277  config-grsec.armhf
-1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4  config-virtgrsec.x86
-0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0  config-virtgrsec.x86_64"
+e0f8793210d3974a748bd7b1cd71cf7adc3672d279a1d51bbf1a7417161fadaf377bff43fa51b943c89051c62cf608af263137e5c5f904cf70391b94d60cb14d  config-hardened.x86
+adab5e5165c139e219a49b5aa386e64a8778548fe41d34d62a4ca1fceae36a3001d570695a425b9e10f96a14fa67288ffde3d012165e23aeccc087fd6a79989f  config-hardened.x86_64
+0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277  config-hardened.armhf
+1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4  config-virthardened.x86
+0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0  config-virthardened.x86_64"
diff --git a/main/linux-grsec/config-grsec.armhf b/main/linux-hardened/config-hardened.armhf
index 3149a8878a..3149a8878a 100644
--- a/main/linux-grsec/config-grsec.armhf
+++ b/main/linux-hardened/config-hardened.armhf
diff --git a/main/linux-grsec/config-grsec.x86 b/main/linux-hardened/config-hardened.x86
index d1a7a62b8b..d1a7a62b8b 100644
--- a/main/linux-grsec/config-grsec.x86
+++ b/main/linux-hardened/config-hardened.x86
diff --git a/main/linux-grsec/config-grsec.x86_64 b/main/linux-hardened/config-hardened.x86_64
index c8cf5f64a3..c8cf5f64a3 100644
--- a/main/linux-grsec/config-grsec.x86_64
+++ b/main/linux-hardened/config-hardened.x86_64
diff --git a/main/linux-grsec/config-virtgrsec.x86 b/main/linux-hardened/config-virthardened.x86
index a35c3255c2..a35c3255c2 100644
--- a/main/linux-grsec/config-virtgrsec.x86
+++ b/main/linux-hardened/config-virthardened.x86
diff --git a/main/linux-grsec/config-virtgrsec.x86_64 b/main/linux-hardened/config-virthardened.x86_64
index 29bd7098ec..29bd7098ec 100644
--- a/main/linux-grsec/config-virtgrsec.x86_64
+++ b/main/linux-hardened/config-virthardened.x86_64
diff --git a/main/linux-grsec/zfs-fix.patch b/main/linux-hardened/zfs-fix.patch
index 997add4dbc..997add4dbc 100644
--- a/main/linux-grsec/zfs-fix.patch
+++ b/main/linux-hardened/zfs-fix.patch