Merge branch 'master' of vparabola:abslibre

Conflicts:
	pcr/pandoc/PKGBUILD

1 files changed, 20 insertions, 17 deletions

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 3d027c7ec..e2da7fff9 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203427 2014-01-10 20:21:13Z andyrtr $
+# $Id: PKGBUILD 204934 2014-01-31 16:13:52Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=26
+_sublevel=28
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
-_lxopkgver=${_basekernel}.26 # nearly always the same as pkgver
+pkgrel=1.1
+_lxopkgver=${_basekernel}.28 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,10 +30,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '3.10.6-logitech-dj.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+        '0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         'b04f41f84f48724609baac04282e9755'
+         '1eeedf694bd64b34a031ac27549bc7a3'
          '85ce008eaacbb2fc54b81116d35cf946'
          '16867e648e4b9f89bec949cb643888c2'
          'c072b17032e80debc6a8626299245d46'
@@ -42,8 +42,8 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '3ff40ca684cfe719723e627e2cef7cea'
-         '040015fc338ec1a35616e72bade6bdc2')
+         '336d2c4afd7ee5f2bdf0dcb1a54df4b2'
+         'cec0d90f5d3fae8752b0020c6b785954')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -63,6 +63,9 @@ prepare() {
   # add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
+  # 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)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -71,9 +74,9 @@ prepare() {
   # allow criu without expert option set
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
- 
-  # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
-  patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
+
+  # CVE-2014-0038
+  patch -Np1 -i "${srcdir}/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch"
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile
@@ -191,7 +194,7 @@ _package() {
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
     cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
   else
-    cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}"
+    cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
   fi
 
   # add vmlinux
@@ -276,16 +279,16 @@ _package-headers() {
 
   # copy arch includes for external modules
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
-  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  cp -a arch/${KARCH}/include "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
 
   # copy files necessary for later builds
   cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
   cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
 
   if [ "$CARCH" = "mips64el" ]; then
-    cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
+    cp arch/${KARCH}/Kbuild "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp -a arch/${KARCH}/loongson "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
   fi
 
   # fix permissions on scripts dir