diff options
31 files changed, 461 insertions, 258 deletions
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index c1b37a5e6..fd2ab4bd3 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103683 2014-01-09 13:30:06Z spupykin $ +# $Id: PKGBUILD 104422 2014-01-20 13:27:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") @@ -13,7 +13,7 @@ makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 config) install=busybox.install -md5sums=('ac1881d1cdeb0729b22c663feaf1c663' +md5sums=('337d1a15ab1cb1d4ed423168b1eb7d7e' 'e7c697e37b2120f0e0a354c48180cde4') build() { diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD index 09198d579..bb1f8fd79 100644 --- a/community/calc/PKGBUILD +++ b/community/calc/PKGBUILD @@ -1,62 +1,28 @@ -# $Id: PKGBUILD 93457 2013-07-03 13:50:16Z spupykin $ +# $Id: PKGBUILD 104409 2014-01-20 11:01:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=calc -pkgver=2.12.4.8 +pkgver=2.12.4.13 pkgrel=1 pkgdesc="console calculator" arch=(i686 x86_64) url="http://www.isthe.com/chongo/tech/comp/calc/" license=('GPL') -depends=(glibc) +depends=('readline') +makedepends=('chrpath') #source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2) -md5sums=('38694f375e172f0b830d4dbf9d6f2dcc') +md5sums=('7955e52ebd6b4f8482ef2b31c490eb35') build() { cd $srcdir/calc-$pkgver - - patch -p0 Makefile <<EOF -1146c1146 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1180c1180 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR} -1233c1233 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1275c1275 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1312c1312 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1350c1350 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1406c1406 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -1443c1443 -< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib ---- -> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR} -EOF - - make -j1 + make USE_READLINE="-DUSE_READLINE" READLINE_LIB="-lreadline" READLINE_EXTRAS="-lhistory -lncurses" -j1 } package() { cd $srcdir/calc-$pkgver make T=$pkgdir install mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/ + chrpath -d $pkgdir/usr/bin/calc } diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index e6535f2ea..f7912b40d 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104326 2014-01-17 15:42:38Z lfleischer $ +# $Id: PKGBUILD 104414 2014-01-20 11:04:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Patrick Palka <patrick@parcs.ath.cx> @@ -10,7 +10,7 @@ pkgver=0.10 pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64') -url="http://hjemli.net/git/cgit" +url="http://git.zx2c4.com/cgit/" license=('GPL2') depends=('openssl' 'luajit') makedepends=('zlib' 'curl' 'asciidoc') diff --git a/community/higan-gtk/PKGBUILD b/community/higan-gtk/PKGBUILD index 53dc19714..fdad4d440 100755 --- a/community/higan-gtk/PKGBUILD +++ b/community/higan-gtk/PKGBUILD @@ -1,83 +1,58 @@ -# $Id: PKGBUILD 96210 2013-08-21 19:09:14Z alucryd $ +# $Id: PKGBUILD 104429 2014-01-20 19:23:37Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=higan-gtk -pkgver=093 -pkgrel=2 -pkgdesc="Nintendo multi-system emulator - GTK version" +pkgver=094 +pkgrel=1 +pkgdesc='Nintendo multi-system emulator' arch=('i686' 'x86_64') -url="http://code.google.com/p/higan/" +url='http://byuu.org/' license=('GPL3') depends=('libao' 'libpulse' 'libxv' 'openal' 'sdl' 'xdialog') -makedepends=('gendesk' 'mesa') +makedepends=('mesa') optdepends=('beat: Delta patcher') conflicts=('higan-qt') -source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz" - "http://higan.googlecode.com/files/purify_v03-source.tar.xz" +source=("http://byuu.org/files/${pkgname%-*}_v${pkgver}-source.tar.xz" 'higan') -sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538' - '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38' +sha256sums=('5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b' 'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048') -_profiles="accuracy balanced performance" +_profiles='accuracy balanced performance' prepare() { - gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u' - gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify' - cd higan_v${pkgver}-source - sed -i "s/flags += -I. -O3 -fomit-frame-pointer/flags += -I. -fomit-frame-pointer -std=gnu++11/ - s/flags += -march=native/flags += $CXXFLAGS/g" Makefile + sed "s/-march=native/-march=${CARCH/_/-} -mtune=generic/g" -i Makefile } build() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# libananke - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke + make phoenix=gtk -C ananke -# higan for _profile in ${_profiles}; do - make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile} + make phoenix=gtk profile=${_profile} mv out/higan{,-${_profile}} make clean done - -# purify - cd "${srcdir}"/purify_v03-source/purify - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic' } package() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# Common files install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}} install -m 755 {..,"${pkgdir}"/usr/bin}/higan - install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop - install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png + install -m 644 data/higan.desktop "${pkgdir}"/usr/share/applications/ + install -m 644 data/higan.png "${pkgdir}"/usr/share/pixmaps/ cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/ cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/ -# libananke install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1 ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so -# higan for _profile in ${_profiles}; do install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile} done - -# purify - cd "${srcdir}"/purify_v03-source/purify - install -m 755 {,"${pkgdir}"/usr/bin/}purify - install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop - ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png - -# Fix permissions - find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} + - find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} + } # vim: ts=2 sw=2 et: diff --git a/community/higan-qt/PKGBUILD b/community/higan-qt/PKGBUILD index 212caebf4..db655bca5 100755 --- a/community/higan-qt/PKGBUILD +++ b/community/higan-qt/PKGBUILD @@ -1,88 +1,60 @@ -# $Id: PKGBUILD 96212 2013-08-21 19:22:00Z alucryd $ +# $Id: PKGBUILD 104431 2014-01-20 19:37:01Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=higan-qt -pkgver=093 -pkgrel=2 -pkgdesc="Nintendo multi-system emulator - Qt version" +pkgver=094 +pkgrel=1 +pkgdesc='Nintendo multi-system emulator' arch=('i686' 'x86_64') -url="http://code.google.com/p/higan/" +url='http://byuu.org/' license=('GPL3') depends=('libao' 'libpulse' 'openal' 'qt4' 'sdl' 'xdialog') -makedepends=('gendesk' 'mesa') +makedepends=('mesa') optdepends=('beat: Delta patcher') conflicts=('higan-gtk') -source=("http://byuu.org/higan/release/higan_v${pkgver}-source.tar.xz" - "http://higan.googlecode.com/files/purify_v03-source.tar.xz" +source=("http://byuu.org/files/${pkgname%-*}_v${pkgver}-source.tar.xz" 'higan') -sha256sums=('6ad526ab7ac16a5b814f84235fbcd48946310af8645c42980b0063e3270ec538' - '2020f0b5a744f08c24085a15a6c2ec1d7c4424bba6727f244e513b95c4247e38' +sha256sums=('5e149df9d50c1066eb97c0d66665428d75304da782bba5a87078b87fc311151b' 'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048') -_profiles="accuracy balanced performance" +_profiles='accuracy balanced performance' prepare() { - gendesk -n --pkgname "higan" --pkgdesc "${pkgdesc}" --name='higan' --exec='higan %u' - gendesk -n --pkgname "purify" --pkgdesc "ROM Purifier - GTK version" --name='purify' --exec='purify' + cd higan_v${pkgver}-source - cd "${srcdir}"/higan_v${pkgver}-source + sed "s/-march=native/-march=${CARCH/_/-} -mtune=generic/g" -i Makefile moc-qt4 -i -Iphoenix/qt/ -o phoenix/qt/platform.moc phoenix/qt/platform.moc.hpp - sed -i "s/flags += -I. -O3 -fomit-frame-pointer/flags += -I. -fomit-frame-pointer -std=gnu++11/ - s/flags += -march=native/flags += $CXXFLAGS/g" Makefile - - cd "${srcdir}"/purify_v03-source - - moc-qt4 -i -Ipurify/phoenix/qt/ -o purify/phoenix/qt/platform.moc purify/phoenix/qt/platform.moc.hpp } build() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# libananke - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I.. -fomit-frame-pointer -std=gnu++11" -C ananke + make phoenix=qt -C ananke -# higan for _profile in ${_profiles}; do - make compiler=g++ platform=x target=ethos phoenix=gtk profile=${_profile} + make phoenix=qt profile=${_profile} mv out/higan{,-${_profile}} make clean done - -# purify - cd "${srcdir}"/purify_v03-source/purify - make compiler=g++ platform=x phoenix=gtk flags="$CXXFLAGS -I. -fomit-frame-pointer -std=gnu++11" link='-s -lX11 -ldl -Wl,-export-dynamic' } package() { - cd "${srcdir}"/higan_v${pkgver}-source + cd higan_v${pkgver}-source -# Common files install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{applications,pixmaps,higan/Video\ Shaders}} install -m 755 {..,"${pkgdir}"/usr/bin}/higan - install -m 644 {..,"${pkgdir}"/usr/share/applications}/higan.desktop - install -m 644 data/higan512.png "${pkgdir}"/usr/share/pixmaps/higan.png + install -m 644 data/higan.desktop "${pkgdir}"/usr/share/applications/ + install -m 644 data/higan.png "${pkgdir}"/usr/share/pixmaps/ cp -dr --no-preserve=ownership profile/* data/cheats.bml "${pkgdir}"/usr/share/higan/ cp -dr --no-preserve=ownership shaders/*.shader "${pkgdir}"/usr/share/higan/Video\ Shaders/ -# libananke install -m 644 ananke/libananke.so "${pkgdir}"/usr/lib/libananke.so.1 ln -s libananke.so.1 "${pkgdir}"/usr/lib/libananke.so -# higan for _profile in ${_profiles}; do install -m 755 {out,"${pkgdir}"/usr/bin}/higan-${_profile} done - -# purify - cd "${srcdir}"/purify_v03-source/purify - install -m 755 {,"${pkgdir}"/usr/bin/}purify - install -m 644 {../..,"${pkgdir}"/usr/share/applications}/purify.desktop - ln -s higan.png "${pkgdir}"/usr/share/pixmaps/purify.png - -# Fix permissions - find "${pkgdir}"/usr/share/higan/ -type d -exec chmod 755 {} + - find "${pkgdir}"/usr/share/higan/ -type f -exec chmod 644 {} + } # vim: ts=2 sw=2 et: diff --git a/community/pdfgrep/PKGBUILD b/community/pdfgrep/PKGBUILD new file mode 100644 index 000000000..063b5a20c --- /dev/null +++ b/community/pdfgrep/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Gabriel B. Casella <gbc921@gmail.com> +# Contributor: josephgbr <rafael.f.f1@gmail.com> + +pkgname=pdfgrep +pkgver=1.3.0 +pkgrel=2 +pkgdesc="A tool to search text in PDF files" +arch=('i686' 'x86_64') +url="http://pdfgrep.sourceforge.net/" +license=('GPL') +depends=('poppler') +conflicts=('pdfgrep-git') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) +md5sums=('07d2819dd11b0f92278df11a95221833') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index e113ddbc8..e5a316067 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 103819 2014-01-11 20:13:42Z tpowa $ +# $Id: PKGBUILD 104437 2014-01-20 20:07:03Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.3.6 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 48da071f1..6e5700409 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 195909 2013-10-05 07:30:47Z thomas $ +# $Id: PKGBUILD 204472 2014-01-20 18:47:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw -pkgver=3.11 +pkgver=3.13 pkgrel=1 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") @@ -11,7 +11,7 @@ license=("GPL") depends=("libnl") makedepends=("linux-api-headers") source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff') +sha256sums=('70c1c0f5145542b4d04dd52ad637920718515245e3dd3b4dc4c8e3b57b110dc6') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index fabc45ca3..b7cbad492 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,9 +1,13 @@ -# $Id: PKGBUILD 203657 2014-01-13 17:30:34Z foutrelis $ +# $Id: PKGBUILD 204471 2014-01-20 16:59:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> +# after a .so bump first rebuild dirmngr +# with sudo testing-x86_64-build -- -I libgcrypt-1.6.0-1-x86_64.pkg.tar.xz +# then cp /usr/lib/libgcrypt.so.11 /var/lib/archbuild/staging-x86_64/root/usr/lib/ and do staging-x86_64-build + pkgname=libgcrypt pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="General purpose cryptographic library based on the code from GnuPG" arch=(i686 x86_64) url="http://www.gnupg.org" @@ -11,8 +15,22 @@ license=('LGPL') depends=('libgpg-error>=1.10-2') options=('!emptydirs') install=$pkgname.install -source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('43283c0b41c41e3d3bc13c2d8f937dfe2aaa1a77') +source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + fix_avx_detection.patch + fix_slow_PBKDF2.patch) +sha1sums=('43283c0b41c41e3d3bc13c2d8f937dfe2aaa1a77' + '5219ee3d6e08155149f0fa410b07736d4f502d17' + 'a27baab3f4bda7ff6fb493115f6bdd1c990184f1') + +prepare() { + cd ${pkgname}-${pkgver} + + # fix AVX/AVX2 detextion + patch -Np1 -i ${srcdir}/fix_avx_detection.patch + + # fix slow PBKDF2 + patch -Np1 -i ${srcdir}/fix_slow_PBKDF2.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/core/libgcrypt/fix_avx_detection.patch b/core/libgcrypt/fix_avx_detection.patch new file mode 100644 index 000000000..5d21c4232 --- /dev/null +++ b/core/libgcrypt/fix_avx_detection.patch @@ -0,0 +1,159 @@ +From: Jussi Kivilinna <jussi.kivilinna@iki.fi> +Date: Sun, 12 Jan 2014 09:31:20 +0000 (+0200) +Subject: Fix buggy/incomplete detection of AVX/AVX2 support +X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=8302d66d140d5c78c5e808fa1555ed7a8ee27921 + +Fix buggy/incomplete detection of AVX/AVX2 support + +* configure.ac: Also check for 'xgetbv' instruction in AVX and AVX2 +inline assembly checks. +* src/hwf-x86.c [__i386__] (get_xgetbv): New function. +[__x86_64__] (get_xgetbv): New function. +[HAS_X86_CPUID] (detect_x86_gnuc): Check for OSXSAVE and OS support for +XMM&YMM registers and enable AVX/AVX2 only if XMM&YMM registers are +supported by OS. +-- + +This patch is based on original patch and bug report by Panagiotis Christopoulos: + + Adding better detection of AVX/AVX2 support + + After upgrading libgcrypt from 1.5.3 to 1.6.0 on a remote XEN system (linode) my + gpg2 stopped working properly, throwing SIGILL signals when doing sha512 + operations etc. I managed to debug this with the help of Doublas Freed + (dwfreed at mtu.edu) and it seems that the current AVX detection just checks for + bit 28 on cpuid but the check still works on systems that have disabled the avx/avx2 + instructions for some reason (eg. performance/unstability) resulting in SIGILLs + (eg. when trying _gcry_sha512_transform_amd64_avx() ). + From Intel resources[1][2], I found additional checks for better AVX + detection and applied them in the following patch. Please review/change + accordingly and commit some better AVX detection mechanism. The AVX part is + tested but could not test the AVX2 one, because I lack proper hardware. I can + provide additional information upon request. Use the patch only as a guideline, + as it's not thoroughly tested. + + [1] http://software.intel.com/en-us/blogs/2011/04/14/is-avx-enabled + [2] http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf (sections 14.3 +and 14.7.1) + +Reported-by: Panagiotis Christopoulos (pchrist) <pchrist@gentoo.org> +Cc: Doublas Freed <dwfreed@mtu.edu> +Cc: Tim Harder <radhermit@gentoo.org> +Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> +(cherry picked from commit bbcb12187afb1756cb27296166b57fa19ee45d4d) +--- + +diff --git a/configure.ac b/configure.ac +index a47e13e..3387b9a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1035,7 +1035,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AVX instructions], + [gcry_cv_gcc_inline_asm_avx=no + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [[void a(void) { +- __asm__("vaesdeclast (%[mem]),%%xmm0,%%xmm7\n\t"::[mem]"r"(0):); ++ __asm__("xgetbv; vaesdeclast (%[mem]),%%xmm0,%%xmm7\n\t"::[mem]"r"(0):); + }]])], + [gcry_cv_gcc_inline_asm_avx=yes])]) + if test "$gcry_cv_gcc_inline_asm_avx" = "yes" ; then +@@ -1052,7 +1052,7 @@ AC_CACHE_CHECK([whether GCC inline assembler supports AVX2 instructions], + [gcry_cv_gcc_inline_asm_avx2=no + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [[void a(void) { +- __asm__("vpbroadcastb %%xmm7,%%ymm1\n\t":::"cc"); ++ __asm__("xgetbv; vpbroadcastb %%xmm7,%%ymm1\n\t":::"cc"); + }]])], + [gcry_cv_gcc_inline_asm_avx2=yes])]) + if test "$gcry_cv_gcc_inline_asm_avx2" = "yes" ; then +diff --git a/src/hwf-x86.c b/src/hwf-x86.c +index 4e82558..0591b4f 100644 +--- a/src/hwf-x86.c ++++ b/src/hwf-x86.c +@@ -95,6 +95,21 @@ get_cpuid(unsigned int in, unsigned int *eax, unsigned int *ebx, + if (edx) + *edx = regs[3]; + } ++ ++static unsigned int ++get_xgetbv(void) ++{ ++ unsigned int t_eax; ++ ++ asm volatile ++ ("xgetbv\n\t" ++ : "=a" (t_eax) ++ : "c" (0) ++ ); ++ ++ return t_eax; ++} ++ + #endif /* i386 && GNUC */ + + +@@ -129,6 +144,21 @@ get_cpuid(unsigned int in, unsigned int *eax, unsigned int *ebx, + if (edx) + *edx = regs[3]; + } ++ ++static unsigned int ++get_xgetbv(void) ++{ ++ unsigned int t_eax; ++ ++ asm volatile ++ ("xgetbv\n\t" ++ : "=a" (t_eax) ++ : "c" (0) ++ ); ++ ++ return t_eax; ++} ++ + #endif /* x86-64 && GNUC */ + + +@@ -138,9 +168,12 @@ detect_x86_gnuc (void) + { + char vendor_id[12+1]; + unsigned int features; ++ unsigned int os_supports_avx_avx2_registers = 0; + unsigned int max_cpuid_level; + unsigned int result = 0; + ++ (void)os_supports_avx_avx2_registers; ++ + if (!is_cpuid_available()) + return 0; + +@@ -215,10 +248,20 @@ detect_x86_gnuc (void) + if (features & 0x02000000) + result |= HWF_INTEL_AESNI; + #endif /*ENABLE_AESNI_SUPPORT*/ ++#if defined(ENABLE_AVX_SUPPORT) || defined(ENABLE_AVX2_SUPPORT) ++ /* Test bit 27 for OSXSAVE (required for AVX/AVX2). */ ++ if (features & 0x08000000) ++ { ++ /* Check that OS has enabled both XMM and YMM state support. */ ++ if ((get_xgetbv() & 0x6) == 0x6) ++ os_supports_avx_avx2_registers = 1; ++ } ++#endif + #ifdef ENABLE_AVX_SUPPORT + /* Test bit 28 for AVX. */ + if (features & 0x10000000) +- result |= HWF_INTEL_AVX; ++ if (os_supports_avx_avx2_registers) ++ result |= HWF_INTEL_AVX; + #endif /*ENABLE_AVX_SUPPORT*/ + #ifdef ENABLE_DRNG_SUPPORT + /* Test bit 30 for RDRAND. */ +@@ -242,6 +285,7 @@ detect_x86_gnuc (void) + #ifdef ENABLE_AVX2_SUPPORT + /* Test bit 5 for AVX2. */ + if (features & 0x00000020) ++ if (os_supports_avx_avx2_registers) + result |= HWF_INTEL_AVX2; + #endif /*ENABLE_AVX_SUPPORT*/ + } + diff --git a/core/libgcrypt/fix_slow_PBKDF2.patch b/core/libgcrypt/fix_slow_PBKDF2.patch new file mode 100644 index 000000000..ee1eafd52 --- /dev/null +++ b/core/libgcrypt/fix_slow_PBKDF2.patch @@ -0,0 +1,75 @@ +From: Milan Broz <gmazyland@gmail.com> +Date: Mon, 13 Jan 2014 20:30:42 +0000 (+0100) +Subject: PBKDF2: Use gcry_md_reset to speed up calculation. +X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=ead3a097a9ee5908e562e6ec683707c38191acf3 + +PBKDF2: Use gcry_md_reset to speed up calculation. + +* cipher/kdf.c (_gcry_kdf_pkdf2): Use gcry_md_reset +to speed up calculation. +-- + +Current PBKDF2 implementation uses gcry_md_set_key in every iteration +which is extremely slow (even in comparison with other implementations). + +Use gcry_md_reset instead and set key only once. + +With this test program: + + char input[32000], salt[8], key[16]; + gcry_kdf_derive(input, sizeof(input), GCRY_KDF_PBKDF2, + gcry_md_map_name("sha1"), + salt, sizeof(salt), 100000, sizeof(key), key); + +running time without patch: + real 0m11.165s + user 0m11.136s + sys 0m0.000s + +and with patch applied + real 0m0.230s + user 0m0.184s + sys 0m0.024s + +(The problem was found when cryptsetup started to use gcrypt internal PBKDF2 +and for very long keyfiles unlocking time increased drastically. +See https://bugzilla.redhat.com/show_bug.cgi?id=1051733) + +Signed-off-by: Milan Broz <gmazyland@gmail.com> +(cherry picked from commit 04cda6b7cc16f3f52c12d9d3e46c56701003496e) +--- + +diff --git a/cipher/kdf.c b/cipher/kdf.c +index 503f068..af0dc48 100644 +--- a/cipher/kdf.c ++++ b/cipher/kdf.c +@@ -175,19 +175,21 @@ _gcry_kdf_pkdf2 (const void *passphrase, size_t passphraselen, + return ec; + } + ++ ec = _gcry_md_setkey (md, passphrase, passphraselen); ++ if (ec) ++ { ++ _gcry_md_close (md); ++ xfree (sbuf); ++ return ec; ++ } ++ + /* Step 3 and 4. */ + memcpy (sbuf, salt, saltlen); + for (lidx = 1; lidx <= l; lidx++) + { + for (iter = 0; iter < iterations; iter++) + { +- ec = _gcry_md_setkey (md, passphrase, passphraselen); +- if (ec) +- { +- _gcry_md_close (md); +- xfree (sbuf); +- return ec; +- } ++ _gcry_md_reset (md); + if (!iter) /* Compute U_1: */ + { + sbuf[saltlen] = (lidx >> 24); + diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 089ba8f7d..2c3cd9c7f 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 203439 2014-01-10 21:08:52Z heftig $ +# $Id: PKGBUILD 204483 2014-01-20 20:35:39Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.16.0 -pkgrel=3 +pkgver=1.16.2 +pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" @@ -12,7 +12,7 @@ depends=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'p makedepends=('gobject-introspection') options=(!emptydirs) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094') +sha256sums=('65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index 31982b9af..fd6be0868 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 201495 2013-12-12 22:17:22Z heftig $ +# $Id: PKGBUILD 204484 2014-01-20 20:37:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.10.2 -pkgrel=2 +pkgver=3.10.3 +pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('3aae8d501fce8ffd30bee6740e61bfbd7c48336f4ca254912f2646c8486324b1') +sha256sums=('239a373dc318eeb33ecbbe175880d95239aa8500f7b67d554e084ed6ace69324') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD index 6db473249..e2ef5a1b6 100644 --- a/extra/gnome-online-miners/PKGBUILD +++ b/extra/gnome-online-miners/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 200220 2013-11-22 18:17:22Z heftig $ +# $Id: PKGBUILD 204482 2014-01-20 20:34:48Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-miners -pkgver=3.10.2 +pkgver=3.10.3 pkgrel=1 pkgdesc="Tracker miners for online accounts" arch=(i686 x86_64) @@ -10,7 +10,7 @@ url="http://www.gnome.org" license=(GPL) depends=(libgdata gnome-online-accounts grilo libzapojit tracker) source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('38c9e60cf56b6d0ec32e972256268d6038d15e32521a91aede1ec168f5e31cd9') +sha256sums=('129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8') build() { cd $pkgname-$pkgver diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index 8736b9a0e..eb453ae40 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199543 2013-11-15 09:39:54Z pierre $ +# $Id: PKGBUILD 204468 2014-01-20 16:04:30Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd -pkgver=1.4.33 -pkgrel=3 +pkgver=1.4.34 +pkgrel=1 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -19,37 +19,14 @@ options=('emptydirs') install='lighttpd.install' source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" - "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch" - "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch.asc" - "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch" - "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch.asc" - "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch" - "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch.asc" 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') -sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c' - 'SKIP' - '87792bcf62a554ac094263b931a8ae369d975b7e6bf83778f8f0a6c0ff31b979' - 'SKIP' - '1772cae2a0678c93dd5fa54f2622a563c3eb0a0047ba2a6648a5680d50d3bfde' - 'SKIP' - 'babf177f2e88a1444550825ce8e8ad1a95dbc78cfaa59c2c3f121ccbb37799d2' +sha256sums=('3e067bd12a6c953862139f0ee4cb03a0cd8cff9b3ffe393ddc7dc3956431cb72' 'SKIP' '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f' 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147') -prepare() { - cd $srcdir/$pkgname-$pkgver - - # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_02.txt - patch -p1 -i $srcdir/lighttpd-1.4.33_fix_setuid.patch - # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_03.txt - patch -p1 -i $srcdir/lighttpd-1.4.33_fix_fam_use_after_free.patch - # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_01.txt - patch -p1 -i $srcdir/lighttpd-1.4.33_fix_ssl_sni.patch -} - build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/pycurl/PKGBUILD b/extra/pycurl/PKGBUILD index 04f2fe87b..3db793090 100644 --- a/extra/pycurl/PKGBUILD +++ b/extra/pycurl/PKGBUILD @@ -1,31 +1,51 @@ -# $Id: PKGBUILD 196757 2013-10-17 23:38:31Z eric $ +# $Id: PKGBUILD 204461 2014-01-20 15:09:51Z eric $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgbase=pycurl -pkgname=('python2-pycurl') -pkgver=7.19.0.2 +pkgname=('python-pycurl' 'python2-pycurl') +pkgver=7.19.3 pkgrel=1 arch=('i686' 'x86_64') url="http://pycurl.sourceforge.net/" -license=('GPL') -makedepends=('python2' 'curl') +license=('LGPL' 'MIT') +makedepends=('python' 'python2' 'curl') source=("http://pycurl.sourceforge.net/download/${pkgbase}-${pkgver}.tar.gz") -md5sums=('518be33976dbc6838e42495ada64b43f') +sha1sums=('5d8b7a7f869362421061d72f6d234bf805ebebb5') + +prepare() { + cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} + + cd "${srcdir}/${pkgbase}-${pkgver}" + find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} + + sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py + cd "${srcdir}/python2-${pkgbase}-${pkgver}" + find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} + + sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + python3 setup.py build --with-ssl + cd "${srcdir}/python2-${pkgbase}-${pkgver}" + python2 setup.py build --with-ssl +} + +package_python-pycurl() { + pkgdesc="A Python 3.x interface to libcurl" + depends=('python' 'curl') + + cd ${pkgbase}-${pkgver} + python setup.py install --root="${pkgdir}" + install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} package_python2-pycurl() { pkgdesc="A Python 2.x interface to libcurl" depends=('python2' 'curl') - replaces=('pycurl' 'python-pycurl') - provides=('pycurl' 'python-pycurl') - conflicts=('python-pycurl') - - cd ${pkgbase}-${pkgver} - python2 setup.py install --curl-config=/usr/bin/curl-config \ - --prefix "${pkgdir}"/usr --optimize=1 - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find "${pkgdir}" -name '*.py') + cd python2-${pkgbase}-${pkgver} + python2 setup.py install --root="${pkgdir}" + install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 3bf81bf20..c114cfea2 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 201450 2013-12-11 20:06:25Z eric $ +# $Id: PKGBUILD 204459 2014-01-20 13:39:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=syslog-ng -pkgver=3.5.2 +pkgver=3.5.3 pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') @@ -16,8 +16,8 @@ backup=('etc/syslog-ng/scl.conf' 'etc/logrotate.d/syslog-ng') source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz syslog-ng.conf syslog-ng.logrotate) -sha1sums=('f0c91e14ee1f691cf680daf942d84ed87e5469c0' - 'b5b0d54ec295c6f8a62f68238c36fe62da01ef6e' +sha1sums=('7a8070f384e0dba1dfd6622c40bc6e402fa6178f' + 'cf61571ffde34ecf36be76881fce20944fd3efa4' '949128fe3d7f77a7aab99048061f885bc758000c') prepare() { diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf index bb89a82f3..2b9a325fd 100644 --- a/extra/syslog-ng/syslog-ng.conf +++ b/extra/syslog-ng/syslog-ng.conf @@ -1,4 +1,5 @@ @version: 3.5 +@include "scl.conf" # # /etc/syslog-ng/syslog-ng.conf # @@ -18,9 +19,8 @@ options { }; source src { - unix-dgram("/run/systemd/journal/syslog"); + system(); internal(); - file("/proc/kmsg"); }; destination d_authlog { file("/var/log/auth.log"); }; diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 981db5bed..4eee1ce66 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204356 2014-01-17 19:43:50Z andyrtr $ +# $Id: PKGBUILD 204466 2014-01-20 15:33:19Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,8 +7,8 @@ # Contributor: Milan Knížek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.1.12 -pkgrel=5 +pkgver=4.0.1.13 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/" @@ -61,7 +61,7 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('2f41accfb7b7d8b8113eb6f2f686e340') +md5sums=('24181098a9c4d7a5ca2c1416b0cee22d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 6a310c2bf..67602c919 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 200773 2013-12-04 20:25:36Z andyrtr $ +# $Id: PKGBUILD 204457 2014-01-20 06:42:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=300 +pkgver=301 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('6adc7c7f39ab2a71fd83747049d60358' +md5sums=('50ba12a4decca06213203bff1b35ef19' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index e089e5eb6..90fd4009a 100644 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203524 2014-01-12 13:05:55Z tpowa $ +# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,12 +10,12 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=7 +_sublevel=8 _grsecver=3.0 -_timestamp=201401120824 +_timestamp=201401191015 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -44,8 +44,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'known-exploit-detection.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - 'c42ff446236915fe1a6e2b6f9724d267' - 'a90b0bcd0ece5c0bee4fa8155a0122fd' + '392f920129940c4f83c7d204468213f3' + 'a7dd09d05b98cca3b7c00098698bdd38' 'ce2f5067862192ce2dcb897e362b24f6' '93ff5264c547d894cc68e0c30a0dbdd8' '5f66bed97a5c37e48eb2f71b2d354b9a' @@ -63,7 +63,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'f93ef6157fbb23820bd5ae08fd3f451e' '0db7629711f4ed76bd1f9da9f97bc4ea' '34f7e421a25ebc3c1406e04db56accfa' - '7554da820df91c282656972976d9e0b5') + '0569e96c071703cc244f1ea7ee87d40a') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD index 64ec61576..07aa6fe1e 100644 --- a/kernels/linux-libre-knock/PKGBUILD +++ b/kernels/linux-libre-knock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203524 2014-01-12 13:05:55Z tpowa $ +# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,11 +10,11 @@ pkgbase=linux-libre-knock # Build stock -LIBRE-KNOCK kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=7 +_sublevel=8 _knockpatchver=${_basekernel}.4 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -40,7 +40,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - 'c42ff446236915fe1a6e2b6f9724d267' + '392f920129940c4f83c7d204468213f3' '387673a6510de1e1bce8188fc7a72bd1' '6eac169d20fd27b55815b0b2db4a473b' 'f341bc4685a40dc409b144b0f44bb137' @@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '7554da820df91c282656972976d9e0b5') + '0569e96c071703cc244f1ea7ee87d40a') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 2941d7fd1..09c36fa68 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203524 2014-01-12 13:05:55Z tpowa $ +# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,8 +6,8 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -pkgver=${_basekernel}.7 -pkgrel=2 +pkgver=${_basekernel}.8 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,7 +29,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch' 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch') md5sums=('254f59707b6676b59ce5ca5c3c698319' - 'c42ff446236915fe1a6e2b6f9724d267' + '392f920129940c4f83c7d204468213f3' '2c07956936879d8729ad68d997a79bbf' 'f302c931bd85309da9d9792b4cc96467' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 4a3460e36..373157c7a 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203524 2014-01-12 13:05:55Z tpowa $ +# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,8 +6,8 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -pkgver=${_basekernel}.7 -pkgrel=2 +pkgver=${_basekernel}.8 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,7 +29,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch' 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch') md5sums=('254f59707b6676b59ce5ca5c3c698319' - 'c42ff446236915fe1a6e2b6f9724d267' + '392f920129940c4f83c7d204468213f3' '670682e633d1b785c73581307da7eb9c' 'b7c2805bb287a644c0a303bf7721e534' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 8f2eb8493..51d33f1cd 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20140119 -_libretools_commit=b6e66bce4dadd1a5b9f74a456de3ef5575e648fa +pkgver=20140120.1 +_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822 _devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd _packages_url=https://projects.parabolagnulinux.org/packages @@ -87,5 +87,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('459bb1e453a8acb4bdcb3dc5e36f9322' +md5sums=('8991b27aed494b60f33c84dd48aea874' 'ec69dffa68829f063224de19bbd55fa9') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install index a451add36..35edf68c7 100644 --- a/libre-testing/libretools/libretools.install +++ b/libre-testing/libretools/libretools.install @@ -4,10 +4,14 @@ _edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o _edit_cmnt='#%s # commented out by the libretools post_install script' _add_cmnt='# The following line is added by the libretools post_install script' -_add_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' +_add_code='DLAGENTS+=({https,libre}'\''::/usr/bin/librefetch -p "$BUILDFILE" -- %u %o'\'')' -# This line was installed by previous versions of this script -_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' +# These lines were installed by previous versions of this script +_old_code=( + '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + '[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")' + 'DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p $(printf "%q" "$BUILDFILE") -- %u %o")' +) # has_line $line has_line() { grep -Fxq -- "$1" etc/makepkg.conf; } @@ -32,13 +36,14 @@ rep_line() { post_install() { if grep -q 'librefetch' etc/makepkg.conf; then libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" - if has_line "$_old_code"; then - libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf" - del_line "$_old_code" - post_install - else - return 0 - fi + local line del=false + for line in "${_old_code[@]}"; do + if has_line "$line"; then + pre_remove + post_install + return $? + fi + done else libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf" rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')" @@ -60,5 +65,8 @@ pre_remove() { del_line "$_add_cmnt" del_line "$_add_code" - del_line "$_old_code" + local line + for line in "${_old_code[@]}"; do + del_line "$line" + done } diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 3c6f1ba33..745c3fce3 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103710 2014-01-10 12:51:56Z tpowa $ +# $Id: PKGBUILD 104385 2014-01-19 20:27:05Z tpowa $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: M0Rf30 # Contributor: Samsagax <samsagax@gmail.com> @@ -8,7 +8,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.8 _extramodules=extramodules-3.12-LIBRE # Don't forget to update bbswitch.install -pkgrel=4 +pkgrel=5 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ebf30af10..7d32cd7ad 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203524 2014-01-12 13:05:55Z tpowa $ +# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -38,7 +38,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - 'c42ff446236915fe1a6e2b6f9724d267' + '392f920129940c4f83c7d204468213f3' '568ce15a9df133072489cbac8c4fefb3' '772873c548059c57c8ec7898f35c0e2b' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -53,7 +53,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' 'cec0bb8981936eab2943b2009b7a6fff' '88d9cddf9e0050a76ec4674f264fb2a1' 'cb9016630212ef07b168892fbcfd4e5d' - '7554da820df91c282656972976d9e0b5') + '0569e96c071703cc244f1ea7ee87d40a') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 8d2f988bc..277f31c7c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203411 2014-01-10 12:51:03Z tpowa $ +# $Id: PKGBUILD 204436 2014-01-19 20:29:01Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-libre-utils') pkgver=0.9.0 -pkgrel=68 +pkgrel=69 epoch=1 _extramodules=extramodules-3.12-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index e4d5a6879..4b53e4463 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103716 2014-01-10 12:53:25Z tpowa $ +# $Id: PKGBUILD 104391 2014-01-19 20:28:42Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=42 +pkgrel=43 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 0b1ae56c2..ed87b2b70 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103718 2014-01-10 12:54:19Z tpowa $ +# $Id: PKGBUILD 104393 2014-01-19 20:29:02Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.12-LIBRE -pkgrel=22 +pkgrel=23 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" |