Downgrade linux-libre-knock

Due to missing rcn-libre patches for 4.10.17 and missing knock patches for 4.11

1 files changed, 19 insertions, 19 deletions

diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index 47434d5ee..1e88d5d32 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -1,8 +1,10 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: David P. <megver83@parabola.nu>
+# Maintainer: Jesús E. <heckyel@parabola.nu>
+# Contributor: André Silva <emulatorman@riseup.net>
+# Contributor: Márcio Silva <coadde@riseup.net>
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
-# Contributor: Márcio Silva <coadde@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 
@@ -10,7 +12,7 @@
 
 pkgbase=linux-libre-knock
 _pkgbasever=4.10-gnu
-_pkgver=4.10.9-gnu
+_pkgver=4.10.16-gnu
 _knockpatchver=4.10_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -21,7 +23,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x1
+rcnrel=armv7-x2
 arch=('i686' 'x86_64' 'armv7h')
 url="https://gnunet.org/knock"
 license=('GPL2')
@@ -45,7 +47,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.armv7h'
         # pacman hook for initramfs regeneration
-        '99-linux.hook'
+        '90-linux.hook'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
@@ -64,7 +66,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0009-disable-USB3-port-on-ODROID-XU.patch')
 sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf5811fdae48fafd5a8e00d18ed9ac2e1ad4b12a657f322eb234384316ad131e0'
             'SKIP'
-            '3b8bf353cd98417c6f0eac1a40b79cfdd59f772f9bd287bb59d809f7c0d8108dfe678c7662a896c31d8102cb5ffc47436570b93691b0b34b0b3baa0f0afa9d48'
+            '83b92415a071baf8064fe4d6f2a100d3201236fcf46c689b2391a4fecbc4be0005fe8b8e4c73266f968e79a1da0f789a8c482db3ca22013967353d8c52d84697'
             'SKIP'
             '61b12333aaaeec86fc51feff8a46dc3e8e89b49530de66a389a3ed6ce974912772b8126d6a4bbc71b2d7b133974432141b896924db0e46df50537499447c0a95'
             'SKIP'
@@ -81,7 +83,7 @@ sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf58
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '1089ffb0718c6b40a6f2a3080845ebeb1a1561de35a28e46d74ab0232b98719400f85fdbf3a98fafd0105ed0fe11ec0bd726c7cc47a4a79767ab744875e9538e'
+            'd58a65532e0e9bfad4099e5650d2391d28d135e17c779de3766137f31b5dae925db78005187015914a66279d68bf701b50da0e29b20ac052596916262eb2662f'
             'SKIP'
             '1d550ee87d3c35b4022c23feb771f9a40c34bead6eb8dc5e92cd767417723b32bcb7e0608419aa2b8a4f3306c183447d9ae713d33df68102b1c2df4e267cee39'
             'cca509462861ac85e6229bd2bf5f5e0e4d2d2db182cf1d562f765862eb192ade5917a9e0306375642c1090143fae6826129fd531435658d906e6a8f88982ddef'
@@ -94,9 +96,7 @@ sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf58
             'b36238543e6dcaa3b6086618fb0eab108480d1224898548205f56a174911d38ce140b8206636c093ad6670987e09bd8a55c7d84ab5512bc6cda45260a1031a59')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
-              'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
-              '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
-              #'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch
+              '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
 )
 
 _kernelname=${pkgbase#linux-libre}
@@ -121,10 +121,10 @@ prepare() {
   patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
 
   if [ "${CARCH}" = "armv7h" ]; then
-    # RCN patch (CM3 firmware deblobbed, AUFS and RT removed)
-    # Note: For stability reasons, AUFS and RT have been removed in the RCN patch.
-    # We are supporting AUFS in linux-libre-pck through PCK patch and RT through its official
-    # patch in linux-libre-rt. See https://wiki.parabola.nu/PCK for further details about PCK.
+    # RCN patch (CM3 firmware deblobbed and AUFS 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.
     git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
 
     # ALARM patches
@@ -190,12 +190,12 @@ build() {
 
 _package() {
   pkgdesc="The ${pkgbase^} kernel and modules with support for stealth TCP sockets"
-  [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc')
-  depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
+  [ "${pkgbase}" = "linux" ] && groups=('base')
+  depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country'
               'systemd-knock: to use system and service manager with TCP Stealth support'
               'openssh-knock: to use SSH with TCP Stealth support')
-  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}")
+  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}" "kernel=${_archpkgver}")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -233,8 +233,8 @@ _package() {
   fi
 
   # install pacman hook for initramfs regeneration
-  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
-    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
+  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/90-linux.hook" |
+    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook"
 
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}