Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

4 files changed, 18 insertions, 15 deletions

diff --git a/libre/b43-tools/PKGBUILD b/libre/b43-tools/PKGBUILD
index f3c022578..39423778a 100644
--- a/libre/b43-tools/PKGBUILD
+++ b/libre/b43-tools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=b43-tools
 pkgver=019
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Tools for the Broadcom 43xx series WLAN chip"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/mbuesch/b43-tools"
@@ -12,8 +12,9 @@ depends=('python2')
 makedepends=('bison' 'flex' 'python2')
 provides=("b43-fwcutter=$pkgver")
 conflicts=('b43-fwcutter')
+replaces=('b43-fwcutter')
 source=("https://github.com/mbuesch/b43-tools/archive/b43-fwcutter-019.tar.gz")
-md5sums=('d8387ec57b8bced796b0f9231077501a')
+sha256sums=('6fe82827655cf978a649c2c3f8221bc22bded28e4ec2f4ab0a7df487ea1ea4aa')
 
 build() {
   cd "$srcdir/b43-tools-b43-fwcutter-$pkgver"
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 620fc4eb5..6ebc431c3 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@
 pkgbase=linux-libre         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _pkgbasever=4.14-gnu
-_pkgver=4.14.7-gnu
+_pkgver=4.14.8-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -23,7 +23,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x2
+rcnrel=armv7-x3
 arch=('i686' 'x86_64' 'armv7h')
 url="https://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -59,7 +59,7 @@ source=(
   )
 sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e684147ebed91d1528d2685423dd784c5fca0f3650f874f2b93cfc6b7689b9a87f'
             'SKIP'
-            '5c62bbc5d3bc5aa67eed8c4952e86263cc86bd9406cfe30a87ee4ff891b8aeb23e78df82d7cfefcdbedce17520b7fe3d515d930905ee2ceaf6c7462399670fb7'
+            '3afac9aab10cc30065636264285f97e37537c766bb6ffa72a612561ba826bf75aeb6af1920f7dac09cc252e17e5d99722bf6e4436316cdb0c81b8d40572ae847'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -69,13 +69,11 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841
             'SKIP'
             '6dac1e8ab08eea83dfb70d31c698002fe1f63530e046ecf2a8a7f708cbe9ac116a8ff532b27a75c92b978b53621bf76f9361b42cfed8bcbfdcad2cad145e7e6b'
             '61407e3f5f3db60fc37e03f184b81b8a275a9795d3943bdeefd1a55efffe2fd178e162c3d2b40c446e25742468a3e9049001326ce62b7da62ee683c7c06b8215'
-            '873eba395fb0540b21760e17dc8442b2c04a159dcd597cd2574536f20195c7c38f35cbbaa1e4d47ed0ee440215adfb2f03f9602180175bf2cacdbfbdb3ad1cfe'
+            'ac84cda32d6fcd4368728898281157e029a9809788124621dbcfd2929b062c52480a44ef56eab1ec307f06119b8f7dd3f90b776afc210b05ccc9390600fc1b76'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
-            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            'ee810f2a28e5e07be61a6f3593eb6e1829803aff51ed959caaca6c4f83b7dde477bacbbb0581bd2dbd5bed1591170cf94666efe04064b16cc1ce7adac0813be4'
+            '8ccab6e545647b97135ae9b0c233ea385af43d4a592913740e743c50326c69aa7f91d25578aa2fef25363e1854c9a00c819fbd849ae9757b79f9602e4434d7b4'
             'SKIP'
             '29c709ee6892a668c77945142ed9749cb8a3135575a4316f4a3cc85fbda41c09fdd65e32507b654c96aa438bd2aed08c09919bb162daee969643aafd053321c4'
             '5b35ef2c675aed00ddf82b8a96a486230fad78f05b5a69c95a57632d6c7f428f026439f3ced72cf54156ffd4fd563e68d4285ba6f42428c00b966257951039c3'
@@ -85,7 +83,9 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841
             '23f21fb05188479fb2238229a88d1d45f30052e3d7dcbbf99c5b9a763493eac122795431cf6932e85bd6e091380179b62e986782fafe7e8c2bd53940199b925e'
             '45a21f9dfec613c8f4dba284aaf80e307612440893536295a32ec805e11439272a0949921a22f12f67600df8415870aa27101b7e3d3869aea88ad3e1cb614086'
             '6c93bc1e8d580af288921e10c456bdbda1dcb6d6f08c111cddaf9a32b43c2df41b50136bc09aaac1da9c3cae667bba6e075d590dcc465107ae6e2c3dcf7da657'
-            'f813d51834cedc23fabbb6060709a24f29969fea5aeb963fdeddb79723014ffc0c6d34be45eea8419d5087a5a9c561a42a113d667f03625283f2f2fc68196545')
+            'f813d51834cedc23fabbb6060709a24f29969fea5aeb963fdeddb79723014ffc0c6d34be45eea8419d5087a5a9c561a42a113d667f03625283f2f2fc68196545'
+            '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
+            'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
@@ -151,8 +151,8 @@ prepare() {
     sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config.${CARCH}
   fi
   
-  # set extraversion to pkgrel
-  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+  # append pkgrel to extraversion
+  sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h
index 36583bcee..9a0a591e1 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.4-gnu-1 Kernel Configuration
+# Linux/arm 4.14.8-gnu-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2174,6 +2174,7 @@ CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_BONE_CAPEMGR=y
 # CONFIG_DEV_OVERLAYMGR is not set
 CONFIG_TIEQEP=m
+# CONFIG_UDOO_ARD is not set
 # CONFIG_C2PORT is not set
 
 #
diff --git a/libre/vim-colorsamplerpack/PKGBUILD b/libre/vim-colorsamplerpack/PKGBUILD
index 490bc246e..41667e3d6 100644
--- a/libre/vim-colorsamplerpack/PKGBUILD
+++ b/libre/vim-colorsamplerpack/PKGBUILD
@@ -1,12 +1,13 @@
 # $Id: PKGBUILD 189356 2016-09-15 20:21:37Z svenstaro $
 # Contributor (Arch): Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 _pkgname=vim-colorsamplerpack-libre
 pkgname=vim-colorsamplerpack
 pkgver=2012.10.28
-pkgrel=4.parabola1
+pkgrel=4.parabola2
 _scriptid=18915
 pkgdesc="Different colorschemes for vim, without nonfree colorschemes"
 arch=('any')