aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-04-27 08:44:42 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2017-04-27 08:44:42 +0000
commita07da753957573d128ef1a39bc6a078701147b18 (patch)
treef0afd46083b2221c3ff21de6907c7303b56ff278 /main
parent52118f66311d912bd685fac87b4ae77d89865e35 (diff)
downloadaports-a07da753957573d128ef1a39bc6a078701147b18.tar.bz2
aports-a07da753957573d128ef1a39bc6a078701147b18.tar.xz
main/linux-hardened (and friends): update pkgrel, drop linux-grsec provides as it creates a loop with fake package
Diffstat (limited to 'main')
-rw-r--r--main/dahdi-linux-hardened/APKBUILD2
-rw-r--r--main/devicemaster-linux-hardened/APKBUILD2
-rw-r--r--main/drbd9-hardened/APKBUILD2
-rw-r--r--main/linux-hardened/APKBUILD6
-rw-r--r--main/spl-hardened/APKBUILD2
-rw-r--r--main/xtables-addons-hardened/APKBUILD2
-rw-r--r--main/zfs-hardened/APKBUILD2
7 files changed, 7 insertions, 11 deletions
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