From 2e5b72e5e8dfb5199a9b0da7c76d052a456662c2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 May 2013 01:18:40 -0700 Subject: Tue May 14 01:18:40 PDT 2013 --- community/inn/PKGBUILD | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'community/inn/PKGBUILD') diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index b2e23f518..9af8ff540 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82923 2013-01-25 21:39:24Z spupykin $ +# $Id: PKGBUILD 90747 2013-05-13 14:54:46Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Edward Tjörnhammar # Contributor: Edward Tjörnhammar pkgname=inn pkgver=2.5.3 -pkgrel=2 +pkgrel=4 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64') @@ -47,18 +47,10 @@ backup=(etc/inn/newsfeeds var/db/inn/history.index var/db/inn/newsgroups) source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz - innd.rc - nnrpd.rc - innd.conf - nnrpd.conf innd.service inn.tmpfiles site.make.patch) md5sums=('353fe95232828ddbc80debff86c240bc' - 'a243d9498568f1beee20da5684b5fbfc' - 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' - 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' - 'bb4bbe86ae52fbbf08b0f6f370dea052' '9da925a486fcf0cd67fdf462cbb9c0b4' '050b7bffff3361c673a118739e42349e' '960c800026ed6e03901cf0bafdfd53d8') @@ -96,7 +88,6 @@ build() { EOF sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH make } @@ -107,13 +98,6 @@ package() { make DESTDIR=$pkgdir install - mkdir -p $pkgdir/etc/{conf,rc}.d - install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd - install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd - - install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd - install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd - cd $pkgdir/usr/lib for i in lib*.a; do gcc -shared -o ${i%%.a}.so.2.0.0 $i -- cgit v1.2.3-54-g00ecf From 453f3b8b2c568e9babcdc4852772278a39f130c0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 May 2013 01:06:25 -0700 Subject: Thu May 16 01:06:25 PDT 2013 --- community/autofs/PKGBUILD | 6 +- community/etherape/PKGBUILD | 10 +- community/fcron/PKGBUILD | 8 +- community/fcron/systab | Bin 478 -> 498 bytes community/fcron/systab.orig | 8 +- community/goobox/PKGBUILD | 6 +- community/haskell-pandoc/PKGBUILD | 7 +- community/inn/PKGBUILD | 4 +- community/intellij-idea-libs/PKGBUILD | 8 +- community/libaccounts-qt/PKGBUILD | 10 +- community/libmediainfo/PKGBUILD | 6 +- community/libmemcached/PKGBUILD | 4 +- community/libvirt/PKGBUILD | 4 +- community/libzen/PKGBUILD | 6 +- community/llvm-amdgpu-snapshot/PKGBUILD | 39 ++++- community/mediainfo-gui/PKGBUILD | 6 +- community/mediainfo/PKGBUILD | 6 +- community/muffin/PKGBUILD | 15 +- community/muffin/fix-dnd.patch | 29 ---- community/nodejs/PKGBUILD | 25 +-- community/pari/PKGBUILD | 19 +-- community/pidgin-lwqq/PKGBUILD | 6 +- community/signon-plugin-oauth2/PKGBUILD | 10 +- community/signon/PKGBUILD | 6 +- community/squid/PKGBUILD | 4 +- community/stone-soup/PKGBUILD | 6 +- community/znc/PKGBUILD | 8 +- ...-Make-gtester-report-work-with-Python-3.x.patch | 60 -------- core/glib2/PKGBUILD | 22 +-- core/glib2/gvariant-fix-annotation.patch | 25 --- ...-ce0022933c255313e010b27f977f4ae02aad1e7e.patch | 132 ---------------- core/gnupg/PKGBUILD | 18 +-- core/gnupg/valid-keyblock-packet.patch | 61 -------- core/libcap/PKGBUILD | 11 +- core/libsasl/0003_saslauthd_mdoc.patch | 35 ----- core/libsasl/0012_xopen_crypt_prototype.patch | 20 --- .../libsasl/0016_pid_file_lock_creation_mask.patch | 27 ---- core/libsasl/0018_auth_rimap_quotes.patch | 35 ----- core/libsasl/0019_ldap_deprecated.patch | 22 --- core/libsasl/0022_gcc4.4_preprocessor_syntax.patch | 26 ---- core/libsasl/0027_db5_support.patch | 24 --- core/libsasl/PKGBUILD | 51 ++----- core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 --------------------- core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch | 94 ------------ core/libsasl/cyrus-sasl-2.1.22-crypt.patch | 71 --------- core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 ---- core/libsasl/cyrus-sasl-2.1.26-size_t.patch | 11 ++ core/openldap/PKGBUILD | 4 +- core/pcmciautils/PKGBUILD | 5 +- extra/accountsservice/PKGBUILD | 6 +- extra/clutter/PKGBUILD | 8 +- extra/cyrus-sasl/0003_saslauthd_mdoc.patch | 35 ----- extra/cyrus-sasl/0012_xopen_crypt_prototype.patch | 20 --- .../0016_pid_file_lock_creation_mask.patch | 27 ---- extra/cyrus-sasl/0018_auth_rimap_quotes.patch | 35 ----- extra/cyrus-sasl/0019_ldap_deprecated.patch | 22 --- .../0022_gcc4.4_preprocessor_syntax.patch | 26 ---- extra/cyrus-sasl/0027_db5_support.patch | 24 --- extra/cyrus-sasl/PKGBUILD | 53 ++----- extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 --------------------- .../cyrus-sasl-2.1.22-automake-1.10.patch | 94 ------------ extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch | 71 --------- extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 ---- extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch | 11 ++ extra/devhelp/PKGBUILD | 6 +- extra/ekiga/PKGBUILD | 4 +- extra/evince/PKGBUILD | 6 +- extra/gtk-vnc/PKGBUILD | 4 +- extra/java7-openjdk/PKGBUILD | 4 +- extra/java7-openjdk/jre7-openjdk-headless.install | 4 +- extra/kdepim/PKGBUILD | 4 +- extra/libetpan/PKGBUILD | 6 +- extra/mercurial/PKGBUILD | 6 +- extra/mutt/PKGBUILD | 4 +- extra/perl-html-parser/PKGBUILD | 18 +-- extra/php/PKGBUILD | 13 +- extra/php/php-fpm.service | 2 +- extra/pidgin/PKGBUILD | 4 +- extra/postfix/PKGBUILD | 8 +- extra/ptlib/PKGBUILD | 4 +- extra/qemu/PKGBUILD | 4 +- extra/samba/PKGBUILD | 4 +- extra/subversion/PKGBUILD | 25 ++- extra/subversion/svnserve | 42 ----- extra/syslog-ng/PKGBUILD | 10 +- libre/icecat-adblock-plus/PKGBUILD | 12 +- libre/icecat-noscript/PKGBUILD | 6 +- libre/iceweasel-adblock-plus/PKGBUILD | 12 +- libre/iceweasel-noscript/PKGBUILD | 6 +- libre/kdepim-libre/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/mplayer-libre/PKGBUILD | 19 ++- .../mplayer-libre/subreader-fix-srt-parsing.patch | 60 ++++++++ libre/mplayer-vaapi-libre/PKGBUILD | 22 ++- .../subreader-fix-srt-parsing.patch | 60 ++++++++ pcr/hexter/PKGBUILD | 28 ++++ pcr/hexter/hexter | 4 + pcr/lv2-c++-tools/PKGBUILD | 33 ++++ pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch | 42 +++++ 101 files changed, 568 insertions(+), 1786 deletions(-) delete mode 100644 community/muffin/fix-dnd.patch delete mode 100644 core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch delete mode 100644 core/glib2/gvariant-fix-annotation.patch delete mode 100644 core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch delete mode 100644 core/gnupg/valid-keyblock-packet.patch delete mode 100644 core/libsasl/0003_saslauthd_mdoc.patch delete mode 100644 core/libsasl/0012_xopen_crypt_prototype.patch delete mode 100644 core/libsasl/0016_pid_file_lock_creation_mask.patch delete mode 100644 core/libsasl/0018_auth_rimap_quotes.patch delete mode 100644 core/libsasl/0019_ldap_deprecated.patch delete mode 100644 core/libsasl/0022_gcc4.4_preprocessor_syntax.patch delete mode 100644 core/libsasl/0027_db5_support.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.22-crypt.patch delete mode 100644 core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 core/libsasl/cyrus-sasl-2.1.26-size_t.patch delete mode 100644 extra/cyrus-sasl/0003_saslauthd_mdoc.patch delete mode 100644 extra/cyrus-sasl/0012_xopen_crypt_prototype.patch delete mode 100644 extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch delete mode 100644 extra/cyrus-sasl/0018_auth_rimap_quotes.patch delete mode 100644 extra/cyrus-sasl/0019_ldap_deprecated.patch delete mode 100644 extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch delete mode 100644 extra/cyrus-sasl/0027_db5_support.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch delete mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch delete mode 100755 extra/subversion/svnserve create mode 100644 libre/mplayer-libre/subreader-fix-srt-parsing.patch create mode 100644 libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch create mode 100644 pcr/hexter/PKGBUILD create mode 100644 pcr/hexter/hexter create mode 100644 pcr/lv2-c++-tools/PKGBUILD create mode 100644 pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch (limited to 'community/inn/PKGBUILD') diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 80133065d..29fbd6653 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75188 2012-08-15 18:36:09Z lfleischer $ +# $Id: PKGBUILD 90885 2013-05-15 08:03:41Z bpiotrowski $ # Maintainer: Lukas Fleischer # Contributor: Andrea Scarpino # Contributor: Dale Blount @@ -6,13 +6,13 @@ pkgname=autofs pkgver=5.0.7 -pkgrel=1 +pkgrel=2 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') url='http://freshmeat.net/projects/autofs' license=('GPL2') depends=('libxml2') -makedepends=('libldap' 'krb5') +makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') backup=('etc/autofs/auto.master' 'etc/autofs/auto.misc' diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD index 8fc090151..c56998921 100644 --- a/community/etherape/PKGBUILD +++ b/community/etherape/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 64163 2012-02-09 16:45:19Z ttopper $ +# $Id: PKGBUILD 90898 2013-05-15 12:17:39Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: kevin # Contributor: Damir Perisa pkgname=etherape -pkgver=0.9.12 -pkgrel=2 -pkgdesc="A graphical network monitor for various OSI layers and protocols" +pkgver=0.9.13 +pkgrel=1 +pkgdesc='A graphical network monitor for various OSI layers and protocols' arch=('i686' 'x86_64') url="http://etherape.sourceforge.net/" license=('GPL2') depends=('libgnomeui' 'libpcap') makedepends=('rarian' 'gnome-doc-utils') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('8e9cc85e73e44eccb236f488111e02f418ab095d') +sha1sums=('87c387b0929071581bcb6515b15ab849ea8c77fb') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 1eb727dd0..37c0626e3 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90800 2013-05-14 01:21:05Z seblu $ +# $Id: PKGBUILD 90861 2013-05-15 00:13:25Z seblu $ # Contributor: Giorgio Lando # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -7,7 +7,7 @@ pkgname=fcron pkgver=3.1.2 -pkgrel=4 +pkgrel=5 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64) url='http://fcron.free.fr' @@ -29,8 +29,8 @@ source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" 'systab.orig' 'run-cron') md5sums=('36bf213e15f3a480f2274f8e46cced0a' - '938722c6654ef7b07f4aa10001905ba1' - 'bfb7daa22ebe22b9917e455c1ca4a382' + '55be3e80fb2545608feae6f2e0eebece' + '5384c607d842ca3d5cbb612ac1dceb15' '524eba827447a6b7ef7515eedf305698') build() { diff --git a/community/fcron/systab b/community/fcron/systab index 11c7e2fd0..7947f3598 100644 Binary files a/community/fcron/systab and b/community/fcron/systab differ diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig index 5b0045626..b57ba8ef2 100644 --- a/community/fcron/systab.orig +++ b/community/fcron/systab.orig @@ -1,4 +1,4 @@ -&bootrun 01 * * * * /usr/sbin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly +&bootrun 01 * * * * /usr/bin/run-cron /etc/cron.hourly +&bootrun 02 00 * * * /usr/bin/run-cron /etc/cron.daily +&bootrun 22 00 * * 0 /usr/bin/run-cron /etc/cron.weekly +&bootrun 42 00 1 * * /usr/bin/run-cron /etc/cron.monthly diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD index bf14a8002..41024fa62 100644 --- a/community/goobox/PKGBUILD +++ b/community/goobox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87383 2013-03-30 13:01:13Z bgyorgy $ +# $Id: PKGBUILD 90865 2013-05-15 04:00:47Z bgyorgy $ # Maintainer: Balló György pkgname=goobox -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="CD player and ripper for GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool') optdepends=('gst-plugins-good: rip CDs into flac and wav formats') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0bd5c31d53635588f46ad4d254866ff74356caee5edb45c1a3bce9c754cc6cb6') +sha256sums=('c2dba51881902cad3593fc3b3dafd3c12038173a27c623350f1771a1bfbf09a7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD index 6f8310913..a31f95cb8 100644 --- a/community/haskell-pandoc/PKGBUILD +++ b/community/haskell-pandoc/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=pandoc pkgname=haskell-pandoc pkgver=1.11.1 -pkgrel=5 +pkgrel=6 pkgdesc="Conversion between markup formats" url="http://hackage.haskell.org/package/${_hkgname}" license=('GPL') @@ -15,6 +15,9 @@ depends=('haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup' source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install md5sums=('e895b22745affba37c0ba5e6e6d0f17c') +provides=(pandoc) +conflicts=(pandoc) +replaces=(pandoc) build() { cd $_hkgname-$pkgver @@ -22,7 +25,7 @@ build() { --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock - runhaskell Setup register --gen-script + runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 9af8ff540..00de73769 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90747 2013-05-13 14:54:46Z spupykin $ +# $Id: PKGBUILD 90886 2013-05-15 08:03:42Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Edward Tjörnhammar # Contributor: Edward Tjörnhammar pkgname=inn pkgver=2.5.3 -pkgrel=4 +pkgrel=5 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64') diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index c42acfd63..bcf67f648 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89105 2013-04-26 19:07:54Z stativ $ +# $Id: PKGBUILD 90936 2013-05-15 15:48:29Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=intellij-idea-libs -pkgver=12.1.2 -_pkgver=129.354 +pkgver=12.1.3 +_pkgver=129.451 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('ad9f4bbd7c8c7a86a4708d3f4bb093ed') +md5sums=('03aea501b9e1dc87a63a8c30399c4304') package() { cd "$srcdir" diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD index a0d646997..aa5b97e46 100644 --- a/community/libaccounts-qt/PKGBUILD +++ b/community/libaccounts-qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85369 2013-03-01 10:34:56Z andrea $ +# $Id: PKGBUILD 90880 2013-05-15 06:57:50Z bgyorgy $ # Maintainer: Balló György pkgbase=libaccounts-qt _pkgbase=accounts-qt pkgname=('libaccounts-qt' 'libaccounts-qt-doc') -pkgver=1.6 -pkgrel=2 +pkgver=1.7 +pkgrel=1 pkgdesc="Qt-based client library for accessing the online accounts database" arch=('i686' 'x86_64') url="http://code.google.com/p/accounts-sso/" @@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') options=('!emptydirs') source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) -sha1sums=('bd2c02b747384d53b75767c18b1e026bcf2211c5') +sha1sums=('628c278f42289247f0669dc65ffd2af8a329a27d') build() { cd "$srcdir/$_pkgbase-$pkgver" @@ -22,7 +22,7 @@ build() { # Do not install tests echo 'INSTALLS =' >>tests/accountstest.pro - qmake PREFIX=/usr LIBDIR=/usr/lib + qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index c461ee73d..3561880a4 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84838 2013-02-25 10:38:34Z spupykin $ +# $Id: PKGBUILD 90920 2013-05-15 13:45:55Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=libmediainfo -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('df890b982250711055f5cb6d948251bb' +md5sums=('7a50881744a29dac6f93a8f6cbaebc0c' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 6513b4746..665b104c8 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83452 2013-02-01 11:36:01Z foutrelis $ +# $Id: PKGBUILD 90890 2013-05-15 08:03:49Z bpiotrowski $ # Maintainer: Evangelos Foutras pkgname=libmemcached pkgver=1.0.16 -pkgrel=1 +pkgrel=2 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') url="http://libmemcached.org/" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index cab1b749b..608e854b9 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90621 2013-05-13 11:43:22Z spupykin $ +# $Id: PKGBUILD 90887 2013-05-15 08:03:43Z bpiotrowski $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.5 -pkgrel=3 +pkgrel=4 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 5f009b9b0..6e81755fc 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74891 2012-08-09 07:50:09Z spupykin $ +# $Id: PKGBUILD 90922 2013-05-15 13:46:19Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: hydro pkgname=libzen -pkgver=0.4.28 +pkgver=0.4.29 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f09e519b71e61a7226ffefe55d00eadf') +md5sums=('a103218d3438c63fe246cda71ad0ca88') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/llvm-amdgpu-snapshot/PKGBUILD b/community/llvm-amdgpu-snapshot/PKGBUILD index 65dd5a138..cd96dcb81 100644 --- a/community/llvm-amdgpu-snapshot/PKGBUILD +++ b/community/llvm-amdgpu-snapshot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87738 2013-04-05 20:58:51Z lcarlier $ +# $Id: PKGBUILD 90882 2013-05-15 07:40:34Z lcarlier $ # Maintainer: Laurent Carlier # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Roberto Alsina @@ -6,22 +6,26 @@ # Contributor: Anders Bergh # Contributor: Tomas Wilhelmsson -pkgname=llvm-amdgpu-snapshot +pkgbase=llvm-amdgpu-snapshot +pkgname=('llvm-amdgpu-snapshot' 'llvm-amdgpu-lib-snapshot') pkgver=20130403 -pkgrel=1 +pkgrel=2 pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support' arch=('i686' 'x86_64') url="http://llvm.org" license=('custom:University of Illinois/NCSA Open Source License') -depends=('libffi' 'python2' 'ocaml') -conflicts=('llvm') +makedepends=('libffi' 'python2' 'ocaml') source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) md5sums=('4baa7b8da9eff4811952b6f855c141ca') -build() { +prepare() { cd "$srcdir"/llvm-c* sed -i 's/python$/python2/' utils/llvm-build/llvm-build +} + +build() { + cd "$srcdir"/llvm-c* # Apply strip option to configure _optimized_switch="enable" @@ -47,16 +51,37 @@ build() { make REQUIRES_RTTI=1 } -package() { +package_llvm-amdgpu-snapshot() { + depends=("llvm-amdgpu-lib-snapshot=${pkgver}" 'python2') + conflicts=('llvm') + cd "$srcdir"/llvm-c* make DESTDIR="$pkgdir" install # Remove useless files rm -r "$pkgdir"/usr/{docs,lib/ocaml} + # moved to llvm-amdgpu-lib-snapshot + rm "$pkgdir"/usr/lib/libLLVM-3.2svn.so # Fix permissions of static libs chmod -x "$pkgdir"/usr/lib/lib*.a install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } +package_llvm-amdgpu-lib-snapshot() { + depends=('libffi' 'gcc-libs') + + cd "$srcdir"/llvm-c* + + make DESTDIR="$pkgdir" install + + mv -v "$pkgdir"/usr/lib/libLLVM-3.2svn.so "$pkgdir"/ + + # Remove useless files + rm -r "$pkgdir"/usr/{bin,include,docs,lib/*} + + mv "$pkgdir"/libLLVM-3.2svn.so "$pkgdir"/usr/lib/ + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 7336d6581..cf721eebe 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84844 2013-02-25 10:39:41Z spupykin $ +# $Id: PKGBUILD 90926 2013-05-15 13:47:03Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo-gui -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') +md5sums=('bd794e4066b6bb197af23cb7b8ba832b') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 83036b32f..3166fd6ad 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84842 2013-02-25 10:39:20Z spupykin $ +# $Id: PKGBUILD 90924 2013-05-15 13:46:41Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: hydro pkgname=mediainfo -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') +md5sums=('bd794e4066b6bb197af23cb7b8ba832b') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index e73fd266a..a21cfe27d 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90125 2013-05-06 21:32:15Z faidoc $ +# $Id: PKGBUILD 90940 2013-05-15 21:35:03Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - "switch-applications.patch" - "fix-dnd.patch") -sha256sums=('4b3f872c0a0325d88d2d6ece4b67202b7b91b89634fb3c8ff93ebd5c6acfbd67' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' - '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') + "switch-applications.patch") +sha256sums=('6907d2b2fb78c7b710c4454ef321d40cffe5ab1273df14facbbd5cda691ccb34' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') build() { cd ${pkgname}-${pkgver} @@ -28,9 +26,6 @@ build() { # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch - # Fix unresponsive panel on DND - patch -RNp1 -i ../fix-dnd.patch - PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch deleted file mode 100644 index f30e22521..000000000 --- a/community/muffin/fix-dnd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 -From: luyikei -Date: Wed, 16 Jan 2013 14:09:39 +0900 -Subject: [PATCH] Put the rest of redirect window types into the top window - group - ---- - src/compositor/meta-window-actor.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index 4113e72..66ba3c4 100644 ---- a/src/compositor/meta-window-actor.c -+++ b/src/compositor/meta-window-actor.c -@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) - - if (window->type == META_WINDOW_DROPDOWN_MENU || - window->type == META_WINDOW_POPUP_MENU || -- window->type == META_WINDOW_COMBO){ -+ window->type == META_WINDOW_COMBO || -+ window->type == META_WINDOW_NOTIFICATION || -+ window->type == META_WINDOW_DND || -+ window->type == META_WINDOW_OVERRIDE_OTHER){ - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); - } --- -1.8.1.6 - diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 738d4a395..e06281bc6 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88884 2013-04-24 15:09:27Z bpiotrowski $ +# $Id: PKGBUILD 90906 2013-05-15 13:05:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,20 +8,21 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.5 +pkgver=0.10.6 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' license=('MIT') -depends=('openssl' 'python2') +depends=('openssl') +makedepends=('python2') checkdepends=('curl') options=('!emptydirs') -source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd') +source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) +sha256sums=('7e2079394efe82f62798178f617888c9d6a39150c76122c432ae9ea73ce28e79') -build() { - cd node-v${pkgver} +prepare() { + cd node-v$pkgver msg 'Fixing for python2 name' find -type f -exec sed \ @@ -30,8 +31,12 @@ build() { -e 's_^#!/usr/bin/python$_&2_' \ -e "s_'python'_'python2'_" -i {} \; find test/ -type f -exec sed 's_python _python2 _' -i {} \; - export PYTHON=python2 +} +build() { + cd node-v$pkgver + + export PYTHON=python2 ./configure \ --prefix=/usr \ --shared-openssl @@ -40,12 +45,12 @@ build() { } check() { - cd node-v${pkgver} + cd node-v$pkgver make test || true } package() { - cd node-v${pkgver} + cd node-v$pkgver make DESTDIR="$pkgdir" install diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index c00a3466f..c9b018932 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 77048 2012-10-03 23:34:04Z bisson $ +# $Id: PKGBUILD 90928 2013-05-15 13:56:58Z bisson $ # Maintainer: Gaetan Bisson pkgname=pari -pkgver=2.5.3 +pkgver=2.5.4 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -11,12 +11,16 @@ arch=('i686' 'x86_64') depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') -source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz") -sha1sums=('de79eee7ae017a495dc0c648b6f7d5a4f6c7a522') +source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc}) +sha1sums=('471226fd86fea0ad1f236249a49bdaee16aa34bf' 'SKIP') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/\$addlib64//g' -i config/get_libpth +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/\$addlib64/ /' -i config/get_libpth ./Configure --prefix=/usr --with-gmp --with-readline make all } @@ -29,8 +33,5 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - # symlink pointing to a symlink that is going to be moved by zipman - rm "${pkgdir}"/usr/share/man/man1/pari.1 - ln -s gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1.gz + ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1 } diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 7dc881071..caac6d1a5 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90442 2013-05-12 11:52:36Z fyan $ +# $Id: PKGBUILD 90931 2013-05-15 14:52:30Z fyan $ # Maintainer: Felix Yan pkgname=pidgin-lwqq pkgver=0.1e _pkgver=0.1e -pkgrel=1 +pkgrel=2 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') url="https://github.com/xiehuc/pidgin-lwqq" @@ -30,4 +30,4 @@ package() make DESTDIR="${pkgdir}" install } -sha512sums=('0e5c49dd5b0c9ba9f9eef90cb075c66839a6691aae93789da409a758a36916aef8fceea0d272ee9b67a5e6279bafea2907d2acba10c9d3858a94f4509f4b1f4b') +sha512sums=('56d296e198fc3d41454864cda8fae3ba202b3957e95419de22994a11c1aa5be3acbbb68f2cd4a6c8a3c1e6678884027d3c854f08a8f1efe39f7ff6bccd213c20') diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD index 9016f2a42..308221338 100644 --- a/community/signon-plugin-oauth2/PKGBUILD +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84333 2013-02-16 20:09:04Z bgyorgy $ +# $Id: PKGBUILD 90878 2013-05-15 06:48:00Z bgyorgy $ # Maintainer: Balló György pkgname=signon-plugin-oauth2 _pkgname=signon-oauth2 -pkgver=0.15 +pkgver=0.17 pkgrel=1 pkgdesc="OAuth 2 plugin for signon" arch=('i686' 'x86_64') @@ -12,16 +12,18 @@ license=('LGPL') depends=('signon-ui' 'qjson') makedepends=('signon') source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('31f63f73eca2c8341ab41ec0d63650c9a0b4820a') +sha1sums=('400301bf4a0cc7ad005ed552f9700e00a74b7237') build() { cd "$srcdir/$_pkgname-$pkgver" + sed -i '/-Werror/d' common-project-config.pri + # Do not install tests and example echo 'INSTALLS =' >>tests/tests.pro echo 'INSTALLS =' >>example/example.pro - qmake PREFIX=/usr LIBDIR=/usr/lib + qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index 3b75f4ba7..4df065ba1 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87393 2013-03-30 17:15:21Z bgyorgy $ +# $Id: PKGBUILD 90876 2013-05-15 06:33:09Z bgyorgy $ # Maintainer: Balló György pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.49 +pkgver=8.51 pkgrel=1 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/signond.conf) install=$pkgname.install source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 use_keyring.patch) -sha1sums=('349d700eed718977463020f252269786883bc4c6' +sha1sums=('5d62d9f2923381baf5cffbd112adf3ae935e6c65' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') build() { diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 2300e0472..03471e84f 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90617 2013-05-13 10:59:49Z spupykin $ +# $Id: PKGBUILD 90888 2013-05-15 08:03:45Z bpiotrowski $ # Maintainer: Sergej Pupykin # Contributor: Mark Coolen # Contributor: Tom Newsom @@ -6,7 +6,7 @@ pkgname=squid pkgver=3.3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 1092cda59..90f07aa95 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Jakob Gruber pkgname=stone-soup -pkgver=0.12.0 -pkgrel=2 +pkgver=0.12.1 +pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' @@ -64,4 +64,4 @@ package() { "${pkgdir}/usr/share/applications/${pkgname}.desktop" } -md5sums=('38ed5bae81f6513cc898aa12efda2c38') +md5sums=('47d7c65cf72786d446e1289533af01de') diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index b3edff7b1..0bc6a0486 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81614 2012-12-25 00:34:19Z foutrelis $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 90889 2013-05-15 08:03:46Z bpiotrowski $ +# Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen # Contributor: mickael9 pkgname=znc pkgver=1.0 -pkgrel=4 +pkgrel=6 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') @@ -27,7 +27,7 @@ build() { --enable-python \ --enable-perl \ --enable-tcl \ - --with-systemdsystemunitdir=yes + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch deleted file mode 100644 index b4ce93e83..000000000 --- a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001 -From: Jan de Groot -Date: Thu, 21 Mar 2013 20:47:57 +0100 -Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations - (tabs to spaces) - Replace print with print(), still works with Python 2.x - ---- - glib/gtester-report | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/glib/gtester-report b/glib/gtester-report -index 0fcdd9a..00296ea 100755 ---- a/glib/gtester-report -+++ b/glib/gtester-report -@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter): - if binary.success_cases: - oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter - if real_cases != 0: -- self.oprint ('ER\n' % erlink) -- self.oprint ('OK\n' % oklink) -- self.oprint ('\n') -- perc = binary.success_cases * 100.0 / real_cases -- pcolor = { -- 100 : 'bgcolor="lightgreen"', -- 0 : 'bgcolor="red"', -- }.get (int (perc), 'bgcolor="yellow"') -- self.oprint ('%.2f%%\n' % (pcolor, perc)) -- self.oprint ('\n') -+ self.oprint ('ER\n' % erlink) -+ self.oprint ('OK\n' % oklink) -+ self.oprint ('\n') -+ perc = binary.success_cases * 100.0 / real_cases -+ pcolor = { -+ 100 : 'bgcolor="lightgreen"', -+ 0 : 'bgcolor="red"', -+ }.get (int (perc), 'bgcolor="yellow"') -+ self.oprint ('%.2f%%\n' % (pcolor, perc)) -+ self.oprint ('\n') - else: -- self.oprint ('Empty\n') -- self.oprint ('\n') -- self.oprint ('\n') -+ self.oprint ('Empty\n') -+ self.oprint ('\n') -+ self.oprint ('\n') - for tc in binary.testcases: - self.handle_testcase (tc, binary) - def handle_totals (self): -@@ -466,7 +466,7 @@ def parse_opts(): - " Needs python-subunit]") - options, files = parser.parse_args() - if options.version: -- print parser.epilog -+ print(parser.epilog) - return None, None - if len(files) != 1: - parser.error("Must supply a log file to parse.") --- -1.8.2 - diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 50260971f..5f0fb0ce7 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,33 +1,25 @@ -# $Id: PKGBUILD 183737 2013-04-27 14:20:45Z jgc $ +# $Id: PKGBUILD 185564 2013-05-15 07:54:44Z heftig $ # Maintainer: Jan de Groot pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.36.1 -pkgrel=3 +pkgver=2.36.2 +pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz - revert-warn-glib-compile-schemas.patch - gvariant-fix-annotation.patch - partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch) -sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' - 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b' - '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be') + revert-warn-glib-compile-schemas.patch) +sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - # fix FS#34630 https://bugs.archlinux.org/task/34630 + # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716 export CFLAGS+=" -Wall" - # Upstream fixes from 2.36 branch - patch -Np1 -i ../gvariant-fix-annotation.patch - patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/core/glib2/gvariant-fix-annotation.patch b/core/glib2/gvariant-fix-annotation.patch deleted file mode 100644 index ee10312c8..000000000 --- a/core/glib2/gvariant-fix-annotation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Fri, 12 Apr 2013 15:25:15 +0000 -Subject: GVariant: fix transfer annotation - -g_variant_new_from_bytes() returns a floating reference, so it -must be annotated (transfer none) - -https://bugzilla.gnome.org/show_bug.cgi?id=697887 ---- -diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c -index b96bc90..f823e01 100644 ---- a/glib/gvariant-core.c -+++ b/glib/gvariant-core.c -@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type, - * - * A reference is taken on @bytes. - * -- * Returns: a new #GVariant with a floating reference -+ * Returns: (transfer none): a new #GVariant with a floating reference - * - * Since: 2.36 - */ --- -cgit v0.9.1 diff --git a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch b/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch deleted file mode 100644 index f623c1b21..000000000 --- a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch +++ /dev/null @@ -1,132 +0,0 @@ -From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie -Date: Tue, 23 Apr 2013 17:26:48 +0000 -Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()" - -This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e. - -It used to be safe to use g_spawn_sync() from processes that had their -own SIGCHLD handler because it simply called wait(). When it was -changed to depend on the GLib child watching infrastructure this meant -that GLib had to own the SIGCHLD handler. - -This caused hangs in at least Pidgin. - -The patch contained two other improvements to the child watch code which -we want to keep, so only revert the changes to gspawn itself. - -https://bugzilla.gnome.org/show_bug.cgi?id=698081 ---- -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 381ed5c..01cedf6 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -47,7 +47,6 @@ - - #include "genviron.h" - #include "gmem.h" --#include "gmain.h" - #include "gshell.h" - #include "gstring.h" - #include "gstrfuncs.h" -@@ -207,21 +206,6 @@ read_data (GString *str, - } - } - --typedef struct { -- GMainLoop *loop; -- gint *status_p; --} SyncWaitpidData; -- --static void --on_sync_waitpid (GPid pid, -- gint status, -- gpointer user_data) --{ -- SyncWaitpidData *data = user_data; -- *(data->status_p) = status; -- g_main_loop_quit (data->loop); --} -- - /** - * g_spawn_sync: - * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's -@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory, - GString *errstr = NULL; - gboolean failed; - gint status; -- SyncWaitpidData waitpid_data; - - g_return_val_if_fail (argv != NULL, FALSE); - g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE); -@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory, - close_and_invalidate (&outpipe); - if (errpipe >= 0) - close_and_invalidate (&errpipe); -- -- /* Now create a temporary main context and loop, with just one -- * waitpid source. We used to invoke waitpid() directly here, but -- * this way we unify with the worker thread in gmain.c. -+ -+ /* Wait for child to exit, even if we have -+ * an error pending. - */ -- { -- GMainContext *context; -- GMainLoop *loop; -- GSource *source; -- -- context = g_main_context_new (); -- loop = g_main_loop_new (context, TRUE); -+ again: -+ -+ ret = waitpid (pid, &status, 0); - -- waitpid_data.loop = loop; -- waitpid_data.status_p = &status; -- -- source = g_child_watch_source_new (pid); -- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL); -- g_source_attach (source, context); -- g_source_unref (source); -- -- g_main_loop_run (loop); -+ if (ret < 0) -+ { -+ if (errno == EINTR) -+ goto again; -+ else if (errno == ECHILD) -+ { -+ if (exit_status) -+ { -+ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly."); -+ } -+ else -+ { -+ /* We don't need the exit status. */ -+ } -+ } -+ else -+ { -+ if (!failed) /* avoid error pileups */ -+ { -+ int errsv = errno; - -- g_main_context_unref (context); -- g_main_loop_unref (loop); -- } -+ failed = TRUE; -+ -+ g_set_error (error, -+ G_SPAWN_ERROR, -+ G_SPAWN_ERROR_READ, -+ _("Unexpected error in waitpid() (%s)"), -+ g_strerror (errsv)); -+ } -+ } -+ } - - if (failed) - { --- -cgit v0.9.1 diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 31081061f..7bde3053b 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 183489 2013-04-22 09:10:16Z tpowa $ +# $Id: PKGBUILD 185550 2013-05-14 23:25:14Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Tobias Powalowski # Contributor: Andreas Radke # Contributor: Judd Vinet pkgname=gnupg -pkgver=2.0.19 -pkgrel=7 +pkgver=2.0.20 +pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -17,11 +17,8 @@ optdepends=('curl: gpg2keys_curl' makedepends=('curl' 'libldap' 'libusb-compat') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'valid-keyblock-packet.patch' 'protect-tool-env.patch') -sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' - 'f6e6830610a8629b0aad69d789373bf8ca481733' - '474d827f1c2976bb107985047f61ac9096ae0953' +sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP' '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') install=install @@ -30,12 +27,13 @@ conflicts=('gnupg2') provides=("gnupg2=${pkgver}") replaces=('gnupg2') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../protect-tool-env.patch # FS#31900 - patch -p1 -i ../valid-keyblock-packet.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/core/gnupg/valid-keyblock-packet.patch b/core/gnupg/valid-keyblock-packet.patch deleted file mode 100644 index 64bf1c2da..000000000 --- a/core/gnupg/valid-keyblock-packet.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Werner Koch -Date: Thu, 20 Dec 2012 08:43:41 +0000 (+0100) -Subject: gpg: Import only packets which are allowed in a keyblock. -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=498882296ffac7987c644aaf2a0aa108a2925471;hp=20c95ef258f8520283406239f7c6f4729341d463 - -gpg: Import only packets which are allowed in a keyblock. - -* g10/import.c (valid_keyblock_packet): New. -(read_block): Store only valid packets. --- - -A corrupted key, which for example included a mangled public key -encrypted packet, used to corrupt the keyring. This change skips all -packets which are not allowed in a keyblock. - -GnuPG-bug-id: 1455 - -(cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e) ---- - -diff --git a/g10/import.c b/g10/import.c -index ba2439d..ad112d6 100644 ---- a/g10/import.c -+++ b/g10/import.c -@@ -347,6 +347,27 @@ import_print_stats (void *hd) - } - - -+/* Return true if PKTTYPE is valid in a keyblock. */ -+static int -+valid_keyblock_packet (int pkttype) -+{ -+ switch (pkttype) -+ { -+ case PKT_PUBLIC_KEY: -+ case PKT_PUBLIC_SUBKEY: -+ case PKT_SECRET_KEY: -+ case PKT_SECRET_SUBKEY: -+ case PKT_SIGNATURE: -+ case PKT_USER_ID: -+ case PKT_ATTRIBUTE: -+ case PKT_RING_TRUST: -+ return 1; -+ default: -+ return 0; -+ } -+} -+ -+ - /**************** - * Read the next keyblock from stream A. - * PENDING_PKT should be initialzed to NULL -@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root ) - } - in_cert = 1; - default: -- if( in_cert ) { -+ if (in_cert && valid_keyblock_packet (pkt->pkttype)) { - if( !root ) - root = new_kbnode( pkt ); - else diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 70c3a306e..bf3e12c95 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 182644 2013-04-12 00:05:24Z allan $ +#$Id: PKGBUILD 185557 2013-05-15 05:24:44Z allan $ # Maintainer: Allan McRae # Contributor: Hugo Doria pkgname=libcap pkgver=2.22 -pkgrel=4 +pkgrel=5 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') url="http://sites.google.com/site/fullycapable/" @@ -15,6 +15,13 @@ source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.a md5sums=('b4896816b626bea445f0b3849bdd4077' '9d0983e25e5a251d098507f9561d2b27') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # install into /usr/bin + sed -i "/SBINDIR/s#sbin#bin#" Make.Rules +} + build() { cd ${srcdir}/${pkgname}-${pkgver} make diff --git a/core/libsasl/0003_saslauthd_mdoc.patch b/core/libsasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/core/libsasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/core/libsasl/0012_xopen_crypt_prototype.patch b/core/libsasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/core/libsasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by - -When _XOPEN_SOURCE is defined, the subsequent #include -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/core/libsasl/0016_pid_file_lock_creation_mask.patch b/core/libsasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/core/libsasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/core/libsasl/0018_auth_rimap_quotes.patch b/core/libsasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/core/libsasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/core/libsasl/0019_ldap_deprecated.patch b/core/libsasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/core/libsasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm ) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include - #endif - -+#define LDAP_DEPRECATED 1 - #include - #include - #include diff --git a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/core/libsasl/0027_db5_support.patch b/core/libsasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/core/libsasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index a95f373b8..a9b159b17 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180675 2013-03-25 19:13:43Z bpiotrowski $ +# $Id: PKGBUILD 185567 2013-05-15 08:03:34Z bpiotrowski $ # Maintainer: Jan de Groot # This package spans multiple repositories. @@ -7,75 +7,48 @@ #pkgbase=('cyrus-sasl') #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl -pkgver=2.1.23 -pkgrel=10 +pkgver=2.1.26 +pkgrel=2 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch +source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch + cyrus-sasl-2.1.26-size_t.patch 0010_maintainer_mode.patch 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.conf.d saslauthd) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' + 'f45aa8c42b32e0569ab3d14a83485b37' 'f45d8b60e8f74dd7f7c2ec1665fa602a' '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' '49219af5641150edec288a3fdb65e7c1' '75542f613185d5a90520ad0d7d926a20') build() { + export CFLAGS="$CFLAGS -fPIC" + cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -130,7 +103,7 @@ build() { package_libsasl() { pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" - depends=('openssl') + depends=('openssl' 'krb5') conflicts=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}" diff --git a/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch b/core/libsasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/core/libsasl/cyrus-sasl-2.1.26-size_t.patch b/core/libsasl/cyrus-sasl-2.1.26-size_t.patch new file mode 100644 index 000000000..3a4820f16 --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.26-size_t.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 95fa405d5..2f289dbc7 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184147 2013-05-02 19:39:44Z eric $ +# $Id: PKGBUILD 185566 2013-05-15 08:03:32Z bpiotrowski $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.35 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index 2e9902106..b83d8cc50 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173746 2012-12-22 15:22:21Z tomegun $ +# $Id: PKGBUILD 185562 2013-05-15 07:34:58Z tpowa $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=pcmciautils pkgver=018 -pkgrel=6 +pkgrel=7 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" @@ -19,6 +19,7 @@ options=(!makeflags) build() { cd "$pkgname-$pkgver" sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile + sed -i -e 's,/sbin,/usr/bin,g' Makefile make } diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 7a3ed0fbb..a7cf9580c 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $ +# $Id: PKGBUILD 185560 2013-05-15 07:14:20Z heftig $ # Maintainer: Ionut Biru pkgname=accountsservice -pkgver=0.6.31 +pkgver=0.6.32 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('d594f1da95c6a83c0463695ca31815b2' +md5sums=('0c2c87f3bf982bdab54be887fed25bc5' '1d5cf127e5aac407fe7c37b2f4fd503c') build() { diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index fd8b05e04..885c94ccc 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183339 2013-04-21 22:08:40Z heftig $ +# $Id: PKGBUILD 185561 2013-05-15 07:16:35Z heftig $ # Maintainer: Jan de Groot # Contributor: Sergej Pupykin # Contributor: William Rea pkgname=clutter -pkgver=1.14.2 -pkgrel=2 +pkgver=1.14.4 +pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -14,7 +14,7 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8') +sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c') build() { cd "$pkgname-$pkgver" diff --git a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch b/extra/cyrus-sasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch b/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by - -When _XOPEN_SOURCE is defined, the subsequent #include -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch b/extra/cyrus-sasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/extra/cyrus-sasl/0019_ldap_deprecated.patch b/extra/cyrus-sasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/extra/cyrus-sasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm ) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include - #endif - -+#define LDAP_DEPRECATED 1 - #include - #include - #include diff --git a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/extra/cyrus-sasl/0027_db5_support.patch b/extra/cyrus-sasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/extra/cyrus-sasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 665bd7fbb..64eaee908 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $ +# $Id: PKGBUILD 185591 2013-05-15 13:17:58Z eric $ # Maintainer: Jan de Groot # This package spans multiple repositories. @@ -7,53 +7,33 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl -pkgver=2.1.23 -pkgrel=12 +pkgver=2.1.26 +pkgrel=2 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') +source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch + cyrus-sasl-2.1.26-size_t.patch 0010_maintainer_mode.patch 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d saslauthd tmpfiles.conf) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' + 'f45aa8c42b32e0569ab3d14a83485b37' 'f45d8b60e8f74dd7f7c2ec1665fa602a' '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' @@ -61,25 +41,18 @@ md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' '45bb0192d2f188066240b9a66ee6365f') build() { + export CFLAGS="$CFLAGS -fPIC" + cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -194,7 +167,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch new file mode 100644 index 000000000..3a4820f16 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index fae630d93..b355d8bdf 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183344 2013-04-21 22:08:46Z heftig $ +# $Id: PKGBUILD 185584 2013-05-15 11:33:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Link Dupont pkgname=devhelp -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64) @@ -15,7 +15,7 @@ makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96') +sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7') build() { cd $pkgname-$pkgver diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 52c8b2df8..f58f82e6d 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183345 2013-04-21 22:08:47Z heftig $ +# $Id: PKGBUILD 185578 2013-05-15 08:05:39Z bpiotrowski $ # Maintainer: Jan de Groot # Contributor: Tom K pkgname=ekiga pkgver=4.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index bc6151ddc..8d022c38d 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183350 2013-04-21 22:08:55Z heftig $ +# $Id: PKGBUILD 185565 2013-05-15 07:56:22Z heftig $ # Maintainer: Jan de Groot pkgname=evince -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -16,7 +16,7 @@ groups=(gnome) install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cf136d2a025ef486c4e248e0dc134e7a9420557d9edc0df1ceb6a6330fbd4e9a') +sha256sums=('dd35b54b82190ba01f0c481e2d073ccddaa325ce80964b655dc167752b6bc2f5') build() { cd $pkgname-$pkgver diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index a403e3373..6750bdfbc 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $ +# $Id: PKGBUILD 185577 2013-05-15 08:05:37Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -6,7 +6,7 @@ pkgname=gtk-vnc pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64') url="http://live.gnome.org/gtk-vnc" diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 564bd8f5e..efdfea91e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184397 2013-05-06 19:38:04Z foutrelis $ +# $Id: PKGBUILD 185582 2013-05-15 08:29:48Z guillaume $ # Maintainer: Andreas Radke # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') diff --git a/extra/java7-openjdk/jre7-openjdk-headless.install b/extra/java7-openjdk/jre7-openjdk-headless.install index 0787545b9..8fa330c19 100644 --- a/extra/java7-openjdk/jre7-openjdk-headless.install +++ b/extra/java7-openjdk/jre7-openjdk-headless.install @@ -1,11 +1,11 @@ post_install() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } post_upgrade() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 898dbc24e..e8e75b6d6 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184967 2013-05-09 09:45:11Z andrea $ +# $Id: PKGBUILD 185580 2013-05-15 08:05:42Z bpiotrowski $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -21,7 +21,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktnef' 'kdepim-libkdepim') pkgver=4.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD index 482123b31..d546d9eaa 100644 --- a/extra/libetpan/PKGBUILD +++ b/extra/libetpan/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 168431 2012-10-11 16:04:57Z andyrtr $ +# $Id: PKGBUILD 185576 2013-05-15 08:05:36Z bpiotrowski $ # Maintainer: Andreas Radke pkgname=libetpan pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A portable middleware for email access" arch=('i686' 'x86_64') url="http://www.etpan.org/" license=("custom:etpan") -depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1') +depends=('db>=5.3.15' 'libsasl>=2.1.26' 'curl>=7.23.1' 'expat>=2.0.1-1') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('6fee60d08506e941642b8fa087e60b07') diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3f880502c..e46ff579f 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184144 2013-05-02 17:00:09Z giovanni $ +# $Id: PKGBUILD 185603 2013-05-15 19:30:15Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('d012d8bb5f85369d3b6a630a80667170' +md5sums=('db34e6085b71c33ba250e689b1535101' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index 9650cff99..55972b5d1 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167418 2012-10-02 02:04:08Z bisson $ +# $Id: PKGBUILD 185574 2013-05-15 08:05:34Z bpiotrowski $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson pkgname=mutt pkgver=1.5.21 -pkgrel=8 +pkgrel=9 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 1469dab58..edf79db2e 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $ +# $Id: PKGBUILD 185586 2013-05-15 11:58:32Z eric $ # Maintainer: kevin # Contributor: Manolis Tzanidakis # Contributor: Firmicus pkgname=perl-html-parser -_realname=HTML-Parser -pkgver=3.70 +pkgver=3.71 pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/HTML-Parser/" depends=('perl-html-tagset' 'perl') checkdepends=('perl-test-pod') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('efe7699f5ece3a230d730a3682359c08') +source=(http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-${pkgver}.tar.gz) +md5sums=('9128a45893097dfa3bf03301b19c5efe') build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. + cd HTML-Parser-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make install DESTDIR="${pkgdir}" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 9c1355b33..7bd593a6f 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184818 2013-05-09 07:44:41Z pierre $ +# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ # Maintainer: Pierre Schmitz pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.15 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -38,24 +38,21 @@ md5sums=('145ea5e845e910443ff1eddb3dbcf56a' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - 'f8b206cb8fecb05cb1ded8bee45633ff' + '4af4d94f3db58437eef8db87d16a5fab' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - # adjust paths patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # workaround for pkg-config 0.28 - sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure } build() { local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/php \ --localstatedir=/var \ --with-layout=GNU \ @@ -243,7 +240,7 @@ package_php-fpm() { backup=('etc/php/php-fpm.conf') install='php-fpm.install' - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index fc5ead6f3..1ae62051f 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=forking PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 2bb6c93cc..73762cb53 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178040 2013-02-14 01:37:10Z foutrelis $ +# $Id: PKGBUILD 185575 2013-05-15 08:05:35Z bpiotrowski $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.7 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 15848217b..ac465b8a6 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $ +# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $ # Contributor: Jeff Brodnax # Contributor: Paul Mattal # Maintainer: Gaetan Bisson pkgname=postfix pkgver=2.10.0 -pkgrel=4 +pkgrel=5 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -13,11 +13,11 @@ arch=('i686' 'x86_64') depends=('pcre' 'libsasl' 'libldap' 'db' 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' 'service' 'rc.d') -sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' +sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD index 170c33fee..eba6e483e 100644 --- a/extra/ptlib/PKGBUILD +++ b/extra/ptlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178389 2013-02-21 05:32:58Z heftig $ +# $Id: PKGBUILD 185571 2013-05-15 08:05:30Z bpiotrowski $ # Maintainer: Jan de Groot pkgname=ptlib pkgver=2.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Portable Windows Library" arch=('i686' 'x86_64') url="http://www.opalvoip.org" diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index a3312d36c..f7ea473ee 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184424 2013-05-06 19:39:18Z foutrelis $ +# $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ # Maintainer: Tobias Powalowski pkgname=qemu pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index d0bb45a6e..29534340d 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -15,13 +15,13 @@ pkgver=4.0.5 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=4.0.5 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' - 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index d6edcf95e..f3f0f0dbf 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $ +# $Id: PKGBUILD 185569 2013-05-15 08:05:28Z bpiotrowski $ # Maintainer: Stéphane Gaudreault # Contributor: Paul Mattal # Contributor: Jason Chu pkgname=subversion pkgver=1.7.9 -pkgrel=1 +pkgrel=4 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') @@ -19,22 +19,18 @@ url="http://subversion.apache.org/" provides=('svn') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -sha1sums=('453757bae78a800997559f2232483ab99238ec1e' - '5ce5adc5f5cae5a2d569a89b5e4498623feae84a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' - '9f6790d842cf3e0228b007483a43e39a42724068' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - +md5sums=('8d532025771a67c06c23f299699f056f' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 @@ -78,8 +74,7 @@ package() { ## svnserve ... - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + # xinetd install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn # ... systemd diff --git a/extra/subversion/svnserve b/extra/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/extra/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 2a4cc6fce..3c54082b4 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179615 2013-03-08 18:57:03Z dreisner $ +# $Id: PKGBUILD 185556 2013-05-15 00:48:48Z dreisner $ # Maintainer: Dave Reisner # Contributor: Eric Bélanger # Contributor: Aaron Griffin pkgname=syslog-ng pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -14,8 +14,7 @@ depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd') makedepends=('flex' 'pkg-config' 'python2') optdepends=('logrotate: for rotating log files') options=('!libtool') -backup=('etc/syslog-ng/modules.conf' - 'etc/syslog-ng/scl.conf' +backup=('etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') install=$pkgname.install @@ -33,6 +32,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc/syslog-ng \ --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ --localstatedir=/var/lib/syslog-ng \ --datadir=/usr/share/syslog-ng \ --with-pidfile-dir=/run \ @@ -50,4 +50,6 @@ package() { install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + + sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service" } diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 1b444d1e6..9508d8e15 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=icecat-adblock-plus -pkgver=2.2.3 -_addons_file=192004 -pkgrel=2.1 +pkgver=2.2.4 +_addons_file=206960 +pkgrel=2 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -16,7 +16,7 @@ provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') +md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1-2 -d.` @@ -25,7 +25,7 @@ package() { cd $srcdir [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} [ -n ${emid} ] || return 1 install -d $dstdir # sed -i 's#.*#20.*#' install.rdf diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 61840c4df..1a0e3ddd0 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=icecat-noscript pkgver=2.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -23,7 +23,7 @@ package() { cd $srcdir local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} install -d $dstdir # sed -i 's#.*#7.*#' install.rdf cp -R * $dstdir diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 58f72b6da..019d1edd2 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-adblock-plus pkgname=iceweasel-adblock-plus -pkgver=2.2.3 -_addons_file=192004 -pkgrel=2.1 +pkgver=2.2.4 +_addons_file=206960 +pkgrel=2 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -16,7 +16,7 @@ provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') +md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1-2 -d.` @@ -25,7 +25,7 @@ package() { cd $srcdir [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid} [ -n ${emid} ] || return 1 install -d $dstdir # sed -i 's#.*#20.*#' install.rdf diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 999131a86..7db206be9 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer (Parabola): André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript pkgver=2.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin for iceweasel which disables script" arch=('any') url="http://noscript.net/" @@ -23,7 +23,7 @@ package() { cd $srcdir local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid} install -d $dstdir # sed -i 's#.*#7.*#' install.rdf cp -R * $dstdir diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 256211d8c..7ed1b1a01 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184590 2013-05-07 13:30:09Z andrea $ +# $Id: PKGBUILD 185074 2013-05-10 20:52:59Z tomegun $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva @@ -23,7 +23,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') pkgver=4.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 58662b78b..6e2796cff 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.77 +_kernver=3.0.78 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 61bbef162..efd3cd3c8 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184766 2013-05-08 09:12:14Z tpowa $ +# $Id: PKGBUILD 185334 2013-05-13 12:44:58Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=77 +_sublevel=78 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.78 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '8b2ca0f6a92462ba9e544f02fc450c03' + 'd4c068f9b6fb431f606220ec8e707fa1' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '5b330cc23071e1250b7e0a1613a25952') + '85cd68841ef098249949638c1e8dd443') 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-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 0030c7ce2..b4c66216e 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.77-1-LIBRE-LTS +KERNEL_VERSION=3.0.78-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 5ad383873..ffd2362be 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183981 2013-04-30 09:11:10Z bpiotrowski $ +# $Id: PKGBUILD 185551 2013-05-14 23:48:31Z foutrelis $ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35920 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' @@ -16,15 +16,24 @@ makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'lib license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) +source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch) md5sums=('5f96e829d711e7d1ea65e324710dca50' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc') + '7b5be7191aafbea64218dc4916343bbc' + '7cb6019018a95dcc3d1231e1aaa8bbdb') -build() { +prepare() { cd "$srcdir/$_pkgbase" + patch -Np0 -i ../cdio-includes.patch + # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 + patch -Np1 -i ../subreader-fix-srt-parsing.patch +} + +build() { + cd "$srcdir/$_pkgbase" + ./configure --prefix=/usr \ --enable-runtime-cpudetection \ --disable-gui \ diff --git a/libre/mplayer-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre/subreader-fix-srt-parsing.patch new file mode 100644 index 000000000..84f2de4d9 --- /dev/null +++ b/libre/mplayer-libre/subreader-fix-srt-parsing.patch @@ -0,0 +1,60 @@ +From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 +From: wm4 +Date: Tue, 30 Apr 2013 00:09:31 +0200 +Subject: [PATCH] subreader: fix out of bound write access when parsing .srt + +This broke .srt subtitles on gcc-4.8. The breakage was relatively +subtle: it set all hour components to 0, while everything else was +parsed successfully. + +But the problem is really that sscanf wrote 1 byte past the sep +variable (or more, for invalid/specially prepared input). The %[..] +format specifier is unbounded. Fix that by letting sscanf drop the +parsed contents with "*", and also make it skip only one input +character by adding "1" (=> "%*1[..."). + +The out of bound write could easily lead to security issues. + +Also, this change makes .srt subtitle parsing slightly more strict. +Strictly speaking this is an unrelated change, but do it anyway. It's +more correct. +--- + sub/subreader.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + + (foutrelis: adjusted variable names in first hunk to apply to mplayer) + +diff --git a/sub/subreader.c b/sub/subreader.c +index 23da4c7..0f1b6c9 100644 +--- a/sub/subreader.c ++++ b/sub/subreader.c +@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, + int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; + + while (!current->text[0]) { +- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; ++ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; + int i; + + /* Parse SubRip header */ + if (!stream_read_line(st, line, LINE_LEN, utf16)) + return NULL; +- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", +- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) ++ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", ++ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) + continue; + + current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; +@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, + return sub_ass_read_line_subviewer(st, current, args); + while (!current->text[0]) { + if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; +- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) ++ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; +-- +1.8.1.6 + diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 3b0ef9080..93958ca69 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 90856 2013-05-14 23:55:05Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria @@ -8,8 +8,8 @@ pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=5 -pkgdesc="A movie player, compiled with vaapi (without unfree faac support)" +pkgrel=7 +pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') url="http://gitorious.org/vaapi/mplayer" license=('GPL') @@ -26,19 +26,29 @@ replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz cdio-includes.patch - tweak-desktop-file.patch) + tweak-desktop-file.patch + subreader-fix-srt-parsing.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' - '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') + '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' + '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092') -build() { + +prepare() { cd "$srcdir/mplayer-vaapi-$pkgver" patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" + # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 + patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch" +} + +build() { + cd "$srcdir/mplayer-vaapi-$pkgver" + ./configure \ --prefix=/usr \ --enable-runtime-cpudetection \ diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch new file mode 100644 index 000000000..84f2de4d9 --- /dev/null +++ b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch @@ -0,0 +1,60 @@ +From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 +From: wm4 +Date: Tue, 30 Apr 2013 00:09:31 +0200 +Subject: [PATCH] subreader: fix out of bound write access when parsing .srt + +This broke .srt subtitles on gcc-4.8. The breakage was relatively +subtle: it set all hour components to 0, while everything else was +parsed successfully. + +But the problem is really that sscanf wrote 1 byte past the sep +variable (or more, for invalid/specially prepared input). The %[..] +format specifier is unbounded. Fix that by letting sscanf drop the +parsed contents with "*", and also make it skip only one input +character by adding "1" (=> "%*1[..."). + +The out of bound write could easily lead to security issues. + +Also, this change makes .srt subtitle parsing slightly more strict. +Strictly speaking this is an unrelated change, but do it anyway. It's +more correct. +--- + sub/subreader.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + + (foutrelis: adjusted variable names in first hunk to apply to mplayer) + +diff --git a/sub/subreader.c b/sub/subreader.c +index 23da4c7..0f1b6c9 100644 +--- a/sub/subreader.c ++++ b/sub/subreader.c +@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, + int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; + + while (!current->text[0]) { +- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; ++ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; + int i; + + /* Parse SubRip header */ + if (!stream_read_line(st, line, LINE_LEN, utf16)) + return NULL; +- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", +- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) ++ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", ++ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) + continue; + + current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; +@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, + return sub_ass_read_line_subviewer(st, current, args); + while (!current->text[0]) { + if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; +- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) ++ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; +-- +1.8.1.6 + diff --git a/pcr/hexter/PKGBUILD b/pcr/hexter/PKGBUILD new file mode 100644 index 000000000..e0ccbb848 --- /dev/null +++ b/pcr/hexter/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Guest One +# file 'hexter' taken from https://aur.archlinux.org/packages/hexter/ +pkgname=hexter +pkgver=1.0.2 +pkgrel=1 +pkgdesc="A DSSI software synthesizer that models the sound generation of a Yamaha DX7" +arch=('i686') +url="http://dssi.sourceforge.net/hexter.html" +license=('GPL') +depends=('alsa-lib' 'liblo' 'gtk2' 'dssi') +makedepends=('ladspa') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/dssi/hexter/${pkgver}/${pkgname}-${pkgver}.tar.gz hexter) +md5sums=('a61765a649fcab05811c226fb5c9415b' 'ce72d4f996c17ffd72eb02af76c4dd9b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install || return 1 + install -D -m755 ${srcdir}/hexter ${pkgdir}/usr/bin/hexter +} diff --git a/pcr/hexter/hexter b/pcr/hexter/hexter new file mode 100644 index 000000000..8338bfdc5 --- /dev/null +++ b/pcr/hexter/hexter @@ -0,0 +1,4 @@ +#!/bin/bash + +export DSSI_PATH=/usr/lib/dssi +exec jack-dssi-host hexter.so diff --git a/pcr/lv2-c++-tools/PKGBUILD b/pcr/lv2-c++-tools/PKGBUILD new file mode 100644 index 000000000..de2e69578 --- /dev/null +++ b/pcr/lv2-c++-tools/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer : Guest One +# patch taken from https://aur.archlinux.org/packages/lv2-c%2B%2B-tools/ +pkgname=lv2-c++-tools +pkgver=1.0.4 +pkgrel=1 +pkgdesc="Tools and libraries that may come in handy when writing LV2 plugins." +arch=('i686') +url="http://ll-plugins.nongnu.org/hacking.html" +license=('GPL3') +depends=('gtkmm') +makedepends=('boost') +source=("http://download.savannah.nongnu.org/releases-noredirect/ll-plugins/$pkgname-$pkgver.tar.bz2" + "$pkgname-boost-1.50.patch") +md5sums=('2468f8750bae1d57300853479846e5ed' + '1dd1152e9ab8be15248b54546716c8c9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # boots 1.50 patch + patch -p1 -i ../${source[1]} + + # do not call ldconfig + sed -i '/ldconfig/d' Makefile.template + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} \ No newline at end of file diff --git a/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch b/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch new file mode 100644 index 000000000..85d3e32da --- /dev/null +++ b/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch @@ -0,0 +1,42 @@ +diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp +--- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp 2012-09-27 16:41:39.925303056 +0200 +@@ -28,7 +28,7 @@ + #include + #include + +-#include ++#include + + #include "turtleparser.hpp" + +diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp +--- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp 2012-09-27 16:41:39.925303056 +0200 +@@ -23,10 +23,10 @@ + #ifndef TURTLEPARSER_HPP + #define TURTLEPARSER_HPP + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include + #include +diff -aur lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp +--- lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp 2012-09-27 16:42:00.818959807 +0200 +@@ -29,7 +29,7 @@ + + + using namespace std; +-using namespace boost::spirit; ++using namespace boost::spirit::classic; + + + template -- cgit v1.2.3-54-g00ecf From b4ca83da72ffb5800852339f6efe5a59c16e9f94 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 27 May 2013 00:29:16 -0700 Subject: Mon May 27 00:29:16 PDT 2013 --- community/aria2/PKGBUILD | 6 +- community/collectd/PKGBUILD | 4 +- community/ekg2/PKGBUILD | 4 +- community/filezilla/PKGBUILD | 6 +- community/freeradius/PKGBUILD | 4 +- community/gedit-plugins/PKGBUILD | 6 +- community/go/PKGBUILD | 10 +- community/inn/PKGBUILD | 4 +- community/kvirc/PKGBUILD | 4 +- community/linux-tools/PKGBUILD | 4 +- community/pcsc-perl/PKGBUILD | 4 +- community/perl-berkeleydb/PKGBUILD | 4 +- community/perl-class-methodmaker/PKGBUILD | 8 +- community/perl-clone/PKGBUILD | 2 +- community/perl-crypt-blowfish/PKGBUILD | 19 +- community/perl-crypt-blowfish/perl-5.18.patch | 13 ++ community/perl-crypt-des/PKGBUILD | 22 +- community/perl-crypt-des/perl-5.18.patch | 13 ++ community/perl-curses/PKGBUILD | 8 +- community/perl-data-structure-util/PKGBUILD | 8 +- community/perl-datetime/PKGBUILD | 4 +- community/perl-dbd-odbc/PKGBUILD | 4 +- community/perl-dbd-pg/PKGBUILD | 4 +- community/perl-dbd-sqlite2/PKGBUILD | 4 +- community/perl-dbd-sybase/PKGBUILD | 4 +- community/perl-device-serialport/PKGBUILD | 8 +- community/perl-file-rsyncp/PKGBUILD | 8 +- community/perl-fuse/PKGBUILD | 4 +- community/perl-gd/PKGBUILD | 4 +- community/perl-gnome2-wnck/PKGBUILD | 4 +- community/perl-gssapi/PKGBUILD | 4 +- community/perl-gstreamer-interfaces/PKGBUILD | 4 +- community/perl-gstreamer/PKGBUILD | 4 +- community/perl-gtk2-sexy/PKGBUILD | 4 +- community/perl-gtk2-trayicon/PKGBUILD | 4 +- community/perl-gtk2-webkit/PKGBUILD | 4 +- community/perl-html-strip/PKGBUILD | 4 +- community/perl-inline-java/PKGBUILD | 4 +- community/perl-io-dirent/PKGBUILD | 8 +- community/perl-io-tty/PKGBUILD | 4 +- community/perl-json-xs/PKGBUILD | 4 +- community/perl-lchown/PKGBUILD | 9 +- community/perl-linux-pid/PKGBUILD | 8 +- community/perl-mail-box-parser-c/PKGBUILD | 4 +- community/perl-mail-transport-dbx/PKGBUILD | 4 +- community/perl-net-dbus/PKGBUILD | 4 +- community/perl-net-libidn/PKGBUILD | 4 +- community/perl-package-stash-xs/PKGBUILD | 15 +- community/perl-params-classify/PKGBUILD | 8 +- community/perl-params-util/PKGBUILD | 27 ++- community/perl-params-validate/PKGBUILD | 4 +- community/perl-string-crc32/PKGBUILD | 4 +- community/perl-term-readline-gnu/PKGBUILD | 12 +- community/perl-text-charwidth/PKGBUILD | 4 +- community/perl-text-kakasi/PKGBUILD | 4 +- community/perl-tie-hash-indexed/PKGBUILD | 4 +- community/perl-tk-tablematrix/PKGBUILD | 4 +- community/perl-www-curl/PKGBUILD | 4 +- community/perl-xml-fast/PKGBUILD | 4 +- community/perl-xml-libxml/PKGBUILD | 6 +- community/perl-xml-libxslt/PKGBUILD | 4 +- community/perl-xmms/PKGBUILD | 4 +- community/pork/PKGBUILD | 4 +- community/python-pymongo/PKGBUILD | 6 +- community/quassel/PKGBUILD | 86 +++++--- community/quassel/quassel-client.install | 9 + community/quassel/quassel.install | 7 +- community/quassel/rc.quassel | 41 ---- .../rxvt-unicode/01-fix-tabber-perl-ext.patch | 12 ++ community/rxvt-unicode/PKGBUILD | 12 +- community/znc/PKGBUILD | 4 +- core/openldap/PKGBUILD | 10 +- core/openldap/slapd.service | 2 +- core/perl/CVE-2012-6329.patch | 79 ------- core/perl/PKGBUILD | 25 +-- core/perl/cgi-cr-escaping.diff | 75 ------- extra/alsa-utils/PKGBUILD | 11 +- extra/cairo-perl/PKGBUILD | 4 +- extra/frozen-bubble/PKGBUILD | 4 +- extra/gconf-perl/PKGBUILD | 4 +- extra/git/PKGBUILD | 8 +- extra/glade-perl/PKGBUILD | 4 +- ...-Make-Glib-Object-subclassing-more-robust.patch | 230 +++++++++++++++++++++ extra/glib-perl/PKGBUILD | 17 +- extra/gnome-perl/PKGBUILD | 4 +- extra/gnome-vfs-perl/PKGBUILD | 4 +- extra/gnomecanvas-perl/PKGBUILD | 4 +- extra/gnumeric/PKGBUILD | 5 +- extra/gparted/PKGBUILD | 9 +- extra/gparted/gparted_polkit | 6 +- extra/graphicsmagick/PKGBUILD | 4 +- extra/graphviz/PKGBUILD | 7 +- extra/gtk2-perl/PKGBUILD | 4 +- extra/imagemagick/PKGBUILD | 6 +- extra/irssi/PKGBUILD | 4 +- extra/kdebindings-perlkde/PKGBUILD | 10 +- extra/kdebindings-perlqt/PKGBUILD | 7 +- extra/libjpeg-turbo/PKGBUILD | 25 +-- extra/libproxy/PKGBUILD | 4 +- extra/libwps/PKGBUILD | 6 +- extra/mod_perl/PKGBUILD | 14 +- extra/net-snmp/PKGBUILD | 8 +- extra/net-snmp/snmptrapd.service | 12 ++ extra/pango-perl/PKGBUILD | 6 +- extra/perl-async-interrupt/PKGBUILD | 11 +- extra/perl-bit-vector/Bit-Vector-destroy.patch | 27 +++ extra/perl-bit-vector/PKGBUILD | 20 +- extra/perl-compress-bzip2/PKGBUILD | 10 +- extra/perl-crypt-openssl-bignum/PKGBUILD | 2 +- extra/perl-crypt-openssl-random/PKGBUILD | 2 +- extra/perl-crypt-openssl-rsa/PKGBUILD | 2 +- extra/perl-crypt-ssleay/PKGBUILD | 4 +- extra/perl-dbd-mysql/PKGBUILD | 7 +- extra/perl-dbd-sqlite/PKGBUILD | 6 +- extra/perl-dbi/PKGBUILD | 9 +- extra/perl-digest-nilsimsa/PKGBUILD | 9 +- extra/perl-digest-sha1/PKGBUILD | 9 +- extra/perl-ev/PKGBUILD | 4 +- extra/perl-fcgi/PKGBUILD | 4 +- extra/perl-guard/PKGBUILD | 22 +- extra/perl-html-parser/PKGBUILD | 6 +- extra/perl-libintl-perl/PKGBUILD | 7 +- extra/perl-list-moreutils/PKGBUILD | 13 +- extra/perl-locale-gettext/PKGBUILD | 4 +- extra/perl-net-dns/PKGBUILD | 4 +- extra/perl-net-ssleay/PKGBUILD | 4 +- extra/perl-netaddr-ip/PKGBUILD | 4 +- extra/perl-sdl/PKGBUILD | 4 +- extra/perl-socket6/PKGBUILD | 11 +- extra/perl-template-toolkit/PKGBUILD | 16 +- extra/perl-term-readkey/PKGBUILD | 9 +- extra/perl-text-iconv/PKGBUILD | 6 +- ...-Fix-compilation-under-threaded-bleadperl.patch | 32 +++ ...7.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch | 47 +++++ extra/perl-tk/PKGBUILD | 25 ++- extra/perl-xml-parser/PKGBUILD | 4 +- extra/perl-yaml-syck/PKGBUILD | 4 +- extra/pidgin/PKGBUILD | 4 +- extra/postgresql-old-upgrade/PKGBUILD | 4 +- extra/postgresql/PKGBUILD | 4 +- extra/razor/PKGBUILD | 4 +- extra/rrdtool/PKGBUILD | 4 +- extra/smb4k/PKGBUILD | 6 +- extra/subversion/PKGBUILD | 8 +- extra/vim/PKGBUILD | 2 +- extra/weechat/PKGBUILD | 6 +- extra/xfconf/PKGBUILD | 8 +- kernels/linux-libre-pae/PKGBUILD | 8 +- kernels/linux-libre-pae/config | 5 +- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 8 +- kernels/linux-libre-xen/config | 5 +- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/bbswitch-libre/PKGBUILD | 2 +- libre/cdfs-libre/PKGBUILD | 4 +- libre/hexchat-libre/PKGBUILD | 8 +- libre/libquicktime-libre/PKGBUILD | 16 +- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 10 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre-tools/PKGBUILD | 4 +- libre/linux-libre/PKGBUILD | 14 +- libre/linux-libre/config.i686 | 5 +- libre/linux-libre/config.x86_64 | 7 +- libre/linux-libre/linux-libre.install | 2 +- libre/lirc-libre/PKGBUILD | 10 +- libre/lirc-libre/lirc.service | 2 +- libre/lirc-libre/lircm.service | 2 +- libre/mplayer-libre/PKGBUILD | 30 ++- .../mplayer-libre/subreader-fix-srt-parsing.patch | 60 ------ libre/mplayer-vaapi-libre/PKGBUILD | 8 +- .../subreader-fix-srt-parsing.patch | 58 ++---- libre/tp_smapi-libre/PKGBUILD | 4 +- libre/vhba-module-libre/PKGBUILD | 4 +- libre/virtualbox-libre-modules/PKGBUILD | 4 +- .../virtualbox-libre-guest-modules.install | 2 +- .../virtualbox-libre-host-modules.install | 2 +- libre/xchat-libre/PKGBUILD | 16 +- pcr/amsynth/PKGBUILD | 26 +-- pcr/amsynth/amsynth.install | 11 + pcr/lua51-sql-mysql/PKGBUILD | 31 +++ pcr/openhpi/PKGBUILD | 83 ++++++++ pcr/prboom/PKGBUILD | 34 +++ pcr/prboom/libpng-1.4.patch | 21 ++ pcr/python2-sfml2/PKGBUILD | 8 +- pcr/ryzom-hg/PKGBUILD | 84 +++----- 187 files changed, 1312 insertions(+), 891 deletions(-) create mode 100644 community/perl-crypt-blowfish/perl-5.18.patch create mode 100644 community/perl-crypt-des/perl-5.18.patch create mode 100644 community/quassel/quassel-client.install delete mode 100644 community/quassel/rc.quassel create mode 100644 community/rxvt-unicode/01-fix-tabber-perl-ext.patch delete mode 100644 core/perl/CVE-2012-6329.patch delete mode 100644 core/perl/cgi-cr-escaping.diff create mode 100644 extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch create mode 100644 extra/net-snmp/snmptrapd.service create mode 100644 extra/perl-bit-vector/Bit-Vector-destroy.patch create mode 100644 extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch create mode 100644 extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch delete mode 100644 libre/mplayer-libre/subreader-fix-srt-parsing.patch create mode 100644 pcr/amsynth/amsynth.install create mode 100644 pcr/lua51-sql-mysql/PKGBUILD create mode 100644 pcr/openhpi/PKGBUILD create mode 100644 pcr/prboom/PKGBUILD create mode 100644 pcr/prboom/libpng-1.4.patch (limited to 'community/inn/PKGBUILD') diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 4de1674c0..658d13067 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88658 2013-04-21 10:47:57Z bpiotrowski $ +# $Id: PKGBUILD 91644 2013-05-26 08:19:25Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths pkgname=aria2 -pkgver=1.17.0 +pkgver=1.17.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz) -sha256sums=('e3b533a33d33ad2392acc37d4510e5cd660af8ac23943c6402a0172f4a347c9c') +sha256sums=('7e18cf15afa17cf725c2ab4338751bc165e33d41917a4af9927da0855298efc0') build() { cd $pkgname-$pkgver diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 59f594221..691b918e4 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91248 2013-05-20 14:50:52Z bisson $ +# $Id: PKGBUILD 91648 2013-05-26 09:24:29Z bluewind $ # Maintainer: Gaetan Bisson # Contributor: Gerhard Brauer pkgname=collectd pkgver=5.3.0 -pkgrel=2 +pkgrel=3 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64') diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index 6fa98320d..7aa172028 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72899 2012-06-24 16:20:06Z bpiotrowski $ +# $Id: PKGBUILD 91649 2013-05-26 09:24:30Z bluewind $ # Maintainer: Bartłomiej Piotrowski # Contributor: Mateusz Herych pkgname=ekg2 pkgver=0.3.1 -pkgrel=5 +pkgrel=6 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" arch=('i686' 'x86_64') url="http://ekg2.org/" diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index f933e383e..7d419f030 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90268 2013-05-10 20:25:25Z bluewind $ +# $Id: PKGBUILD 91731 2013-05-26 17:21:25Z bluewind $ # Contributor: Alexander Fehr # Maintainer: Daniel J Griffiths pkgname=filezilla -pkgver=3.7.0.1 +pkgver=3.7.0.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=('cb07cf02ee4cc767e10e8a022ad0ce0d') +md5sums=('04a6a6aea31a01feda78e509246ae10a') diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index da96df47e..1dc5afa57 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90665 2013-05-13 14:24:07Z spupykin $ +# $Id: PKGBUILD 91650 2013-05-26 09:24:31Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=6 +pkgrel=7 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 161682e5a..68a714768 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88687 2013-04-21 22:17:03Z heftig $ +# $Id: PKGBUILD 91737 2013-05-26 21:49:55Z heftig $ # Maintainer: Ionut Biru # Contributor: Alexander Rødseth # Contributor: Hugo Doria @@ -6,7 +6,7 @@ # Contributor: zhuqin pkgname=gedit-plugins -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Plugins for gedit" arch=(x86_64 i686) @@ -19,7 +19,7 @@ optdepends=('gucharmap: for charmap plugin' options=('!libtool' '!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141') +sha256sums=('ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502') build() { cd $pkgname-$pkgver diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 7578cb815..83d3d3ca6 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90814 2013-05-14 09:02:17Z arodseth $ +# $Id: PKGBUILD 91709 2013-05-26 13:26:56Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -8,11 +8,11 @@ # Contributor: Mike Rosset # Contributor: Daniel YC Lin -# TODO: Create split packages for the crosscompilation versions as well +# TODO: Create split packages for the crosscompilation versions as well? pkgname=go pkgver=1.1 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -23,6 +23,7 @@ makedepends=('inetutils') options=('!strip') install="$pkgname.install" backup=('usr/lib/go/bin') + if [ "$CARCH" == 'x86_64' ]; then source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" "$pkgname.sh") @@ -93,7 +94,8 @@ package() { install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done - mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site}} + mkdir -p \ + $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site/src}} cp -r doc misc -t $pkgdir/usr/share/go ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 00de73769..dd354675d 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90886 2013-05-15 08:03:42Z bpiotrowski $ +# $Id: PKGBUILD 91652 2013-05-26 09:24:36Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Edward Tjörnhammar # Contributor: Edward Tjörnhammar pkgname=inn pkgver=2.5.3 -pkgrel=5 +pkgrel=6 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64') diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index b775d55d1..7ff5ad13d 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85367 2013-03-01 10:34:38Z andrea $ +# $Id: PKGBUILD 91653 2013-05-26 09:24:37Z bluewind $ # Maintainer: Sergej Pupykin pkgname=kvirc pkgver=4.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" depends=('python2' 'libxss' 'qtwebkit') diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index 33f0ac807..a00653f90 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90493 2013-05-12 22:57:07Z seblu $ +# $Id: PKGBUILD 91654 2013-05-26 09:24:39Z bluewind $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools @@ -9,7 +9,7 @@ pkgname=('linux-tools-meta' 'x86_energy_perf_policy' 'usbip') pkgver=3.9 -pkgrel=2 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD index acacbf515..c7c9dbca1 100644 --- a/community/pcsc-perl/PKGBUILD +++ b/community/pcsc-perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87531 2013-04-02 15:53:32Z giovanni $ +# $Id: PKGBUILD 91655 2013-05-26 09:24:45Z bluewind $ # Maintainer: Giovanni Scafora # Contributor: neuromante # Contributor: marc0s pkgname=pcsc-perl pkgver=1.4.13 -pkgrel=1 +pkgrel=2 pkgdesc="A Perl Module for PC/SC SmartCard access" arch=('i686' 'x86_64') url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/" diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index c584b82da..5dd7abcec 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73833 2012-07-16 05:37:51Z spupykin $ +# $Id: PKGBUILD 91656 2013-05-26 09:24:46Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch # Contributor: Francois Charette pkgname=perl-berkeleydb pkgver=0.51 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/BerkeleyDB/" diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD index d80482f8e..1304b3d3d 100644 --- a/community/perl-class-methodmaker/PKGBUILD +++ b/community/perl-class-methodmaker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71753 2012-06-02 10:29:34Z bluewind $ +# $Id: PKGBUILD 91657 2013-05-26 09:24:47Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: François Charette pkgname=perl-class-methodmaker pkgver=2.18 -pkgrel=6 +pkgrel=7 pkgdesc="Create generic class methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Class-MethodMaker" @@ -18,6 +18,10 @@ build() { cd $srcdir/Class-MethodMaker-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Class-MethodMaker-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index f7d58cbe6..1ce7f161f 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-clone pkgver=0.34 -pkgrel=1 +pkgrel=2 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64') url='http://search.cpan.org/~RDF/Clone' diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD index 780a82008..726c0ee4f 100644 --- a/community/perl-crypt-blowfish/PKGBUILD +++ b/community/perl-crypt-blowfish/PKGBUILD @@ -1,21 +1,32 @@ -# $Id: PKGBUILD 71757 2012-06-02 10:29:42Z bluewind $ +# $Id: PKGBUILD 91659 2013-05-26 09:24:50Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-crypt-blowfish pkgver=2.12 -pkgrel=5 +pkgrel=6 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") -md5sums=('a0eca17addc8bdaf38c044c365a8800c') +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 +} build() { cd $srcdir/Crypt-Blowfish-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Crypt-Blowfish-$pkgver make pure_install doc_install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-crypt-blowfish/perl-5.18.patch b/community/perl-crypt-blowfish/perl-5.18.patch new file mode 100644 index 000000000..291733cb9 --- /dev/null +++ b/community/perl-crypt-blowfish/perl-5.18.patch @@ -0,0 +1,13 @@ +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-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD index e40092acd..fbf870154 100644 --- a/community/perl-crypt-des/PKGBUILD +++ b/community/perl-crypt-des/PKGBUILD @@ -1,20 +1,32 @@ -# $Id: PKGBUILD 71759 2012-06-02 10:29:46Z bluewind $ +# $Id: PKGBUILD 91660 2013-05-26 09:24:51Z bluewind $ # Maintainer: Sergej Pupykin #Contributor: Pete Morris pkgname=perl-crypt-des pkgver=2.05 -pkgrel=5 +pkgrel=6 pkgdesc="Perl DES encryption module" arch=('i686' 'x86_64') url="http://search.cpan.org/~dparis/Crypt-DES" license=("GPL" "PerlArtistic") depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb') +source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz" + "perl-5.18.patch") +md5sums=('a8a0bea7064e11d2af434f3e468c17bb' + '836d1a954281257efe00503d98b42dc8') + +prepare() { + cd $srcdir/Crypt-DES-$pkgver + patch -p1 <$srcdir/perl-5.18.patch +} + build() { - cd Crypt-DES-$pkgver + cd $srcdir/Crypt-DES-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Crypt-DES-$pkgver make pure_install doc_install DESTDIR=${pkgdir} find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-crypt-des/perl-5.18.patch b/community/perl-crypt-des/perl-5.18.patch new file mode 100644 index 000000000..16e5aac85 --- /dev/null +++ b/community/perl-crypt-des/perl-5.18.patch @@ -0,0 +1,13 @@ +diff -wbBur Crypt-DES-2.05.org/DES.xs Crypt-DES-2.05/DES.xs +--- Crypt-DES-2.05.org/DES.xs 2005-12-08 18:52:50.000000000 +0300 ++++ Crypt-DES-2.05/DES.xs 2013-05-20 15:35:58.668612530 +0400 +@@ -64,8 +64,7 @@ + output = sv_newmortal(); + output_len = 8; + +- if (!SvUPGRADE(output, SVt_PV)) +- croak("cannot use output argument as lvalue"); ++ SvUPGRADE(output, SVt_PV); + + perl_des_crypt(input, SvGROW(output, output_len), (i32 *)ks, enc_flag); + diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD index 3f11fa792..458498978 100644 --- a/community/perl-curses/PKGBUILD +++ b/community/perl-curses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71761 2012-06-02 10:29:50Z bluewind $ +# $Id: PKGBUILD 91661 2013-05-26 09:24:52Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch # Contributor: Francois Charette pkgname=perl-curses pkgver=1.28 -pkgrel=5 +pkgrel=6 pkgdesc="Character screen handling and windowing" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Curses" @@ -19,6 +19,10 @@ build() { cd $srcdir/Curses-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Curses-$pkgver make pure_install doc_install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD index 636e1a877..00d73ae7e 100644 --- a/community/perl-data-structure-util/PKGBUILD +++ b/community/perl-data-structure-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71763 2012-06-02 10:29:54Z bluewind $ +# $Id: PKGBUILD 91662 2013-05-26 09:24:54Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-data-structure-util pkgver=0.15 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module Data::Structure::Util" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Data-Structure-Util" @@ -16,6 +16,10 @@ build() { cd $srcdir/Data-Structure-Util-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Data-Structure-Util-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index c4ccab0a8..bd674b53f 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90635 2013-05-13 12:43:00Z spupykin $ +# $Id: PKGBUILD 91663 2013-05-26 09:24:55Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: François Charette pkgname=perl-datetime pkgver=1.03 -pkgrel=1 +pkgrel=2 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime" diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index 68507ffc9..51f94c7f8 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88252 2013-04-15 10:48:00Z spupykin $ +# $Id: PKGBUILD 91664 2013-05-26 09:24:58Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: François Charette pkgname=perl-dbd-odbc pkgver=1.43 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-ODBC/" diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD index a7c72882a..64bb7d24f 100644 --- a/community/perl-dbd-pg/PKGBUILD +++ b/community/perl-dbd-pg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82880 2013-01-25 09:55:54Z spupykin $ +# $Id: PKGBUILD 91665 2013-05-26 09:25:00Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: François Charette pkgname=perl-dbd-pg pkgver=2.19.3 -pkgrel=1 +pkgrel=2 pkgdesc="Postgres Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-Pg" diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD index c0f2a9056..2f8a19579 100644 --- a/community/perl-dbd-sqlite2/PKGBUILD +++ b/community/perl-dbd-sqlite2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88254 2013-04-15 10:48:22Z spupykin $ +# $Id: PKGBUILD 91666 2013-05-26 09:25:02Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-dbd-sqlite2 pkgver=0.36 -pkgrel=1 +pkgrel=2 pkgdesc="Perl/CPAN Module DBD::SQLite2" arch=("i686" "x86_64") url="http://search.cpan.org/dist/DBD-SQLite2" diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index 095d8718a..e0962a6e3 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88257 2013-04-15 10:48:59Z spupykin $ +# $Id: PKGBUILD 91667 2013-05-26 09:25:03Z bluewind $ # Maintainer: Sergej Pupykin pkgname=perl-dbd-sybase pkgver=1.15 -pkgrel=1 +pkgrel=2 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-Sybase/" diff --git a/community/perl-device-serialport/PKGBUILD b/community/perl-device-serialport/PKGBUILD index 7f0ba54d6..3305d0af1 100644 --- a/community/perl-device-serialport/PKGBUILD +++ b/community/perl-device-serialport/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71775 2012-06-02 10:30:18Z bluewind $ +# $Id: PKGBUILD 91668 2013-05-26 09:25:04Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Ross melin pkgname=perl-device-serialport pkgver=1.04 -pkgrel=4 +pkgrel=5 pkgdesc="POSIX clone of Win32::SerialPort" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Device-SerialPort" @@ -19,6 +19,10 @@ build() { eval `perl -V:archname` PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Device-SerialPort-$pkgver make DESTDIR=$pkgdir install find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-file-rsyncp/PKGBUILD b/community/perl-file-rsyncp/PKGBUILD index 29af9c1a1..a6f54cef5 100644 --- a/community/perl-file-rsyncp/PKGBUILD +++ b/community/perl-file-rsyncp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71777 2012-06-02 10:30:22Z bluewind $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 91669 2013-05-26 09:25:06Z bluewind $ +# Maintainer: Sébastien Luttringer pkgname=perl-file-rsyncp pkgver=0.70 -pkgrel=2 +pkgrel=3 pkgdesc='Perl interface to rsync file list encoding and decoding' arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir/" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index ae5b9ccfc..73a26df30 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71779 2012-06-02 10:30:26Z bluewind $ +# $Id: PKGBUILD 91670 2013-05-26 09:25:07Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Tom K pkgname=perl-fuse pkgver=0.14 -pkgrel=2 +pkgrel=3 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Fuse" diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD index 424de1316..636a8d4d8 100644 --- a/community/perl-gd/PKGBUILD +++ b/community/perl-gd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86698 2013-03-21 10:52:41Z spupykin $ +# $Id: PKGBUILD 91671 2013-05-26 09:25:08Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=perl-gd pkgver=2.49 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to Gd Graphics Library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GD" diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD index 368617485..064c8167e 100644 --- a/community/perl-gnome2-wnck/PKGBUILD +++ b/community/perl-gnome2-wnck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87815 2013-04-07 02:33:26Z bgyorgy $ +# $Id: PKGBUILD 91672 2013-05-26 09:25:09Z bluewind $ # Maintainer Sergej Pupykin # Contributor: Alessio 'mOLOk' Bolognino pkgname=perl-gnome2-wnck pkgver=0.16 -pkgrel=7 +pkgrel=8 pkgdesc="Perl interface to the Window Navigator Construction Kit" arch=('i686' 'x86_64') license=("GPL" "PerlArtistic") diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD index 51bed482b..c6a965a3e 100644 --- a/community/perl-gssapi/PKGBUILD +++ b/community/perl-gssapi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71785 2012-06-02 10:30:38Z bluewind $ +# $Id: PKGBUILD 91673 2013-05-26 09:25:11Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-gssapi pkgver=0.28 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module GSSAPI" arch=("i686" "x86_64") url="http://search.cpan.org/dist/GSSAPI" diff --git a/community/perl-gstreamer-interfaces/PKGBUILD b/community/perl-gstreamer-interfaces/PKGBUILD index 50bb736b6..41e300029 100644 --- a/community/perl-gstreamer-interfaces/PKGBUILD +++ b/community/perl-gstreamer-interfaces/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71789 2012-06-02 10:30:46Z bluewind $ +# $Id: PKGBUILD 91675 2013-05-26 09:25:18Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Corrado Primier pkgname=perl-gstreamer-interfaces pkgver=0.06 -pkgrel=5 +pkgrel=6 pkgdesc="GStreamer::Interfaces" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GStreamer-Interfaces" diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD index f51ca9e6e..99d656129 100644 --- a/community/perl-gstreamer/PKGBUILD +++ b/community/perl-gstreamer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86700 2013-03-21 10:53:05Z spupykin $ +# $Id: PKGBUILD 91674 2013-05-26 09:25:14Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Corrado Primier pkgname=perl-gstreamer pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to the GStreamer library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GStreamer" diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD index 46f089951..7ad769b37 100644 --- a/community/perl-gtk2-sexy/PKGBUILD +++ b/community/perl-gtk2-sexy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71791 2012-06-02 10:30:50Z bluewind $ +# $Id: PKGBUILD 91676 2013-05-26 09:25:19Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Charles Mauch # Creator: Florian Ragwitz pkgname=perl-gtk2-sexy pkgver=0.05 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module Gtk2::Sexy" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-Sexy" diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD index aa6c724f3..4ee678a9e 100644 --- a/community/perl-gtk2-trayicon/PKGBUILD +++ b/community/perl-gtk2-trayicon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71793 2012-06-02 10:30:54Z bluewind $ +# $Id: PKGBUILD 91677 2013-05-26 09:25:21Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Tom K pkgname=perl-gtk2-trayicon pkgver=0.06 -pkgrel=9 +pkgrel=10 pkgdesc="Perl interface to the EggTrayIcon library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-TrayIcon/" diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD index 5df9e74c1..7dcd5f7d3 100644 --- a/community/perl-gtk2-webkit/PKGBUILD +++ b/community/perl-gtk2-webkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71795 2012-06-02 10:30:58Z bluewind $ +# $Id: PKGBUILD 91678 2013-05-26 09:25:22Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Corrado Primier pkgname=perl-gtk2-webkit pkgver=0.09 -pkgrel=3 +pkgrel=4 pkgdesc="Gtk2::WebKit" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-WebKit" diff --git a/community/perl-html-strip/PKGBUILD b/community/perl-html-strip/PKGBUILD index 830bfff44..4cc4e0970 100644 --- a/community/perl-html-strip/PKGBUILD +++ b/community/perl-html-strip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71797 2012-06-02 10:31:02Z bluewind $ +# $Id: PKGBUILD 91679 2013-05-26 09:25:24Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-html-strip pkgver=1.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module HTML::Strip" arch=('i686' 'x86_64') url="http://search.cpan.org/~kilinrax/HTML-Strip/" diff --git a/community/perl-inline-java/PKGBUILD b/community/perl-inline-java/PKGBUILD index 8704e58e9..500b8d3c7 100644 --- a/community/perl-inline-java/PKGBUILD +++ b/community/perl-inline-java/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71799 2012-06-02 10:31:06Z bluewind $ +# $Id: PKGBUILD 91680 2013-05-26 09:25:26Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Wael Nasreddine pkgname=perl-inline-java pkgver=0.53 -pkgrel=4 +pkgrel=5 pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." arch=('i686' 'x86_64') depends=('perl' 'perl-inline' 'java-runtime') diff --git a/community/perl-io-dirent/PKGBUILD b/community/perl-io-dirent/PKGBUILD index 4dbd3d576..9a2de7e7f 100644 --- a/community/perl-io-dirent/PKGBUILD +++ b/community/perl-io-dirent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71801 2012-06-02 10:31:10Z bluewind $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 91681 2013-05-26 09:25:30Z bluewind $ +# Maintainer: Sébastien Luttringer pkgname=perl-io-dirent pkgver=0.05 -pkgrel=2 +pkgrel=3 pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir' arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir/" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD index 540af17de..54100cf32 100644 --- a/community/perl-io-tty/PKGBUILD +++ b/community/perl-io-tty/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71803 2012-06-02 10:31:14Z bluewind $ +# $Id: PKGBUILD 91682 2013-05-26 09:25:34Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Charles Mauch pkgname=perl-io-tty pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc="Provide an interface to TTYs and PTYs" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/IO-Tty/" diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index 4e09f47ce..1adf19bec 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82882 2013-01-25 09:56:15Z spupykin $ +# $Id: PKGBUILD 91683 2013-05-26 09:25:38Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Tor Krill pkgname=perl-json-xs pkgver=2.33 -pkgrel=1 +pkgrel=2 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") diff --git a/community/perl-lchown/PKGBUILD b/community/perl-lchown/PKGBUILD index 319a30bd1..cd1f89437 100644 --- a/community/perl-lchown/PKGBUILD +++ b/community/perl-lchown/PKGBUILD @@ -2,7 +2,7 @@ pkgname=perl-lchown pkgver=1.01 -pkgrel=1 +pkgrel=2 pkgdesc="use the lchown(2) system call from Perl" arch=(i686 x86_64) license=(PerlArtistic GPL) @@ -12,7 +12,6 @@ url=https://metacpan.org/release/Lchown source=("http://search.cpan.org/CPAN/authors/id/N/NC/NCLEATON/Lchown-${pkgver}.tar.gz") md5sums=(e3db31be650437eb5d9bfc4da6252ee3) sha512sums=(f3b7bf7b3b71a7d92449d4ae8249d76b456869e48105db401a49f39f687ee5d97e079485fb2bbaae991a3a27d408959fc132b843c6f69487eeb2958c85f683a8) -_distdir="${srcdir}/Lchown-${pkgver}" build() ( @@ -22,7 +21,7 @@ build() PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" /usr/bin/perl Build.PL ./Build ) @@ -30,12 +29,12 @@ build() check() ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" ./Build test ) package() { - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" ./Build install find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD index d606c11d3..586aaf72e 100644 --- a/community/perl-linux-pid/PKGBUILD +++ b/community/perl-linux-pid/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 86747 2013-03-21 21:01:12Z eric $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 91685 2013-05-26 09:25:43Z bluewind $ +# Maintainer: Angel Velasquez # Contributor: Angel Velasquez # Generator : CPANPLUS::Dist::Arch 1.12 pkgname='perl-linux-pid' pkgver='0.04' -pkgrel='2' +pkgrel='3' pkgdesc="Interface to Linux getpp?id functions" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl') url='http://search.cpan.org/dist/Linux-Pid' -source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz') +source=(http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz) md5sums=('130c4d299f827abf1f2285fddf03fccb') build() { diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD index da609e0f6..79d0b2e16 100644 --- a/community/perl-mail-box-parser-c/PKGBUILD +++ b/community/perl-mail-box-parser-c/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71811 2012-06-02 10:31:30Z bluewind $ +# $Id: PKGBUILD 91686 2013-05-26 09:25:45Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-mail-box-parser-c pkgver=3.006 -pkgrel=8 +pkgrel=9 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" diff --git a/community/perl-mail-transport-dbx/PKGBUILD b/community/perl-mail-transport-dbx/PKGBUILD index fb303ea49..f3ed0f502 100644 --- a/community/perl-mail-transport-dbx/PKGBUILD +++ b/community/perl-mail-transport-dbx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71813 2012-06-02 10:31:34Z bluewind $ +# $Id: PKGBUILD 91687 2013-05-26 09:25:47Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-mail-transport-dbx pkgver=0.07 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Mail-Transport-Dbx" diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD index d8e5e7ae5..6b0163fe9 100644 --- a/community/perl-net-dbus/PKGBUILD +++ b/community/perl-net-dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71815 2012-06-02 10:31:38Z bluewind $ +# $Id: PKGBUILD 91688 2013-05-26 09:25:48Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Francois Charette pkgname=perl-net-dbus pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Binding for DBus messaging protocol" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Net-DBus" diff --git a/community/perl-net-libidn/PKGBUILD b/community/perl-net-libidn/PKGBUILD index 75bf0f379..d3669234d 100644 --- a/community/perl-net-libidn/PKGBUILD +++ b/community/perl-net-libidn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71817 2012-06-02 10:31:42Z bluewind $ +# $Id: PKGBUILD 91689 2013-05-26 09:25:49Z bluewind $ # Maintainer: Sergej Pupykin pkgname=perl-net-libidn pkgver=0.12 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module Net::LibIDN" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Net-LibIDN/" diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD index 009a0633d..5fe8094fc 100644 --- a/community/perl-package-stash-xs/PKGBUILD +++ b/community/perl-package-stash-xs/PKGBUILD @@ -1,17 +1,18 @@ -# Maintainer: Justin Davis -# $Id: PKGBUILD 86634 2013-03-20 19:09:56Z eric $ +# $Id: PKGBUILD 91690 2013-05-26 09:25:52Z bluewind $ +# Maintainer: Jonathan Steel +# Contributor: Justin Davis pkgname=perl-package-stash-xs pkgver=0.26 -pkgrel=1 +pkgrel=2 pkgdesc="Faster and more correct implementation of the Package::Stash API" -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/Package-Stash-XS" +license=('PerlArtistic' 'GPL') depends=('perl') makedepends=('perl-extutils-makemaker') checkdepends=('perl-test-fatal' 'perl-test-simple' 'perl-test-requires') -url="http://search.cpan.org/dist/Package-Stash-XS" +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz") md5sums=('33b07af6344d4a16ecd4e9ae3fa48984') diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD index d0dae4a7d..dd2a74a64 100644 --- a/community/perl-params-classify/PKGBUILD +++ b/community/perl-params-classify/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71821 2012-06-02 10:31:50Z bluewind $ +# $Id: PKGBUILD 91691 2013-05-26 09:25:54Z bluewind $ # Maintainer: Sergej Pupykin pkgname=perl-params-classify pkgver=0.013 -pkgrel=2 +pkgrel=3 pkgdesc="argument type classification" arch=(i686 x86_64) license=('PerlArtistic') @@ -17,6 +17,10 @@ build() { cd $srcdir/Params-Classify-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Params-Classify-$pkgver make install DESTDIR=${pkgdir} find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD index 415ad5810..6b0fc9784 100644 --- a/community/perl-params-util/PKGBUILD +++ b/community/perl-params-util/PKGBUILD @@ -1,23 +1,22 @@ -# Maintainer: Justin Davis (juster) -# $Id: PKGBUILD 72466 2012-06-15 00:05:46Z juster $ +# $Id: PKGBUILD 91692 2013-05-26 09:25:55Z bluewind $ +# Maintainer: Jonathan Steel +# Contributor: Justin Davis (juster) pkgname=perl-params-util pkgver=1.07 -pkgrel=1 +pkgrel=2 pkgdesc='Simple, compact and correct param-checking functions' -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=('perl>=5.5.30') -url=https://metacpan.org/release/Params-Util +arch=('i686' 'x86_64') +url="https://metacpan.org/release/Params-Util" +license=('PerlArtistic' 'GPL') +depends=('perl') +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz") -md5sums=(02db120c0eef87aae1830cc62bdec37b) -sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56) -_dir="$srcdir/Params-Util-$pkgver" +sha256sums=('30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c') build() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT /usr/bin/perl Makefile.PL @@ -26,7 +25,7 @@ build() check() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test @@ -34,7 +33,7 @@ check() package() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" make install INSTALLDIRS=vendor DESTDIR="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete ) diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index b6d54a1d6..935af82e5 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79319 2012-11-02 19:11:19Z spupykin $ +# $Id: PKGBUILD 91693 2013-05-26 09:25:57Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: François Charette pkgname=perl-params-validate pkgver=1.07 -pkgrel=1 +pkgrel=2 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Params-Validate" diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD index 8b4470b72..87d2a6d57 100644 --- a/community/perl-string-crc32/PKGBUILD +++ b/community/perl-string-crc32/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71827 2012-06-02 10:32:02Z bluewind $ +# $Id: PKGBUILD 91694 2013-05-26 09:26:00Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-string-crc32 pkgver=1.4 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" arch=("i686" "x86_64") url="http://search.cpan.org/dist/String-CRC32" diff --git a/community/perl-term-readline-gnu/PKGBUILD b/community/perl-term-readline-gnu/PKGBUILD index cfa9a7fe7..898aee284 100644 --- a/community/perl-term-readline-gnu/PKGBUILD +++ b/community/perl-term-readline-gnu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83559 2013-02-03 00:44:54Z dwallace $ +# $Id: PKGBUILD 91695 2013-05-26 09:26:04Z bluewind $ # CPAN Name : Term-ReadLine-Gnu # Maintainer: Daniel Wallace # Contributor: jason ryan @@ -7,7 +7,7 @@ pkgname=perl-term-readline-gnu pkgver=1.20 -pkgrel=5 +pkgrel=6 pkgdesc="GNU Readline XS library wrapper" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') @@ -18,7 +18,6 @@ source=('http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1 'termcap-bad-ncurses-good.patch') md5sums=('fa33510193b89a2ada74fcef00816322' 'a000706b89792f822b5ec20baa370910') -_distdir="${srcdir}/Term-ReadLine-Gnu-1.20" build() { export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -27,21 +26,20 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" patch --forward -p1 < "${srcdir}/termcap-bad-ncurses-good.patch" /usr/bin/perl Makefile.PL make - } check() { - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test } package() { - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" make pure_install PERL_INSTALL_ROOT="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD index 46ad4d725..a2dafad6e 100644 --- a/community/perl-text-charwidth/PKGBUILD +++ b/community/perl-text-charwidth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71829 2012-06-02 10:32:06Z bluewind $ +# $Id: PKGBUILD 91696 2013-05-26 09:26:06Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-text-charwidth pkgver=0.04 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Text::CharWidth" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Text-CharWidth" diff --git a/community/perl-text-kakasi/PKGBUILD b/community/perl-text-kakasi/PKGBUILD index 81f4b2066..e9b1eeb1e 100644 --- a/community/perl-text-kakasi/PKGBUILD +++ b/community/perl-text-kakasi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71831 2012-06-02 10:32:12Z bluewind $ +# $Id: PKGBUILD 91697 2013-05-26 09:26:08Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Allan McRae # Contributor: François Charette pkgname=perl-text-kakasi pkgver=2.04 -pkgrel=9 +pkgrel=10 pkgdesc="Perl frontend to kakasi" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Text-Kakasi" diff --git a/community/perl-tie-hash-indexed/PKGBUILD b/community/perl-tie-hash-indexed/PKGBUILD index a2326057c..67a21ae28 100644 --- a/community/perl-tie-hash-indexed/PKGBUILD +++ b/community/perl-tie-hash-indexed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71833 2012-06-02 10:32:16Z bluewind $ +# $Id: PKGBUILD 91698 2013-05-26 09:26:10Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Francois Charette pkgname=perl-tie-hash-indexed pkgver=0.05 -pkgrel=8 +pkgrel=9 pkgdesc="Ordered hashes for Perl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Tie-Hash-Indexed" diff --git a/community/perl-tk-tablematrix/PKGBUILD b/community/perl-tk-tablematrix/PKGBUILD index 21f70e804..89e3a1181 100644 --- a/community/perl-tk-tablematrix/PKGBUILD +++ b/community/perl-tk-tablematrix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71835 2012-06-02 10:32:20Z bluewind $ +# $Id: PKGBUILD 91699 2013-05-26 09:26:12Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-tk-tablematrix pkgver=1.23 -pkgrel=9 +pkgrel=10 pkgdesc="Display data in TableSpreadsheet format" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Tk-TableMatrix" diff --git a/community/perl-www-curl/PKGBUILD b/community/perl-www-curl/PKGBUILD index c0b79e460..37a44c0d4 100644 --- a/community/perl-www-curl/PKGBUILD +++ b/community/perl-www-curl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71837 2012-06-02 10:32:24Z bluewind $ +# $Id: PKGBUILD 91700 2013-05-26 09:26:14Z bluewind $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch pkgname=perl-www-curl pkgver=4.15 -pkgrel=3 +pkgrel=4 pkgdesc="Perl/CPAN Module WWW::Curl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/WWW-Curl/" diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD index ced5668d1..79df32a7a 100644 --- a/community/perl-xml-fast/PKGBUILD +++ b/community/perl-xml-fast/PKGBUILD @@ -1,10 +1,10 @@ -$Id: PKGBUILD 76693 2012-09-27 04:18:50Z dwallace $ +# $Id: PKGBUILD 91701 2013-05-26 09:26:15Z bluewind $ # Maintainer: Daniel Wallace # Contributor: trizen .= x@gmail.com pkgname=perl-xml-fast pkgver=0.11 -pkgrel=3 +pkgrel=4 pkgdesc="Simple and very fast XML to hash conversion." arch=('x86_64' 'i686') url="http://search.cpan.org/dist/XML-Fast/" diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index 7339477ad..e16c6e966 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89886 2013-05-04 19:42:51Z jsteel $ +# $Id: PKGBUILD 91702 2013-05-26 09:26:18Z bluewind $ # Maintainer: Jonathan Steel # Contributor: Justin "juster" Davis # Contributor: François Charette pkgname=perl-xml-libxml -pkgver=2.0016 +pkgver=2.0018 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') install=perl-xml-libxml.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('d3bbc3437f6b39eca5825e9d0b0c187a') +md5sums=('c5db1c6ba5f588802a5e1a15b5b6d653') build() { cd XML-LibXML-$pkgver diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index 0438538ed..fc76d8f87 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86669 2013-03-21 01:03:52Z eric $ +# $Id: PKGBUILD 91703 2013-05-26 09:26:22Z bluewind $ # Maintainer: Justin "juster" Davis # Contributor: François Charette pkgname=perl-xml-libxslt pkgver=1.80 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/XML-LibXSLT" diff --git a/community/perl-xmms/PKGBUILD b/community/perl-xmms/PKGBUILD index 3291dc2bc..d747b0561 100644 --- a/community/perl-xmms/PKGBUILD +++ b/community/perl-xmms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71843 2012-06-02 10:32:38Z bluewind $ +# $Id: PKGBUILD 91704 2013-05-26 09:26:24Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Georg Grabler pkgname=perl-xmms pkgver=0.12 -pkgrel=8 +pkgrel=9 pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" arch=('i686' 'x86_64') url="http://search.cpan.org/~dougm/Xmms-Perl/" diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD index 0dbe383f4..44fa8776c 100644 --- a/community/pork/PKGBUILD +++ b/community/pork/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71845 2012-06-02 10:32:42Z bluewind $ +# $Id: PKGBUILD 91705 2013-05-26 09:26:27Z bluewind $ # Maintainer: Jaroslav Lichtblau # Contributor: William Rea pkgname=pork pkgver=0.99.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="Console-based AOL Instant Messenger & IRC client" arch=('i686' 'x86_64') url="http://dev.ojnk.net/" diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index bad79de24..630f80156 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86969 2013-03-25 14:30:39Z arodseth $ +# $Id: PKGBUILD 91711 2013-05-26 13:45:28Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Thomas S Hatch # Contributor: Jelle van der Waa pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.5 +pkgver=2.5.1 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222') +sha256sums=('85949837c807b19af6c3972e311a6eaaae6b2b6e15daa1d207a296b8d2027d36') build() { cd "$srcdir" diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index 0b7f18610..04c8c6994 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,50 +1,90 @@ -# $Id: PKGBUILD 79252 2012-11-01 19:02:54Z mtorromeo $ +# $Id: PKGBUILD 91733 2013-05-26 19:25:26Z jelle $ # Maintainer: Vesa Kaihlavirta # Maintainer: Jaroslav Lichtblau -pkgname=quassel -pkgver=0.8.0 -pkgrel=2 +pkgbase=quassel +pkgname=('quassel-client' 'quassel-core') +pkgver=0.9.0 +pkgrel=1 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64') url="http://quassel-irc.org/" license=('GPL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=quassel.install -backup=(etc/conf.d/quassel) -source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2" +makedepends=('cmake' 'automoc4' 'qt4' 'icu') +source=("http://quassel-irc.org/pub/quassel-$pkgver.tar.bz2" 'quassel.service' - 'rc.quassel' 'quassel.conf') -sha256sums=('a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071' + +sha256sums=('2e3fe06ae3731c829aa3c2f6bb5320619bad264c831f322985c3aa3fe58b6027' '91a1aaae47d41c11aa418dd560039ddbbfb659e02b86379d8c4789c5ada362d3' - '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') - build() { + cd $srcdir [[ ! -d build ]] && mkdir build + mkdir build-client + + # Core cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DWITH_KDE=1 \ + -DWITH_KDE=0 \ + -DCMAKE_BUILD_TYPE="Release" \ + -DWITH_OPENSSL=ON \ + -DWANT_CORE=ON \ + -DWANT_MONO=OFF \ + -DWANT_QTCLIENT=OFF \ + -DWITH_DBUS=OFF \ + -DWITH_OXYGEN=OFF \ + -DWITH_PHONON=OFF \ + -DWITH_WEBKIT=OFF \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + + make + + # Client + cd $srcdir/build-client + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DWITH_KDE=0 \ + -DWITH_OPENSSL=ON \ -DCMAKE_BUILD_TYPE="Release" \ - ../${pkgname}-${pkgver}/ \ + -DWANT_CORE=OFF \ + -DWANT_QTCLIENT=ON \ + -DWANT_MONO=ON \ + ../quassel-${pkgver}/ \ -Wno-dev make + } -package() { - cd build +package_quassel-core() { +pkgdesc="Qt4 IRC client with a separated core - core only" +depends=('qt4' 'icu') +backup=(etc/conf.d/quassel) +install=quassel.install + cd $srcdir/build make DESTDIR="${pkgdir}" install + + # Remove unneeded pixmap icons + rm -r $pkgdir/usr/share + + + install -Dm644 "${srcdir}"/$pkgbase.service \ + "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service + install -Dm644 "${srcdir}"/$pkgbase.conf \ + "${pkgdir}"/etc/conf.d/$pkgbase +} + +package_quassel-client() { +pkgdesc="Qt4 IRC client with a separated core - client only" +depends=('qt4') +install=quassel-client.install + cd $srcdir/build-client - install -Dm644 "${srcdir}"/$pkgname.service \ - "${pkgdir}"/usr/lib/systemd/system/$pkgname.service - install -D "${srcdir}"/rc.$pkgname \ - "${pkgdir}"/etc/rc.d/$pkgname - install -Dm644 "${srcdir}"/$pkgname.conf \ - "${pkgdir}"/etc/conf.d/$pkgname + make DESTDIR=${pkgdir} install } diff --git a/community/quassel/quassel-client.install b/community/quassel/quassel-client.install new file mode 100644 index 000000000..1c93ee3f9 --- /dev/null +++ b/community/quassel/quassel-client.install @@ -0,0 +1,9 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} +post_upgrade() { + post_install +} +post_remove() { + post_install +} diff --git a/community/quassel/quassel.install b/community/quassel/quassel.install index 289ecc63f..5cd29276b 100644 --- a/community/quassel/quassel.install +++ b/community/quassel/quassel.install @@ -1,7 +1,7 @@ post_install() { useradd -r -s /bin/sh -d /var/lib/quassel quassel mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel - xdg-icon-resource forceupdate --theme hicolor &> /dev/null +# xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { @@ -12,15 +12,10 @@ post_upgrade() { ==> - quasselcore now listens to port 127.0.0.1 by default ==> - both of above are configurable: /etc/conf.d/quassel EOF - /etc/rc.d/quassel stop post_install ) || true } -pre_remove() { - /etc/rc.d/quassel stop -} - post_remove() { userdel quassel } diff --git a/community/quassel/rc.quassel b/community/quassel/rc.quassel deleted file mode 100644 index 99b82eec9..000000000 --- a/community/quassel/rc.quassel +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/quassel - -PIDFILE=/var/run/quassel.pid -PID=`pidof -o %PPID /usr/bin/quasselcore` - -case "$1" in - start) - stat_busy "Starting Quassel Core" - [ -z "$PID" ] && su -l -c "/usr/bin/quasselcore --configdir=/var/lib/quassel --listen=$LISTEN &" $QUASSEL_USER &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > $PIDFILE - add_daemon quassel - stat_done - fi - ;; - stop) - stat_busy "Stopping Quassel Core" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $PIDFILE - rm_daemon quassel - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rxvt-unicode/01-fix-tabber-perl-ext.patch b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch new file mode 100644 index 000000000..adb140bcc --- /dev/null +++ b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch @@ -0,0 +1,12 @@ +# https://bugs.archlinux.org/task/35420 +--- a/src/perl/tabbed 2012-09-12 17:32:04.000000000 +0900 ++++ b/src/perl/tabbed 2013-05-24 13:04:37.000000000 +0900 +@@ -402,7 +402,7 @@ + # simply proxies all interesting calls back to the tabbed class. + + { +- for my $hook qw(start destroy key_press property_notify) { ++ for my $hook (qw(start destroy key_press property_notify)) { + eval qq{ + sub on_$hook { + my \$parent = \$_[0]{term}{parent} diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index e94f50ee7..d4c42a962 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90167 2013-05-07 19:14:34Z seblu $ +# $Id: PKGBUILD 91706 2013-05-26 09:26:28Z bluewind $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez # Contributor: tobias @@ -6,7 +6,7 @@ pkgname=rxvt-unicode pkgver=9.18 -pkgrel=3 +pkgrel=5 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64') url='http://software.schmorp.de/pkg/rxvt-unicode.html' @@ -18,11 +18,17 @@ source=( 'urxvt.desktop' 'urxvtc.desktop' 'urxvt-tabbed.desktop' + '01-fix-tabber-perl-ext.patch' ) md5sums=('963ccc748fe5bca925e7b92c0404d68b' 'fec94dc986fa37ec380079d81de3e0b2' 'fac55f0a8404c86dad3e702146762332' - '8a5599197568c63720e282b9722a7990') + '8a5599197568c63720e282b9722a7990' + '0c26ae7022a128e68981577785358b63') + +prepare() { + patch -p1 -d $pkgname-$pkgver < 01-fix-tabber-perl-ext.patch +} build() { cd $pkgname-$pkgver diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 0bc6a0486..a840a834a 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90889 2013-05-15 08:03:46Z bpiotrowski $ +# $Id: PKGBUILD 91707 2013-05-26 09:26:32Z bluewind $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen # Contributor: mickael9 pkgname=znc pkgver=1.0 -pkgrel=6 +pkgrel=7 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 2f289dbc7..838c91cbf 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185566 2013-05-15 08:03:32Z bpiotrowski $ +# $Id: PKGBUILD 186436 2013-05-26 15:20:21Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.35 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') @@ -13,7 +13,7 @@ options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch) sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' - '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393' + '2441815efbfa01ad7a1d39068e5503b53d1d04b0' 'f86a82e35ebe15026980467c9dee4007e686b795' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' 'b2d11b4c522750ad9da3409333094fb599ac2c85') @@ -31,7 +31,7 @@ prepare() { build() { cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ - --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \ --enable-ipv6 --enable-syslog --enable-local \ --enable-bdb --enable-hdb \ --enable-crypt --enable-dynamic \ @@ -101,7 +101,7 @@ package_openldap() { # get rid of duplicate default conf files rm "${pkgdir}"/etc/openldap/*.default - ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} diff --git a/core/openldap/slapd.service b/core/openldap/slapd.service index 79b2cf81f..a664fa38e 100644 --- a/core/openldap/slapd.service +++ b/core/openldap/slapd.service @@ -3,7 +3,7 @@ Description=OpenLDAP server daemon [Service] Type=forking -ExecStart=/usr/sbin/slapd -u ldap -g ldap +ExecStart=/usr/bin/slapd -u ldap -g ldap [Install] WantedBy=multi-user.target diff --git a/core/perl/CVE-2012-6329.patch b/core/perl/CVE-2012-6329.patch deleted file mode 100644 index 5f59e03c1..000000000 --- a/core/perl/CVE-2012-6329.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit 1735f6f53ca19f99c6e9e39496c486af323ba6a8 -Author: Brian Carlson -Date: Wed Nov 28 08:54:33 2012 -0500 - - Fix misparsing of maketext strings. - - Case 61251: This commit fixes a misparse of maketext strings that could - lead to arbitrary code execution. Basically, maketext was compiling - bracket notation into functions, but neglected to escape backslashes - inside the content or die on fully-qualified method names when - generating the code. This change escapes all such backslashes and dies - when a method name with a colon or apostrophe is specified. ---- - AUTHORS | 1 + - dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++---------------- - 2 files changed, 9 insertions(+), 16 deletions(-) - -diff --git a/AUTHORS b/AUTHORS -index 70734b0..009dea0 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -154,6 +154,7 @@ Breno G. de Oliveira - Brent Dax - Brooks D Boyd - Brian Callaghan -+Brian Carlson - Brian Clarke - brian d foy - Brian Fraser -diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm -index 4822027..63e5fba 100644 ---- a/dist/Locale-Maketext/lib/Locale/Maketext.pm -+++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm -@@ -625,21 +625,9 @@ sub _compile { - # 0-length method name means to just interpolate: - push @code, ' ('; - } -- elsif($m =~ /^\w+(?:\:\:\w+)*$/s -- and $m !~ m/(?:^|\:)\d/s -- # exclude starting a (sub)package or symbol with a digit -+ elsif($m =~ /^\w+$/s -+ # exclude anything fancy, especially fully-qualified module names - ) { -- # Yes, it even supports the demented (and undocumented?) -- # $obj->Foo::bar(...) syntax. -- $target->_die_pointing( -- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, -- 2 + length($c[-1]) -- ) -- if $m =~ m/^SUPER::/s; -- # Because for SUPER:: to work, we'd have to compile this into -- # the right package, and that seems just not worth the bother, -- # unless someone convinces me otherwise. -- - push @code, ' $_[0]->' . $m . '('; - } - else { -@@ -693,7 +681,9 @@ sub _compile { - elsif(substr($1,0,1) ne '~') { - # it's stuff not containing "~" or "[" or "]" - # i.e., a literal blob -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - - } - elsif($1 eq '~~') { # "~~" -@@ -731,7 +721,9 @@ sub _compile { - else { - # It's a "~X" where X is not a special character. - # Consider it a literal ~ and X. -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - } - } - } diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index ce3d5ac29..b69e86a03 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183473 2013-04-21 22:15:16Z bluewind $ +# $Id: PKGBUILD 186370 2013-05-26 09:24:10Z bluewind $ # Maintainer: Florian Pritz # Contributor: Angel Velasquez # Contributor: kevin @@ -6,8 +6,8 @@ # Contributor: francois pkgname=perl -pkgver=5.16.3 -pkgrel=3 +pkgver=5.18.0 +pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -15,32 +15,27 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 - cgi-cr-escaping.diff perlbin.sh perlbin.csh - CVE-2012-6329.patch provides.pl) install=perl.install options=('makeflags' '!purge') -md5sums=('025102de0e4a597cf541e57da80c6aa3' - '0486659c9eefe682364a3e364d814296' +md5sums=('a832e928adfd36d162d2a5d3b631265c' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' - '5dc374e095d896fb30618e414aeb9017' '999c3eea6464860704abbb055a0f0896') + # workaround to let the integrity check find the correct provides array if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) fi -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} +} - patch -i "$srcdir/cgi-cr-escaping.diff" -p1 - patch -i "$srcdir/CVE-2012-6329.patch" -p1 - - # Fix FS#34531; in perl upstream >= 5.17.9 - sed -i "s/Is_dos/is_dos/" cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +build() { + cd ${srcdir}/${pkgname}-${pkgver} if [ "${CARCH}" = "x86_64" ]; then # for x86_64 @@ -69,7 +64,7 @@ build() { check() { cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness + TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true # make test } diff --git a/core/perl/cgi-cr-escaping.diff b/core/perl/cgi-cr-escaping.diff deleted file mode 100644 index 51adf7231..000000000 --- a/core/perl/cgi-cr-escaping.diff +++ /dev/null @@ -1,75 +0,0 @@ -From 18b607e4544c0cffc85207a8f9901ba37ac917d9 Mon Sep 17 00:00:00 2001 -From: Ryo Anazawa -Date: Wed, 14 Nov 2012 09:47:32 +0900 -Subject: CR escaping for P3P and Set-Cookie headers - -Bug: https://github.com/markstos/CGI.pm/pull/23 -Bug-Debian: http://bugs.debian.org/693420 -Origin: https://github.com/markstos/CGI.pm/commit/cb39938b45206093a363e36fd104e4a0f26deecb -Patch-Name: fixes/cgi-cr-escaping.diff ---- - cpan/CGI/lib/CGI.pm | 24 ++++++++++++------------ - cpan/CGI/t/headers.t | 6 ++++++ - 2 files changed, 18 insertions(+), 12 deletions(-) - -diff --git a/cpan/CGI/lib/CGI.pm b/cpan/CGI/lib/CGI.pm -index 1a52c70..c70e9c1 100644 ---- a/cpan/CGI/lib/CGI.pm -+++ b/cpan/CGI/lib/CGI.pm -@@ -1550,8 +1550,17 @@ sub header { - 'EXPIRES','NPH','CHARSET', - 'ATTACHMENT','P3P'],@p); - -+ # Since $cookie and $p3p may be array references, -+ # we must stringify them before CR escaping is done. -+ my @cookie; -+ for (ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie) { -+ my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_; -+ push(@cookie,$cs) if defined $cs and $cs ne ''; -+ } -+ $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY'; -+ - # CR escaping for values, per RFC 822 -- for my $header ($type,$status,$cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) { -+ for my $header ($type,$status,@cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) { - if (defined $header) { - # From RFC 822: - # Unfolding is accomplished by regarding CRLF immediately -@@ -1595,18 +1604,9 @@ sub header { - - push(@header,"Status: $status") if $status; - push(@header,"Window-Target: $target") if $target; -- if ($p3p) { -- $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY'; -- push(@header,qq(P3P: policyref="/w3c/p3p.xml", CP="$p3p")); -- } -+ push(@header,"P3P: policyref=\"/w3c/p3p.xml\", CP=\"$p3p\"") if $p3p; - # push all the cookies -- there may be several -- if ($cookie) { -- my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie; -- for (@cookie) { -- my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_; -- push(@header,"Set-Cookie: $cs") if $cs ne ''; -- } -- } -+ push(@header,map {"Set-Cookie: $_"} @cookie); - # if the user indicates an expiration time, then we need - # both an Expires and a Date header (so that the browser is - # uses OUR clock) -diff --git a/cpan/CGI/t/headers.t b/cpan/CGI/t/headers.t -index 661b74b..4b4922c 100644 ---- a/cpan/CGI/t/headers.t -+++ b/cpan/CGI/t/headers.t -@@ -22,6 +22,12 @@ like($@,qr/contains a newline/,'invalid header blows up'); - like $cgi->header( -type => "text/html".$CGI::CRLF." evil: stuff " ), - qr#Content-Type: text/html evil: stuff#, 'known header, with leading and trailing whitespace on the continuation line'; - -+eval { $cgi->header( -p3p => ["foo".$CGI::CRLF."bar"] ) }; -+like($@,qr/contains a newline/,'P3P header with CRLF embedded blows up'); -+ -+eval { $cgi->header( -cookie => ["foo".$CGI::CRLF."bar"] ) }; -+like($@,qr/contains a newline/,'Set-Cookie header with CRLF embedded blows up'); -+ - eval { $cgi->header( -foobar => "text/html".$CGI::CRLF."evil: stuff" ) }; - like($@,qr/contains a newline/,'unknown header with CRLF embedded blows up'); - diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index da828c0e1..e694728a1 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186218 2013-05-22 06:35:50Z tpowa $ +# $Id: PKGBUILD 186452 2013-05-26 17:55:09Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils pkgver=1.0.27.1 -pkgrel=1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -22,6 +22,9 @@ build() { --with-udev-rules-dir=/usr/lib/udev/rules.d \ --with-systemdsystemunitdir=/usr/lib/systemd/system make + # fix udev rules genaration + cd alsactl + make 90-alsa-restore.rules } package() { @@ -29,6 +32,10 @@ package() { make DESTDIR=${pkgdir} install install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa + # install alsa udev rule file + install -D -m644 alsactl/90-alsa-restore.rules \ + ${pkgdir}/usr/lib/udev/rules.d/90-alsa-restore.rules + # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index 710f42b82..f111bccb1 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $ +# $Id: PKGBUILD 186371 2013-05-26 09:24:20Z bluewind $ # Maintainer: Jan de Groot pkgname=cairo-perl pkgver=1.103 -pkgrel=1 +pkgrel=2 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD index c003f806c..b59505dbf 100644 --- a/extra/frozen-bubble/PKGBUILD +++ b/extra/frozen-bubble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160465 2012-06-02 10:25:48Z bluewind $ +# $Id: PKGBUILD 186373 2013-05-26 09:24:23Z bluewind $ # Maintainer: Jan "heftig" Steffens # Contributor: Allan McRae # Contributor: Brandon Niemczyk @@ -6,7 +6,7 @@ pkgname=frozen-bubble _pkgver=2.2.1-beta1 pkgver=${_pkgver/-/} -pkgrel=4 +pkgrel=5 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" arch=(i686 x86_64) url="http://www.frozen-bubble.org" diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD index 35f4f4d06..e3adf41a7 100644 --- a/extra/gconf-perl/PKGBUILD +++ b/extra/gconf-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160467 2012-06-02 10:25:52Z bluewind $ +# $Id: PKGBUILD 186374 2013-05-26 09:24:24Z bluewind $ # Maintainer: Jan de Groot pkgname=gconf-perl pkgver=1.044 -pkgrel=7 +pkgrel=8 pkgdesc="Gnome2-GConf perl bindings for gconf" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index bad7b3336..5216969f9 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185043 2013-05-10 16:49:05Z dan $ +# $Id: PKGBUILD 186460 2013-05-26 20:12:59Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.8.2.3 +pkgver=1.8.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('03ebfd403a8cf355da0e3f15e53b8925' - '891481ec6ecd9ee530701378e5b61d3f' +md5sums=('d91b6099fb6763cf92c696977a247060' + '0b469c0fd81b4a56b9059d7c443282f0' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD index cac93c7ca..a69c7589d 100644 --- a/extra/glade-perl/PKGBUILD +++ b/extra/glade-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160469 2012-06-02 10:25:54Z bluewind $ +# $Id: PKGBUILD 186375 2013-05-26 09:24:26Z bluewind $ # Maintainer: Jan de Groot pkgname=glade-perl _realname=Gtk2-GladeXML pkgver=1.007 -pkgrel=6 +pkgrel=7 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch new file mode 100644 index 000000000..fe92fbd94 --- /dev/null +++ b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch @@ -0,0 +1,230 @@ +From ebf55199407d3be92162f5c2573c7f9c34614cb1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= +Date: Thu, 2 Aug 2012 21:41:41 +0200 +Subject: [PATCH] Make Glib::Object subclassing more robust +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rearrange how we register the interfaces, properties and signals of a newly +created type so that: + +• The outcome is independent of the order of the arguments passed to +Glib::Object::Subclass or Glib::Type->register. This also avoids fallout from +the change to hash randomization in perl 5.17.6. + +• We register things in the correct order: interfaces first, before entering +class_init; then properties and signals from within class_init. This also +avoids prematurely creating the new type's class. +--- + GType.xs | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- + NEWS | 7 +++++ + 2 files changed, 77 insertions(+), 22 deletions(-) + +diff --git a/GType.xs b/GType.xs +index 02e24a4..fdaad68 100644 +--- a/GType.xs ++++ b/GType.xs +@@ -1234,13 +1234,10 @@ parse_signal_hash (GType instance_type, + + + static void +-add_signals (GType instance_type, HV * signals) ++add_signals (GType instance_type, HV * signals, AV * interfaces) + { +- GObjectClass *oclass; + HE * he; + +- oclass = g_type_class_ref (instance_type); +- + hv_iterinit (signals); + while (NULL != (he = hv_iternext (signals))) { + I32 keylen; +@@ -1250,9 +1247,36 @@ add_signals (GType instance_type, HV * signals) + + /* the key is the signal name */ + signal_name = hv_iterkey (he, &keylen); +- /* if the signal is defined at this point, we're going to +- * override the installed closure. */ +- signal_id = g_signal_lookup (signal_name, instance_type); ++ ++ /* if, at this point, the signal is already defined in the ++ * ancestry or the interfaces we just added to instance_type, ++ * we can only override the installed closure. trying to ++ * create a new signal with the same name is an error. ++ * ++ * unfortunately, we cannot simply use instance_type to do the ++ * lookup because g_signal_lookup would complain about it since ++ * it hasn't been fully loaded yet. see ++ * . ++ * ++ * FIXME: the "if (signal_id)" check in the hash ref block ++ * below could be removed since g_signal_newv also checks this. ++ * consequently, this lookup code could be moved into the class ++ * closure block below. */ ++ signal_id = g_signal_lookup (signal_name, ++ g_type_parent (instance_type)); ++ if (!signal_id && interfaces) { ++ int i; ++ for (i = 0; i <= av_len (interfaces); i++) { ++ GType interface_type; ++ SV ** svp = av_fetch (interfaces, i, FALSE); ++ if (!svp || !gperl_sv_is_defined (*svp)) ++ continue; ++ interface_type = gperl_object_type_from_package (SvPV_nolen (*svp)); ++ signal_id = g_signal_lookup (signal_name, interface_type); ++ if (signal_id) ++ break; ++ } ++ } + + /* parse the key's value... */ + value = hv_iterval (signals, he); +@@ -1310,8 +1334,6 @@ add_signals (GType instance_type, HV * signals) + signal_name); + } + } +- +- g_type_class_unref (oclass); + } + + typedef struct { +@@ -1407,13 +1429,10 @@ prop_handler_lookup (GType instance_type, + } + + static void +-add_properties (GType instance_type, AV * properties) ++add_properties (GType instance_type, GObjectClass * oclass, AV * properties) + { +- GObjectClass *oclass; + int propid; + +- oclass = g_type_class_ref (instance_type); +- + for (propid = 0; propid <= av_len (properties); propid++) { + SV * sv = *av_fetch (properties, propid, 1); + GParamSpec * pspec = NULL; +@@ -1452,8 +1471,6 @@ add_properties (GType instance_type, AV * properties) + } + g_object_class_install_property (oclass, propid + 1, pspec); + } +- +- g_type_class_unref (oclass); + } + + /* +@@ -1776,12 +1793,26 @@ gperl_type_reg_quark (void) + return q; + } + ++typedef struct { ++ GType instance_type; ++ AV *interfaces; ++ AV *properties; ++ HV *signals; ++} GPerlClassData; ++ + static void +-gperl_type_class_init (GObjectClass * class) ++gperl_type_class_init (GObjectClass * class, GPerlClassData * class_data) + { + class->finalize = gperl_type_finalize; + class->get_property = gperl_type_get_property; + class->set_property = gperl_type_set_property; ++ ++ if (class_data->properties) ++ add_properties (class_data->instance_type, class, ++ class_data->properties); ++ if (class_data->signals) ++ add_signals (class_data->instance_type, ++ class_data->signals, class_data->interfaces); + } + + static void +@@ -2152,15 +2183,18 @@ g_type_register_object (class, parent_package, new_package, ...); + PREINIT: + int i; + GTypeInfo type_info; ++ GPerlClassData class_data; + GTypeQuery query; + GType parent_type, new_type; + char * new_type_name; + CODE: + /* start with a clean slate */ + memset (&type_info, 0, sizeof (GTypeInfo)); ++ memset (&class_data, 0, sizeof (GPerlClassData)); + type_info.base_init = (GBaseInitFunc) gperl_type_base_init; + type_info.class_init = (GClassInitFunc) gperl_type_class_init; + type_info.instance_init = (GInstanceInitFunc) gperl_type_instance_init; ++ type_info.class_data = &class_data; + + /* yeah, i could just call gperl_object_type_from_package directly, + * but i want the error messages to be more informative. */ +@@ -2196,29 +2230,43 @@ g_type_register_object (class, parent_package, new_package, ...); + /* mark this type as "one of ours". */ + g_type_set_qdata (new_type, gperl_type_reg_quark (), (gpointer) TRUE); + +- /* now look for things we should initialize presently, e.g. +- * signals and properties and interfaces and such, things that +- * would generally go into a class_init. */ ++ /* put it into the class data so that add_signals and add_properties ++ * can use it. */ ++ class_data.instance_type = new_type; ++ ++ /* now look for things we should initialize, e.g. signals and ++ * properties and interfaces. put the corresponding data into the ++ * class_data struct. the interfaces will be handled directly further ++ * below, while the properties and signals will be handled in the ++ * class_init function so that they have access to the class instance. ++ * this mimics the way things are supposed to be done in C: register ++ * interfaces in the get_type function, and register properties and ++ * signals in the class_init function. */ + for (i = 3 ; i < items ; i += 2) { + char * key = SvPV_nolen (ST (i)); + if (strEQ (key, "signals")) { + if (gperl_sv_is_hash_ref (ST (i+1))) +- add_signals (new_type, (HV*)SvRV (ST (i+1))); ++ class_data.signals = (HV*)SvRV (ST (i+1)); + else + croak ("signals must be a hash of signalname => signalspec pairs"); + } else if (strEQ (key, "properties")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_properties (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.properties = (AV*)SvRV (ST (i+1)); + else + croak ("properties must be an array of GParamSpecs"); + } else if (strEQ (key, "interfaces")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_interfaces (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.interfaces = (AV*)SvRV (ST (i+1)); + else + croak ("interfaces must be an array of package names"); + } + } + ++ /* add the interfaces to the type now before we create its class and ++ * enter the class_init function. */ ++ if (class_data.interfaces) ++ add_interfaces (new_type, class_data.interfaces); ++ + /* instantiate the class right now. perl doesn't let classes go + * away once they've been defined, so we'll just leak this ref and + * let the GObjectClass live as long as the program. in fact, +diff --git a/NEWS b/NEWS +index 5606566..ad71da0 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,10 @@ ++Overview of changes in Glib (unstable) ++============================================ ++ ++* Make Glib::Object subclassing more robust. This should in particular fix ++ issues revealed by the change to hash randomization introduced in perl ++ 5.17.6. ++ + Overview of changes in Glib 1.280 (stable) + ========================================== + +-- +1.8.2.3 + diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index 352cff1c5..f4a870312 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183484 2013-04-21 22:21:04Z heftig $ +# $Id: PKGBUILD 186376 2013-05-26 09:24:27Z bluewind $ # Maintainer: Jan de Groot # Contributor: Sarah Hay pkgname=glib-perl pkgver=1.280 -pkgrel=1 +pkgrel=3 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64) license=('LGPL') @@ -12,8 +12,17 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('glib2' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('1d81a8aec5f7f1182a96cfaaf119d866') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz + 0001-Make-Glib-Object-subclassing-more-robust.patch) +md5sums=('1d81a8aec5f7f1182a96cfaaf119d866' + 'ebe39d50eff182a1ad4390cbbef46e41') + +prepare() { + cd "${srcdir}/Glib-${pkgver}" + + # Needed for gtk2-perl to compile against Perl 5.18 + patch -Np1 -i "${srcdir}/0001-Make-Glib-Object-subclassing-more-robust.patch" +} build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD index d790dc760..ae54a978f 100644 --- a/extra/gnome-perl/PKGBUILD +++ b/extra/gnome-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160473 2012-06-02 10:26:01Z bluewind $ +# $Id: PKGBUILD 186378 2013-05-26 09:24:29Z bluewind $ # Maintainer: Jan de Groot pkgname=gnome-perl _realname=Gnome2 pkgver=1.042 -pkgrel=8 +pkgrel=9 pkgdesc="Perl bindings for libgnome" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD index e3b84ab0b..9af97014d 100644 --- a/extra/gnome-vfs-perl/PKGBUILD +++ b/extra/gnome-vfs-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177009 2013-02-04 08:18:57Z jgc $ +# $Id: PKGBUILD 186379 2013-05-26 09:24:30Z bluewind $ # Maintainer: Jan de Groot pkgname=gnome-vfs-perl _realname=Gnome2-VFS pkgver=1.081 -pkgrel=6 +pkgrel=7 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD index c869a2752..677e38726 100644 --- a/extra/gnomecanvas-perl/PKGBUILD +++ b/extra/gnomecanvas-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160477 2012-06-02 10:26:08Z bluewind $ +# $Id: PKGBUILD 186377 2013-05-26 09:24:28Z bluewind $ # Maintainer: Jan de Groot pkgname=gnomecanvas-perl _realname=Gnome2-Canvas pkgver=1.002 -pkgrel=10 +pkgrel=11 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 60251ada3..05788a0c6 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184239 2013-05-04 19:38:00Z foutrelis $ +# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $ # Maintainer: Eric Belanger # Contributor: Kritoke pkgname=gnumeric pkgver=1.12.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/gnumeric/" @@ -38,6 +38,7 @@ prepare() { # Fix invalid PNG images to work with libpng 1.6 # https://bugzilla.gnome.org/show_bug.cgi?id=699683 + # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out find -name '*.png' -exec optipng -quiet -force -fix {} + } diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 1d84e9d56..0ca2e4f53 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185984 2013-05-20 05:43:08Z giovanni $ +# $Id: PKGBUILD 186367 2013-05-26 06:28:56Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Andrew Simmons # Contributor: György Balló pkgname=gparted pkgver=0.16.1 -pkgrel=4 +pkgrel=5 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" @@ -30,7 +30,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgnam 'gparted_polkit') md5sums=('3f399bff031b5ce14d11a8c346f4b89c' '122ed3120c846376bead22b25f6a3b19' - '9b70450ef7d17c282e9185e5869a4cec') + '0b68a4e2bc6bc15440730ebe2d7bf9f6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -51,5 +51,6 @@ package() { "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" # Install launcher script - install -m755 "${srcdir}/gparted_polkit" "${pkgdir}/usr/bin/gparted_polkit" + install -m755 "${srcdir}/gparted_polkit" \ + "${pkgdir}/usr/bin/gparted_polkit" } diff --git a/extra/gparted/gparted_polkit b/extra/gparted/gparted_polkit index ebf9b13a3..d9f94d1bd 100644 --- a/extra/gparted/gparted_polkit +++ b/extra/gparted/gparted_polkit @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash if [ $(which pkexec) ]; then - pkexec --disable-internal-agent "/usr/bin/gparted" "$@" + pkexec --disable-internal-agent "/usr/bin/gparted" "$@" else - /usr/bin/gparted "$@" + /usr/bin/gparted "$@" fi diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 41909bd7e..4c7f11296 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184386 2013-05-06 19:37:35Z foutrelis $ +# $Id: PKGBUILD 186381 2013-05-26 09:24:32Z bluewind $ # Maintainer: Ronald van Haren # Maintainer: Gaetan Bisson # Contributor: Jaroslav Lichtblau @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.18 -pkgrel=2 +pkgrel=3 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64') diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 45e95ea37..e68fd5922 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184387 2013-05-06 19:37:39Z foutrelis $ +# $Id: PKGBUILD 186382 2013-05-26 09:24:35Z bluewind $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: John Proctor pkgname=graphviz pkgver=2.30.1 -pkgrel=3 +pkgrel=4 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -33,6 +33,9 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed \ + -e 's/ qw(\([^)]*\))/ (qw(\1))/g' \ + -i config/config_perl.pl sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD index cde0800ff..1dcdaa2d8 100644 --- a/extra/gtk2-perl/PKGBUILD +++ b/extra/gtk2-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183485 2013-04-21 22:21:05Z heftig $ +# $Id: PKGBUILD 186383 2013-05-26 09:24:36Z bluewind $ # Maintainer: Jan de Groot # Contributor: Sarah Hay pkgname=gtk2-perl pkgver=1.247 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for GTK+ 2.x" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index d005414fe..396e02973 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185248 2013-05-12 14:13:52Z eric $ +# $Id: PKGBUILD 186384 2013-05-26 09:24:37Z bluewind $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.6 +pkgver=6.8.5.7 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('3c932aa3febb1e992a780e9091925bdbc0d61613' +sha1sums=('f393612e9797a6129f2cac7f83df337bb54ecf76' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD index 676ab070d..d2de75232 100644 --- a/extra/irssi/PKGBUILD +++ b/extra/irssi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160489 2012-06-02 10:26:29Z bluewind $ +# $Id: PKGBUILD 186385 2013-05-26 09:24:38Z bluewind $ # Maintainer: Giovanni Scafora # Contributor: Dan McGee pkgname=irssi pkgver=0.8.15 -pkgrel=6 +pkgrel=7 pkgdesc="Modular text mode IRC client with Perl scripting" arch=('i686' 'x86_64') url="http://irssi.org/" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index f5a45326c..e87001636 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184887 2013-05-09 09:43:00Z andrea $ +# $Id: PKGBUILD 186386 2013-05-26 09:24:39Z bluewind $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlkde pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" arch=('i686' 'x86_64') @@ -11,22 +11,22 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' - 'kdegraphics-okular' 'kdesdk-kate') + 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") sha1sums=('7db692b0a06ba421caa870fc254f03c2e3bf4e79') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlkde-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 4694c5ed5..77f215089 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184858 2013-05-09 09:42:29Z andrea $ +# $Id: PKGBUILD 186387 2013-05-26 09:24:45Z bluewind $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlqt pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" arch=('i686' 'x86_64') @@ -15,7 +15,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") sha1sums=('261e1c4d9a6a216d7b5b5e2962ba5266f0d62bdf') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlqt-${pkgver} \ @@ -27,6 +26,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index f8825590b..387fc2c08 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162914 2012-07-03 20:59:56Z eric $ +# $Id: PKGBUILD 186456 2013-05-26 18:10:34Z eric $ # Maintainer: Allan McRae # Contributor: Simone Sclavi 'Ito' pkgname=libjpeg-turbo -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=1 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64') @@ -16,38 +16,27 @@ conflicts=('libjpeg') replaces=('libjpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361') +sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') build() { - cd "$srcdir/$pkgname-$pkgver" - - # put documentation in a reasonable directory... - sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - + cd $pkgname-$pkgver ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man make } check() { cd "$srcdir/$pkgname-$pkgver" - make test } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \ + exampledir=/usr/share/doc/libjpeg-turbo install # provide jpegint.h as it is required by various software install -m644 jpegint.h "$pkgdir/usr/include/" - # do not distributre libturbojpeg as it is unversioned - rm "$pkgdir"/usr/lib/libturbojpeg.{so,a} - rm "$pkgdir/usr/include/turbojpeg.h" - rm "$pkgdir/usr/bin/tjbench" - install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/" ln -s ../../doc/libjpeg-turbo/README \ "$pkgdir/usr/share/licenses/libjpeg-turbo/README" diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index 8cd9bb63d..84523e295 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ +# $Id: PKGBUILD 186388 2013-05-26 09:24:47Z bluewind $ # Maintainer: Jan de Groot pkgname=libproxy pkgver=0.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index fec3ea1c8..334010061 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183268 2013-04-20 07:13:33Z andyrtr $ +# $Id: PKGBUILD 186454 2013-05-26 18:05:27Z andyrtr $ # Maintainer: AndyRTR # Contributor: Robert McCathie pkgname=libwps -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libwpd>=0.9.6') makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('78196c097db366fac66841d032b1ddac') +md5sums=('46eb0e7f213ad61bd5dee0c494132cb0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index dd9d26bc2..98635216b 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160911 2012-06-06 19:20:20Z foutrelis $ +# $Id: PKGBUILD 186389 2013-05-26 09:24:48Z bluewind $ # Maintainer: # Contributor: Firmicus # Contributor: Tom K pkgname=mod_perl -pkgver=2.0.7 +pkgver=2.0.8 pkgrel=1 pkgdesc="Apache module that embeds the Perl interpreter within the server" arch=('i686' 'x86_64') @@ -12,12 +12,12 @@ url="http://perl.apache.org/" license=('APACHE') depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') options=('!emptydirs') -source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz +source=(http://apache.org/dist/perl/$pkgname-$pkgver.tar.gz mod_perl-2.0.6-nolfs.patch) -sha256sums=('53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6' +sha256sums=('35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6' '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Patch from openSUSE to fix segfaults on i686 (FS#25008): @@ -25,6 +25,10 @@ build() { # FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl # structures to be invalid if only the apache flags are used patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 549bc60fa..07cb6c7c8 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185295 2013-05-13 03:05:59Z eric $ +# $Id: PKGBUILD 186390 2013-05-26 09:24:49Z bluewind $ # Maintainer: # Contributor: Dale Blount pkgname=net-snmp pkgver=5.7.2 -pkgrel=5 +pkgrel=7 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" @@ -16,10 +16,11 @@ optdepends=('perl-term-readkey: for snmpcheck application' 'python2: for the python modules') options=('!libtool' '!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.service libnl32.patch) + snmpd.service snmptrapd.service libnl32.patch) sha1sums=('c493027907f32400648244d81117a126aecd27ee' 'SKIP' '84e32c54d32e6b608747054e04a3ddfe6d6638cc' + '0244e91c7baa0abebfb5c0560e8ce04c966c5992' '74a9848b95f63378eb1753fc309d2b74de5afb0f') prepare() { @@ -52,5 +53,6 @@ package() { sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" + install -D -m644 "${srcdir}/snmptrapd.service" "${pkgdir}/usr/lib/systemd/system/snmptrapd.service" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/net-snmp/snmptrapd.service b/extra/net-snmp/snmptrapd.service new file mode 100644 index 000000000..50eee7ac8 --- /dev/null +++ b/extra/net-snmp/snmptrapd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) TRAP Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/snmptrapd.pid +ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD index dd883080c..1b8079cee 100644 --- a/extra/pango-perl/PKGBUILD +++ b/extra/pango-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183483 2013-04-21 22:21:03Z heftig $ +# $Id: PKGBUILD 186391 2013-05-26 09:24:50Z bluewind $ # Maintainer: Jan de Groot pkgname=pango-perl pkgver=1.224 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for Pango" arch=(i686 x86_64) license=('LGPL') @@ -25,7 +25,7 @@ check() { make test } -package() { +package() { cd "${srcdir}/Pango-${pkgver}" make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD index 904bdad48..45f6be82d 100644 --- a/extra/perl-async-interrupt/PKGBUILD +++ b/extra/perl-async-interrupt/PKGBUILD @@ -1,10 +1,10 @@ # Packager: Justin Davis (juster) -# $Id: PKGBUILD 160503 2012-06-02 10:26:54Z bluewind $ +# $Id: PKGBUILD 186392 2013-05-26 09:24:51Z bluewind $ pkgname=perl-async-interrupt _ver=1.1 pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc='allow C/XS libraries to interrupt perl asynchronously' arch=(i686 x86_64) license=(PerlArtistic GPL) @@ -14,11 +14,10 @@ url=https://metacpan.org/release/Async-Interrupt source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz") md5sums=(18f19b1537ecf5d6195a6a243110e64b) sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e) -_dir="$srcdir/Async-Interrupt-$_ver" build() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT /usr/bin/perl Makefile.PL @@ -27,7 +26,7 @@ build() check() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test @@ -35,7 +34,7 @@ check() package() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" make install INSTALLDIRS=vendor DESTDIR="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete ) diff --git a/extra/perl-bit-vector/Bit-Vector-destroy.patch b/extra/perl-bit-vector/Bit-Vector-destroy.patch new file mode 100644 index 000000000..580f4cf21 --- /dev/null +++ b/extra/perl-bit-vector/Bit-Vector-destroy.patch @@ -0,0 +1,27 @@ +From 0646f34fc3eeb47627822df860986cf7bee4ebed Mon Sep 17 00:00:00 2001 +From: Gisle Aas +Date: Thu, 28 Mar 2013 00:41:07 -0700 +Subject: [PATCH] eval { 1->method } triggers different error in 5.17.11 + +--- + t/02_____destroy.t | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/t/02_____destroy.t b/t/02_____destroy.t +index 41e3aa3..adcf995 100644 +--- a/t/02_____destroy.t ++++ b/t/02_____destroy.t +@@ -17,7 +17,9 @@ if (ref($set) eq '') + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { $set->DESTROY(); }; +-if ($@ =~ /Can't call method "DESTROY" without a package or object reference/) ++if ($@ =~ /Can't call method "DESTROY" without a package or object reference/ || ++ $@ =~ /Can't locate object method "DESTROY" via package "1"/ ++) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { Bit::Vector::DESTROY($set); }; +-- +1.7.0.5 + diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD index b27aa1b39..8076b44dd 100644 --- a/extra/perl-bit-vector/PKGBUILD +++ b/extra/perl-bit-vector/PKGBUILD @@ -1,19 +1,29 @@ -# $Id: PKGBUILD 160505 2012-06-02 10:26:56Z bluewind $ -# Maintainer: Kevin Piche +# $Id: PKGBUILD 186393 2013-05-26 09:24:52Z bluewind $ +# Maintainer: +# Contributor: Kevin Piche # Contributor: K. Piche pkgname=perl-bit-vector _cpanname=Bit-Vector pkgver=7.2 -pkgrel=2 +pkgrel=3 pkgdesc='Efficient bit vector, set of integers and "big int" math library' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_cpanname}/" depends=('perl-carp-clan' 'perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('bc6ae34738b8f889290bf50099ff8aed') +source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz + Bit-Vector-destroy.patch) +md5sums=('bc6ae34738b8f889290bf50099ff8aed' + 'c86a55b84cb05dd04004ee8f56ee2ee3') + +prepare() { + cd "${srcdir}/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=84250 + patch -Np1 -i "${srcdir}/Bit-Vector-destroy.patch" +} build() { cd "${srcdir}/${_cpanname}-$pkgver" diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 7f5e2bc99..d81b53e5c 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 160507 2012-06-02 10:27:00Z bluewind $ +# $Id: PKGBUILD 186394 2013-05-26 09:24:54Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=5 +pkgver=2.15 +pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) license=(GPL2) depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") -md5sums=('1699fde3e86f2a036f135ae606d456bf') +source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") +md5sums=('f1cc338445e60dfd22f5a3a302fc22ca') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-crypt-openssl-bignum/PKGBUILD b/extra/perl-crypt-openssl-bignum/PKGBUILD index e5f881bcc..15c3bb1b6 100644 --- a/extra/perl-crypt-openssl-bignum/PKGBUILD +++ b/extra/perl-crypt-openssl-bignum/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-bignum pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="OpenSSL's multiprecision integer arithmetic " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD index 24ebde127..90a4bd540 100644 --- a/extra/perl-crypt-openssl-random/PKGBUILD +++ b/extra/perl-crypt-openssl-random/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-random pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" diff --git a/extra/perl-crypt-openssl-rsa/PKGBUILD b/extra/perl-crypt-openssl-rsa/PKGBUILD index 3a44bf936..afe76a7c5 100644 --- a/extra/perl-crypt-openssl-rsa/PKGBUILD +++ b/extra/perl-crypt-openssl-rsa/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-rsa pkgver=0.28 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to OpenSSL RSA methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD index f01b17aac..bf1e57bb6 100644 --- a/extra/perl-crypt-ssleay/PKGBUILD +++ b/extra/perl-crypt-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164793 2012-08-06 08:07:22Z giovanni $ +# $Id: PKGBUILD 186398 2013-05-26 09:25:03Z bluewind $ # Maintainer: Giovanni Scafora # Contributor: François Charette pkgname=perl-crypt-ssleay pkgver=0.64 -pkgrel=1 +pkgrel=2 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-SSLeay" diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index 0ad18ea79..ae62a279c 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 185631 2013-05-16 14:46:08Z bpiotrowski $ -# Maintainer: kevin +# $Id: PKGBUILD 186399 2013-05-26 09:25:04Z bluewind $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: kevin # Contributor: Eric Johnson pkgname=perl-dbd-mysql _realname=DBD-mysql pkgver=4.023 -pkgrel=1 +pkgrel=2 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index 450f50237..00ba3f4a3 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163611 2012-07-17 02:14:42Z eric $ +# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $ # Maintainer: # Contributor: Tom Killian # Contributor: francois at archlinux dot org @@ -6,12 +6,12 @@ pkgname=perl-dbd-sqlite _cpanname=DBD-SQLite pkgver=1.37 -pkgrel=1 +pkgrel=2 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_cpanname}" license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.61' 'sqlite') +depends=('perl-dbi' 'sqlite') options=('!emptydirs') source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) md5sums=('b8ac1c584befa63cd5ffc391b2366e84') diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index 8dc1bc45f..2860395fc 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 182702 2013-04-12 23:53:53Z eric $ -# Maintainer: kevin -# Contributor: Matt Thompson +# $Id: PKGBUILD 186401 2013-05-26 09:25:07Z bluewind $ +# Maintainer: +# Contributor: kevin +# Contributor: Matt Thompson pkgname=perl-dbi _realname=DBI pkgver=1.625 -pkgrel=1 +pkgrel=2 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD index d4878b1e8..62097190f 100644 --- a/extra/perl-digest-nilsimsa/PKGBUILD +++ b/extra/perl-digest-nilsimsa/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 160523 2012-06-02 10:27:26Z bluewind $ -# Maintainer: kevin +# $Id: PKGBUILD 186402 2013-05-26 09:25:08Z bluewind $ +# Maintainer: +# Contributor: kevin # Contributor: Manolis Tzanidakis pkgname=perl-digest-nilsimsa _realname=Digest-Nilsimsa pkgver=0.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl version of Nilsimsa code" arch=('i686' 'x86_64') license=('LGPL') @@ -13,7 +14,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') replaces=('digest-nilsimsa') provides=('digest-nilsimsa') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD index e35269169..ecd6141ac 100644 --- a/extra/perl-digest-sha1/PKGBUILD +++ b/extra/perl-digest-sha1/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 160525 2012-06-02 10:27:28Z bluewind $ -# Maintainer: kevin +# $Id: PKGBUILD 186403 2013-05-26 09:25:09Z bluewind $ +# Maintainer: +# Contributor: kevin # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.13 -pkgrel=3 +pkgrel=4 pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) replaces=('digest-sha1') provides=('digest-sha1') diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 5f968227e..1f6075bde 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $ +# $Id: PKGBUILD 186404 2013-05-26 09:25:10Z bluewind $ pkgname=perl-ev pkgver=4.15 -pkgrel=1 +pkgrel=2 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64) license=(PerlArtistic GPL) diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index a03c4baf9..a77fdf42a 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160531 2012-06-02 10:27:39Z bluewind $ +# $Id: PKGBUILD 186405 2013-05-26 09:25:13Z bluewind $ # Maintainer: Giovanni Scafora # Contributor: François Charette pkgname=perl-fcgi pkgver=0.74 -pkgrel=3 +pkgrel=4 pkgdesc="Fast CGI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/FCGI" diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD index 8a21ab9e5..63e5e7488 100644 --- a/extra/perl-guard/PKGBUILD +++ b/extra/perl-guard/PKGBUILD @@ -1,19 +1,17 @@ # Packager: Justin Davis -# $Id: PKGBUILD 180339 2013-03-20 16:34:29Z eric $ +# $Id: PKGBUILD 186406 2013-05-26 09:25:16Z bluewind $ pkgname=perl-guard pkgver=1.022 -pkgrel=2 +pkgrel=3 pkgdesc="safe cleanup blocks" -arch=(i686 x86_64) -license=(custom:unknown) -options=(!emptydirs) +arch=('i686' 'x86_64') +url="https://metacpan.org/release/Guard" +license=('GPL' 'PerlArtistic') depends=('perl') -url=https://metacpan.org/release/Guard +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz") -md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c) -sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e) -_distdir="${srcdir}/Guard-${pkgver}" +md5sums=('8d1d8b942fd5d0240f47906a6d6fac8c') build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -22,7 +20,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -30,13 +28,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index edf79db2e..a3b4d2874 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185586 2013-05-15 11:58:32Z eric $ +# $Id: PKGBUILD 186407 2013-05-26 09:25:18Z bluewind $ # Maintainer: kevin # Contributor: Manolis Tzanidakis -# Contributor: Firmicus +# Contributor: Firmicus pkgname=perl-html-parser pkgver=3.71 -pkgrel=1 +pkgrel=2 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') license=('PerlArtistic') diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index add6c8a44..76e6a5e68 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $ -# Maintainer: kevin +# $Id: PKGBUILD 186408 2013-05-26 09:25:20Z bluewind $ +# Maintainer: +# Contributor: kevin # Contributor: Tobias Kieslich pkgname=perl-libintl-perl _realname=libintl-perl pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD index bb77bb4e7..1541e0d28 100644 --- a/extra/perl-list-moreutils/PKGBUILD +++ b/extra/perl-list-moreutils/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 180362 2013-03-20 17:38:22Z eric $ +# $Id: PKGBUILD 186409 2013-05-26 09:25:22Z bluewind $ # Maintainer : Justin "juster" Davis # Generator : pbjam 0.01 pkgname=perl-list-moreutils pkgver=0.33 -pkgrel=3 +pkgrel=4 pkgdesc="Provide the stuff missing in List::Util" arch=(i686 x86_64) license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.5.30') +depends=('perl') url=http://search.cpan.org/dist/List-MoreUtils source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz") md5sums=(8a33c84028cc2ff3e92c92434b326c0f) sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5) -_distdir="${srcdir}/List-MoreUtils-${pkgver}" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -23,7 +22,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -31,13 +30,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD index e2bb2e3b5..89e65b7d6 100644 --- a/extra/perl-locale-gettext/PKGBUILD +++ b/extra/perl-locale-gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160541 2012-06-02 10:27:56Z bluewind $ +# $Id: PKGBUILD 186410 2013-05-26 09:25:23Z bluewind $ # Maintainer: Giovanni Scafora # Contributor: Mark Rosenstand # Contributor: Paul Mattal @@ -6,7 +6,7 @@ pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=9 +pkgrel=10 pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index 5b07942f8..5161edc15 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175933 2013-01-25 04:57:21Z eric $ +# $Id: PKGBUILD 186412 2013-05-26 09:25:29Z bluewind $ # Maintainer: kevin # Contributor: Manolis Tzanidakis pkgname=perl-net-dns _realname=Net-DNS pkgver=0.72 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Interface to the DNS resolver." arch=('i686' 'x86_64') license=('PerlArtistic') diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index acf0031f1..7f2b29caf 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182685 2013-04-12 16:53:38Z giovanni $ +# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $ # Maintainer: Giovanni Scafora # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay pkgver=1.54 -pkgrel=1 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index 8673d2d6e..ae11dd646 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175931 2013-01-25 04:44:59Z eric $ +# $Id: PKGBUILD 186411 2013-05-26 09:25:25Z bluewind $ # Maintainer: # Contributor: Dale Blount # Contributor: Francois Charette @@ -6,7 +6,7 @@ pkgname=perl-netaddr-ip _realname=NetAddr-IP pkgver=4.066 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64) license=('PerlArtistic' 'GPL') diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index d8273a34e..674b20c57 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168746 2012-10-15 12:11:10Z heftig $ +# $Id: PKGBUILD 186414 2013-05-26 09:25:36Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay pkgname=perl-sdl pkgver=2.540 -pkgrel=3 +pkgrel=4 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64) license=(LGPL) diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD index bfcd0de59..31370ad40 100644 --- a/extra/perl-socket6/PKGBUILD +++ b/extra/perl-socket6/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180365 2013-03-20 17:57:40Z eric $ +# $Id: PKGBUILD 186415 2013-05-26 09:25:40Z bluewind $ # Maintainer: Florian Pritz # Generator : CPANPLUS::Dist::Arch 1.18 pkgname='perl-socket6' pkgver='0.23' -pkgrel='2' +pkgrel='3' pkgdesc="getaddrinfo/getnameinfo support module" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') @@ -15,7 +15,6 @@ url='http://search.cpan.org/dist/Socket6' source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') md5sums=('2c02adb13c449d48d232bb704ddbd492') sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') -_distdir="${srcdir}/Socket6-0.23" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -24,21 +23,21 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" /usr/bin/perl Makefile.PL make ) } check() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index 4b6d5fa56..0328f9f90 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 165152 2012-08-11 20:28:19Z eric $ -# Maintainer: Firmicus +# $Id: PKGBUILD 186416 2013-05-26 09:25:42Z bluewind $ +# Maintainer: +# Contributor: Firmicus # Contributor: Tom Killian # Contributor: FJ pkgname=perl-template-toolkit _realname=Template-Toolkit pkgver=2.24 -pkgrel=1 +pkgrel=2 pkgdesc="Perl template processing system" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl-appconfig' 'perl>=5.10.0') -options=(!emptydirs) +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) md5sums=('c25fdab1beebf8818c2e624bc9f9d212') @@ -25,7 +26,10 @@ build() { check() { cd "${srcdir}/${_realname}-${pkgver}" - make test + + # 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 } package() { diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD index 8c73caf7a..e3c98ae6b 100644 --- a/extra/perl-term-readkey/PKGBUILD +++ b/extra/perl-term-readkey/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 160555 2012-06-02 10:28:20Z bluewind $ -# Maintainer: kevin +# $Id: PKGBUILD 186417 2013-05-26 09:25:44Z bluewind $ +# Maintainer: +# Contributor: kevin # Contributor: Wael Nasreddine -# Contributor: Francois Charette +# Contributor: Francois Charette pkgname=perl-term-readkey _realname=TermReadKey pkgver=2.30.02 -pkgrel=2 +pkgrel=3 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64') license=('custom') diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD index cde5d71c0..b8609c4fd 100644 --- a/extra/perl-text-iconv/PKGBUILD +++ b/extra/perl-text-iconv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160557 2012-06-02 10:28:23Z bluewind $ -# Maintainer: +# $Id: PKGBUILD 186418 2013-05-26 09:25:46Z bluewind $ +# Maintainer: # Contributor: Francois Charette pkgname=perl-text-iconv _realname=Text-Iconv pkgver=1.7 -pkgrel=7 +pkgrel=8 pkgdesc="Interface to iconv codeset conversion" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_realname}/" diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch new file mode 100644 index 000000000..5b65557c1 --- /dev/null +++ b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch @@ -0,0 +1,32 @@ +From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001 +From: Father Chrysostomos via RT +Date: Mon, 6 Aug 2012 17:42:14 -0400 +Subject: [PATCH] Fix compilation under threaded bleadperl + + Ticket + +CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.) +--- + tkGlue.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tkGlue.c b/tkGlue.c +index 1b7c025..9079302 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -4154,11 +4154,7 @@ int type; + SV *x = NULL; + int prefix = '?'; + name = SvPV(sv,na); +-#ifdef USE_ITHREADS +- CopSTASHPV(PL_curcop) = NULL; +-#else +- CopSTASH(PL_curcop) = NULL; +-#endif ++ CopSTASH_set(PL_curcop, NULL); + switch (type) + { + case TK_CONFIG_SCALARVAR: +-- +1.8.2.3 + diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch new file mode 100644 index 000000000..95067501f --- /dev/null +++ b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch @@ -0,0 +1,47 @@ +From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001 +From: Slaven Rezic +Date: Sat, 23 Mar 2013 14:00:58 +0100 +Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an + expression + +--- + IO/IO.xs | 6 +----- + tkGlue.c | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/IO/IO.xs b/IO/IO.xs +index 8ae2a57..42f7515 100644 +--- a/IO/IO.xs ++++ b/IO/IO.xs +@@ -207,11 +207,7 @@ int offset + info.count = 0; + info.error = 0; + info.eof = 0; +- if (!SvUPGRADE(buf, SVt_PV)) +- { +- RETVAL = &PL_sv_undef; +- return; +- } ++ (void)SvUPGRADE(buf, SVt_PV); + SvPOK_only(buf); /* validate pointer */ + Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info); + do +diff --git a/tkGlue.c b/tkGlue.c +index dd3d283..cdc53ad 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -3830,10 +3830,7 @@ ClientData clientData; + return EXPIRE((interp, "Cannot trace readonly variable")); + } + } +- if (!SvUPGRADE(sv, SVt_PVMG)) +- { +- return EXPIRE((interp, "Trace SvUPGRADE failed")); +- } ++ (void)SvUPGRADE(sv, SVt_PVMG); + + if (SvTYPE(sv) == SVt_PVAV) + { +-- +1.8.2.3 + diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 993b1df63..0e04e7f76 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 184418 2013-05-06 19:39:04Z foutrelis $ -# Maintainer: François Charette +# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $ +# Maintainer: +# Contributor: François Charette # Contributor: Jason Chu # Contributor: Juergen Hoetzel pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=4 +pkgrel=5 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_cpanname}" @@ -15,8 +16,22 @@ depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('13275e85f99ee467a86d9598a437abff') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz + 0001-Fix-compilation-under-threaded-bleadperl.patch + 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch) +md5sums=('13275e85f99ee467a86d9598a437abff' + '361c34978746310e5c31b7a47c016b22' + '46448cdac9d7159f15f2d4b2719d171b') + +prepare() { + cd "$srcdir/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=78824 + patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch" + + # https://rt.cpan.org/Public/Bug/Display.html?id=82677 + patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch" +} build() { cd "$srcdir/${_cpanname}-$pkgver" diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD index 3e2a9db86..ba9146c1d 100644 --- a/extra/perl-xml-parser/PKGBUILD +++ b/extra/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160565 2012-06-02 10:28:38Z bluewind $ +# $Id: PKGBUILD 186420 2013-05-26 09:25:49Z bluewind $ # Maintainer: # Contributor: firmicus # Contributor: dorphell @@ -7,7 +7,7 @@ pkgname=perl-xml-parser _realname=XML-Parser pkgver=2.41 -pkgrel=3 +pkgrel=4 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index e0102c451..0565c319a 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $ +# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin pkgname=perl-yaml-syck _realname=YAML-Syck pkgver=1.25 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') license=('custom') diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 73762cb53..5fa8a6c60 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185575 2013-05-15 08:05:35Z bpiotrowski $ +# $Id: PKGBUILD 186422 2013-05-26 09:25:53Z bluewind $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.7 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 6f9202026..8f0e8bb0c 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181849 2013-04-04 14:34:55Z dan $ +# $Id: PKGBUILD 186424 2013-05-26 09:25:57Z bluewind $ # Maintainer: Dan McGee pkgname=postgresql-old-upgrade pkgver=9.1.9 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64') url="http://www.postgresql.org/" diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 0d250f2c2..da4a4c307 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181847 2013-04-04 14:20:11Z dan $ +# $Id: PKGBUILD 186423 2013-05-26 09:25:56Z bluewind $ # Maintainer: Dan McGee pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.2.4 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index a38df1083..30b699697 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $ +# $Id: PKGBUILD 186425 2013-05-26 09:26:01Z bluewind $ # Maintainer: # Contributor: Dale Blount # Contributor: Manolis Tzanidakis pkgname=razor pkgver=2.85 -pkgrel=1 +pkgrel=2 pkgdesc="A distributed, collaborative, spam detection and filtering network" arch=('i686' 'x86_64') url="http://razor.sourceforge.net" diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index b3b42deb7..fa1ef15e5 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184432 2013-05-06 19:39:40Z foutrelis $ +# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $ # Maintainer: Eric Bélanger pkgname=rrdtool pkgver=1.4.7 -pkgrel=6 +pkgrel=7 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 102fa5129..abd254912 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179497 2013-03-05 17:07:36Z giovanni $ +# $Id: PKGBUILD 186369 2013-05-26 07:53:25Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Emanuele Rampichini pkgname=smb4k -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('438ea64ed1296de6618677758257445b') +md5sums=('1b15d7f0f4ad89b0fe730629ec53c2ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index f3f0f0dbf..2b794f481 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 185569 2013-05-15 08:05:28Z bpiotrowski $ +# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $ # Maintainer: Stéphane Gaudreault # Contributor: Paul Mattal # Contributor: Jason Chu pkgname=subversion pkgver=1.7.9 -pkgrel=4 +pkgrel=6 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf' 'systemd') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' +makedepends=('krb5' 'apache' 'python2' 'perl>=5.18' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.apache.org/" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 40bf31977..7fdb838a2 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -10,7 +10,7 @@ _patchlevel=918 __hgrev=c61da758a9a2 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 3c5178ea5..817dd26c8 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 186008 2013-05-20 11:47:11Z giovanni $ +# $Id: PKGBUILD 186429 2013-05-26 09:26:13Z bluewind $ # Maintainer: Giovanni Scafora # Contributor: lucke pkgname=weechat pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" license=('GPL') depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile') +makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index c8258bf35..2ebcdb02c 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160585 2012-06-02 10:29:16Z bluewind $ +# $Id: PKGBUILD 186431 2013-05-26 09:26:17Z bluewind $ # Maintainer: Evangelos Foutras # Contributor: tobias pkgname=xfconf pkgver=4.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -13,8 +13,8 @@ groups=('xfce4') # http://www.xfce.org/documentation/requirements # keep dbus, see also http://bugs.archlinux.org/task/14536 depends=('libxfce4util' 'dbus-glib' 'dbus') -makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' - 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') +makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'glib-perl' + 'intltool' 'gtk-doc' 'chrpath') options=('!libtool' '!emptydirs') source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index f86e71660..ca6fbb0fa 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4ddd90d45cc8a4e663ef1e984e731232' - 'c4e0f6ed7f166b401dd522b8594efd81' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '7985f1e2cdb6838cf89bd85c0229db6a' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 87cf2bc63..dd3549ac6 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -5180,7 +5180,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index fcd021bd7..a5e974c9b 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.9.3-1-LIBRE-PAE +KERNEL_VERSION=3.9.4-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 4392f493f..7ae0ec08c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,8 +22,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4ddd90d45cc8a4e663ef1e984e731232' - '625f76c5e67c57c1fa35b74cf4a15d5e' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '8cc2a43c771d0fbb652c8264c746c007' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index a933be16e..dd2c45fd8 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -5197,7 +5197,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index f59400336..2bde797ef 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.9.3-1-LIBRE-XEN +KERNEL_VERSION=3.9.4-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 31997eb35..fe5469dd0 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.6 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=7 +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/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index f2138e86a..8ea0dbba7 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90185 2013-05-08 10:46:15Z tpowa $ +# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $ # Maintainer: Sergej Pupykin # Contributor: J. Santiago Hirschfeld # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=44 +pkgrel=45 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index bab6e70c5..a377c189c 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: TingPing # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.5 -pkgrel=4 -pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)" +pkgrel=5 +pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') url="http://www.hexchat.org/" license=('GPL') @@ -34,7 +34,7 @@ build() { # Rebrand to Parabola sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c -# Remove non-free browser references +# Remove nonfree browser references patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index b800c1444..81165b02d 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,18 +1,19 @@ -# $Id$ -# Maintainer: Mateusz Herych +# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $ +# Maintainer: Federico Cinelli +# Maintainer: Mateusz Herych # Contributor (Parabola): Jorge Lopez pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=2 -pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." +pkgrel=6 +pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64') license=('GPL') url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') +depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz") sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) @@ -29,7 +30,6 @@ build() { } package() { - cd $srcdir/$_pkgname-$pkgver + cd "$srcdir/$_pkgname-$pkgver" make DESTDIR="$pkgdir" install } - diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index b3176ccbb..ec385c23a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.9.3 +_kernver=3.9.4 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 3c8924131..7c3e3ad47 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.79 +_kernver=3.0.80 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=3 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 2dcd13686..baab66b5c 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185987 2013-05-20 06:38:28Z tpowa $ +# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=79 +_sublevel=80 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.78 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.80 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '4ddd90d45cc8a4e663ef1e984e731232' + '6dfc33fc2587b36e2bf61ff1b26584c2' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '85cd68841ef098249949638c1e8dd443') + '7a0757288e0f61cbd91f7fc6b2bafb7b') 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-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 8bf93b71e..3c8ebbdae 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.79-1-LIBRE-LTS +KERNEL_VERSION=3.0.80-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 394563806..85ba7dba7 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90492 2013-05-12 22:55:40Z seblu $ +# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $ # Maintainer: Sébastien Luttringer # Maintainer (Parabola): André Silva @@ -13,7 +13,7 @@ _basekernel=3.9 #_sublevel=6 _pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=2 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e5f7a6bc1..76c1908f7 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185985 2013-05-20 06:09:54Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # 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=('120df29f88622dabf7015a22c7cc8e25' - '4ddd90d45cc8a4e663ef1e984e731232' - '9de4af59b9c560df524b525afa117328' - 'f350294046f6a74ac1d2748ac6326723' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + 'b0bc969b9e8c1767b16cdc0504a7bad7' + '42dfd3a3702433b68c079d6b3fd13c3c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '4e229083e416b258e0957299971d7859') + '846eb5948403dd0f2f02c50d3acb69c3') 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 62baa74b7..107968129 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -5166,7 +5166,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 0a16459f0..24d6be2bd 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.3-1 Kernel Configuration +# Linux/x86 3.9.4-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4978,7 +4978,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=m # diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index a595bb180..619ad6090 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.3-1-LIBRE +KERNEL_VERSION=3.9.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index cd55468eb..509275d5d 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184774 2013-05-08 10:43:50Z tpowa $ +# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $ # Maintainer: Paul Mattal # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=45 +pkgrel=46 epoch=1 _extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -47,7 +47,7 @@ build() { PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ - --with-transmitter + --sbindir=/usr/bin --with-transmitter # Remove drivers already in kernel sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ @@ -108,7 +108,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' '3deb02604b37811d41816e9b4385fcc3' - 'dab8a73bcc5fd5479d8750493d8d97dc' - 'c2e20fe68b034df752dba2773db16ebe' + '1c7ceace42da44f41e5a42b4dd3b3d76' + '121283a6de274e52ed86522aecd0f6e5' '07131d117fcfe9dcd50c453c3a5e9531' 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service index 953601fd3..2123348fd 100644 --- a/libre/lirc-libre/lirc.service +++ b/libre/lirc-libre/lirc.service @@ -3,7 +3,7 @@ Description=Linux Infrared Remote Control [Service] ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd -ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid +ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid Type=forking PIDFile=/run/lirc/lircd.pid diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service index 6b258e312..eedcf5d8f 100644 --- a/libre/lirc-libre/lircm.service +++ b/libre/lirc-libre/lircm.service @@ -4,7 +4,7 @@ After=lirc.service Wants=lirc.service [Service] -ExecStart=/usr/sbin/lircmd -u +ExecStart=/usr/bin/lircmd -u Type=forking [Install] diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 73f1135e0..a49b889bd 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185551 2013-05-14 23:48:31Z foutrelis $ +# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva @@ -7,32 +7,30 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=35920 -pkgrel=3 +pkgver=36285 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch subreader-fix-srt-parsing.patch) -md5sums=('5f96e829d711e7d1ea65e324710dca50' +options=('!buildflags' '!emptydirs') +source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz + mplayer.desktop + cdio-includes.patch) +md5sums=('5e4f0d4d039b0219514cf52ae6da831d' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc' - '7cb6019018a95dcc3d1231e1aaa8bbdb') + '7b5be7191aafbea64218dc4916343bbc') prepare() { - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" patch -Np0 -i ../cdio-includes.patch - - # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 - patch -Np1 -i ../subreader-fix-srt-parsing.patch } build() { - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -68,7 +66,7 @@ package_mplayer-libre() { replaces=('mplayer') conflicts=('mplayer') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mplayer install-mplayer-man install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" @@ -88,7 +86,7 @@ package_mencoder-libre() { replaces=('mencoder') conflicts=('mencoder') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mencoder install-mencoder-man - find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; + find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } diff --git a/libre/mplayer-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-libre/subreader-fix-srt-parsing.patch deleted file mode 100644 index 84f2de4d9..000000000 --- a/libre/mplayer-libre/subreader-fix-srt-parsing.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 -From: wm4 -Date: Tue, 30 Apr 2013 00:09:31 +0200 -Subject: [PATCH] subreader: fix out of bound write access when parsing .srt - -This broke .srt subtitles on gcc-4.8. The breakage was relatively -subtle: it set all hour components to 0, while everything else was -parsed successfully. - -But the problem is really that sscanf wrote 1 byte past the sep -variable (or more, for invalid/specially prepared input). The %[..] -format specifier is unbounded. Fix that by letting sscanf drop the -parsed contents with "*", and also make it skip only one input -character by adding "1" (=> "%*1[..."). - -The out of bound write could easily lead to security issues. - -Also, this change makes .srt subtitle parsing slightly more strict. -Strictly speaking this is an unrelated change, but do it anyway. It's -more correct. ---- - sub/subreader.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - - (foutrelis: adjusted variable names in first hunk to apply to mplayer) - -diff --git a/sub/subreader.c b/sub/subreader.c -index 23da4c7..0f1b6c9 100644 ---- a/sub/subreader.c -+++ b/sub/subreader.c -@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, - int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; - - while (!current->text[0]) { -- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; -+ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; - int i; - - /* Parse SubRip header */ - if (!stream_read_line(st, line, LINE_LEN, utf16)) - return NULL; -- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", -- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", -+ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) - continue; - - current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; -@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, - return sub_ass_read_line_subviewer(st, current, args); - while (!current->text[0]) { - if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; -- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) - continue; - current->start = a1*360000+a2*6000+a3*100+a4/10; - current->end = b1*360000+b2*6000+b3*100+b4/10; --- -1.8.1.6 - diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 023b703b4..311c469ca 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90856 2013-05-14 23:55:05Z foutrelis $ +# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Hugo Doria @@ -8,7 +8,7 @@ pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=7 +pkgrel=8 pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" @@ -33,7 +33,7 @@ install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' - '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092') + '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') prepare() { @@ -43,7 +43,7 @@ prepare() { patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 - patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch" + patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" } build() { diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch index 84f2de4d9..f1c087377 100644 --- a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch +++ b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch @@ -1,34 +1,8 @@ -From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001 -From: wm4 -Date: Tue, 30 Apr 2013 00:09:31 +0200 -Subject: [PATCH] subreader: fix out of bound write access when parsing .srt - -This broke .srt subtitles on gcc-4.8. The breakage was relatively -subtle: it set all hour components to 0, while everything else was -parsed successfully. - -But the problem is really that sscanf wrote 1 byte past the sep -variable (or more, for invalid/specially prepared input). The %[..] -format specifier is unbounded. Fix that by letting sscanf drop the -parsed contents with "*", and also make it skip only one input -character by adding "1" (=> "%*1[..."). - -The out of bound write could easily lead to security issues. - -Also, this change makes .srt subtitle parsing slightly more strict. -Strictly speaking this is an unrelated change, but do it anyway. It's -more correct. ---- - sub/subreader.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - - (foutrelis: adjusted variable names in first hunk to apply to mplayer) - -diff --git a/sub/subreader.c b/sub/subreader.c -index 23da4c7..0f1b6c9 100644 ---- a/sub/subreader.c -+++ b/sub/subreader.c -@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, +Index: sub/subreader.c +=================================================================== +--- sub/subreader.c (revision 36284) ++++ sub/subreader.c (revision 36285) +@@ -378,14 +378,14 @@ int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; while (!current->text[0]) { @@ -41,20 +15,26 @@ index 23da4c7..0f1b6c9 100644 return NULL; - if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", - &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) -+ if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d", ++ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", + &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) continue; - current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10; -@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, - return sub_ass_read_line_subviewer(st, current, args); + current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; +@@ -442,7 +442,7 @@ + #endif while (!current->text[0]) { if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; - if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) -+ if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) ++ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10; --- -1.8.1.6 - +@@ -1123,7 +1123,7 @@ + {*uses_time=1;return SUB_MPL2;} + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBRIP;} +- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) ++ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBVIEWER;} + if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) + {*uses_time=1;return SUB_SUBVIEWER2;} diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index a3d48d0f3..4dd77dda3 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90191 2013-05-08 10:50:10Z tpowa $ +# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $ # Maintainer: Lukas Fleischer # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=21 +pkgrel=22 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 95f94c9b4..b1f8c6ffb 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90193 2013-05-08 10:51:01Z tpowa $ +# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.9-LIBRE -pkgrel=24 +pkgrel=25 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/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 9646cb1f7..a6c22c177 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90212 2013-05-09 00:26:24Z seblu $ +# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $ # Maintainer: Ionut Biru # Maintainer: Sébastien Luttringer # Maintainer (Parabola): Jorge López @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 -pkgrel=5.1 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 82bda9855..9a98c5752 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 6c1a57d3a..f0ca024ed 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index e7805a9b4..cc50fb44c 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $ +# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $ # Maintainer: Eric Bélanger # Maintainer (ConnochaetOS): Henry Jensen # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ _pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=12 -pkgdesc="A GTK+ based IRC client without non-free browser reference" +pkgrel=13 +pkgdesc="A GTK+ based IRC client, without nonfree browser reference" arch=('i686' 'x86_64' 'mips64el') url="http://www.xchat.org/" provides=("xchat=$pkgver") @@ -35,14 +35,18 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' 'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911' '20aef0ae608af6b30e1b4249f9c53830f8f514f6') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" +} + +build() { + cd ${_pkgname}-${pkgver} autoconf autoheader @@ -52,7 +56,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd ${_pkgname}-${pkgver} make DESTDIR="${pkgdir}" install for i in 24 32 48 64 128 256 ; do diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD index 58c097cf4..1cd3cccf6 100644 --- a/pcr/amsynth/PKGBUILD +++ b/pcr/amsynth/PKGBUILD @@ -1,26 +1,26 @@ -# Mantainer: Guest One +# Maintainer : Guest One pkgname=amsynth pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Analogue Modeling SYNTHesizer" -arch=('i686') +arch=('i686' 'x86_64') url="http://code.google.com/p/amsynth/" license=('GPL') -depends=('gtkmm' 'jack') -source=(http://amsynth.googlecode.com/files/amSynth-${pkgver}.tar.gz) +depends=('gtkmm' 'jack' 'liblo') +makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa') +install="$pkgname.install" +source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz") md5sums=('991329e433bb8c496f9ca5158faf0bca') build() { - cd ${srcdir}/amSynth-${pkgver} - - sed -i -e 's|/amSynth|/amsynth|' src/main.cc - - autoreconf --force --install + cd "$srcdir/amSynth-$pkgver" + libtoolize ./configure --prefix=/usr make +} - install -Dm755 src/amSynth ${pkgdir}/usr/bin/amSynth - mkdir -p ${pkgdir}/usr/share/${pkgname} - install -m644 skel/{Controllersrc,presets} ${pkgdir}/usr/share/${pkgname}/ +package() { + cd "$srcdir/amSynth-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/pcr/amsynth/amsynth.install b/pcr/amsynth/amsynth.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/pcr/amsynth/amsynth.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD new file mode 100644 index 000000000..04ffee934 --- /dev/null +++ b/pcr/lua51-sql-mysql/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Sergej Pupykin +# Contributor: Sébastien Luttringer +# Contributor: Anders Bergh + +pkgname=lua51-sql-mysql +pkgdesc='MySQL module for Lua 5.1' +pkgver=2.2.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://www.keplerproject.org/luasql/' +license=('MIT') +depends=('lua51' 'libmariadbclient') +source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz") +md5sums=('59d72db444c6369c936d4f03694db6b7') + +build() { + cd luasql-$pkgver + sed -i '24s,$,/lua5.1,' config + msg2 'Building MySQL support' + make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \ + DRIVER_INCS="$(mysql_config --include) -fPIC" +} + +package() { + cd luasql-$pkgver + install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.1/luasql/mysql.so" + install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD new file mode 100644 index 000000000..284034782 --- /dev/null +++ b/pcr/openhpi/PKGBUILD @@ -0,0 +1,83 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=openhpi +pkgver=3.2.0 +pkgrel=1 +pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.$pkgname.org/ +license=custom +depends=( + libxml2 + net-snmp +) +source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz +sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab + +prepare() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh .) + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/bin .) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin' .) + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin' .) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock .) + sed -i 's|var/run|run|; + ' $(grep -rl var/run .) + sed -i '/Like Linux/ s|Linux|GNU/Linux|; + /Linux and Compaq Tru64 Unix/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux software/ s|Linux|GNU/Linux|; + ' $(grep -rl Linux .) +} + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --enable-clients\ + --enable-dynamic_simulator\ + --enable-ilo2_ribcl\ + --enable-ipmidirect\ + --enable-man\ + --enable-oa_soap\ + --enable-simulator\ + --enable-slave\ + --enable-snmp_bc\ + --enable-sysfs\ + --enable-test_agent\ + --enable-watchdog\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + rm $pkgdir/etc/init.d/openhpid + rmdir $pkgdir/etc/init.d + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'Description=Enable OpenHPI service which is provided by openhpid' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'After=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'ExecStart=/usr/bin/openhpid -c /etc/openhpi/openhpi.conf' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/openhpi.service +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD new file mode 100644 index 000000000..03f53784e --- /dev/null +++ b/pcr/prboom/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ +# Maintainer: Lukas Fleischer +# Contributor: Thayer Williams +# Contributor: dale + +pkgname=prboom +pkgver=2.5.0 +pkgrel=7 +pkgdesc='A game engine which provides a program to play Doom levels.' +url='http://prboom.sourceforge.net/' +license=('GPL2') +arch=('i686' 'x86_64' 'mips64el') +depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" + 'libpng-1.4.patch') +md5sums=('a8a15f61fa2626ab98051ab2703378c4' + 'ba53474db8e747035ca2320a445e4ae0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../libpng-1.4.patch + + ./configure --prefix=/usr --disable-i386-asm + sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch new file mode 100644 index 000000000..a2215e37b --- /dev/null +++ b/pcr/prboom/libpng-1.4.patch @@ -0,0 +1,21 @@ +diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c +--- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 ++++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 +@@ -231,7 +231,7 @@ + if (fp) + { + png_struct *png_ptr = png_create_write_struct( +- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); ++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); + + if (png_ptr) + { +@@ -279,7 +279,7 @@ + break; + } + } +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + } + fclose(fp); + } diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD index b612997f3..ed5249a25 100644 --- a/pcr/python2-sfml2/PKGBUILD +++ b/pcr/python2-sfml2/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Jorge Araya Navarro pkgname=python2-sfml2 -pkgver=1.2 +pkgver=master pkgrel=0 pkgdesc="Python 2 binding for SFML 2, written with Cython." arch=('i686' 'x86_64') -url="http://openhelbreath.net/python-sfml2" +url="http://python-sfml.org" license=('LGPL3') depends=('sfml' 'python2') makedepends=('sfml' 'cython2') conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2') -source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') +source=('https://github.com/Sonkun/python-sfml/archive/master.zip') optdepends=('pyqt-common: To use pysfml with Qt') build() { @@ -37,4 +37,4 @@ package() { install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE fi } -sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') +sha256sums=('01bb4a07c3100807163cd2ddcb1208794b1dbac19706eabea430e23fbf00414b') diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index e01f42ef0..8bc928115 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -1,29 +1,45 @@ # Maintainer:Bjoern Bidar #_gui_toolkit=qt # qt or gtk _build_server=false # set true to build server (default:false) _build_client=true # set false to don't build client (default:true) _CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client _CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client - if [ $_build_client = true ] ; then true && pkgname=( 'ryzom-client-hg' ) fi if [ $_build_server = true ] ; then true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg') -fi +fi +pkgbase=ryzom-hg +pkgname=ryzom-hg +pkgver=20130331 +pkgrel=1 +pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server" +arch=('i686' 'x86_64') +url="http://www.ryzom.com/" +license=('AGPL3') +depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') +conflicts=('ryzom-client-latest-hg') +groups=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison') +provides=('ryzom') +source=( 'ryzom.sh' 'ryzom.desktop' ) +md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' + '71d5136d40ec4e76c2ac2b0c9e506aef') + + case $_gui_toolkit in qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;; gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;; -esac +esac _hg_root='https://bitbucket.org/ryzom/ryzomcore' -_hg_name='ryzomcore' +_hg_name='ryzomcore' prepare() { if [ -d "$_hg_name" ] ; then # fetch sources @@ -33,84 +49,52 @@ prepare() { else hg clone "$_hg_root" fi - + msg2 "hg clone done or server timeout" } build() { cd $_hg_name - - if [ $_build_client = true ] ; then - + + if [ $_build_client = true ] ; then mkdir -p "$srcdir/build-client" cd "$srcdir/build-client" msg "client is $_build_client, building client" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin msg "Starting make, to build client" make - + fi - + if [ $_build_server = true ] ; then mkdir -p "$srcdir/build-server" cd "$srcdir/build-server" msg "client is $_build_server, building server" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - msg "Starting make, to build server" - make - + msg "Starting make, to build server" + make fi - } -if [ $_build_client = true ] ; then +if [ $_build_client = true ] ; then + package_ryzom-client-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server" depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql' 'ryzom-data' ) cd "$srcdir/build-client" make DESTDIR="$pkgdir/" install - install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + install -Dm755 ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom } - fi if [ $_build_server = true ] ; then - + package_ryzom-server-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server" cd "$srcdir/build-server" - make DESTDIR="$pkgdir/" install - # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications - # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - # cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - #chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + make DESTDIR="$pkgdir/" install } - fi - - - -pkgname=ryzom-hg -pkgbase=ryzom-hg -pkgver=20130331 -pkgrel=1 -pkgdesc="An awesome free software 3D MMORPG game" -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL3') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51') #'lua51-sql-mysql') -conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg') -groups=('ryzom') -makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -provides=('ryzom') -source=( 'ryzom.sh' 'ryzom.desktop' ) -md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' - '71d5136d40ec4e76c2ac2b0c9e506aef') -- cgit v1.2.3-54-g00ecf