main/*-grsec: enable e_powersaver module and update 3rdpary module building

We no need to manually edit every 3rd party module's kernel ver to match
the kernel packages version.

We need to do this because we will at some point allow building in a
chroot whithout the entire aports tree beeing present.

6 files changed, 53 insertions, 31 deletions

diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index dd357f7a2..e6406173d 100644
--- a/main/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
@@ -2,19 +2,22 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 
 _flavor=grsec
+_kver=3.0.8
+_kpkgrel=2
 
-# source the kernel version
+# verify the kernel version before entering chroot
 if [ -f ../linux-${_flavor}/APKBUILD ]; then
 	. ../linux-${_flavor}/APKBUILD
+	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
 fi
 
-_kernelver="$pkgver-r$pkgrel"
-_abi_release=${pkgver}-${_flavor}
-_kpkgrel=$pkgrel
+_kpkgver="$_kver-r$_kpkgrel"
+_abi_release=${_kver}-${_flavor}
 _realname=dahdi-linux
 
 pkgname=${_realname}-${_flavor}
-pkgver=$pkgver
+pkgver=$_kver
 # when chaning _dahdiver we *must* bump _mypkgrel
 _dahdiver=2.5.0.2
 _mypkgrel=0
@@ -23,10 +26,10 @@ pkgdesc="Digium Asterisk Hardware Device Interface drivers $_dahdiver"
 url="http://www.asterisk.org"
 arch="all"
 license="GPL"
-depends="dahdi-linux linux-${_flavor}=${_kernelver}"
+depends="dahdi-linux linux-${_flavor}=${_kpkgver}"
 # we need wget and tar because make install downloads firmware and uses fancy
 # options for tar and wget.
-makedepends="linux-${_flavor}-dev=${_kernelver} wget tar perl"
+makedepends="linux-${_flavor}-dev=${_kpkgver} wget tar perl"
 install=
 subpackages="$pkgname-dev"
 source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realname}-$_dahdiver.tar.gz
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index d56b78993..92b5737b1 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=3.0.8
 _kernver=3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -146,5 +146,5 @@ c41cf0ee9794f393423c6b2093072260  grsec-timblogiw-noconst.patch
 ebb99ef6ad8cd2d9fd8f49d5c5849057  0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch
 b27bc150f7a3932de28fcb8803809cbc  0001-ipv4-fix-ipsec-forward-performance-regression.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
-0134b22fc2c95106803f4043cffed087  kernelconfig.x86
+464e2356a1983e1ffe261904a1d76338  kernelconfig.x86
 d97d1808eebdfb97734dccfbcaea35f2  kernelconfig.x86_64"
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index fe29b0502..463042587 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.4 Kernel Configuration
+# Linux/i386 3.0.8 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -504,7 +504,7 @@ CONFIG_X86_P4_CLOCKMOD=m
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_LONGRUN is not set
 # CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_E_POWERSAVER=m
 
 #
 # shared options
diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD
index 092089438..9098230d4 100644
--- a/main/open-iscsi-grsec/APKBUILD
+++ b/main/open-iscsi-grsec/APKBUILD
@@ -3,14 +3,18 @@
 _flavor=grsec
 _realname=open-iscsi
 _realver=2.0-872
-# source the kernel version
-if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
-	. ../../main/linux-$_flavor/APKBUILD
+_kver=3.0.8
+_kpkgrel=2
+
+# verify the kernel version before entering chroot
+if [ -f ../linux-${_flavor}/APKBUILD ]; then
+	. ../linux-${_flavor}/APKBUILD
+	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
 fi
-_kver=$pkgver
-_kernelver=$pkgver-r$pkgrel
-_abi_release=$pkgver-${_flavor}
-_kpkgrel=$pkgrel
+
+_kernelver="$_kver-r$_kpkgrel"
+_abi_release=$_kver-${_flavor}
 _ksrc=/usr/src/linux-headers-${_abi_release}
 
 _iscsiver=$_realver
diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD
index 70f84d020..db20bb650 100644
--- a/main/open-vm-tools-grsec/APKBUILD
+++ b/main/open-vm-tools-grsec/APKBUILD
@@ -3,23 +3,32 @@
 _flavor=grsec
 _realname=open-vm-tools
 _mypkgrel=0
+_realver=2011.09.23
+_realsubver=491607
 
 # source open-vm-tools version
-if [ -f ../../main/$_realname/APKBUILD ]; then
-	. ../../main/$_realname/APKBUILD
+if [ -f ../main/$_realname/APKBUILD ]; then
+	. ../main/$_realname/APKBUILD
+	[ "$_realver" != "$pkgver" ] && die "please set _realver to $pkgver"
+	[ "$_realsubver" != "$_pkgsubver" ] \
+		&& die "please set _realsubver to $_pkgsubver"
 fi
 
-_realver="$pkgver"
-_realsubver="$_pkgsubver"
+_kver=3.0.8
+_kpkgrel=2
 
 # source the kernel version
-if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
-        . ../../main/linux-${_flavor}/APKBUILD
+if [ -f ../main/linux-${_flavor}/APKBUILD ]; then
+        . ../main/linux-${_flavor}/APKBUILD
+	[ "$_kver" != "$pkgver" ] && die "please set _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "please set _kpkgrel to $pkgrel"
 fi
 
-_kernelver="$pkgver-r$pkgrel"
-_kpkgrel=$pkgrel
+_abi_release=${_kver}-${_flavor}
+_kernelver="$_kver-r$_kpkgrel"
+
 pkgname="$_realname-$_flavor"
+pkgver=$_kver
 pkgrel=$(($_kpkgrel + $_mypkgrel))
 
 pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index f37c076f2..dd01f1c2e 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -1,17 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 _flavor=${FLAVOR:-grsec}
 _realname=xtables-addons
+_name=$_realname-$_flavor
+
+_kver=3.0.8
+_kpkgrel=2
 
 # source the kernel version
 if [ -f ../linux-$_flavor/APKBUILD ]; then
 	. ../linux-$_flavor/APKBUILD
+	[ "$_kver" != "$pkgver" ] && die "$_name: Please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "$_name: Please update _kpkgrel to $pkgrel"
 fi
-_kernelver=$pkgver-r$pkgrel
-_abi_release=$pkgver-${_flavor}
-_kpkgrel=$pkgrel
 
-pkgname=${_realname}-${_flavor}
-pkgver=${pkgver}
+_kernelver=$_kver-r$_kpkgrel
+_abi_release=$_kver-${_flavor}
+
+pkgname=$_name
+pkgver=$_kver
 _realver=1.37
 _mypkgrel=0
 pkgrel=$(($_kpkgrel + $_mypkgrel))