main/linux-pae: sync with main/linux-grsec

1 files changed, 38 insertions, 16 deletions

diff --git a/main/linux-pae/APKBUILD b/main/linux-pae/APKBUILD
index 971800f428..95d20f1ac2 100644
--- a/main/linux-pae/APKBUILD
+++ b/main/linux-pae/APKBUILD
@@ -4,7 +4,7 @@ _flavor=pae
 pkgname=linux-${_flavor}
 pkgver=2.6.32.11
 _kernver=2.6.32
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with PAE enabled"
 url=http://www.kernel.org
 depends="mkinitfs linux-firmware"
@@ -14,12 +14,23 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	ip_gre.patch
-	ip_gre2.patch
-	arp.patch
-	xfrm-cache-size-revert.patch
-	net-git-78f1cd-r8169-fix-broken-register-writes.patch
-	net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch
+	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
+	0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch
+	0013-flow-structurize-flow-cache.patch
+	0014-flow-virtualize-flow-cache-entry-methods.patch
+	0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch
+	0016-xfrm-remove-policy-garbage-collection.patch
+	0017-flow-delayed-deletion-of-flow-cache-entries.patch
+	0018-xfrm-Fix-crashes-in-xfrm_lookup.patch
 	kernelconfig.x86
 	"
 subpackages="$pkgname-dev"
@@ -42,7 +53,7 @@ prepare() {
 	mkdir -p "$srcdir"/build
 	cp "$srcdir"/$_config "$srcdir"/build/.config
 	echo "-${_flavor}" > "$srcdir"/linux-$_kernver/localversion-${_flavor}
-	make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="$CC" \
+	make -C "$srcdir"/linux-$_kernver O="$srcdir"/build HOSTCC="${CC:-gcc}" \
 		silentoldconfig
 }
 
@@ -55,7 +66,7 @@ menuconfig() {
 
 build() {
 	cd "$srcdir"/build
-	make CC="$CC" || return 1
+	make CC="${CC:-gcc}" || return 1
 }
 
 package() {
@@ -88,7 +99,7 @@ dev() {
 	# external modules, and create the scripts
 	mkdir -p "$dir"
 	cp "$srcdir"/$_config "$dir"/.config
-	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="$CC" \
+	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" HOSTCC="${CC:-gcc}" \
 		silentoldconfig prepare scripts
 
 	# remove the stuff that poits to real sources. we want 3rd party
@@ -121,10 +132,21 @@ dev() {
 
 md5sums="260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
 855c248334a71ef5ca3d8cb89d51334f  patch-2.6.32.11.bz2
-3ef822f3a2723b9a80c3f12954457225  ip_gre.patch
-13ca9e91700e459da269c957062bbea7  ip_gre2.patch
-4c39a161d918e7f274292ecfd168b891  arp.patch
-329fcab881425e001d3243caa4648478  xfrm-cache-size-revert.patch
-21ed38773d846097b7315e1e0801d87a  net-git-78f1cd-r8169-fix-broken-register-writes.patch
-962a6dd7c639612fc8bdaeb836388b0b  net-git-c0cd88-r8169-offical-fix-for-CVE-2009-4537-overlength-frame-DMAs.patch
+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
+b035114e893883cf67530350678e00f5  0012-xfrm-remove-policy-lock-when-accessing-policy-walk.d.patch
+9dea03ec19aaf9a384e4f56f57009257  0013-flow-structurize-flow-cache.patch
+fc9ab26abbfec0d3f20000b5e695620b  0014-flow-virtualize-flow-cache-entry-methods.patch
+c09b82b89a49ba2a3836a0bc3a3312f4  0015-xfrm-cache-bundles-instead-of-policies-for-outgoing-.patch
+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"