From d7d82a10592b6fb2b95ee7fb8182532fbe7387c7 Mon Sep 17 00:00:00 2001 From: David P Date: Fri, 21 Apr 2017 20:04:25 -0300 Subject: Updated linux-libre-apparmor --- kernels/linux-libre-apparmor/PKGBUILD | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/kernels/linux-libre-apparmor/PKGBUILD b/kernels/linux-libre-apparmor/PKGBUILD index 156475f20..e7f43b5cd 100644 --- a/kernels/linux-libre-apparmor/PKGBUILD +++ b/kernels/linux-libre-apparmor/PKGBUILD @@ -1,16 +1,16 @@ -# Maintainer: André Silva -# Contributor: Nicolás Reynolds -# Contributor: Sorin-Mihai Vârgolici -# Contributor: Michał Masłowski -# Contributor: Márcio Silva -# Contributor: Luke Shumaker -# Contributor: Luke R. +# Maintainer: André Silva +# Contributor: Márcio Silva +# Contributor (Parabola): Nicolás Reynolds +# Contributor (Parabola): Sorin-Mihai Vârgolici +# Contributor (Parabola): Michał Masłowski +# Contributor (Parabola): Luke Shumaker +# Contributor (Parabola): Luke R. # Based on linux package pkgbase=linux-libre-apparmor _pkgbasever=4.10-gnu -_pkgver=4.10.9-gnu +_pkgver=4.10.11-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -31,12 +31,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 @@ -46,8 +46,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 +59,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' + '17b2fd74ce2485cee053e851687e83fe2d08fd3d6ebe0b8b9eed4919bd756f6be10024d9a2d713f0ded817f1170a04d5143869e46e72277dce612235de9de4af' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -74,7 +74,7 @@ sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf58 '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '1089ffb0718c6b40a6f2a3080845ebeb1a1561de35a28e46d74ab0232b98719400f85fdbf3a98fafd0105ed0fe11ec0bd726c7cc47a4a79767ab744875e9538e' + 'cf967533f4dffa8f403d67efeb83e8e33fd01b5b3bbc1c8ca1e416756eea6a27881a2b0d0347e6a660b480afa7a2a43d81f654d8729174556c68274de75ac31d' 'SKIP' '1d550ee87d3c35b4022c23feb771f9a40c34bead6eb8dc5e92cd767417723b32bcb7e0608419aa2b8a4f3306c183447d9ae713d33df68102b1c2df4e267cee39' 'cca509462861ac85e6229bd2bf5f5e0e4d2d2db182cf1d562f765862eb192ade5917a9e0306375642c1090143fae6826129fd531435658d906e6a8f88982ddef' @@ -183,9 +183,9 @@ _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}") - conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") - replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}" "kernel=${_archpkgver}") + conflicts=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + replaces=("${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install @@ -250,8 +250,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=("${_replacesoldkernels[@]/%/-headers}") + replaces=("${_replacesoldkernels[@]/%/-headers}") install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" @@ -391,8 +391,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=("${_replacesoldkernels[@]/%/-docs}") + replaces=("${_replacesoldkernels[@]/%/-docs}") cd "${srcdir}/${_srcname}" -- cgit v1.2.3