main/linux-pae: upgrade to .15 and sync up with linux-grsec

1 files changed, 23 insertions, 15 deletions

diff --git a/main/linux-pae/APKBUILD b/main/linux-pae/APKBUILD
index 95d20f1ac..fa5b0431d 100644
--- a/main/linux-pae/APKBUILD
+++ b/main/linux-pae/APKBUILD
@@ -2,9 +2,9 @@
 
 _flavor=pae
 pkgname=linux-${_flavor}
-pkgver=2.6.32.11
+pkgver=2.6.32.15
 _kernver=2.6.32
-pkgrel=1
+pkgrel=0
 pkgdesc="Linux kernel with PAE enabled"
 url=http://www.kernel.org
 depends="mkinitfs linux-firmware"
@@ -17,10 +17,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	0002-gre-fix-hard-header-destination-address-checking.patch
 	0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
 	0004-arp-flush-arp-cache-on-device-change.patch
-	0005-r8169-fix-broken-register-writes.patch
-	0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
 	0007-r8169-Fix-rtl8169_rx_interrupt.patch
-	0008-r8169-clean-up-my-printk-uglyness.patch
 	0009-ipsec-Fix-bogus-bundle-flowi.patch
 	0010-xfrm-Remove-xfrm_state_genid.patch
 	0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
@@ -31,6 +28,10 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	0016-xfrm-remove-policy-garbage-collection.patch
 	0017-flow-delayed-deletion-of-flow-cache-entries.patch
 	0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
+	xfrm-fix-policy-unreferencing-on-larval-drop.patch
+	r8169-fix-random-mdio_write-failures.patch
+	r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch
+	x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
 	kernelconfig.x86
 	"
 subpackages="$pkgname-dev"
@@ -44,10 +45,14 @@ prepare() {
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1
 	fi
 
-	for i in ../*.diff ../*.patch; do
-		[ -f $i ] || continue
-		msg "Applying $i..."
-		patch -s -p1 -N < $i || return 1
+	# first apply patches in specified order
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			patch -s -p1 -N < "$srcdir"/$i || return 1
+			;;
+		esac
 	done
 
 	mkdir -p "$srcdir"/build
@@ -66,7 +71,9 @@ menuconfig() {
 
 build() {
 	cd "$srcdir"/build
-	make CC="${CC:-gcc}" || return 1
+	make CC="${CC:--gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
+		|| return 1
 }
 
 package() {
@@ -131,14 +138,11 @@ dev() {
 }
 
 md5sums="260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-855c248334a71ef5ca3d8cb89d51334f  patch-2.6.32.11.bz2
+5c9251844c2819eddee4dba1293bd46d  patch-2.6.32.15.bz2
 437317f88ec13ace8d39c31983a41696  0002-gre-fix-hard-header-destination-address-checking.patch
 151b29a161178ed39d62a08f21f3484d  0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
-afa06334c81f21c20571286a83d3d928  0005-r8169-fix-broken-register-writes.patch
-c538c0f735d79fd71b47dde02bf1f790  0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
 5f8b9a76d95319c5b1aa26b54a42e6b5  0007-r8169-Fix-rtl8169_rx_interrupt.patch
-f878c802700e3babd03be3505119c5c2  0008-r8169-clean-up-my-printk-uglyness.patch
 cf168620efa63479a6e03da78906e32f  0009-ipsec-Fix-bogus-bundle-flowi.patch
 3af4b5ae1afae3278b0070f585b874e3  0010-xfrm-Remove-xfrm_state_genid.patch
 9f284c3fd5ab38cef4544efc1f50c6ba  0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
@@ -149,4 +153,8 @@ c09b82b89a49ba2a3836a0bc3a3312f4  0015-xfrm-cache-bundles-instead-of-policies-fo
 41618efb65ab9ddacfb59a1cde9b4edd  0016-xfrm-remove-policy-garbage-collection.patch
 3b83f0972ab715819d1119b120a987e7  0017-flow-delayed-deletion-of-flow-cache-entries.patch
 45a676c7a1759fec60b724d557b4e295  0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
-bf15e3ee69e03319dab0d59e08b67195  kernelconfig.x86"
+c7e606c11c05ff03012b21c3fe0ece47  xfrm-fix-policy-unreferencing-on-larval-drop.patch
+ce4a74190febe13713bab1b886dd5bee  r8169-fix-random-mdio_write-failures.patch
+b41ee19f13498fb25992fd60cd1126d4  r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch
+a1bcf76870b63a4a4035a8948fb758e2  x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
+970a1dc0f8c6c3e3227a77934eafd68e  kernelconfig.x86"