diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-10 12:19:57 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-10 12:19:57 -0300 |
| commit | f827deea99dedab87970efc0196326842f1d2fd0 (patch) | |
| tree | 8ded56eb31c0007106f91c7b6dd17aa6f47bfb4d | |
| parent | f0ff43807036d38b907bafcdc29f115c8835b53c (diff) | |
| parent | 402287336ca8b45bed9facea19ab6411d1ecdedc (diff) | |
Merge branch 'master' of gparabola:abslibre
| -rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/libretools/PKGBUILD | 6 |
2 files changed, 9 insertions, 14 deletions
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 5add61cc4..863bfd637 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_releasever=9 -_rtpatchver=rt13 +_releasever=10 +_rtpatchver=rt15 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -38,11 +38,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch' 'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch' 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' - '0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '348975e36e4dd27f5d8fc50e92de8922' - '83499dd2bd77368221ba2d6d5d7164ed' + 'fb31503633d3378480cacde9d164b3ca' + '400e066dbfd3a7c8eb2da558a1047ba8' 'e40789b1e59136235827a3b3bf40c121' 'bf542c4038d3e7d0da4c92bac0466198' '82496e68851d1960543a07ba51cdb44a' @@ -57,8 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '336d2c4afd7ee5f2bdf0dcb1a54df4b2' - '9cdff00e5aa53962869857d64a1ccf01') + '88c9ba7ea767ed8ae2d3cb5d887e2e70') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -107,9 +105,6 @@ prepare() { patch -Np1 -i "${srcdir}/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch" - # Fix CVE-2014-0038 - patch -p1 -i "${srcdir}/0001-x86-x32-Correct-invalid-use-of-user-timespec-in-the-.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 98602a1c5..53e9afb22 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,10 +9,10 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20140206 -_libretools_commit=93276b1059c6bce3aa6e400f70160b8b89cab007 +pkgver=20140210 +_libretools_commit=696c05516039b7b93381811451d393b16a8653d1 _devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd -md5sums=('317e997ae93f562dc18b7979981620f0' +md5sums=('e5e6e2a939850c4ce6695e3ee10e71f4' 'ec69dffa68829f063224de19bbd55fa9') _packages_url=https://projects.parabolagnulinux.org/packages |