main/linux-grsec: remove patches that got applied upstream

3 files changed, 1 insertions, 88 deletions

diff --git a/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch b/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
deleted file mode 100644
index ae2a0f9100..0000000000
--- a/main/linux-grsec/0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5b3e87bccb0e48f2f8b78695e949c015a3695f8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 31 Mar 2010 00:17:04 +0000
-Subject: [PATCH 11/18] xfrm_user: verify policy direction at XFRM_MSG_POLEXPIRE handler
-
-Add missing check for policy direction verification. This is
-especially important since without this xfrm_user may end up
-deleting per-socket policy which is not allowed.
-
-Signed-off-by: Timo Teras <timo.teras@iki.fi>
-Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit c8bf4d04f970fafb3430d332533e1cf103f2a018)
----
- net/xfrm/xfrm_user.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
-index b95a2d6..d1e9ee3 100644
---- a/net/xfrm/xfrm_user.c
-+++ b/net/xfrm/xfrm_user.c
-@@ -1589,6 +1589,10 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
- 	if (err)
- 		return err;
- 
-+	err = verify_policy_dir(p->dir);
-+	if (err)
-+		return err;
-+
- 	if (p->index)
- 		xp = xfrm_policy_byid(net, type, p->dir, p->index, 0, &err);
- 	else {
--- 
-1.7.0.2
-
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index d557959e66..37da9f8952 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=2.6.35.7
 _kernver=2.6.35
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -16,8 +16,6 @@ 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
 	grsecurity-2.2.0-2.6.35.7-201010232009.patch
 	0004-arp-flush-arp-cache-on-device-change.patch
-	0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
-	r8169-fix-random-mdio_write-failures.patch
 	r8169-fix-rx-checksum-offload.patch
 	r8169-add-gro-support.patch
 	kernelconfig.x86
@@ -143,8 +141,6 @@ md5sums="091abeb4684ce03d1d936851618687b6  linux-2.6.35.tar.bz2
 6a00ec267b0100f20a3fa900b97a5b7f  patch-2.6.35.7.bz2
 4a1ceddc62ff83b136f32dbab50e15f8  grsecurity-2.2.0-2.6.35.7-201010232009.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
-9f284c3fd5ab38cef4544efc1f50c6ba  0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
-ce4a74190febe13713bab1b886dd5bee  r8169-fix-random-mdio_write-failures.patch
 0ccecafd4123dcad0b0cd7787553d734  r8169-fix-rx-checksum-offload.patch
 139b39da44ecb577275be53d7d365949  r8169-add-gro-support.patch
 f6b46f11945c77d01679c87e95d512ee  kernelconfig.x86"
diff --git a/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch b/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch
deleted file mode 100644
index 1e2beadd0f..0000000000
--- a/main/linux-grsec/r8169-fix-random-mdio_write-failures.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Sun, 6 Jun 2010 15:38:47 -0700
-Subject: [PATCH 1/1] r8169: fix random mdio_write failures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Some configurations need delay between the "write completed" indication
-and new write to work reliably.
-
-Realtek driver seems to use longer delay when polling the "write complete"
-bit, so it waits long enough between writes with high probability (but
-could probably break too). This patch adds a new udelay to make sure we
-wait unconditionally some time after the write complete indication.
-
-This caused a regression with XID 18000000 boards when the board specific
-phy configuration writing many mdio registers was added in commit
-2e955856ff (r8169: phy init for the 8169scd). Some of the configration
-mdio writes would almost always fail, and depending on failure might leave
-the PHY in non-working state.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
-Acked-off-by: Francois Romieu <romieu@fr.zoreil.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/r8169.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index 217e709..03a8318 100644
---- a/drivers/net/r8169.c
-+++ b/drivers/net/r8169.c
-@@ -559,6 +559,11 @@ static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
- 			break;
- 		udelay(25);
- 	}
-+	/*
-+	 * Some configurations require a small delay even after the write
-+	 * completed indication or the next write might fail.
-+	 */
-+	udelay(25);
- }
- 
- static int mdio_read(void __iomem *ioaddr, int reg_addr)
--- 
-1.7.1
-