diff options
57 files changed, 891 insertions, 368 deletions
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 9ba45c2a7..70e4039fa 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93466 2013-07-03 21:46:52Z bluewind $ +# $Id: PKGBUILD 95217 2013-08-06 19:44:34Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.1.1 +pkgver=3.7.2 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('52c6f764b2f4a94b1781da42b2bbb9b5') +md5sums=('2cf1e519b78c87e35284dae98439e96c') diff --git a/community/gimp-plugin-lqr/PKGBUILD b/community/gimp-plugin-lqr/PKGBUILD index 56697466c..2a6362b4b 100644 --- a/community/gimp-plugin-lqr/PKGBUILD +++ b/community/gimp-plugin-lqr/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 64850 2012-02-18 17:54:47Z stativ $ +# $Id: PKGBUILD 95142 2013-08-06 08:05:18Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Andreas Schönfelder <passtschu at freenet dot de> - pkgname=gimp-plugin-lqr -pkgver=0.7.1 -pkgrel=4 +pkgver=0.7.2 +pkgrel=1 pkgdesc="Plugin for The GIMP providing Liquid Rescale" arch=('i686' 'x86_64') url="http://liquidrescale.wikidot.com/" @@ -12,7 +11,7 @@ license=('GPL') depends=('gimp' 'liblqr') makedepends=('intltool') source=(http://liquidrescale.wikidot.com/local--files/en:download-page-sources/gimp-lqr-plugin-$pkgver.tar.bz2) -md5sums=('d7ee28b16bdbd9f46bc9f21cf5deb487') +md5sums=('af7eb1a0d480bacfa6e5eff9b06bd877') build() { cd "$srcdir"/gimp-lqr-plugin-$pkgver diff --git a/community/guitarix2/PKGBUILD b/community/guitarix2/PKGBUILD index 5f4dadb8c..a6835ffa7 100644 --- a/community/guitarix2/PKGBUILD +++ b/community/guitarix2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 94628 2013-07-29 00:41:54Z speps $ +# $Id: PKGBUILD 95211 2013-08-06 18:27:47Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> pkgname=guitarix2 -pkgver=0.28.1 -pkgrel=2 +pkgver=0.28.2 +pkgrel=1 pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust" arch=('i686' 'x86_64') url="http://guitarix.sourceforge.net/" license=('GPL') -depends=('gtkmm' 'jack' 'liblrdf' 'boost-libs' +depends=('gtkmm' 'jack' 'librsvg' 'liblrdf' 'boost-libs' 'zita-convolver' 'zita-resampler' 'desktop-file-utils') makedepends=('python2' 'boost' 'intltool' 'lv2') optdepends=('meterbridge: sound meters') @@ -17,7 +17,7 @@ conflicts=('guitarix' 'gx_head') replaces=('guitarix' 'gx_head') install="$pkgname.install" source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2") -md5sums=('7038bf7ab112bd5c5c2bd86f0b632d02') +md5sums=('d957c28e4d68318427f2478257307235') build() { cd "$srcdir/guitarix-$pkgver" diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index 19dae4b17..a3e2f1bfa 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 87583 2013-04-03 13:18:34Z stativ $ +# $Id: PKGBUILD 95139 2013-08-06 07:59:09Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=klavaro -pkgver=1.9.7 +pkgver=1.9.8 pkgrel=1 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64') @@ -12,11 +12,10 @@ makedepends=('intltool') optdepends=('espeakup: voice output') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('e28114568ac20f64b372f5af53abc5a3') +md5sums=('62ad2c6bec1c2bafab4bdd29227433ac') build() { cd "$srcdir"/$pkgname-$pkgver -# CFLAGS="-lgmodule-2.0" ./configure --prefix=/usr ./configure --prefix=/usr make } diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD index 64094d1c2..a0f2b603b 100644 --- a/community/libinfinity/PKGBUILD +++ b/community/libinfinity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89907 2013-05-05 14:48:21Z spupykin $ +# $Id: PKGBUILD 95152 2013-08-06 11:50:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gregory Haynes <greg@greghaynes.net> pkgname=libinfinity -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="An implementation of the Infininote protocol written in GObject-based C" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('avahi: zeroconf support' 'gtk2: gtk support') options=('!libtool') source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1a784b00fe26c6984c03cd5a09eb2cd6') +md5sums=('1e83ec8b3ed3159d0c883c056b153429') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/oprofile/PKGBUILD b/community/oprofile/PKGBUILD index 3491127be..9be8c2556 100644 --- a/community/oprofile/PKGBUILD +++ b/community/oprofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85381 2013-03-01 10:36:45Z andrea $ +# $Id: PKGBUILD 95213 2013-08-06 18:59:38Z bpiotrowski $ # Maintainer : Aaron Griffin <aaron@archlinux.org> pkgname=oprofile -pkgver=0.9.8 -pkgrel=2 +pkgver=0.9.9 +pkgrel=1 pkgdesc='System-wide profiler for Linux systems' arch=('i686' 'x86_64') url="http://oprofile.sourceforge.net" @@ -14,23 +14,21 @@ optdepends=('qt4: for oprof_start gui') options=('!libtool') install=oprofile.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd') +sha1sums=('02a1f6609affb04a348dbddfdf8f03e66154f5be') build() { - . /etc/profile.d/qt4.sh - - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --with-kernel-support --with-x --enable-gui=qt4 make } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make check } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -d "$pkgdir/var/lib/oprofile" diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD index 726c0ee4f..80b24bbc7 100644 --- a/community/perl-crypt-blowfish/PKGBUILD +++ b/community/perl-crypt-blowfish/PKGBUILD @@ -1,23 +1,16 @@ -# $Id: PKGBUILD 91659 2013-05-26 09:24:50Z bluewind $ +# $Id: PKGBUILD 95154 2013-08-06 11:51:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-crypt-blowfish -pkgver=2.12 -pkgrel=6 +pkgver=2.14 +pkgrel=1 pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Crypt-Blowfish" license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz" - "perl-5.18.patch") -md5sums=('a0eca17addc8bdaf38c044c365a8800c' - '700129e690f239f9c1a318fffd3504c7') - -prepare() { - cd $srcdir/Crypt-Blowfish-$pkgver - patch -p1 <$srcdir/perl-5.18.patch -} +source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz") +md5sums=('792b43cd4e49d2c2cf4a9f6990ff7d1b') build() { cd $srcdir/Crypt-Blowfish-$pkgver diff --git a/community/perl-crypt-blowfish/perl-5.18.patch b/community/perl-crypt-blowfish/perl-5.18.patch deleted file mode 100644 index 291733cb9..000000000 --- a/community/perl-crypt-blowfish/perl-5.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -wbBur Crypt-Blowfish-2.12.org/Blowfish.xs Crypt-Blowfish-2.12/Blowfish.xs ---- Crypt-Blowfish-2.12.org/Blowfish.xs 2000-11-30 09:25:21.000000000 +0300 -+++ Crypt-Blowfish-2.12/Blowfish.xs 2013-05-20 15:31:52.481940353 +0400 -@@ -63,8 +63,7 @@ - output = sv_newmortal(); - output_len = 8; - -- if (!SvUPGRADE(output, SVt_PV)) -- croak("cannot use output argument as lvalue"); -+ SvUPGRADE(output, SVt_PV); - - /* blowfish_crypt_8bytes(input, SvGROW(output, 8), ks, dir); */ - /* HP-UX (HP cc) fix below, thanks Addi! */ diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index 73a26df30..a7efcd34d 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 91670 2013-05-26 09:25:07Z bluewind $ +# $Id: PKGBUILD 95164 2013-08-06 11:52:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-fuse -pkgver=0.14 -pkgrel=3 +pkgver=0.15 +pkgrel=1 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Fuse" depends=('perl' 'fuse') license=('GPL') source=(http://www.cpan.org/authors/id/D/DP/DPAVLIN/Fuse-$pkgver.tar.gz) -md5sums=('df72f17bf03e1a31c1a834816a3a59f1') +md5sums=('5c521508bea036fed946d43b44d56056') build() { cd $srcdir/Fuse-$pkgver diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD index 79d0b2e16..637543d3e 100644 --- a/community/perl-mail-box-parser-c/PKGBUILD +++ b/community/perl-mail-box-parser-c/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 91686 2013-05-26 09:25:45Z bluewind $ +# $Id: PKGBUILD 95186 2013-08-06 11:55:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-box-parser-c -pkgver=3.006 -pkgrel=9 +pkgver=3.007 +pkgrel=1 pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Mail-Box-Parser-C" license=("GPL" "PerlArtistic") options=('!emptydirs') source=("http://www.cpan.org/authors/id/M/MA/MARKOV/Mail-Box-Parser-C-${pkgver}.tar.gz") -md5sums=('3dfb3e2729597ae33114250cbce1b884') +md5sums=('4203b3df229df135ec3488721f0ce7f8') build() { cd Mail-Box-Parser-C-${pkgver} diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD index 6ca3778a1..62f4e2f7a 100644 --- a/community/python-matplotlib/PKGBUILD +++ b/community/python-matplotlib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90082 2013-05-06 19:39:14Z foutrelis $ +# $Id: PKGBUILD 95128 2013-08-05 23:48:54Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,59 +6,51 @@ pkgbase=python-matplotlib pkgname=('python2-matplotlib' 'python-matplotlib') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="A python plotting library, making publication quality plots" arch=('i686' 'x86_64') url='http://matplotlib.org' license=('custom') -makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python-pytz' 'python-numpy' 'pyqt' - 'tk' 'python-cairo' 'python2-cairo' 'python-dateutil' 'python2-dateutil' - 'python-gobject' 'python2-gobject' 'python-pyparsing' 'python2-pyparsing' - 'pygtk' 'python-six' 'ghostscript' 'texlive-bin') +makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz' 'python-numpy' + 'python-pyqt4' 'tk' 'python-cairo' 'python2-cairo' 'python-dateutil' + 'python2-dateutil' 'python-gobject' 'python2-gobject' 'python-pyparsing' + 'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin') optdepends=('pygtk: for use with the GTK or GTKAgg backend' 'tk: used by the TkAgg backend' 'ghostscript: usetex dependencies' 'texlive-bin: usetex dependencies') source=("http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-${pkgver}/matplotlib-${pkgver}.tar.gz") -sha1sums=('82fc44d0047a713c1b0b1b4ea2503e6a41c57f98') +sha1sums=('4bcf177bbe2a1a576fbc0896e69c2de2cf7429ae') -build() { - cd "${srcdir}"/matplotlib-${pkgver} - - # use system python-six - rm lib/six.py - - # remove internal copies of pyparsing - rm -r lib/matplotlib/pyparsing_py{2,3}.py - sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py - - cd .. +prepare() { cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3 - # Build python2 cd matplotlib-${pkgver} for file in $(find . -name '*.py' -print); do sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file} done - python2 setup.py build - - # Build python3 cd ../matplotlib-${pkgver}-py3 for file in $(find . -name '*.py' -print); do sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file} done +} +build() { + cd matplotlib-${pkgver} + python2 setup.py build + + cd ../matplotlib-${pkgver}-py3 python3 setup.py build } package_python2-matplotlib() { - depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing') + depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt4' 'python2-dateutil' 'python2-pyparsing') - cd "${srcdir}"/matplotlib-${pkgver} + cd matplotlib-${pkgver} python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib @@ -66,8 +58,9 @@ package_python2-matplotlib() { } package_python-matplotlib() { - depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing') - cd "${srcdir}"/matplotlib-${pkgver}-py3 + depends=('python-pytz' 'python-numpy' 'python-cairo' 'python-pyqt4' 'python-dateutil' 'python-pyparsing') + + cd matplotlib-${pkgver}-py3 python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 51b0f410c..cc8295555 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94462 2013-07-25 11:22:57Z tpowa $ +# $Id: PKGBUILD 95204 2013-08-06 14:56:23Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.16 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/winff/PKGBUILD b/community/winff/PKGBUILD index f342c14de..4ac9e154a 100644 --- a/community/winff/PKGBUILD +++ b/community/winff/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93143 2013-06-25 18:51:28Z arodseth $ +# $Id: PKGBUILD 95219 2013-08-06 20:32:53Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Paolo Stivanin <admin AT polslinux DOT it> pkgname=winff -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc='GUI for ffmpeg' url='http://code.google.com/p/winff/' @@ -12,13 +12,11 @@ license=('GPL3') arch=('x86_64' 'i686') depends=('ffmpeg' 'gtk2' 'xterm' 'hicolor-icon-theme') makedepends=('lazarus' 'lazarus-gtk2' 'gendesk') -install="$pkgname.install" +install='winff.install' source=("http://winff.googlecode.com/files/winff-$pkgver-source.tar.gz") -sha256sums=('e94e5a4c11038e9a30fc3f5ea9094f86415d02bd1f1a746808513bbd47ea5766') +sha256sums=('9d0c46c4245633ed4754fcc0dc104c850daeeefb032a9c5690eda63e84cd367b') prepare() { - cd "$srcdir" - gendesk -n \ --pkgname "$pkgname" \ --pkgdesc "$pkgdesc" \ @@ -27,14 +25,12 @@ prepare() { } build() { - cd "$srcdir/$pkgname" + cd "$pkgname" lazbuild --lazarusdir=/usr/lib/lazarus winff.lpr --ws=gtk2 } package() { - cd "$srcdir" - install -Dm755 "$srcdir/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" install -dm755 "$pkgdir/usr/share/winff/" find . -name "*.xml" \ diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index f0e3302d8..c4ded449d 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187029 2013-06-03 11:15:12Z allan $ +# $Id: PKGBUILD 192132 2013-08-06 06:57:03Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.9.0 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -20,8 +20,8 @@ options=('!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz - iproute2-fhs.patch) -sha1sums=('3f48a6d3019f1766f26cda6c4de5d3858837d92b' + iproute2-fhs.patch) +sha1sums=('e94b5dc9dc586006b272f67134ec07f6fbc81bd7' '35b8cf2dc94b73eccad427235c07596146cd6f6c') prepare() { diff --git a/core/libusbx/0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch b/core/libusbx/0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch new file mode 100644 index 000000000..b66abd48f --- /dev/null +++ b/core/libusbx/0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch @@ -0,0 +1,103 @@ +From daf4c9fadaf8a49198c53c039bf78980dc251a4b Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Tue, 30 Jul 2013 15:57:16 +0200 +Subject: [PATCH 1/2] linux: Use a separate lock to serialize start/stop vs + hotplug events + +Using one lock for this is a bad idea, as we should not be holding any +locks used by the hotplug thread when trying to stop otherwise the stop +function may wait indefinetely in pthread_join, while the event-thread +is waiting for the lock the caller of the stop function holds. + +Using 2 separate locks for this should fix this deadlock, which has been +reported here: https://bugzilla.redhat.com/show_bug.cgi?id=985484 + +Many thanks to Chris Dickens for figuring out the cause of this deadlock! + +CC: Chris Dickens <christopher.a.dickens@gmail.com> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + libusb/os/linux_usbfs.c | 24 +++++++++++++++++------- + libusb/version_nano.h | 2 +- + 2 files changed, 18 insertions(+), 8 deletions(-) + +diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c +index 09288af..90e23b7 100644 +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c +@@ -120,7 +120,9 @@ static int sysfs_has_descriptors = -1; + /* how many times have we initted (and not exited) ? */ + static volatile int init_count = 0; + +-/* Serialize hotplug start/stop, scan-devices, event-thread, and poll */ ++/* Serialize hotplug start/stop */ ++usbi_mutex_static_t linux_hotplug_startstop_lock = USBI_MUTEX_INITIALIZER; ++/* Serialize scan-devices, event-thread, and poll */ + usbi_mutex_static_t linux_hotplug_lock = USBI_MUTEX_INITIALIZER; + + static int linux_start_event_monitor(void); +@@ -419,7 +421,7 @@ static int op_init(struct libusb_context *ctx) + if (sysfs_has_descriptors) + usbi_dbg("sysfs has complete descriptors"); + +- usbi_mutex_static_lock(&linux_hotplug_lock); ++ usbi_mutex_static_lock(&linux_hotplug_startstop_lock); + r = LIBUSB_SUCCESS; + if (init_count == 0) { + /* start up hotplug event handler */ +@@ -433,20 +435,20 @@ static int op_init(struct libusb_context *ctx) + linux_stop_event_monitor(); + } else + usbi_err(ctx, "error starting hotplug event monitor"); +- usbi_mutex_static_unlock(&linux_hotplug_lock); ++ usbi_mutex_static_unlock(&linux_hotplug_startstop_lock); + + return r; + } + + static void op_exit(void) + { +- usbi_mutex_static_lock(&linux_hotplug_lock); ++ usbi_mutex_static_lock(&linux_hotplug_startstop_lock); + assert(init_count != 0); + if (!--init_count) { + /* tear down event handler */ + (void)linux_stop_event_monitor(); + } +- usbi_mutex_static_unlock(&linux_hotplug_lock); ++ usbi_mutex_static_unlock(&linux_hotplug_startstop_lock); + } + + static int linux_start_event_monitor(void) +@@ -469,11 +471,19 @@ static int linux_stop_event_monitor(void) + + static int linux_scan_devices(struct libusb_context *ctx) + { ++ int ret; ++ ++ usbi_mutex_static_lock(&linux_hotplug_lock); ++ + #if defined(USE_UDEV) +- return linux_udev_scan_devices(ctx); ++ ret = linux_udev_scan_devices(ctx); + #else +- return linux_default_scan_devices(ctx); ++ ret = linux_default_scan_devices(ctx); + #endif ++ ++ usbi_mutex_static_unlock(&linux_hotplug_lock); ++ ++ return ret; + } + + static void op_hotplug_poll(void) +diff --git a/libusb/version_nano.h b/libusb/version_nano.h +index ebf41e1..34e26ff 100644 +--- a/libusb/version_nano.h ++++ b/libusb/version_nano.h +@@ -1 +1 @@ +-#define LIBUSB_NANO 10774 ++#define LIBUSB_NANO 10777 +-- +1.8.3.1 + diff --git a/core/libusbx/0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch b/core/libusbx/0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch new file mode 100644 index 000000000..5342fbe70 --- /dev/null +++ b/core/libusbx/0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch @@ -0,0 +1,141 @@ +From 852efb5a3e82de43cf6288e9904cb254ff636aa0 Mon Sep 17 00:00:00 2001 +From: Chris Dickens <christopher.a.dickens@gmail.com> +Date: Sat, 20 Jul 2013 13:01:41 -0700 +Subject: [PATCH 2/2] hotplug: Remove use of pthread_cancel from linux_udev + +Using pthread_cancel() presents the opportunity for deadlock, so +use a control pipe to cause the event thread to gracefully exit. + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + libusb/os/linux_udev.c | 63 ++++++++++++++++++++++++++++++++++++++------------ + libusb/version_nano.h | 2 +- + 2 files changed, 49 insertions(+), 16 deletions(-) + +diff --git a/libusb/os/linux_udev.c b/libusb/os/linux_udev.c +index 5a2aadf..70f632d 100644 +--- a/libusb/os/linux_udev.c ++++ b/libusb/os/linux_udev.c +@@ -46,6 +46,7 @@ + /* udev context */ + static struct udev *udev_ctx = NULL; + static int udev_monitor_fd = -1; ++static int udev_control_pipe[2] = {-1, -1}; + static struct udev_monitor *udev_monitor = NULL; + static pthread_t linux_event_thread; + +@@ -95,14 +96,23 @@ int linux_udev_start_event_monitor(void) + goto err_free_monitor; + } + ++ r = usbi_pipe(udev_control_pipe); ++ if (r) { ++ usbi_err(NULL, "could not create udev control pipe"); ++ goto err_free_monitor; ++ } ++ + r = pthread_create(&linux_event_thread, NULL, linux_udev_event_thread_main, NULL); + if (r) { + usbi_err(NULL, "creating hotplug event thread (%d)", r); +- goto err_free_monitor; ++ goto err_close_pipe; + } + + return LIBUSB_SUCCESS; + ++err_close_pipe: ++ close(udev_control_pipe[0]); ++ close(udev_control_pipe[1]); + err_free_monitor: + udev_monitor_unref(udev_monitor); + udev_monitor = NULL; +@@ -115,14 +125,19 @@ err_free_ctx: + + int linux_udev_stop_event_monitor(void) + { ++ char dummy = 1; ++ int r; ++ + assert(udev_ctx != NULL); + assert(udev_monitor != NULL); + assert(udev_monitor_fd != -1); + +- /* Cancel the event thread. This is the only way to guarantee the +- thread exits since closing the monitor fd won't necessarily cause +- poll to return. */ +- pthread_cancel(linux_event_thread); ++ /* Write some dummy data to the control pipe and ++ * wait for the thread to exit */ ++ r = usbi_write(udev_control_pipe[1], &dummy, sizeof(dummy)); ++ if (r <= 0) { ++ usbi_warn(NULL, "udev control pipe signal failed"); ++ } + pthread_join(linux_event_thread, NULL); + + /* Release the udev monitor */ +@@ -134,27 +149,45 @@ int linux_udev_stop_event_monitor(void) + udev_unref(udev_ctx); + udev_ctx = NULL; + ++ /* close and reset control pipe */ ++ close(udev_control_pipe[0]); ++ close(udev_control_pipe[1]); ++ udev_control_pipe[0] = -1; ++ udev_control_pipe[1] = -1; ++ + return LIBUSB_SUCCESS; + } + + static void *linux_udev_event_thread_main(void *arg) + { ++ char dummy; ++ int r; + struct udev_device* udev_dev; +- struct pollfd fds = {.fd = udev_monitor_fd, +- .events = POLLIN}; ++ struct pollfd fds[] = { ++ {.fd = udev_control_pipe[0], ++ .events = POLLIN}, ++ {.fd = udev_monitor_fd, ++ .events = POLLIN}, ++ }; + + usbi_dbg("udev event thread entering."); + +- while (1 == poll(&fds, 1, -1)) { +- if (NULL == udev_monitor || POLLIN != fds.revents) { ++ while (poll(fds, 2, -1) >= 0) { ++ if (fds[0].revents & POLLIN) { ++ /* activity on control pipe, read the byte and exit */ ++ r = usbi_read(udev_control_pipe[0], &dummy, sizeof(dummy)); ++ if (r <= 0) { ++ usbi_warn(NULL, "udev control pipe read failed"); ++ } + break; + } +- +- usbi_mutex_static_lock(&linux_hotplug_lock); +- udev_dev = udev_monitor_receive_device(udev_monitor); +- if (udev_dev) +- udev_hotplug_event(udev_dev); +- usbi_mutex_static_unlock(&linux_hotplug_lock); ++ if (fds[1].revents & POLLIN) { ++ usbi_mutex_static_lock(&linux_hotplug_lock); ++ udev_dev = udev_monitor_receive_device(udev_monitor); ++ if (udev_dev) ++ udev_hotplug_event(udev_dev); ++ usbi_mutex_static_unlock(&linux_hotplug_lock); ++ } + } + + usbi_dbg("udev event thread exiting"); +diff --git a/libusb/version_nano.h b/libusb/version_nano.h +index 34e26ff..39ad7e3 100644 +--- a/libusb/version_nano.h ++++ b/libusb/version_nano.h +@@ -1 +1 @@ +-#define LIBUSB_NANO 10777 ++#define LIBUSB_NANO 10778 +-- +1.8.3.1 + diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD index a36e62dfa..e103f8a7b 100644 --- a/core/libusbx/PKGBUILD +++ b/core/libusbx/PKGBUILD @@ -1,19 +1,30 @@ -# $Id: PKGBUILD 191277 2013-07-23 09:46:53Z tpowa $ +# $Id: PKGBUILD 192163 2013-08-06 15:03:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libusbx pkgver=1.0.16 -pkgrel=1 +pkgrel=2 depends=('glibc' 'systemd') pkgdesc="Library that provides generic access to USB device" arch=(i686 x86_64) url="http://libusbx.org" license=('LGPL') -source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + 0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch + 0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch) options=(!libtool) replaces=('libusb1' 'libusb') provides=("libusb=$pkgver") conflicts=("libusb") +md5sums=('7f5715d624cd6c26b30a317eb6c2fe5e' + 'dad04322621fe7cabd2fe631c6d9929f' + '259238c92c92f8b3df5dcad0db8aaf2f') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix #36418 + patch -Np1 -i ../0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch + patch -Np1 -i ../0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static @@ -29,4 +40,3 @@ package () { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('7f5715d624cd6c26b30a317eb6c2fe5e') diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 91d7e9cfb..19613b406 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 187046 2013-06-03 11:15:40Z allan $ +# $Id: PKGBUILD 192147 2013-08-06 13:08:02Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.23.1 -pkgrel=2 +pkgver=2.23.2 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -27,7 +28,7 @@ backup=(etc/pam.d/chfn etc/pam.d/su etc/pam.d/su-l) install=util-linux.install -md5sums=('33ba55ce82f8e3b8d7a38fac0f62779a' +md5sums=('b39fde897334a4858bb2098edcce5b3f' 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 8551ab565..4c7da1644 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188926 2013-06-25 16:51:14Z andyrtr $ +# $Id: PKGBUILD 192152 2013-08-06 14:10:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('984cfc921a83c580c52c86e128e9dac2' +md5sums=('0096442e2a1739b1b7997a833248a263' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD index 7995e5133..594a63a33 100644 --- a/extra/gifsicle/PKGBUILD +++ b/extra/gifsicle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185185 2013-05-11 22:17:24Z eric $ +# $Id: PKGBUILD 192181 2013-08-06 18:35:21Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gifsicle -pkgver=1.70 +pkgver=1.71 pkgrel=1 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.lcdf.org/gifsicle/" license=('GPL') depends=('libx11') source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('f5017c7e3298108f2063a926f83392c66f0652ae') +sha1sums=('a7665faa99b157ea545b65761d19e15b9b4a8b74') build() { cd ${pkgname}-${pkgver} diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 371a2e757..c7e58c45b 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182596 2013-04-10 21:34:12Z heftig $ +# $Id: PKGBUILD 192146 2013-08-06 11:30:34Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.4.5 +pkgver=3.4.6 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('560f9709405fb33500c2f79efabdb1c4056866dec281f354ad3da97181fbf381') +sha256sums=('e3ae2d25b684910f49fc548dc96b8a54b77c431d94ad1fd5a37cbecab7bb1851') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD index 90a4bd540..db3ed64e4 100644 --- a/extra/perl-crypt-openssl-random/PKGBUILD +++ b/extra/perl-crypt-openssl-random/PKGBUILD @@ -3,16 +3,16 @@ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-crypt-openssl-random -pkgver=0.04 -pkgrel=9 +pkgver=0.06 +pkgrel=1 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" depends=('perl' 'openssl') license=('GPL') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz) -md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a') +source=(http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-$pkgver.tar.gz) +md5sums=('3771d3417f658d28f8682adc1e087136') build() { cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index ae11dd646..0e149c3ee 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,34 +1,32 @@ -# $Id: PKGBUILD 186411 2013-05-26 09:25:25Z bluewind $ +# $Id: PKGBUILD 192117 2013-08-06 02:08:02Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-netaddr-ip -_realname=NetAddr-IP -pkgver=4.066 -pkgrel=2 +pkgver=4.069 +pkgrel=1 pkgdesc="Perl module to manage IP addresses and subnets" -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/NetAddr-IP/" license=('PerlArtistic' 'GPL') depends=('perl') options=('!emptydirs') -url="http://search.cpan.org/dist/${_realname}/" -source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) -md5sums=('7c6cf77d3c02fa0baf77b6a97f2a670a') +source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/NetAddr-IP-${pkgver}.tar.gz) +md5sums=('7721135fcea390327f75421a6b701144') build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. + cd NetAddr-IP-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd NetAddr-IP-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd NetAddr-IP-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index 0328f9f90..de6e6f8cb 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -1,38 +1,33 @@ -# $Id: PKGBUILD 186416 2013-05-26 09:25:42Z bluewind $ +# $Id: PKGBUILD 192119 2013-08-06 02:24:44Z eric $ # Maintainer: # Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> # Contributor: FJ <joostef@gmail.com> pkgname=perl-template-toolkit -_realname=Template-Toolkit -pkgver=2.24 -pkgrel=2 +pkgver=2.25 +pkgrel=1 pkgdesc="Perl template processing system" arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/Template-Toolkit/" license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-appconfig' 'perl>=5.10.0') +depends=('perl-appconfig' 'perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) -md5sums=('c25fdab1beebf8818c2e624bc9f9d212') +source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-$pkgver.tar.gz) +md5sums=('6be78743caf5fafe8de4a17c2d0c72ff') build() { - cd "${srcdir}/${_realname}-$pkgver" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd Template-Toolkit-$pkgver + perl Makefile.PL INSTALLDIRS=vendor TT_ACCEPT=y make } check() { - cd "${srcdir}/${_realname}-${pkgver}" - - # Failing test can be ignored as it doesn't indicate a problem in main code - # https://rt.cpan.org/Public/Bug/Display.html?id=84778 - make test || true + cd Template-Toolkit-$pkgver + make test } package() { - cd "${srcdir}/${_realname}-$pkgver" + cd Template-Toolkit-$pkgver make install DESTDIR="${pkgdir}" } diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 97fc2f460..34046030f 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189647 2013-07-04 03:26:07Z andyrtr $ +# $Id: PKGBUILD 192153 2013-08-06 14:10:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.4 +_dcpkgver=2.2.5 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 20b6dafa3..df531c012 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,12 +10,12 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.7 +pkgver=4.0.8 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.7 -pkgrel=3 +_realver=4.0.8 +pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') @@ -246,17 +246,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('d887c1383654fc60b7bb1b74d273a826' +md5sums=('03819bc1132e417feac1b39299365b73' '5697da77590ec092cc8a883bae06093c' 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' - 'c0c561c47de24d33dd48aae79823810b' + 'e4ae6a3cac080602120aa151918c4a36' 'a78b9aa93eb14b0ac445897395693225' - 'e8ebc966b5684a557284dd435daaab7f' + 'df6380c73cb73163968eabc8650f7358' '70afd2db60a2e8eff7615dbdecd887ac' '6db11f3dd2112a4b7a73007b189bef3f' 'fd6be0cf1e5b3f0c3599fdb95455d19f' - '081c20b9d994d69ce5c37dcf96f10572' + 'd5f56f43e1280bba20f6bbd88d16fa41' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 34c66d5d6..e138225ac 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/bin/nmbd -D +ExecStart=/usr/bin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index de34c2a5f..0a8125db0 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/bin/smbd -D +ExecStart=/usr/bin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 20bac9a83..41ecbfdd5 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/bin/winbindd -D +ExecStart=/usr/bin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD index 37db9bb94..6f21c9d27 100644 --- a/extra/testdisk/PKGBUILD +++ b/extra/testdisk/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 176860 2013-02-01 21:35:19Z eric $ +# $Id: PKGBUILD 192126 2013-08-06 06:45:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=testdisk -pkgver=6.13 -pkgrel=4 +pkgver=6.14 +pkgrel=1 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool" arch=('i686' 'x86_64') url="http://www.cgsecurity.org/index.html?testdisk.html" license=('GPL') depends=('libjpeg' 'openssl' 'progsreiserfs' 'ntfsprogs') source=(http://www.cgsecurity.org/$pkgname-$pkgver.tar.bz2) -md5sums=('3bcbf0722d3823ca155e633969ce9f0b') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,3 +26,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('b1f0edabc9035e9ec9c8e0a95059ff3f') diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index eadfd8214..4b182c12e 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install -pkgrel=6 +pkgrel=8 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/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 6921ab67c..1304844bd 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189893 2013-07-10 19:19:27Z andyrtr $ +# $Id: PKGBUILD 191975 2013-08-03 07:52:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.35 -pkgrel=2 +pkgrel=4 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" @@ -18,15 +18,21 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf etc/cups/cups-browsed.conf) options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz + poppler_buildfix.diff cups-browsed.service) md5sums=('26f150f1e9ce1f7b0f38ae4ebb01e23d' + 'e898ddcb65fb08d96595eac24fe0b1ac' '9ef68d7c2a84713fd421f4e87dec0a6e') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") build() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver + + # fix build with poppler 0.24.0 + patch -Np0 -i ${srcdir}/poppler_buildfix.diff + ./configure --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ @@ -38,12 +44,13 @@ build() { } check() { - cd "$srcdir/$_pkgname-$pkgver" - make -j1 -k check + cd $_pkgname-$pkgver + #make -j1 -k check + make check } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver make DESTDIR="$pkgdir/" install # drop static lib rm -f ${pkgdir}/usr/lib/*.a diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff new file mode 100644 index 000000000..18fc643f9 --- /dev/null +++ b/libre/cups-filters-libre/poppler_buildfix.diff @@ -0,0 +1,276 @@ +=== modified file 'filter/pdf.cxx' +--- filter/pdf.cxx 2012-08-19 22:31:27 +0000 ++++ filter/pdf.cxx 2013-08-01 15:48:06 +0000 +@@ -17,6 +17,10 @@ + #include "pdf.h" + + #include <PDFDoc.h> ++#include <config.h> ++#ifdef HAVE_CPP_POPPLER_VERSION_H ++#include "cpp/poppler-version.h" ++#endif + + + extern "C" pdf_t * pdf_load_template(const char *filename) +@@ -343,7 +347,11 @@ + { + } + ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ Goffset getPos() ++#else + int getPos() ++#endif + { + return this->pos; + } + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2012-09-20 22:53:10 +0000 ++++ filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 +@@ -70,8 +70,13 @@ + } + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -297,19 +302,15 @@ + if (argc == 6) { + /* stdin */ + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; ++ char name[BUFSIZ]; + char buf[BUFSIZ]; + int n; + +- fd = cupsTempFd(buf,sizeof(buf)); ++ fd = cupsTempFd(name,sizeof(name)); + if (fd < 0) { + pdfError(-1,"Can't create temporary file"); + exit(1); + } +- /* remove name */ +- unlink(buf); + + /* copy stdin to the tmp file */ + while ((n = read(0,buf,BUFSIZ)) > 0) { +@@ -319,23 +320,10 @@ + exit(1); + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- pdfError(-1,"Can't rewind temporary file"); +- close(fd); +- exit(1); +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- pdfError(-1,"Can't fdopen temporary file"); +- close(fd); +- exit(1); +- } +- +- obj.initNull(); +-// parsePDFTOPDFComment(fp); // TODO? +- rewind(fp); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(new GooString(name)); ++ /* remove name */ ++ unlink(name); + } else { + GooString *fileName = new GooString(argv[6]); + /* argc == 7 filenmae is specified */ + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2012-07-20 08:32:55 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 +@@ -112,8 +112,13 @@ + #define MAX_OPVP_OPTIONS 20 + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -619,9 +624,6 @@ + char *s; + GooString name; + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; + char buf[4096]; + int n; + +@@ -633,8 +635,6 @@ + } + name.append("/XXXXXX"); + fd = mkstemp(name.getCString()); +- /* remove name */ +- unlink(name.getCString()); + if (fd < 0) { + opvpError(-1,"Can't create temporary file"); + exitCode = 2; +@@ -675,23 +675,10 @@ + goto err0; + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- opvpError(-1,"Can't rewind temporary file"); +- close(fd); +- exitCode = 2; +- goto err0; +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- opvpError(-1,"Can't fdopen temporary file"); +- close(fd); +- exitCode = 2; +- goto err0; +- } +- +- obj.initNull(); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(&name); ++ /* remove name */ ++ unlink(name.getCString()); + } else { + /* no jcl check */ + doc = new PDFDoc(fileName.copy()); + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2013-07-30 17:00:43 +0000 ++++ filter/pdftoraster.cxx 2013-08-01 15:48:06 +0000 +@@ -186,8 +186,13 @@ + } + + #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++void CDECL myErrorFun(void *data, ErrorCategory category, ++ Goffset pos, char *msg) ++#else + void CDECL myErrorFun(void *data, ErrorCategory category, + int pos, char *msg) ++#endif + { + if (pos >= 0) { + fprintf(stderr, "ERROR (%d): ", pos); +@@ -1776,19 +1781,15 @@ + if (argc == 6) { + /* stdin */ + int fd; +- Object obj; +- BaseStream *str; +- FILE *fp; ++ char name[BUFSIZ]; + char buf[BUFSIZ]; + int n; + +- fd = cupsTempFd(buf,sizeof(buf)); ++ fd = cupsTempFd(name,sizeof(name)); + if (fd < 0) { + pdfError(-1,const_cast<char *>("Can't create temporary file")); + exit(1); + } +- /* remove name */ +- unlink(buf); + + /* copy stdin to the tmp file */ + while ((n = read(0,buf,BUFSIZ)) > 0) { +@@ -1798,23 +1799,10 @@ + exit(1); + } + } +- if (lseek(fd,0,SEEK_SET) < 0) { +- pdfError(-1,const_cast<char *>("Can't rewind temporary file")); +- close(fd); +- exit(1); +- } +- +- if ((fp = fdopen(fd,"rb")) == 0) { +- pdfError(-1,const_cast<char *>("Can't fdopen temporary file")); +- close(fd); +- exit(1); +- } +- +- obj.initNull(); +- parsePDFTOPDFComment(fp); +- rewind(fp); +- str = new FileStream(fp,0,gFalse,0,&obj); +- doc = new PDFDoc(str); ++ close(fd); ++ doc = new PDFDoc(new GooString(name)); ++ /* remove name */ ++ unlink(name); + } else { + GooString *fileName = new GooString(argv[6]); + /* argc == 7 filenmae is specified */ + +=== modified file 'filter/pdftoijs.cxx' +--- filter/pdftoijs.cxx 2013-08-01 15:48:06 +0000 ++++ filter/pdftoijs.cxx 2013-08-02 13:52:04 +0000 +@@ -79,7 +79,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + +=== modified file 'filter/pdftoraster.cxx' +--- filter/pdftoraster.cxx 2013-08-02 11:13:38 +0000 ++++ filter/pdftoraster.cxx 2013-08-02 13:52:04 +0000 +@@ -199,7 +199,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + +=== modified file 'filter/pdftoopvp/pdftoopvp.cxx' +--- filter/pdftoopvp/pdftoopvp.cxx 2013-08-01 15:48:06 +0000 ++++ filter/pdftoopvp/pdftoopvp.cxx 2013-08-02 14:46:20 +0000 +@@ -121,7 +121,11 @@ + #endif + { + if (pos >= 0) { ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 ++ fprintf(stderr, "ERROR (%lld): ", pos); ++#else + fprintf(stderr, "ERROR (%d): ", pos); ++#endif + } else { + fprintf(stderr, "ERROR: "); + } + diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 2221fb7fe..1db67d42d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -_GRUB_BZR_REV="5043" +_GRUB_BZR_REV="5086" ## grub-extras lua and gpxe fail to build with grub bzr rev 5043 @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=3 +pkgrel=1 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -41,12 +41,14 @@ source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revisio 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' 'grub.default' - 'grub-2.00-mkinitcpio-0.15.patch') + 'grub-2.00-mkinitcpio-0.15.patch' + 'grub-2.00.5086-fix-lvm-parsing.patch') md5sums=('SKIP' 'b3068b52b6f1dcd2850b5c7585bb185f' 'be55eabc102f2c60b38ed35c203686d6' '52d374e0194e3f2e39ff7c92ecd58a6c' 'd25d2dcf8ba708dcf768fcaea799f59c' + '7a0ce6aa4a23fa12e1f79ab03fe63f88' 'SKIP' 'SKIP') @@ -177,6 +179,7 @@ prepare() { ## fix 10_linux patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" + patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch" ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac" diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch new file mode 100644 index 000000000..9a2eb3ff7 --- /dev/null +++ b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch @@ -0,0 +1,54 @@ +There is no explicit option to turn off alignment; it is implicitly +disabled if one of --separator or --nameprefixes option is used. + +--separator was added in 2007, --nameprefixes - in 2009. So let's use +--separator to extend range of versions we are compatible with. Note that +one or another must be used, current parsing is broken otherwise. + +Signed-off-by: Andrey Borzenkov <address@hidden> + +--- + util/getroot.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/util/getroot.c b/util/getroot.c +index 2ad8a55..3afcf96 100644 +--- a/util/getroot.c ++++ b/util/getroot.c +@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev) + static void + pull_lvm_by_command (const char *os_dev) + { +- char *argv[6]; ++ char *argv[8]; + int fd; + pid_t pid; + FILE *mdadm; +@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev) + + /* execvp has inconvenient types, hence the casts. None of these + strings will actually be modified. */ ++ /* by default PV name is left aligned in 10 character field, meaning that ++ we do not know where name ends. Using dummy --separator disables ++ alignment. We have a single field, so separator itself is not output */ + argv[0] = (char *) "vgs"; + argv[1] = (char *) "--options"; + argv[2] = (char *) "pv_name"; + argv[3] = (char *) "--noheadings"; +- argv[4] = vgname; +- argv[5] = NULL; ++ argv[4] = (char *) "--separator"; ++ argv[5] = (char *) ":"; ++ argv[6] = vgname; ++ argv[7] = NULL; + + pid = exec_pipe (argv, &fd); + free (vgname); +@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev) + while (getline (&buf, &len, mdadm) > 0) + { + char *ptr; ++ /* LVM adds two spaces as standard prefix */ + for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++); + if (*ptr == '\0') + continue; diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 64ac53efa..3df9aa783 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191595 2013-07-26 15:20:34Z tpowa $ +# $Id: PKGBUILD 192042 2013-08-05 08:13:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=3 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '4741e325185acae5498cfc77a5e8f55b' - '542fc77350e62009bca7af080359b286' - 'bd77b7112db61fb184139daaa1e390ac' + 'f4810ea4bd977321d76edcde8dc756c9' + '1f848fda2af2e3fc3dfa992d625b3f9e' + 'd63ce6a34f077959b54bc38597582822' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'dd620e4cb68341f847686c000d8038e8') + '6047f873d9c5ec552ab0bbfc125a4535') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index f73d96675..c27f50b4c 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -763,8 +763,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 3876cbaa8..04bbcdf7a 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -164,7 +164,7 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y @@ -741,8 +741,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=y -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index d7a86197a..5b8466b3f 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191260 2013-07-22 12:53:01Z tpowa $ +# $Id: PKGBUILD 192079 2013-08-05 16:42:39Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=52 +pkgrel=54 epoch=1 _extramodules=extramodules-3.10-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin/09-texlive-fonts.conf index f870fbd7a..f870fbd7a 100644 --- a/libre/texlive-bin-libre/09-texlive-fonts.conf +++ b/libre/texlive-bin/09-texlive-fonts.conf diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin/PKGBUILD index 897db2854..8ff03dacd 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin/PKGBUILD @@ -4,20 +4,20 @@ # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> # Contributor (Parabola): André Silva <emulatorman@lavabit.com> -pkgname=texlive-bin-libre +pkgname=texlive-bin pkgver=2013.30973 -pkgrel=2 +pkgrel=3 pkgdesc="TeX Live binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.22.0' +depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2' 'icu' 'harfbuzz' 'harfbuzz-icu') makedepends=('perl' 'clisp' 'ffcall') optdepends=('ed: for texconfig') -provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam' 'texlive-bin') -replaces=('texlive-bin') +provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin-libre') +conflicts=('pdfjam' 'texlive-bin-libre') +replaces=('texlive-bin-libre') options=('!libtool' '!strip') url='http://tug.org/texlive/' install="texlive.install" diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin/fix-fontforge-encoding.patch index 8104b3289..8104b3289 100644 --- a/libre/texlive-bin-libre/fix-fontforge-encoding.patch +++ b/libre/texlive-bin/fix-fontforge-encoding.patch diff --git a/libre/texlive-bin-libre/luatex-poppler-0.20.patch b/libre/texlive-bin/luatex-poppler-0.20.patch index 175824f3e..175824f3e 100644 --- a/libre/texlive-bin-libre/luatex-poppler-0.20.patch +++ b/libre/texlive-bin/luatex-poppler-0.20.patch diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch index f925a1a93..f925a1a93 100644 --- a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch +++ b/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin/poppler-0.20.patch index 3bd8183ab..3bd8183ab 100644 --- a/libre/texlive-bin-libre/poppler-0.20.patch +++ b/libre/texlive-bin/poppler-0.20.patch diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin/texlive.install index 96a41bcfc..96a41bcfc 100644 --- a/libre/texlive-bin-libre/texlive.install +++ b/libre/texlive-bin/texlive.install diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin/texmf.cnf index 76975ee5c..76975ee5c 100644 --- a/libre/texlive-bin-libre/texmf.cnf +++ b/libre/texlive-bin/texmf.cnf diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 138962ca3..2100f4781 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94377 2013-07-22 13:48:54Z tpowa $ +# $Id: PKGBUILD 95105 2013-08-05 18:07:00Z 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=27 +pkgrel=29 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 0f2f8b581..4fcc9e0c4 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94379 2013-07-22 13:49:30Z tpowa $ +# $Id: PKGBUILD 95107 2013-08-05 18:07:47Z 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.10-LIBRE -pkgrel=6 +pkgrel=8 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/pcr/python2-renpy/ChangeLog b/pcr/python2-renpy/ChangeLog deleted file mode 100644 index 0a357d3db..000000000 --- a/pcr/python2-renpy/ChangeLog +++ /dev/null @@ -1,32 +0,0 @@ -2012-28-07 AlexanderR <alexanderr at gmx dot com> - - * 6.14.1-1 : - new upstream release. - added renpy.diff. - -2012-22-07 AlexanderR <alexanderr at gmx dot com> - - * 6.13.12-3 : - fixed build with latest ffmpeg at cost of sound. - -2012-26-04 AlexanderR <alexanderr at gmx dot com> - - * 6.13.12-2 : - moved python-pygame from makedepends to depends. - -2012-20-04 AlexanderR <alexanderr at gmx dot com> - - * 6.13.12-1 : - new upstream release. - -2012-07-04 AlexanderR <alexanderr at gmx dot com> - - * 6.13.11-1 : - new upstream release. - moved python-pygame dependency form renpy to python-renpy. - -2011-22-03 AlexanderR <alexanderr at gmx dot com> - - * 16.13.9-2 : - added ChangeLog. - fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD index e9f039431..a7ff17837 100644 --- a/pcr/python2-renpy/PKGBUILD +++ b/pcr/python2-renpy/PKGBUILD @@ -1,61 +1,48 @@ -# Maintainer: AlexanderR <rvacheva at nxt dot ru> -# Contributor: zhn <zhangn1985 AT gmail com> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: André Silva <emulatorman@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> +_pkgname=renpy pkgname=python2-renpy -pkgflag=renpy -pkgver=6.15.5 -pkgrel=1 +pkgver=6.15.7 +pkgrel=2 pkgdesc="Platform-dependant Ren'Py libraries." arch=( - i686 - x86_64 mips64el + x86_64 + i686 ) license=MIT -url="http://www.$pkgflag.org/" +url=http://www.$_pkgname.org/ depends=( + ffmpeg fribidi glew python2-pygame=1.9.1 ) -# python-argparse is part of distribution since 2.7 -makedepends=( - 'python2>=2.7' - 'ffmpeg' -) -provides="python-$pkgflag=$pkgver" +makedepends='python2>=2.7' +provides="python-$_pkgname=$pkgver" conflicts=( - python-$pkgflag - "$pkgflag<$pkgver" - $pkgflag64 - $pkgflag-bin -) -renplaces=python-$pkgflag -changelog=ChangeLog -source=( - "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2" -) - -sha512sums=( - fc8f640cacf1554c969ded2d9c605d4f5c8e14bff6168aa5b4040e59054be46a2b83d6df686bea7e0103a13eaa01d52322d6fa6a34a1dcac90e011e3b5d24a6e + python-$_pkgname + "$_pkgname<$pkgver" + ${_pkgname}64 + $_pkgname-bin ) +renplaces=python-$_pkgname +source=http://www.$_pkgname.org/dl/$pkgver/$_pkgname-$pkgver-source.tar.bz2 +sha512sums=d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6 build() { - cd $srcdir/$pkgflag-$pkgver-source + cd $srcdir/$_pkgname-$pkgver-source - sed -i -e ' - s#!/usr/bin/env python#!/usr/bin/env python2#; - ' module/setup.py + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|;' module/setup.py - CFLAGS=-Os setarch $CARCH python2 module/setup.py build + python2 module/setup.py build } package(){ - cd $srcdir/$pkgflag-$pkgver-source + cd $srcdir/$_pkgname-$pkgver-source - # install python2-$pkgflag - CFLAGS=-Os setarch $CARCH python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1 + msg "install $pkgname" + python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1 install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog deleted file mode 100644 index 2609ed18f..000000000 --- a/pcr/renpy/ChangeLog +++ /dev/null @@ -1,35 +0,0 @@ -2013-14-06 AlexanderR <alexanderr at gmx dot com> - - * 6.15.5-1 : - new upstream release. - -2012-28-07 AlexanderR <alexanderr at gmx dot com> - - * 6.14.1-1 : - new upstream release. - removed optdepends. - removed jedit-external.diff (does not work anymore). - -2012-23-04 AlexanderR <alexanderr at gmx dot com> - - * 6.13.12-1 : - Added notice abot RENPY_BASE usage to renpy.install. - -2012-20-04 AlexanderR <alexanderr at gmx dot com> - - * 6.13.12-1 : - new upstream release. - -2012-07-04 AlexanderR <alexanderr at gmx dot com> - - * 6.13.11-1 : - new upstream release. - -2012-16-03 AlexanderR <alexanderr at gmx dot com> - - * 6.13.9-1 : - re-split package python-renpy into two. added ChangeLog. - added jedit-external.diff to split jedit into optdepends. - added profile.d scripts to export RENPY_BASE. - added icon, launcher script and .desktop file. - creation of link from /usr/share/renpy/doc to /usr/share/doc/renpy. diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD index 1ed569477..a9f2475db 100644 --- a/pcr/renpy/PKGBUILD +++ b/pcr/renpy/PKGBUILD @@ -2,58 +2,61 @@ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=renpy -pkgver=6.15.5 +pkgver=6.15.7 pkgrel=1 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools." -arch=('any') -license=('MIT') -url='http://www.renpy.org/' -# is ttf-dejavu required by renpy or games itself? -depends=("python-renpy=$pkgver" 'ttf-dejavu') -options=(!strip !zipman) -conflicts=('renpy-bin' 'renpy64') -replaces=('renpy64') -install=renpy.install -changelog=ChangeLog -source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2" - "${pkgname}.desktop" - "${pkgname}."{sh,csh} - 'python2.diff' - 'renpy-launcher.sh') - -md5sums=('45e7c28a426c8d9ef470d09e7a689568' - 'a9beb35fa6c6d8af7ba5d2a764c33158' - 'd206d24b78e207a2c3b603fef14ac47f' - '8b9922e26e567248a2a5adc1d0cdfdd4' - '0476b16220e6faeb031e1dbfe45249b4' - 'dfa92cdecc15e5c1ddee387fbbbb2d9c') - -build() { - cd "$srcdir/renpy-$pkgver-source" - - patch -p1 < ../python2.diff - - # fonts are provided by ttf-dejavu +arch=any +license=MIT +url=http://www.$pkgname.org/ +depends=( + python2-$pkgname=$pkgver + ttf-dejavu +) +conflicts=( + $pkgname-bin + ${pkgname}64 +) +replaces=${pkgname}64 +install=$pkgname.install +source=( + http://www.$pkgname.org/dl/$pkgver/$pkgname-$pkgver-source.tar.bz2 + $pkgname.desktop + $pkgname.{sh,csh} + $pkgname-launcher.sh +) +sha512sums=( + d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6 + 1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5 + 2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df + bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09 + 727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7 +) + +prepare() { + cd "$srcdir/$pkgname-$pkgver-source" + + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgname.py + + msg 'fonts are provided by ttf-dejavu' cd $pkgname - rm common/DejaVuSans.ttf common/DejaVuSans.txt + rm -v common/DejaVuSans.ttf common/DejaVuSans.txt } package(){ - mkdir -p "$pkgdir/"{usr/share/{$pkgname,doc/$pkgname},etc/profile.d} + cd $pkgname-$pkgver-source - cd "$srcdir" + install -vd $pkgdir/{usr/share/{$pkgname,doc/$pkgname},etc/profile.d} + install -vm755 $srcdir/$pkgname.{sh,csh} $pkgdir/etc/profile.d + install -vDm755 $srcdir/$pkgname-launcher.sh $pkgdir/usr/bin/$pkgname + install -vDm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop - install -m755 ${pkgname}.{sh,csh} "$pkgdir/etc/profile.d" - install -D -m755 $pkgname-launcher.sh "$pkgdir/usr/bin/$pkgname" - install -D -m644 ${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop" + cp -va launcher $pkgname{,.py} template the_question tutorial $pkgdir/usr/share/$pkgname + ln -vs $pkgname/common $pkgdir/usr/share/$pkgname/common + cp -va doc/* $pkgdir/usr/share/doc/$pkgname - cd renpy-$pkgver-source + install -vDm644 launcher/game/logo.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -vDm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE - cp -r launcher $pkgname{,.py} $pkgname/common template the_question tutorial "$pkgdir/usr/share/$pkgname" - cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" - install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" - install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - chgrp -R games "$pkgdir"/usr/share/renpy/{the_question,tutorial} - chmod g+w "$pkgdir"/usr/share/renpy/{the_question,tutorial} + chgrp -vR games $pkgdir/usr/share/$pkgname/{the_question,tutorial} + chmod -vR g+w $pkgdir/usr/share/$pkgname/{the_question,tutorial} } diff --git a/pcr/renpy/python2.diff b/pcr/renpy/python2.diff deleted file mode 100644 index 9153659a2..000000000 --- a/pcr/renpy/python2.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- renpy-6.13.9/renpy.py 2012-01-16 01:48:05.000000000 +1100 -+++ renpy-6.13.9.new/renpy.py 2012-03-16 05:36:41.406170787 +1100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - #@PydevCodeAnalysisIgnore - # Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us> - # diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install index 9630a255f..bfe161cdb 100644 --- a/pcr/renpy/renpy.install +++ b/pcr/renpy/renpy.install @@ -1,5 +1,5 @@ post_install() { - ln -sf "/usr/share/doc/renpy" "/usr/share/renpy/doc" + ln -vsf /usr/share/doc/renpy /usr/share/renpy/doc cat << EOF This package sets global environment variable RENPY_BASE, forcing all RenPy @@ -17,5 +17,5 @@ post_upgrade() { } pre_remove() { - rm "/usr/share/renpy/doc" + rm -v /usr/share/renpy/doc } diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD index c6ace77c4..6a53609e9 100644 --- a/pcr/strongswan/PKGBUILD +++ b/pcr/strongswan/PKGBUILD @@ -7,8 +7,8 @@ # Maintainer: dkorzhevin <dkorzhevin at gmail dot com> pkgname=strongswan -pkgver=5.0.4 -pkgrel=6 +pkgver=5.1.0 +pkgrel=2 pkgdesc="open source IPsec implementation" url='http://www.strongswan.org' license=("GPL") @@ -19,8 +19,9 @@ options=(!libtool) backup=(etc/ipsec.conf etc/strongswan.conf) source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc) changelog='CHANGELOG' -md5sums=('0ab0397b44b197febfd0f89148344035' +md5sums=('c1cd0a3ba9960f590cae28c8470800e8' 'cf815adef48a1ffee34517380c731277') + build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -38,7 +39,8 @@ build() { --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \ --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \ --enable-ha \ - --disable-mysql --disable-ldap + --disable-mysql --disable-ldap \ + --enable-cmd make } diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD new file mode 100644 index 000000000..66945cb41 --- /dev/null +++ b/pcr/tomb/PKGBUILD @@ -0,0 +1,53 @@ +## PKGBUILD [bash] +# Maintainer: nignux <nignux@freaknet.org> + +pkgbase=tomb +pkgname=(tomb python2-tomb tomb-gui) +pkgver=1.4 +pkgrel=1 +pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.dyne.org/software/tomb/" +license=('GPL3') +depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'steghide' + 'dcfldd' 'wipe') +makedepends=('python2-pyqt' 'python2-distribute') +install=${pkgname}.install +source=(https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz{,.sha{,.asc}}) +# The first hash comes from the .sha file +sha256sums=('2621ac6b9180321e69743dc899645449b2b958c6aa46e4b2601c2e89131bbf29' + 'fc8b168f991d5b9c1135ceec6e55ac94f494ac4bed7e104e14c7f9ee787591e5' + 'SKIP') + +build() { + cd ${srcdir}/Tomb-${pkgver}/extras/qt + + python2 setup.py build_ui +} + +# The checks require root access +#check() { +# cd ${srcdir}/Tomb-${pkgver} +# make test +#} + +package_tomb() { + pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism." + cd ${srcdir}/Tomb-${pkgver} + make DESTDIR=${pkgdir} install +} + +package_python2-tomb() { + pkgdesc="Crypto Undertaker library" + + cd ${srcdir}/Tomb-${pkgver}/extras/pytomb + python2 setup.py install --root="${pkgdir}/" --optimize=1 +} + +package_tomb-gui() { + pkgdesc="Crypto Undertaker GUI for open and create tombs" + depends=('python2-tomb' 'python2-pyqt') + + cd ${srcdir}/Tomb-${pkgver}/extras/qt + python2 setup.py install --root="${pkgdir}/" --optimize=1 +} |