diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-03 15:18:56 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-03 15:30:51 +0000 |
| commit | 8f6eb6431417b77bda4b73dcbe2c5a466b1ab217 (patch) | |
| tree | 3b93d1d6493b6e1860f785fa6c72c652af7ca1b3 /main/linux-grsec | |
| parent | d8986a8651f762d8755b330ceed404d005fc662b (diff) | |
| download | aports-8f6eb6431417b77bda4b73dcbe2c5a466b1ab217.tar.bz2 aports-8f6eb6431417b77bda4b73dcbe2c5a466b1ab217.tar.xz | |
main/linux-grsec: remove PMTU patch
applied upstream already
Diffstat (limited to 'main/linux-grsec')
| -rw-r--r-- | main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch | 31 | ||||
| -rw-r--r-- | main/linux-grsec/APKBUILD | 6 |
2 files changed, 1 insertions, 36 deletions
diff --git a/main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch b/main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch deleted file mode 100644 index 4890abaa7..000000000 --- a/main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3cdaa5be9e81a914e633a6be7b7d2ef75b528562 Mon Sep 17 00:00:00 2001 -From: Li Wei <lw@cn.fujitsu.com> -Date: Thu, 29 Jan 2015 16:09:03 +0800 -Subject: [PATCH] ipv4: Don't increase PMTU with Datagram Too Big message. - -RFC 1191 said, "a host MUST not increase its estimate of the Path -MTU in response to the contents of a Datagram Too Big message." - -Signed-off-by: Li Wei <lw@cn.fujitsu.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/ipv4/route.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/net/ipv4/route.c b/net/ipv4/route.c -index d58dd0e..52e1f2b 100644 ---- a/net/ipv4/route.c -+++ b/net/ipv4/route.c -@@ -966,6 +966,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu) - if (dst->dev->mtu < mtu) - return; - -+ if (rt->rt_pmtu && rt->rt_pmtu < mtu) -+ return; -+ - if (mtu < ip_rt_min_pmtu) - mtu = ip_rt_min_pmtu; - --- -2.4.5 - diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 3db9c8134..62a939e9c 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs" @@ -20,7 +20,6 @@ source="http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz http://dev.alpinelinux.org/~tteras/grsec/pax-linux-4.1.11-test24-alpine.patch http://dev.alpinelinux.org/~tteras/grsec/grsec-4.1.y-3.1-201509112213-alpine.patch - 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch fix-spi-nor-namespace-clash.patch imx6q-no-unclocked-sleep.patch @@ -207,7 +206,6 @@ md5sums="fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz e790ae84e0109a3d95cc617be448171b patch-4.1.12.xz 15977c12236e3a4f8f61c74ce90a4402 pax-linux-4.1.11-test24-alpine.patch d4d64785f2ff77db38477b3da0d86f9a grsec-4.1.y-3.1-201509112213-alpine.patch -5d708f155fff5fbbbeed2785423832e2 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch b0337a2a9abed17c37eae5db332522d2 fix-spi-nor-namespace-clash.patch 1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch 1bcf1c98ab042ae7868aca90e0ceaaee config-grsec.x86 @@ -219,7 +217,6 @@ sha256sums="caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f li f3520b06e6a2b9929173c680de75f11cde9f0a380e04195d538b5de820a549ae patch-4.1.12.xz ed4626d4de2a283ac087617ebee5ec17e28b372ca060ae83bfd2b2e2cf0bb7f4 pax-linux-4.1.11-test24-alpine.patch 7258089a5e2d5ca65135e47cf13400c47a657f5b2f6ef3f2e2b7383a758e00f8 grsec-4.1.y-3.1-201509112213-alpine.patch -e6cef82ab135a8ab23111a90b95d3d034eaed32d7c5829c0322aaac491b781b7 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch 01279cfb93273d99670c56e2465957ecde3d03693beeb929a743f03afa0b7bdc fix-spi-nor-namespace-clash.patch 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch d9fa91765f13f00fff2a4bb39e6ecf91940ff4e83e9b4ade5783eab4b7c0faac config-grsec.x86 @@ -231,7 +228,6 @@ sha512sums="168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201 164f216faa8fef6a28fe03bdb69c7bee5ff99cf560271264b52e62aec63c1d4d6475d4a6f2b4b4c02d235568ebe8bafd3b36be75c8a505cde8edbb70136d89b4 patch-4.1.12.xz 67bcf3f23a9ee93186e3307d0344a11a9172137d176182ac63b50960eccf9cc0ee476cde7aaee266b98b6121a3efbafdfa41466724e6b04057e91f839eaa636f pax-linux-4.1.11-test24-alpine.patch 7d25216434876e4cdbab9c3a37f554a1ad908416c2afa8b70e92d681029accdd120c9ee4e5ed3df54f806920f05e0e29f0e06fc417083b953e26401be350858d grsec-4.1.y-3.1-201509112213-alpine.patch -0d533a7ae0fd7a524326312d5e10f505936941826766b778508c91698e1ba5b7125248cc6fbbb6adc27db0f6172a68c818fb12818e6d6a27cf4f85a961013bdb 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch 4e3aeb70712f9838afea75fe9e6c1389414d833a89286ea55441d6a8d54ce74b0e39b565721e3153443af0a614bff57c767251b7e5b81faa5e0784eddfcd2164 fix-spi-nor-namespace-clash.patch 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch 98eaa89a171bef67c59c51ad91ea764992a10cfbcce5b1ad01fbbb576f05de6db4dfbb5eabc166994ae7faacb7e89f53580fc0e609e4eebc7e5c8b1fe2d38b7f config-grsec.x86 |