Merge branch 'master' of ssh://parabola-git/srv/git/abslibre/abslibre

3 files changed, 7 insertions, 77 deletions

diff --git a/libre/linux-libre-grsec/0004-fs-Don-t-return-0-from-get_anon_bdev.patch b/libre/linux-libre-grsec/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
deleted file mode 100644
index 5e4a27f06..000000000
--- a/libre/linux-libre-grsec/0004-fs-Don-t-return-0-from-get_anon_bdev.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 835a463e190af87a36df681863db7c3ea7ba0d66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
-Date: Thu, 3 Apr 2014 21:55:37 +0200
-Subject: [PATCH 04/10] fs: Don't return 0 from get_anon_bdev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e30cc9595303b27b48 removed an internal mount. This
-has the side-effect that rootfs now has FSID 0. Many
-userspace utilities assume that st_dev in struct stat
-is never 0, so this change breaks a number of tools in
-early userspace.
-
-Since we don't know how many userspace programs are affected,
-make sure that FSID is at least 1.
-
-References: http://article.gmane.org/gmane.linux.kernel/1666905
-References: http://permalink.gmane.org/gmane.linux.utilities.util-linux-ng/8557
-Cc: 3.14 <stable@vger.kernel.org>
-Signed-off-by: Thomas Bächler <thomas@archlinux.org>
----
- fs/super.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/super.c b/fs/super.c
-index 80d5cf2..7624267 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -802,7 +802,10 @@ void emergency_remount(void)
- 
- static DEFINE_IDA(unnamed_dev_ida);
- static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
--static int unnamed_dev_start = 0; /* don't bother trying below it */
-+/* Many userspace utilities consider an FSID of 0 invalid.
-+ * Always return at least 1 from get_anon_bdev.
-+ */
-+static int unnamed_dev_start = 1;
- 
- int get_anon_bdev(dev_t *p)
- {
--- 
-1.9.2
-
diff --git a/libre/linux-libre-grsec/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch b/libre/linux-libre-grsec/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
deleted file mode 100644
index 2840f190c..000000000
--- a/libre/linux-libre-grsec/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 45fa2f1..6088927 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(skb_checksum_help);
- __be16 skb_network_protocol(struct sk_buff *skb, int *depth)
- {
- 	__be16 type = skb->protocol;
--	int vlan_depth = ETH_HLEN;
-+	int vlan_depth = skb->mac_len;
- 
- 	/* Tunnel gso handlers can set protocol to ethernet. */
- 	if (type == htons(ETH_P_TEB)) {
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 582efe043..154cbc40e 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -12,13 +12,13 @@
 pkgbase=linux-libre-grsec   # Build stock -LIBRE-GRSEC kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.14
-_sublevel=4
+_sublevel=5
 _grsecver=3.0
-_timestamp=201405281922
+_timestamp=201406021708
 _pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}.${_sublevel}.${_timestamp}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="https://grsecurity.net/"
 license=('GPL2')
@@ -39,19 +39,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
-        '0004-fs-Don-t-return-0-from-get_anon_bdev.patch'
         '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch'
         '0011-kernfs-fix-removed-error-check.patch'
         '0012-fix-saa7134.patch'
-        '0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch'
         '0015-fix-xsdt-validation.patch'
         'sysctl.conf'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
-            '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815'
-            '5b1a2efe49736d3b0417f3b76df779de4166fe5890489491e1d0b99fed653b57'
+            '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8'
+            '8695054d1a1bd02acd2a08b1268eb65349f6877b1be1a00251dcbc5dd95a5a00'
             'SKIP'
             'a82a5b673dae3f1aa8124e91c485cb8648623d560b7543da63fffab2606443d6'
             '51e86aeeb4fadbb2ead2b4af115f0bfd04afb83c9959856e3495d704cec55db6'
@@ -63,16 +61,14 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
-            '1e1ae0f31f722e80da083ecada1f1be57f9ddad133941820c4483b0240e494c1'
             '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
             'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85'
             '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a'
             '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
-            'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be'
             '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4'
             'e734ac2a6e865b70dbe1e55ce55a5bd1b1e0cedea903c6341b9cfbabe420c763'
-            '3cd53473e049a4809d9dde8ebef73307ce87076d707f3fd5c100844d4a9e8255')
+            '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -111,10 +107,6 @@ prepare() {
   patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch"
   patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch"
 
-  # Fix various bugs caused by rootfs having FSID 0
-  # See http://www.spinics.net/lists/kernel/msg1716924.html
-  patch -p1 -i "${srcdir}/0004-fs-Don-t-return-0-from-get_anon_bdev.patch"
-
   # Disable usb autosuspend for intel btusb
   # See http://www.spinics.net/lists/kernel/msg1716461.html
   # Until a solution is found, make sure the driver leaves autosuspend alone
@@ -127,7 +119,7 @@ prepare() {
   # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d
   # FS#39815
   patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch"
-
+  
   # fix Xorg crash with i810 chipset due to wrong removed error check
   # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com
   patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch"
@@ -137,11 +129,6 @@ prepare() {
   # https://bugzilla.kernel.org/show_bug.cgi?id=73361
   patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
 
-  # fix tun/openvpn performance
-  # https://bugs.archlinux.org/task/40089
-  # https://bugzilla.kernel.org/show_bug.cgi?id=74051
-  patch -Np1 -i "${srcdir}/0013-net-Start-with-correct-mac_len-in-skb_network_protocol.patch"
-
   # fix xsdt validation bug
   # https://bugs.archlinux.org/task/39811
   # https://bugzilla.kernel.org/show_bug.cgi?id=73911