upgpkg: libre/linux-libre-hardened 4.15.17_gnu.a-1

Plus a small correction to linux-libre-xtreme's PKGBUILD

4 files changed, 16 insertions, 19 deletions

diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index 2419dcf93..db051d6f7 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -7,12 +7,11 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 
-# Based on linux package
-# NOTE: Not based on linux-hardened due to its low quality
+# Based on linux-hardened package
 
 pkgbase=linux-libre-hardened
 _pkgbasever=4.15-gnu
-_pkgver=4.15.14-gnu
+_pkgver=4.15.17-gnu
 _hardenedver=a
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -71,9 +70,9 @@ validpgpkeys=(
 )
 sha512sums=('a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd566b1980e654da26aaec005332e458581495184d6bd4cec669181085d4d78a5'
             'SKIP'
-            'cdbdacb10b290fe43ed7581e9cf2308a094865a860f75780b3afbd8a3d4259972e5c9b612fce2beafc7417d6260a134a7a59e213ab2f8aedce651707c8c4c150'
+            'f74ad4904ec4a845682d3f735e63720793c3b7a915a8678c4e0866c54e0cec928cb5c3352dee4b3e8d7129bd0515b1b6a485d976c05df6585a1d2e4658884ad4'
             'SKIP'
-            '0f40dd8a4a2a0ec0c3349fc9b536172e8ddae495cf926d20d9f3315e7392ff1e3313e56c0e7e373ee3a0178f07beb67b185a1f8782e4abd2632e90b402a31bb1'
+            '9bc61e496bf5c3e2414dab56beea9ad547cfd936458def49b80ae5684095d42245209cc6a17768e74a72a5665a60cc4bf8ce9cf3001343ef9352e78298dbec37'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -81,13 +80,13 @@ sha512sums=('a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd56
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            'c129784fdaa885b3883cf34e511c80f401fb10d3bda6343d92732801b53f568a5af8ccdad46c1d714034ef1164eb149dc746869e4e6705c6f57230b56a5d0650'
-            '769cc0a25a4ea505142dbbf9f2f7e930ceb5bd740a282c2b05839f3f453d37efb645bd944fabe20af6714b475a7a907f1cf840fcfc3318768ea06d1e625b20af'
-            'a70904b429a895193d6f4ce7bec2f1f452de02e0344645f8cd84a86404b523d3e08d5c8861d0d9d3332ab6d298816e49b670dfe2d54379a2aa54a9b4eb83a54c'
+            'e31c484c38d2d53aabe1e4e03521c0a41dba456cae2969eb309349829df19fa1f71bfdfc39169d0ef77dcaaef1ba59b821d63a29e4bb6a95a39d910108f20d8e'
+            '11320767bd5bb48e290a1cfc15d00823926f49375aee2295c8f25c0b1e9852fd871c50754fcea2173b0dc36e02d6a3429a03b8ce6d6043ac82789e38d56b944a'
+            'c8d6497185409c17cc0f5c4d7201b9b28a23007f60c0a4c01694697ddbce808f12c4c86305f1ebf7b5d44c34ef8c582b1adc8c6542fa5f2a0d8925dffe7ea039'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '7da8f3fbeb1b697f758ff6c09dd17384b931cebaa5f2f735998f8d30d088af3d6a1895dc741df3c94f3edaad80c01b588667558a82ed029ecec69dfa39706c16'
+            '9fcda845bf44fdf5a7907d4c9681eaf0d4dc67afde5d3848ee0364afc9ad6719de70770ccde8ed309747450f33275b55dc01a46fb6df4a92d5da87f0230632b3'
             'SKIP'
             'ba44aa1252aa1b172e0bc8bbbff864ff60cad6739b2aed2f6a2402848aa65cdb8a8ca6bb9341569b089d60dfd83c3bdd744b5810061ac76b19f0d337afe4cc8d'
             '738bc2874351d9e1b94319e6caf615b49753155c99dc9318a1ce9eced50f87627a7331762951f55e2bea8abdb97b80a617a08f3f0bc735e56ff831a8bbb19816'
@@ -129,7 +128,7 @@ prepare() {
   fi
   
   if [ "${CARCH}" = "armv7h" ]; then
-    # RCN patch (CM3 firmware deblobbed and AUFS removed)
+    # RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
     # We are supporting AUFS in linux-libre-pck through PCK patch.
     # See https://wiki.parabola.nu/PCK for further details.
@@ -152,7 +151,7 @@ prepare() {
     patch -p1 -i ../0014-ARM-dts-imx6q-evi-Fix-onboard-hub-reset-line.patch
   fi
 
-  # add hardened patches
+  # linux hardened patch
   patch -Np1 -i ../linux-hardened-${_pkgver%-*}.${_hardenedver}.patch
 
   # add freedo as boot logo
diff --git a/libre/linux-libre-hardened/config.armv7h b/libre/linux-libre-hardened/config.armv7h
index 9e90dac7e..4598b589c 100644
--- a/libre/linux-libre-hardened/config.armv7h
+++ b/libre/linux-libre-hardened/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.15.12-gnu-1-hardened Kernel Configuration
+# Linux/arm 4.15.17-gnu-1-hardened Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -169,7 +169,7 @@ CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_LOCAL_SANITIZE is not set
+CONFIG_LOCAL_INIT=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
@@ -1012,8 +1012,6 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_SMC is not set
 CONFIG_INET=y
-CONFIG_WIREGUARD=m
-# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_TRIE_STATS=y
diff --git a/libre/linux-libre-hardened/config.i686 b/libre/linux-libre-hardened/config.i686
index 4299f1134..f1c0cf99e 100644
--- a/libre/linux-libre-hardened/config.i686
+++ b/libre/linux-libre-hardened/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.15.10-gnu-1-hardened Kernel Configuration
+# Linux/x86 4.15.17-gnu-1-hardened Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -195,7 +195,7 @@ CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_LOCAL_SANITIZE is not set
+CONFIG_LOCAL_INIT=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
diff --git a/libre/linux-libre-hardened/config.x86_64 b/libre/linux-libre-hardened/config.x86_64
index 0b4247c2a..f88b8e5aa 100644
--- a/libre/linux-libre-hardened/config.x86_64
+++ b/libre/linux-libre-hardened/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.15.10-gnu-1-hardened Kernel Configuration
+# Linux/x86 4.15.17-gnu-1-hardened Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -207,7 +207,7 @@ CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_LOCAL_SANITIZE is not set
+CONFIG_LOCAL_INIT=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y