1 files changed, 14 insertions, 22 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3074342..037be37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-libre-hardened
-_majver=4.14
-_minver=17
+_majver=4.15
+_minver=2
 _fullver=${_majver}.${_minver}
 _basever=${_majver}-gnu
 _pkgver=${_fullver}-gnu
@@ -26,31 +26,27 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}/linux
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
 
-        # https://bugs.archlinux.org/task/56605
-        xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-lookup.patch
         # https://bugs.archlinux.org/task/56711
         drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
 
-        CVE-2017-8824-dccp-use-after-free-in-DCCP-code.patch
 )
-sha256sums=('70f0098d823472402619a053211532423d15bfef628de7f49616014c81658278'
+sha256sums=('e6556514286f9cd6b46f5d5769b2cc3c61ac7d6fa9c9c400e3c2fb5949490186'
             'SKIP'
-            'a7569d770004cefbcf98d6d70ce3c9012463d13491dd8678391bdb97faafb790'
+            '81ec59f4d123f7b8bb358c765b4cae32979c6859816641f4830e6c87dc974875'
             'SKIP'
-            '77b6c3188a029d3a03164b2ca75bcd9781ea8a32b1e021114667e4a39c1b4bd1'
+            'c8a0c7fc3ef0ea4d7fe6f786b9987952e62c6bce7e3b20002358848c2117cfd9'
             'SKIP'
-            '50184a1ffa47bf180952175968d22c0153ba2e916f55563858c2614e1f249213'
+            '7c5a6ece4e49755cc4f96251788610afbea6c6b2b4afd582dfca0f0879f8082a'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '294c928b8252112d621df1d13fbfeade13f28ddea034d44e89db41b66d2b7d45'
-            'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148'
-            '6be803c62b7ce41f1b4de6c867715398812b1c1a3e68a0078512f2872e2a3fa9')
+            'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
              )
 _kernelname=${pkgbase#linux-libre}
+: ${_kernelname:=-ARCH}
 
 prepare() {
   cd ${_srcname}
@@ -58,8 +54,6 @@ prepare() {
   # add upstream patch
   msg2 "Applying upstream patch"
   patch -p1 -i "${srcdir}/patch-${_basever}-${_pkgver}"
-  # XXX: GNU patch doesn't support git-style file mode
-  chmod +x tools/objtool/sync-check.sh
 
   # Hotfixes
   patch -p1 -i "${srcdir}/CVE-2017-8824-dccp-use-after-free-in-DCCP-code.patch"
@@ -73,15 +67,13 @@ prepare() {
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
-  cp -Tf ../config.${CARCH} .config
-
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
+  cat ../config.x86_64 - >.config <<END
+CONFIG_LOCALVERSION="${_kernelname}"
+CONFIG_LOCALVERSION_AUTO=n
+END
 
   # set extraversion to pkgrel
-  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+  sed -i "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" Makefile
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
@@ -126,7 +118,7 @@ _package() {
   cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
   # make room for external modules
-  local _extramodules="extramodules-${_basekernel}${_kernelname:--ARCH}"
+  local _extramodules="extramodules-${_basekernel}${_kernelname}"
   ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
 
   # add real version for building modules and running depmod from hook