Updated linux-libre-lts-apparmor and added heckyel to Maintainers in other PKGBUILDs

2 files changed, 25 insertions, 22 deletions

diff --git a/kernels/linux-libre-apparmor/PKGBUILD b/kernels/linux-libre-apparmor/PKGBUILD
index 7af9f69b8..fc476cd1a 100644
--- a/kernels/linux-libre-apparmor/PKGBUILD
+++ b/kernels/linux-libre-apparmor/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: David P. <megver83@parabola.nu>
+# Maintainer: Jesús E. <heckyel@openmailbox.org>
 # Contributor: André Silva <emulatorman@riseup.net>
 # Contributor: Márcio Silva <coadde@riseup.net>
 # Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
diff --git a/kernels/linux-libre-lts-apparmor/PKGBUILD b/kernels/linux-libre-lts-apparmor/PKGBUILD
index 7ad966a70..9e10db8b8 100644
--- a/kernels/linux-libre-lts-apparmor/PKGBUILD
+++ b/kernels/linux-libre-lts-apparmor/PKGBUILD
@@ -1,8 +1,10 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: David P. <megver83@parabola.nu>
+# Maintainer: Jesús E. <heckyel@openmailbox.org>
+# 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-lts-apparmor
 _pkgbasever=4.9-gnu
-_pkgver=4.9.21-gnu
+_pkgver=4.9.24-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -31,12 +33,12 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign"
         "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
         "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign"
-        "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"
-        "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig"
-        "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"
-        "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm.sig"
-        "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"
-        "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm.sig"
+        "https://github.com/coadde/linux-libre_logos/raw/master/logo_linux_clut224.ppm"
+        "https://github.com/coadde/linux-libre_logos/raw/master/logo_linux_clut224.ppm.sig"
+        "https://github.com/coadde/linux-libre_logos/raw/master/logo_linux_mono.pbm"
+        "https://github.com/coadde/linux-libre_logos/raw/master/logo_linux_mono.pbm.sig"
+        "https://github.com/coadde/linux-libre_logos/raw/master/logo_linux_vga16.ppm"
+        "https://github.com/coadde/linux-libre_logos/raw/master/logo_linux_vga16.ppm.sig"
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.armv7h'
         # pacman hook for initramfs regeneration
@@ -47,8 +49,8 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
         '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
         # armv7h patches
-        "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
-        "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
+        "https://github.com/coadde/rcn-libre/raw/master/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
+        "https://github.com/coadde/rcn-libre/raw/master/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
@@ -59,7 +61,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
 sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
             'SKIP'
-            'e43f11313726244e7dcc8fafb09e182775c2ae6cc8d6128de73b2033dd7729d8effc1410d930c1c9898f297ce2bc5a3950c14244a54ad2538d20d9924cc5bf8d'
+            'be50b9b7c607bd61571a2d2451dec26a6451be403905758d0635dd8a580d6c79dc45c9a37fe96ad8e72a04f0be9495a65b166857c4b13af69fb89ac5170525f3'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -75,7 +77,7 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
             'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '0d78312e59ce7bf0e7e5eb734ee7dee4d8889d3bd037c40bdc98b5909254269508d769beab610388717c4a0c20d0227b5d201fe91efd0278b0c234645aac783a'
+            'ad856244c852432856f1f411800517a54800e6d6d653fca9e811788da5c7d0efa2856d696230bf5bf6cc6b8316611b245bed0ebbda94bc188387e2fec435c1f4'
             'SKIP'
             'ccf18eb2c3d33a57871cbadd5ad825d2f2f489e69c54c7293b160abdc3e9e5c6a664ba7926a617d31affcf20b7ecb4e8de54fa78438c574aa1b257f686faade9'
             '69f13bb2e353727acbe39034978729272511c6578aa2faf8c829e1bb89c22e769262289b76d93254314304ebd7547c45cdc8ba6afc278444a8fd09f71dff9757'
@@ -110,10 +112,10 @@ prepare() {
   fi
 
   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
@@ -187,7 +189,7 @@ _package() {
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country'
               'apparmor: to configure and enable mandatory access control for programs')
-  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "LINUX-ABI_VERSION=${_archpkgver}")
+  provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "kernel=${_archpkgver}")
   conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -254,8 +256,8 @@ _package() {
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
   provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}")
-  conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
-  replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")
+  conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+  replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
@@ -395,8 +397,8 @@ _package-headers() {
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
   provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}")
-  conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
-  replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")
+  conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
+  replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")
 
   cd "${srcdir}/${_srcname}"