3.14.44-pf-lts

4 files changed, 67 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38a720b155ea..0f3ff7d18a5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-pf-lts
-	pkgver = 3.14.43
+	pkgver = 3.14.44
 	pkgrel = 1
 	url = http://pf.natalenko.name/
 	arch = i686
@@ -22,6 +22,7 @@ pkgbase = linux-pf-lts
 	source = 0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch
 	source = 0003-module-remove-MODULE_GENERIC_TABLE.patch
 	source = 0006-genksyms-fix-typeof-handling.patch
+	source = gcc5_buildfixes.diff
 	source = logo_linux_clut224.ppm.bz2
 	source = logo_linux_mono.pbm.bz2
 	source = logo_linux_vga16.ppm.bz2
@@ -36,30 +37,7 @@ pkgbase = linux-pf-lts
 	source = https://www.kernel.org/pub/linux/kernel/v3.x/incr/patch-3.14.40-41.xz
 	source = https://www.kernel.org/pub/linux/kernel/v3.x/incr/patch-3.14.41-42.xz
 	source = https://www.kernel.org/pub/linux/kernel/v3.x/incr/patch-3.14.42-43.xz
-	sha256sums = 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa
-	sha256sums = SKIP
-	sha256sums = fd4769f86fbe34bf95d26abd6a61ce06ffea9982a782612e60fffdb830927b39
-	sha256sums = c9ec6e9493c871fe2390efed7d7a29ab447135117e9c06739d599f1c0ebe4ea4
-	sha256sums = 1f036f7464da54ae510630f0edb69faa115287f86d9f17641197ffda8cfd49e0
-	sha256sums = faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182
-	sha256sums = 6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02
-	sha256sums = 52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29
-	sha256sums = 65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d
-	sha256sums = cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7
-	sha256sums = 03ed4eb4a35d42ae6beaaa5e6fdbada4244ed6c343944bba6462defaa6fed0bf
-	sha256sums = 51ea665cfec42d9f9c7796af2b060b7edbdeb367e42811f8c02667ad729f6b19
-	sha256sums = 9e1e81d80afac6f316e53947e1b081017090081cd30e6c4c473420b77af4b52b
-	sha256sums = 3b71affbe4b00da4cb31116449d69ac3d0f00d228feaf4f2cc4d747330bedba4
-	sha256sums = 06e080fb001112bb2418539058e987688d9658a927153ae79c967c11860e3b68
-	sha256sums = d60662a9f6b2696c20b6fbd12f365913eeb98d5edefca34587092eac9cb49774
-	sha256sums = a8602dc9e1591ecea14e2f3de06d20970828915b7ff2194b2bc31845b8ff5927
-	sha256sums = e7f9c907cd19aa6ca2f5c3363a5f3cd1d0b4e4c4229fbe2ded6c83356bfdf6c6
-	sha256sums = 4ae4de332c46eb0bae95268ecb57a51579894ef354b75dcf09d8720b0c331164
-	sha256sums = 17829b034090336a2137c87a9447a696a988f4c91b4b6eec197fb8525f578eec
-	sha256sums = d9bd56619b609f9b37f1301af0f539dfd47f2e7ad8f9682f4a7c0ce30b2baf82
-	sha256sums = de9202050d916e4b2426ec5630d15165c22b3911b7dbf5f02068daeb453fb330
-	sha256sums = 1c105726eb1ceda96f7db33fdfe269fea405d7599ca5b57aabe8af565638d427
-	sha256sums = 1b7c21229775206bc0a7a44a5f9af23ea7ff0b7c9fdb1bad0e6536097c93b4cc
+	source = https://www.kernel.org/pub/linux/kernel/v3.x/incr/patch-3.14.43-44.xz
 
 pkgname = linux-pf-lts
 	pkgdesc = Linux kernel and modules with the pf-kernel patchset [-ck patch (BFS included), TuxOnIce, BFQ, UKSM] and aufs3. Long-term support.
@@ -77,7 +55,7 @@ pkgname = linux-pf-lts
 	optdepends = nvidia-beta-all: NVIDIA drivers for all installed kernels
 	optdepends = modprobed_db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig.
 	provides = linux-pf-lts=3.14
-	provides = linux=3.14.43
+	provides = linux=3.14.44
 	provides = aufs3
 	conflicts = linux-pf-lts
 	replaces = aufs3
@@ -86,6 +64,6 @@ pkgname = linux-pf-lts
 pkgname = linux-pf-lts-headers
 	pkgdesc = Header files and scripts for building modules for linux-pf-lts kernel.
 	provides = linux-pf-lts-headers
-	provides = linux-headers=3.14.43
+	provides = linux-headers=3.14.44
 	conflicts = linux-pf-lts-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 0464a0eed820..f1a83869fe6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=linux-pf-lts
 _major=3
 _minor=14
-_patchlevel=43
+_patchlevel=44
 _pfpatchlevel=33
 #_subversion=1
 _basekernel=${_major}.${_minor}
@@ -53,6 +53,7 @@ source=(https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.{xz,sign}
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
+        'gcc5_buildfixes.diff'
 	'logo_linux_clut224.ppm.bz2'		#\
 	'logo_linux_mono.pbm.bz2'		#-> the Arch Linux boot logos
 	'logo_linux_vga16.ppm.bz2'		#/
@@ -116,7 +117,11 @@ prepare() {
   # add upstream patch
   #  patch -p1 -i "${srcdir}/patch-${pkgver}"
 
-  # add latest fixes from stable queue, if needed
+  # buildfixes for gcc5
+  # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176
+  # https://lkml.org/lkml/2014/11/9/27
+  # https://lkml.org/lkml/2014/12/14/55
+  patch -p1 -i "${srcdir}/gcc5_buildfixes.diff"  # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
@@ -535,8 +540,8 @@ package_linux-pf-lts() {
   true && install=${install}.pkg
 
   sed \
-    -e "s|KERNEL_NAME=.*|KERNEL_NAME=${_kernelname}|" \
-    -e "s|KERNEL_VERSION=.*|KERNEL_VERSION=${_kernver}|" \
+    -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+    -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
     -i "${startdir}/${install}"
 
   # install mkinitcpio preset file for kernel
@@ -754,6 +759,7 @@ sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
+            '9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a'
             '03ed4eb4a35d42ae6beaaa5e6fdbada4244ed6c343944bba6462defaa6fed0bf'
             '51ea665cfec42d9f9c7796af2b060b7edbdeb367e42811f8c02667ad729f6b19'
             '9e1e81d80afac6f316e53947e1b081017090081cd30e6c4c473420b77af4b52b'
@@ -767,4 +773,5 @@ sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
             'd9bd56619b609f9b37f1301af0f539dfd47f2e7ad8f9682f4a7c0ce30b2baf82'
             'de9202050d916e4b2426ec5630d15165c22b3911b7dbf5f02068daeb453fb330'
             '1c105726eb1ceda96f7db33fdfe269fea405d7599ca5b57aabe8af565638d427'
-            '1b7c21229775206bc0a7a44a5f9af23ea7ff0b7c9fdb1bad0e6536097c93b4cc')
+            '1b7c21229775206bc0a7a44a5f9af23ea7ff0b7c9fdb1bad0e6536097c93b4cc'
+            '585481b0cb3d830ed61f480acaec12d93b96ff3a72f845446bbc517b258d07e9')
diff --git a/gcc5_buildfixes.diff b/gcc5_buildfixes.diff
new file mode 100644
index 000000000000..e8a85b05564e
--- /dev/null
+++ b/gcc5_buildfixes.diff
@@ -0,0 +1,49 @@
+diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
+index e2b3985..c245ea3 100644
+--- a/lib/mpi/mpi-inline.h
++++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
++#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 60cf765..91ef8ac 100644
+--- a/lib/mpi/mpi-internal.h
++++ b/lib/mpi/mpi-internal.h
+@@ -168,20 +168,24 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
++#ifndef __GNUC__
+ mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb);
+-mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++#endif
++mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ 
+ /*-- mpihelp-sub.c --*/
++#ifndef __GNUC__
+ mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb);
+-mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++#endif
++mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++			 mpi_ptr_t s2_ptr, mpi_size_t size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.3
+
diff --git a/linux-pf-lts.install b/linux-pf-lts.install
index dec890a1e26f..8a72cf9866e5 100644
--- a/linux-pf-lts.install
+++ b/linux-pf-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pf-lts
-KERNEL_VERSION=3.14.4-pf-lts
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies