diff options
55 files changed, 344 insertions, 977 deletions
diff --git a/community-staging/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD index f5f73cd0e..c537ce978 100644 --- a/community-staging/libvirt/PKGBUILD +++ b/community-testing/libvirt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64468 2012-02-14 07:05:10Z spupykin $ +# $Id: PKGBUILD 64585 2012-02-16 20:41:38Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> diff --git a/community-staging/libvirt/libvirt.install b/community-testing/libvirt/libvirt.install index 3881386d2..3881386d2 100644 --- a/community-staging/libvirt/libvirt.install +++ b/community-testing/libvirt/libvirt.install diff --git a/community-staging/libvirt/libvirtd-guests.conf.d b/community-testing/libvirt/libvirtd-guests.conf.d index 02a933715..02a933715 100644 --- a/community-staging/libvirt/libvirtd-guests.conf.d +++ b/community-testing/libvirt/libvirtd-guests.conf.d diff --git a/community-staging/libvirt/libvirtd-guests.rc.d b/community-testing/libvirt/libvirtd-guests.rc.d index b4331964a..b4331964a 100644 --- a/community-staging/libvirt/libvirtd-guests.rc.d +++ b/community-testing/libvirt/libvirtd-guests.rc.d diff --git a/community-staging/libvirt/libvirtd.conf.d b/community-testing/libvirt/libvirtd.conf.d index d4d25b47a..d4d25b47a 100644 --- a/community-staging/libvirt/libvirtd.conf.d +++ b/community-testing/libvirt/libvirtd.conf.d diff --git a/community-staging/libvirt/libvirtd.rc.d b/community-testing/libvirt/libvirtd.rc.d index 193bffa9c..193bffa9c 100644 --- a/community-staging/libvirt/libvirtd.rc.d +++ b/community-testing/libvirt/libvirtd.rc.d diff --git a/community-staging/libvirt/openbsd-netcat-default.patch b/community-testing/libvirt/openbsd-netcat-default.patch index a01b4f14e..a01b4f14e 100644 --- a/community-staging/libvirt/openbsd-netcat-default.patch +++ b/community-testing/libvirt/openbsd-netcat-default.patch diff --git a/community-staging/libvirt/unixperms.patch b/community-testing/libvirt/unixperms.patch index b3fb86cf5..b3fb86cf5 100644 --- a/community-staging/libvirt/unixperms.patch +++ b/community-testing/libvirt/unixperms.patch diff --git a/community-staging/libvirt/yajl-2.x.patch b/community-testing/libvirt/yajl-2.x.patch index 80d3edce0..80d3edce0 100644 --- a/community-staging/libvirt/yajl-2.x.patch +++ b/community-testing/libvirt/yajl-2.x.patch diff --git a/community-staging/netcf/PKGBUILD b/community-testing/netcf/PKGBUILD index cf8d6f053..1498f4623 100644 --- a/community-staging/netcf/PKGBUILD +++ b/community-testing/netcf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64466 2012-02-14 06:53:16Z spupykin $ +# $Id: PKGBUILD 64587 2012-02-16 20:41:45Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> diff --git a/community-staging/netcf/netcf-0.1.7.patch b/community-testing/netcf/netcf-0.1.7.patch index d4a4d31b7..d4a4d31b7 100644 --- a/community-staging/netcf/netcf-0.1.7.patch +++ b/community-testing/netcf/netcf-0.1.7.patch diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD index 824e25a61..60a9f9983 100644 --- a/community/blender/PKGBUILD +++ b/community/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $ +# $Id: PKGBUILD 64569 2012-02-16 20:09:53Z svenstaro $ # Contributor: John Sowiak <john@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> @@ -13,8 +13,8 @@ _svn=false pkgname=blender -pkgver=2.61 -pkgrel=5 +pkgver=2.62 +pkgrel=1 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ options=(!strip) install=blender.install if [ $_svn = false ]; then source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('11a4721ff92286f678bb2e05e5f29c97') + md5sums=('f2357584a5081b03f6e60ba3efe2a610') else source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) md5sums=('7579d1139d0d6025df8afcfca64a65c4') diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD index 0f19cd85c..441d1f08b 100644 --- a/community/clearsilver/PKGBUILD +++ b/community/clearsilver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 27254 2010-09-18 22:01:47Z schuay $ +# $Id: PKGBUILD 64605 2012-02-17 02:32:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Aaron Griffin <aaron@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clearsilver pkgver=0.10.5 -pkgrel=7 +pkgrel=8 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system" arch=('i686' 'x86_64' 'mips64el') url='http://www.clearsilver.net' @@ -23,10 +23,19 @@ build() ./configure --disable-csharp --prefix=/usr --with-python=/usr/bin/python2 - # we all hate broken makefiles... hooray! sed -i "s@/usr/local/bin/python@/usr/bin/env python2@g" scripts/document.py sed -i "s@install.rb install@install.rb install --prefix=$pkgdir@g" ruby/Makefile patch -p1 <$srcdir/clearsilver-ruby-1.9.patch + patch -p0 ruby/install.rb <<EOF +71,73c71,73 +< siteruby = subprefix.call(c['sitedir']) +< versite = subprefix.call(c['sitelibdir']) +< sodir = subprefix.call(c['sitearchdir']) +--- +> siteruby = subprefix.call(c['vendordir']) +> versite = subprefix.call(c['vendorlibdir']) +> sodir = subprefix.call(c['vendorarchdir']) +EOF make make PREFIX=$pkgdir DESTDIR=$pkgdir install diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index e0ad22dc1..79d4d0c51 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63477 2012-02-04 17:14:55Z svenstaro $ +# $Id: PKGBUILD 64556 2012-02-16 07:01:07Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,15 +7,15 @@ pkgname=('dmd' 'libphobos') pkgbase=dmd -pkgver=2.057 -pkgrel=2 +pkgver=2.058 +pkgrel=1 pkgdesc="The Digital Mars D compiler" arch=('i686' 'x86_64') url="http://www.digitalmars.com/d/2.0/" source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip - tools.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v2.057beta) -md5sums=('531c4b60eb002ea8abbe5c80b2eb677d' - '5a0e4a9fe31f55bc69a1dd02486b9c3a') + tools.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver}) +md5sums=('81a0fe7b635d3a38ecbefff6048a37fe' + 'cce5249b59a38a4c0eddf113aff87698') license=('custom') [[ $CARCH == "x86_64" ]] && _archbits="64" @@ -58,7 +58,7 @@ package_dmd() { } package_libphobos() { - install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime.a $pkgdir/usr/lib/libdruntime.a + install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux${_archbits}.a $pkgdir/usr/lib/libdruntime.a install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a mkdir -p $pkgdir/usr/include/d diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD deleted file mode 100644 index 848c0cc97..000000000 --- a/community/fityk/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: Cuneyt Unlu <unlucu AT gmail.com> - -pkgname=fityk -pkgver=1.1.1 -pkgrel=4 -pkgdesc='A program for nonlinear fitting of analytical functions to data.' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.unipress.waw.pl/fityk/' -license=('GPL') -depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot' 'desktop-file-utils') # wxgtk supplied by statically linked wxWidgets -makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion') -options=('!libtool') -install='fityk.install' - -build() { - # daily snapshot because fityk requires a version that hasn't been released yet... - svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets - - cd wxWidgets - ./configure --prefix=${srcdir}/usr --disable-shared --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys - make - make install - - cd ${srcdir} - git clone git://github.com/wojdyr/fityk.git - cd fityk - git checkout v${pkgver} - #cd ${pkgname}-${pkgver} - - # disable xyconvert because wxwidgets>=2.9 is needed (dev version) and it isn't standard with arch yet - #--disable-xyconvert \ - ./autogen.sh \ - --prefix=/usr \ - --without-doc \ - --with-wx-prefix=${srcdir}/usr - #./configure \ - - make -} - -package() { - cd fityk - - make DESTDIR=${pkgdir} install -} diff --git a/community/fityk/fityk.install b/community/fityk/fityk.install deleted file mode 100644 index df476d572..000000000 --- a/community/fityk/fityk.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-mime-database /usr/share/mime - update-desktop-database -q -} - -post_upgrade() { - update-mime-database /usr/share/mime - update-desktop-database -q -} - -post_remove() { - update-mime-database /usr/share/mime - update-desktop-database -q -} diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 78129a3a3..c9d36d11b 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,6 +1,7 @@ +# $Id: PKGBUILD 64554 2012-02-16 06:56:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20120209 +pkgver=20120216 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD index 49647afef..7447235c4 100644 --- a/community/pam-krb5/PKGBUILD +++ b/community/pam-krb5/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46339 2011-05-05 11:43:20Z spupykin $ +# $Id: PKGBUILD 64590 2012-02-16 20:49:57Z kchen $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Ryan Corder <ryanc@greengrey.org> pkgname=pam-krb5 -pkgver=4.4 -pkgrel=2 +pkgver=4.5 +pkgrel=1 pkgdesc='A PAM module providing Kerberos v5 support.' arch=('i686' 'x86_64' 'mips64el') url='http://www.eyrie.org/~eagle/software/pam-krb5/' @@ -12,7 +12,7 @@ license=('custom') options=('!libtool') depends=('krb5' 'pam') source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz") -md5sums=('a3f9a414fef102cd815a763c965b315c') +md5sums=('5736795225cf7f84718af42a15570fe0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD index a082bbacf..0e05880e5 100644 --- a/community/ruby-cairo/PKGBUILD +++ b/community/ruby-cairo/PKGBUILD @@ -1,24 +1,29 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> - +# $Id: PKGBUILD 64611 2012-02-17 02:54:22Z tdziedzic $ +# Maintiner: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=ruby-cairo -_pkgname=rcairo pkgver=1.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Ruby bindings for cairo" arch=('i686' 'x86_64' 'mips64el') url="http://cairographics.org/rcairo/" license=('GPL') depends=('ruby' 'cairo>=1.2.0') makedepends=('ruby-pkgconfig') -source=(http://cairographics.org/releases/$_pkgname-$pkgver.tar.gz) -md5sums=('4fe76f1069d0d1ccfdf7848e3e928d9f') +source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz") +sha256sums=('70e2df4fe0bcd2875d7512279058b116e964ca91d152cf9eb2f05b5c7774f118') build() { - cd "$srcdir/$_pkgname-$pkgver" - ruby extconf.rb - make + cd "$srcdir/rcairo-$pkgver" + + ruby extconf.rb --vendor + make } + package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "$srcdir/rcairo-$pkgver" + + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 6c441072a..8d6598485 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63819 2012-02-05 18:41:40Z arodseth $ +# $Id: PKGBUILD 64609 2012-02-17 02:50:17Z tdziedzic $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -7,7 +7,7 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') pkgver=1.1.2 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686' 'mips64el') url="http://ruby-gnome2.sourceforge.jp/" license=('LGPL') @@ -17,7 +17,7 @@ sha256sums=('a16da4335c3e65ccab22e38caa55843fe2df18d55987c7be3f9dfc70866e2aaf') build() { cd "$srcdir/ruby-gtk2-$pkgver" - LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir="$pkgdir" + LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir="$pkgdir" --vendor make } diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD index 79e296738..f3434fe32 100644 --- a/community/ruby-ncurses/PKGBUILD +++ b/community/ruby-ncurses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59686 2011-11-29 12:01:49Z arodseth $ +# $Id: PKGBUILD 64613 2012-02-17 02:56:44Z tdziedzic $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Jeff Mickey <j@codemac.net> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=ruby-ncurses pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Module for interactive text console applications (ncurses)" arch=('x86_64' 'i686') url="http://ncurses-ruby.berlios.de/" @@ -17,7 +17,7 @@ md5sums=('63fd3d09a51cdd745e1ed37f85621ea2') build() { cd "$srcdir/ncurses-ruby-$pkgver" - ruby extconf.rb + ruby extconf.rb --vendor make } diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD deleted file mode 100644 index 8c3c88efc..000000000 --- a/community/sage-mathematics/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Osman Ugus <ugus11@yahoo.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD - -pkgname=sage-mathematics -pkgver=4.7.2 -pkgrel=3 -pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' -url='http://www.sagemath.org' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -#depends=('readline') -depends=('ppl') -makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') -optdepends=('imagemagick: some plotting functionality benefits from it' - 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' - 'sage-mathematics-spkgs: original packages used to build additional packages') -options=('!makeflags') -install="${pkgname}.install" -source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" - 'SAGE-notebook.desktop') -md5sums=('b3073997e6c7ec00a269f84ff2e54973' - 'dc391f12b7d17dd37326343ec0e99bbd') - -build() { - cd sage-${pkgver} - - # modularization of sage, sort of :) - # fixes the following error: - # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook - # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash - # this is for people who have custom kernels (sage works this around by checking uname -r) - #mkdir -p spkg/installed - #touch spkg/installed/readline-6.1 - mkdir -p spkg/installed - touch spkg/installed/ppl-0.11.2 - - # fix "missing sage.all error" during build - unset CFLAGS - unset CXXFLAGS - - # fix build errors - unset LDFLAGS - - # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS - export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') - export MAKE="make -j${SAGE_BUILD_THREADS}" - - # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran - export SAGE_FORTRAN='/usr/bin/gfortran' - export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' - - # disable building with debugging support - export SAGE_DEBUG='no' - - # enable fat binaries (disables processor specific optimizations) - # comment out if you're only building it for yourself - export SAGE_FAT_BINARY='yes' - - # can't write to root in a clean chroot - export DOT_SAGE='/build/src/' - - # only build sage, no documents - #make build - make -} - -<< COMMENT -check() { - cd sage-${pkgver} - - # uncomment if we want to run all the tests (warning: very long) - #make ptestlong -} -COMMENT - -package() { - cd sage-${pkgver} - - # cp because make install is experimental and will corrupt the install - install -d ${pkgdir}/opt/sage - cp -r * ${pkgdir}/opt/sage - - # move SageTeX files to more appropriate directory - install -d ${pkgdir}/usr/share - mv ${pkgdir}/opt/sage/local/share/texmf \ - ${pkgdir}/usr/share - - desktop-file-install ${srcdir}/SAGE-notebook.desktop \ - --dir ${pkgdir}/usr/share/applications - - # create link to main binary - install -d ${pkgdir}/usr/bin - ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage - - # remove build logs - rm -f ${pkgdir}/opt/sage/install.log - rm -rf ${pkgdir}/opt/sage/spkg/logs - - # remove source packages, since they are rarely needed, they are 300mb in size (compressed) - # no need to package them together, put into sage-mathematics-spkgs - rm -f ${pkgdir}/opt/sage/spkg/base/*spkg - rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg -} diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop deleted file mode 100644 index 26a35d3ac..000000000 --- a/community/sage-mathematics/SAGE-notebook.desktop +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=SAGE -Comment=SAGE NOTEBOOK -Comment[en_US]=SAGE NOTEBOOK -Exec=/opt/sage/sage -notebook -GenericName= -GenericName[de]= -Icon=/opt/sage/data/extcode/notebook/images/sageicon.png -MimeType= -Name[de]=SAGE -StartupNotify=true -Terminal=true -Type=Application -Categories=Science;Math; -X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -GenericName[en_US]= diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install deleted file mode 100644 index 6caa5299e..000000000 --- a/community/sage-mathematics/sage-mathematics.install +++ /dev/null @@ -1,56 +0,0 @@ -post_install() { - cd /opt/sage - - # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership - # the files it writes to ~/.sage can be safely ignored - HOME=/tmp ./sage -c - - # add sagemath user for the daemon - useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath - - # Update LaTeX db to point to SageTeX - if [ -f /usr/bin/texhash ]; then - /usr/bin/texhash /usr/share/texmf - else - echo 'Warning: could not find /usr/bin/texhash' - echo 'SageTeX has been installed but you need to run:' - echo '# texhash /usr/share/texmf' - echo 'So that LaTeX will be able to find it.' - fi - -echo ' - ___ -/ (_) o | -\__ _ _ __ | -/ / |/ | | / \_| | | -\___/ | |_/|/\__/ \_/|/o - /| /| - \| \| - ________________________________ -< sage-mathematics, I mean, MOO! > - -------------------------------- - \ ^__^ - \ (oo)\_______ - (__)\ )\/\ - ||----w | - || || -' - -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - # Update LaTeX db to remove SageTeX entries - if [ -f /usr/bin/texhash ]; then - /usr/bin/texhash /usr/share/texmf - fi - - # remove the sagemath daemon user - userdel sagemath - - # clean up left overs - rm -rf /opt/sage -} diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 692cf063e..c3db6e1c5 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63837 2012-02-06 01:19:19Z giovanni $ +# $Id: PKGBUILD 64563 2012-02-16 14:20:35Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip" "${pkgname}.desktop") -md5sums=('82a2a764e38eb1372dbe43597055957d' +md5sums=('f32da6168a475041e4337fd70845851d' 'fef6aa492af487ccccd6b133635cee5a') build() { diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 6f906779a..aa4bcb6e4 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=1 pkgdesc='An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64' 'mips64el') @@ -11,10 +11,8 @@ makedepends=('bison' 'flex') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') install=stone-soup.install -source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2" +source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz" "${pkgname}.desktop") -md5sums=('b9befb8177618d943295546c3d1e1d78' - 'afdacb4c39342e75674efb88eeb3da21') build() { @@ -23,9 +21,9 @@ build() { # adjust makefile to use /usr/bin, owner root:root, # disable setgid on executable - sed -i 's|bin_prefix := bin|bin_prefix := usr/bin|' makefile - sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' makefile - sed -i 's|MCHMOD := 2755|MCHMOD := 755|' makefile + sed -i 's|bin_prefix := bin|bin_prefix := usr/bin|' Makefile + sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' Makefile + sed -i 's|MCHMOD := 2755|MCHMOD := 755|' Makefile # first build and install tiles version @@ -63,3 +61,5 @@ build() { } # vim: ts=4:sw=4:expandtab +md5sums=('ca360fa13f730f501a0a31b187eeca46' + 'afdacb4c39342e75674efb88eeb3da21') diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD index dcb29d348..8d4c066b6 100644 --- a/community/supertuxkart/PKGBUILD +++ b/community/supertuxkart/PKGBUILD @@ -1,32 +1,41 @@ -# $Id: PKGBUILD 35517 2010-12-21 13:39:10Z svenstaro $ +# $Id: PKGBUILD 64571 2012-02-16 20:13:20Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: rabyte <rabyte__gmail> pkgname=supertuxkart -pkgver=0.7 +pkgver=0.7.3 pkgrel=1 pkgdesc="A kart racing game featuring Tux and his friends" arch=('i686' 'x86_64' 'mips64el') url="http://supertuxkart.sourceforge.net/" license=('GPL2') -depends=('irrlicht' 'openal' 'libvorbis') -makedepends=() -source=(http://downloads.sourceforge.net/project/$pkgname/SuperTuxKart/0.7/$pkgname-$pkgver-src.tar.bz2) -md5sums=('2806f271e4d37fee5ad8ca166e1ad489') +depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl') +makedepends=('cmake' 'subversion' 'mesa') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2) +md5sums=('502664b2ec9ad5ab88b1882fef4c074d') build() { + cd "$srcdir" + + svn co -r 3900 https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk irrlicht + + cd irrlicht/source/Irrlicht + NDEBUG=1 make + cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --datadir=/usr/share + sed -i "s|share/games|share|g" CMakeLists.txt - # Fix compilation failure: http://bugs.gentoo.org/283490 - #sed -i 's/-lGL/-lGL -lGLU/' config.status + [[ -d build ]] && rm -r build + mkdir build && cd build - # those configure flags really mean nothing... - sed -i "s#/usr/local#/usr#" src/io/file_manager.cpp - sed -i "s#/games##" $(grep -Rl "/games" *) + cmake \ + -DIRRLICHT_DIR="$srcdir/irrlicht" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_CXX_FLAGS="-lpthread -lm -ldl" \ + .. make } @@ -34,11 +43,12 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} + cd build make DESTDIR=${pkgdir} install # fix executable location... - install -dm755 ${pkgdir}/usr/bin - mv ${pkgdir}/usr/supertuxkart ${pkgdir}/usr/bin/supertuxkart + install -Dm755 ${pkgdir}/usr/games/supertuxkart ${pkgdir}/usr/bin/supertuxkart + rm -r ${pkgdir}/usr/games sed -i "s#usr/supertuxkart#usr/bin/supertuxkart#" \ ${pkgdir}/usr/share/applications/supertuxkart.desktop diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index b2d59a5e6..d03e2876a 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58429 2011-11-12 17:19:30Z ibiru $ +# $Id: PKGBUILD 64615 2012-02-17 03:15:27Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=2 +pkgrel=4 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -48,26 +48,21 @@ conflicts=('xmms2-devel') install=xmms2.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xmms2d.conf - xmms2d.rc - xmms2-helpers.patch - vorbis-albumart.patch) + xmms2d.rc) md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' - '9d8e3e1a434f271423bdd228a1e9bd7c' - 'eddb800ebcc495b8574044a110a34add' - 'c5a16da0c5a6ebe5e7f58afb6edfa87e') + '9d8e3e1a434f271423bdd228a1e9bd7c') build() { cd ${srcdir}/${pkgname}-${pkgver} -# patch -Np1 < ${srcdir}/xmms2-helpers.patch -# patch -p1 <$srcdir/vorbis-albumart.patch - # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf ./waf configure --prefix=/usr \ - --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli \ + --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ + --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` ./waf build ./waf --destdir=${pkgdir} install diff --git a/community/xylib/PKGBUILD b/community/xylib/PKGBUILD deleted file mode 100644 index dc0c87ea1..000000000 --- a/community/xylib/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > - -pkgname=xylib -pkgver=0.8 -pkgrel=2 -pkgdesc='xylib is a portable C++ library for reading files that contain x-y data from powder diffraction, spectroscopy or other experimental methods.' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.unipress.waw.pl/fityk/xylib/' -license=('LGPL') -makedepends=('boost') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b6f9ddc48da2833dcb95d958bf93ba92') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 0a727b140..b7e30775f 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149932 2012-02-11 23:29:33Z allan $ +# $Id: PKGBUILD 150337 2012-02-16 23:38:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep pkgver=2.10 -pkgrel=2 +pkgrel=3 pkgdesc="A string search utility" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -31,4 +31,7 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + + install -dm755 ${pkgdir}/bin + ln -s /usr/bin/grep ${pkgdir}/bin/grep } diff --git a/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch b/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch new file mode 100644 index 000000000..95e7f859a --- /dev/null +++ b/core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch @@ -0,0 +1,39 @@ +From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Date: Sat, 11 Feb 2012 19:45:29 -0200 +Subject: [PATCH] libkmod-module: probe: fix infinite loop with softdeps + +If a softdep depends on a module in the dependency list of the module +being inserted, we would enter and infinite loop. + +Move the "mod->visited = true" assignment to the proper place, hoping it +didn't break other use cases. This is a bug that comes and goes every +now and then. Since we have a testsuite now, a test for this should be +written. +--- + libkmod/libkmod-module.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index b5eb7c9..835896f 100644 +--- a/libkmod/libkmod-module.c ++++ b/libkmod/libkmod-module.c +@@ -1013,7 +1013,6 @@ static int __kmod_module_fill_softdep(struct kmod_module *mod, + goto fail; + } + *list = l; +- mod->visited = true; + mod->ignorecmd = (pre != NULL || post != NULL); + + kmod_list_foreach(l, post) { +@@ -1043,6 +1042,7 @@ static int __kmod_module_get_probe_list(struct kmod_module *mod, + mod->name); + return 0; + } ++ mod->visited = true; + + dep = kmod_module_get_dependencies(mod); + kmod_list_foreach(l, dep) { +-- +1.7.9 + diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 85d74af1f..b9e69d59f 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150108 2012-02-12 15:37:16Z dreisner $ +# $Id: PKGBUILD 150335 2012-02-16 23:20:12Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod pkgver=5 -pkgrel=2 +pkgrel=4 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64' 'mips64el') url="http://git.profusion.mobi/cgit.cgi/kmod.git" @@ -15,9 +15,11 @@ conflicts=('module-init-tools') replaces=('module-init-tools') source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz" '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch' + '0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch' "depmod-search.conf") md5sums=('b271c2ec54aba1c67bda63c8579d8c15' '81545a1509b43008f85c03fb980f0e86' + '662a85dbe420f04c1ef24f9cd4e4c990' '4b8cbcbc54b9029c99fd730e257d4436') build() { @@ -26,7 +28,10 @@ build() { # fix modprobe --show-depends failures on loaded modules patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch" - CFLAGS+=' -g -O0' ./configure \ + # fix infinite loop with softdeps + patch -Np1 <"$srcdir/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch" + + ./configure \ --sysconfdir=/etc \ --with-rootprefix= \ --with-zlib @@ -46,7 +51,9 @@ package() { # add symlinks to kmod ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" - for tool in {dep,ins,ls,rm}mod modinfo; do + ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" + + for tool in {ins,ls,rm}mod modinfo; do ln -s kmod "$pkgdir/usr/bin/$tool" done diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 28017b729..74caa29f6 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 142117 2011-11-05 10:16:08Z tpowa $ +# $Id: PKGBUILD 150279 2012-02-16 08:29:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils -pkgver=3.1.8 +pkgver=3.1.9 pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('wget') depends=('glibc') source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) -md5sums=('79312f138311d29291c7d44d624cd37e') +md5sums=('e958f5ffb93b12972964381c38f27eb3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index e46251076..79fe34f29 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144463 2011-12-06 10:57:36Z dreisner $ +# $Id: PKGBUILD 150333 2012-02-16 23:20:09Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow -pkgver=4.1.4.3 -pkgrel=5 +pkgver=4.1.5 +pkgrel=3 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64' 'mips64el') url='http://pkg-shadow.alioth.debian.org/' @@ -17,15 +17,26 @@ backup=(etc/login.defs etc/pam.d/{chfn,chgpasswd,groupmems,chsh} etc/default/useradd) options=('!libtool') -install=shadow.install -#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2 -# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied -source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz - adduser chgpasswd chpasswd defaults.pam login login.defs newusers - passwd shadow.cron.daily useradd.defaults LICENSE - xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch +install='shadow.install' +source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} + LICENSE + adduser + chgpasswd + chpasswd + defaults.pam + login + login.defs + newusers + passwd + shadow.cron.daily + useradd.defaults + nscd-error-reporting.patch + xstrdup.patch + shadow-strncpy-usage.patch shadow-add-missing-include.patch) -sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e' +sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41' + '0a31aafceb948a91fe7370a6378cafd6fd883145' + '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' '12427b1ca92a9b85ca8202239f0d9f50198b818f' @@ -36,39 +47,42 @@ sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e' '611be25d91c3f8f307c7fe2485d5f781e5dee75f' '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' - '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' + 'ae6eebb842c433ac4022c493294a13ed68e06acc' '6010fffeed1fc6673ad9875492e1193b1a847b53' - '6bfe6528391eb38d338beacedd620407877b637d' - '9db9e62ad173f31e1039121c0124cf60826ffd7e' + '21e12966a6befb25ec123b403cd9b5c492fe5b16' '0697a21f7519de30821da7772677035652df4ad2') build() { - cd "$srcdir/$pkgname-4.1.4.2+svn3283" + cd "$pkgname-$pkgver" + + # avoid transitive linking issues with binutils 2.22 + sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am - #Ugh, force this to build shared libraries, for god's sake - sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am - libtoolize - autoreconf - export LDFLAGS="$LDFLAGS -lcrypt" + # link to glibc's crypt(3) + LDFLAGS+=" -lcrypt" - patch -p1 -i "$srcdir/xstrdup.patch" - patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch" - patch -p1 -i "$srcdir/shadow-strncpy-usage.patch" - patch -p1 -i "$srcdir/shadow-add-missing-include.patch" + patch -Np1 <"$srcdir/xstrdup.patch" + patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" + patch -Np1 <"$srcdir/shadow-add-missing-include.patch" + patch -Np1 <"$srcdir/nscd-error-reporting.patch" # supress etc/pam.d/*, we provide our own sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in ./configure \ - --prefix=/usr --libdir=/lib \ - --mandir=/usr/share/man --sysconfdir=/etc \ - --enable-shared --disable-static \ - --with-libpam --without-selinux + --prefix=/usr \ + --libdir=/lib \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --with-libpam \ + --without-selinux + make } package() { - cd "$srcdir/$pkgname-4.1.4.2+svn3283" + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install # license @@ -87,11 +101,9 @@ package() { install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" # PAM config - custom - install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login" - install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd" - install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd" - install -Dm644 "$srcdir/chpasswd" "$pkgdir/etc/pam.d/chpasswd" - install -Dm644 "$srcdir/newusers" "$pkgdir/etc/pam.d/newusers" + install -dm755 "$pkgdir/etc/pam.d" + install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{login,passwd,chgpasswd,chpasswd,newusers} + # PAM config - from tarball install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" diff --git a/testing/shadow/nscd-error-reporting.patch b/core/shadow/nscd-error-reporting.patch index a4075756e..a4075756e 100644 --- a/testing/shadow/nscd-error-reporting.patch +++ b/core/shadow/nscd-error-reporting.patch diff --git a/core/shadow/shadow-strncpy-usage.patch b/core/shadow/shadow-strncpy-usage.patch index 46df74ace..5aba8fa01 100644 --- a/core/shadow/shadow-strncpy-usage.patch +++ b/core/shadow/shadow-strncpy-usage.patch @@ -1,27 +1,25 @@ -diff -ur shadow-4.1.4.3.orig/src/login.c shadow-4.1.4.3/src/login.c ---- shadow-4.1.4.3.orig/src/login.c 2011-03-05 22:17:10.032524948 -0800 -+++ shadow-4.1.4.3/src/login.c 2011-03-05 22:17:59.154342059 -0800 -@@ -748,8 +748,9 @@ - sizeof (loginprompt), +diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c +--- shadow-4.1.5/src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 ++++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 +@@ -182,7 +182,7 @@ + struct tm *tp; + + if (date < 0) { +- strncpy (buf, "never", maxsize); ++ strncpy (buf, "never", maxsize - 1); + } else { + time_t t = (time_t) date; + tp = gmtime (&t); +diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c +--- shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 ++++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500 +@@ -752,7 +752,8 @@ _("%s login: "), hostn); } else { -+ loginprompt[sizeof (loginprompt) - 1] = '\0'; strncpy (loginprompt, _("login: "), - sizeof (loginprompt)); + sizeof (loginprompt) - 1); ++ loginprompt[sizeof (loginprompt) - 1] = '\0'; } retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); -diff -ur shadow-4.1.4.3.orig/src/usermod.c shadow-4.1.4.3/src/usermod.c ---- shadow-4.1.4.3.orig/src/usermod.c 2011-03-05 22:17:10.029191265 -0800 -+++ shadow-4.1.4.3/src/usermod.c 2011-03-05 22:18:42.665576968 -0800 -@@ -182,7 +182,8 @@ - struct tm *tp; - - if ((negativ != NULL) && (date < 0)) { -- strncpy (buf, negativ, maxsize); -+ buf[maxsize - 1] = '\0'; -+ strncpy (buf, negativ, maxsize - 1); - } else { - time_t t = (time_t) date; - tp = gmtime (&t); diff --git a/core/shadow/shadow.install b/core/shadow/shadow.install index e990bfe39..14384c333 100644 --- a/core/shadow/shadow.install +++ b/core/shadow/shadow.install @@ -2,7 +2,7 @@ post_upgrade() { grpck -r >/dev/null 2>&1 if [ $? -eq 2 ]; then printf '%s\n' \ - "==> Warning: /etc/group or /etc/gshadow are inconsistant." \ + "==> Warning: /etc/group or /etc/gshadow are inconsistent." \ " Run 'grpck' to correct this." fi return 0 diff --git a/core/shadow/shadow_CVE-2011-0721.patch b/core/shadow/shadow_CVE-2011-0721.patch deleted file mode 100644 index eb9ad80a2..000000000 --- a/core/shadow/shadow_CVE-2011-0721.patch +++ /dev/null @@ -1,57 +0,0 @@ -Goal: Input sanitization for chfn and chsh - -Fixes: CVE-2011-0721 - -Status wrt upstream: Already applied upstream (4.1.4.3) - ---- a/src/chfn.c -+++ b/src/chfn.c -@@ -551,14 +551,14 @@ - static void check_fields (void) - { - int err; -- err = valid_field (fullnm, ":,="); -+ err = valid_field (fullnm, ":,=\n"); - if (err > 0) { - fprintf (stderr, _("%s: name with non-ASCII characters: '%s'\n"), Prog, fullnm); - } else if (err < 0) { - fprintf (stderr, _("%s: invalid name: '%s'\n"), Prog, fullnm); - fail_exit (E_NOPERM); - } -- err = valid_field (roomno, ":,="); -+ err = valid_field (roomno, ":,=\n"); - if (err > 0) { - fprintf (stderr, _("%s: room number with non-ASCII characters: '%s'\n"), Prog, roomno); - } else if (err < 0) { -@@ -566,17 +566,17 @@ - Prog, roomno); - fail_exit (E_NOPERM); - } -- if (valid_field (workph, ":,=") != 0) { -+ if (valid_field (workph, ":,=\n") != 0) { - fprintf (stderr, _("%s: invalid work phone: '%s'\n"), - Prog, workph); - fail_exit (E_NOPERM); - } -- if (valid_field (homeph, ":,=") != 0) { -+ if (valid_field (homeph, ":,=\n") != 0) { - fprintf (stderr, _("%s: invalid home phone: '%s'\n"), - Prog, homeph); - fail_exit (E_NOPERM); - } -- err = valid_field (slop, ":"); -+ err = valid_field (slop, ":\n"); - if (err > 0) { - fprintf (stderr, _("%s: '%s' contains non-ASCII characters\n"), Prog, slop); - } else if (err < 0) { ---- a/src/chsh. -+++ b/src/chsh.c -@@ -528,7 +528,7 @@ - * users are restricted to using the shells in /etc/shells. - * The shell must be executable by the user. - */ -- if (valid_field (loginsh, ":,=") != 0) { -+ if (valid_field (loginsh, ":,=\n") != 0) { - fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, loginsh); - fail_exit (1); - } diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 9593b7e87..ec3931cc1 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148760 2012-02-05 11:49:28Z ibiru $ +# $Id: PKGBUILD 150341 2012-02-17 03:33:20Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.28.0 -pkgrel=7 +pkgrel=8 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -34,8 +34,12 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i "/RUBY_INCLUDES=\"/s|\"$| `eval echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,}`\"|" configure - sed -i '/LIBPOSTFIX="64"/d' configure + sed \ + -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ + -e '/CONFIG/s:site:vendor:' \ + -i config/config_ruby.rb + + sed '/LIBPOSTFIX="64"/d' -i configure export PYTHON=python2 ./configure --prefix=/usr diff --git a/extra/java7-openjdk/glibc2_15.diff b/extra/java7-openjdk/glibc2_15.diff deleted file mode 100644 index c2fd6124b..000000000 --- a/extra/java7-openjdk/glibc2_15.diff +++ /dev/null @@ -1,232 +0,0 @@ - -# HG changeset patch -# User never -# Date 1319555835 25200 -# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28 -# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926 -7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc -Reviewed-by: never -Contributed-by: Omair Majid <omajid@redhat.com> - ---- openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -33,8 +33,6 @@ - #include "opto/subnode.hpp" - - // Portions of code courtesy of Clifford Click -- --#define MAXFLOAT ((float)3.40282346638528860e+38) - - // Classic Add functionality. This covers all the usual 'add' behaviors for - // an algebraic ring. Add-integer, add-float, add-double, and binary-or are ---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -107,7 +107,7 @@ extern "C" { - if (env != xenv) { \ - NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ - } \ -- __ENTRY(result_type, header, thr) -+ VM_ENTRY_BASE(result_type, header, thr) - - - #define UNCHECKED() (unchecked_jni_NativeInterface) ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 08:17:15 2011 -0700 -@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text - <xsl:value-of select="$space"/> - <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> - <xsl:value-of select="$space"/> -- <xsl:text>__ENTRY(jvmtiError, </xsl:text> -+ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> - <xsl:apply-templates select="." mode="functionid"/> - <xsl:text> , current_thread)</xsl:text> - <xsl:value-of select="$space"/> ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread - // from native so as to resolve the jthread. - - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) -+ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - oop thread_oop = JNIHandles::resolve_external_guard(thread); ---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM - JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); - // transition code: native to VM - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) -+ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); ---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700 -@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj - } - }; - --// InterfaceSupport provides functionality used by the __LEAF and __ENTRY --// macros. These macros are used to guard entry points into the VM and --// perform checks upon leave of the VM. -+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and -+// VM_ENTRY_BASE macros. These macros are used to guard entry points into -+// the VM and perform checks upon leave of the VM. - - - class InterfaceSupport: AllStatic { -@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H - - // LEAF routines do not lock, GC or throw exceptions - --#define __LEAF(result_type, header) \ -+#define VM_LEAF_BASE(result_type, header) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - /* begin of body */ -@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H - - // ENTRY routines may lock, GC and throw exceptions - --#define __ENTRY(result_type, header, thread) \ -+#define VM_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - HandleMarkCleaner __hm(thread); \ - Thread* THREAD = thread; \ -@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H - - // QUICK_ENTRY routines behave like ENTRY but without a handle mark - --#define __QUICK_ENTRY(result_type, header, thread) \ -+#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - Thread* THREAD = thread; \ -@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H - #define IRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define IRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(No_Safepoint_Verifier __nspv(true);) - - - #define IRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Another special case for nmethod_entry_point so the nmethod that the -@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H - result_type header { \ - nmethodLocker _nmlock(nm); \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - #define IRT_END } - -@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H - #define JRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define JRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(JRT_Leaf_Verifier __jlv;) - - - #define JRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Same as JRT Entry but allows for return value after the safepoint -@@ -543,11 +543,11 @@ extern "C" { - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - // Ensure that the VMNativeEntryWrapper constructor, which can cause --// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY). -+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE). - #define JNI_QUICK_ENTRY(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ -@@ -555,7 +555,7 @@ extern "C" { - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JNI_LEAF(result_type, header) \ -@@ -563,7 +563,7 @@ extern "C" { - result_type JNICALL header { \ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - // Close the routine and the extern "C" -@@ -579,7 +579,7 @@ extern "C" { - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_ENTRY_NO_ENV(result_type, header) \ -@@ -588,7 +588,7 @@ extern "C" { - JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_QUICK_ENTRY(result_type, header) \ -@@ -597,14 +597,14 @@ extern "C" { - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JVM_LEAF(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ - VM_Exit::block_if_vm_exited(); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - #define JVM_END } } - diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD index a3c3ed9e2..9ea1e9712 100644 --- a/extra/kradio/PKGBUILD +++ b/extra/kradio/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 142630 2011-11-12 17:15:25Z ibiru $ +# $Id: PKGBUILD 150326 2012-02-16 21:21:15Z eric $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=kradio -pkgver=4.0.2 -pkgrel=3 +pkgver=4.0.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') pkgdesc="A comfortable KDE radio application" url="http://kradio.sourceforge.net/" depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') makedepends=('pkg-config' 'automoc4' 'cmake') -install=kradio.install -source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff) options=(!libtool) +install=kradio.install +source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc}) +md5sums=('f495ce341150ab04515d217bd8c36a32' + '42259fac62e427b8c86b7a5e5d4b18bf') build() { cd "$srcdir" - (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff") mkdir build cd build cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release @@ -27,6 +28,3 @@ package() { cd "$srcdir/build" make DESTDIR="$pkgdir" install } -md5sums=('18fea3e2bc7100882075187c6a89f7bd' - '5f407eb75536f39e79c77a70613e8704' - '7d31a4f54602bc109f39cc0a7a1dc50c') diff --git a/extra/kradio/kradio-ffmpeg.diff b/extra/kradio/kradio-ffmpeg.diff deleted file mode 100644 index 27d224fec..000000000 --- a/extra/kradio/kradio-ffmpeg.diff +++ /dev/null @@ -1,34 +0,0 @@ -X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988 - -diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp -index 4cd6cc0..c74d6e2 100644 ---- a/plugins/internetradio/decoder_thread.cpp -+++ b/plugins/internetradio/decoder_thread.cpp -@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE - - //av_log_set_level(255); - m_av_pFormatCtx = avformat_alloc_context(); -- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx)); - m_av_pFormatCtx->probesize = m_maxProbeSize; - m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE; - -@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE - m_av_pFormatCtx_opened = true; - } - else { -- - // IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start"); - if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) { - if (warningsNotErrors) { -@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE - m_av_audioStream = -1; - for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) { - // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) { -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream -+#else -+ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream -+#endif - m_av_audioStream = i; - break; - } diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index 45abe2ae6..c7886480a 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146767 2012-01-17 08:05:03Z andrea $ +# $Id: PKGBUILD 150269 2012-02-16 07:56:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk2 -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('975dfef679436c849a649c9d5d9ae0d3') +md5sums=('4a0a98a3499a9357d0f83191b48900ad') build() { cd "${srcdir}" diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index ef62d5108..4788efdfc 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146769 2012-01-17 08:13:40Z andrea $ +# $Id: PKGBUILD 150271 2012-02-16 07:57:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=oxygen-gtk3 -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3' 'dbus-glib') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('029571469ea3436d47cdac20b2069fed') +md5sums=('5ecdac1dca4307d369b04db9a9e4e3af') build() { cd "${srcdir}" diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD index 18c3813c5..9ac29a82c 100644 --- a/extra/phonon-gstreamer/PKGBUILD +++ b/extra/phonon-gstreamer/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 122917 2011-05-07 10:12:53Z andrea $ +# $Id: PKGBUILD 150265 2012-02-16 07:51:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-gstreamer -pkgver=4.5.1 +pkgver=4.6.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -url="http://phonon.kde.org" +url='http://phonon.kde.org/' pkgdesc="Phonon GStreamer backend" license=('LGPL') depends=('gstreamer0.10-base-plugins') makedepends=('cmake' 'automoc4' 'phonon' 'mesa') provides=('phonon-backend') -source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.bz2") -md5sums=('021cf7740208e7212b7ce91adb6a349b') +install="${pkgname}.install" +source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz") +md5sums=('cc380c7612aaaa87294185ded702f88a') build() { cd "${srcdir}" @@ -20,7 +21,8 @@ build() { cd build cmake ../phonon-backend-gstreamer-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON make } diff --git a/extra/phonon-gstreamer/phonon-gstreamer.install b/extra/phonon-gstreamer/phonon-gstreamer.install new file mode 100644 index 000000000..ceb7592ef --- /dev/null +++ b/extra/phonon-gstreamer/phonon-gstreamer.install @@ -0,0 +1,11 @@ +post_install(){ + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD index 941f3309b..07db77956 100644 --- a/extra/phonon-vlc/PKGBUILD +++ b/extra/phonon-vlc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 134014 2011-08-01 08:35:33Z andrea $ +# $Id: PKGBUILD 150267 2012-02-16 07:53:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-vlc -pkgver=0.4.1 +pkgver=0.5.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -url="http://phonon.kde.org" +url='http://phonon.kde.org/' pkgdesc="Phonon VLC backend" license=('LGPL') depends=('vlc') makedepends=('cmake' 'automoc4' 'phonon') provides=('phonon-backend') -source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.bz2") -md5sums=('bdf188c0d3ad3458e7e39ecad06a500b') +source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz") +md5sums=('fc5dc2b353fa0d9e428ecfc3c485eb66') build() { cd "${srcdir}" @@ -20,7 +20,8 @@ build() { cd build cmake ../phonon-backend-vlc-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON make } diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index 8c2bf8560..27934ec81 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150257 2012-02-16 01:26:10Z dreisner $ +# $Id: PKGBUILD 150293 2012-02-16 14:21:25Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd pkgver=43 -pkgrel=1 +pkgrel=2 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -46,7 +46,8 @@ build() { --libdir=/usr/lib \ --localstatedir=/var \ --with-rootprefix= \ - --with-rootlibdir=/lib + --with-rootlibdir=/lib \ + --with-distro=arch make diff --git a/testing/glibc/glibc-2.15-arena.patch b/testing/glibc/glibc-2.15-arena.patch deleted file mode 100644 index 46f52e98d..000000000 --- a/testing/glibc/glibc-2.15-arena.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/malloc/arena.c b/malloc/arena.c -index d3cf4b9..b1c9469 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size) - { - if (mp_.arena_max != 0) - narenas_limit = mp_.arena_max; -- else -+ else if (narenas > mp_.arena_test) - { - int n = __get_nprocs (); - -@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size) - } - repeat:; - size_t n = narenas; -- if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0)) -+ /* NB: the following depends on the fact that (size_t)0 - 1 is a -+ very large number and that the underflow is OK. If arena_max -+ is set the value of arena_test is irrelevant. If arena_test -+ is set but narenas is not yet larger or equal to arena_test -+ narenas_limit is 0. There is no possibility for narenas to -+ be too big for the test to always fail since there is not -+ enough address space to create that many arenas. */ -+ if (__builtin_expect (n <= narenas_limit - 1, 0)) - { - if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n)) - goto repeat; diff --git a/testing/glibc/glibc-2.15-negative-result-cache.patch b/testing/glibc/glibc-2.15-negative-result-cache.patch deleted file mode 100644 index c09e79a17..000000000 --- a/testing/glibc/glibc-2.15-negative-result-cache.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/nscd/aicache.c b/nscd/aicache.c -index aaaf80d..e1f1244 100644 ---- a/nscd/aicache.c -+++ b/nscd/aicache.c -@@ -1,5 +1,5 @@ - /* Cache handling for host lookup. -- Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. - -@@ -514,8 +514,9 @@ next_nip: - if (fd != -1) - TEMP_FAILURE_RETRY (send (fd, ¬found, total, MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store the -+ result, so be it. */ -+ if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/grpcache.c b/nscd/grpcache.c -index e9607c6..a698f36 100644 ---- a/nscd/grpcache.c -+++ b/nscd/grpcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for group lookup. -- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. - -@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req, - else - written = total; - -- /* If we cannot permanently store the result, so be it. */ -- if (db->negtimeout == 0) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/hstcache.c b/nscd/hstcache.c -index 4d68ade..c72feaa 100644 ---- a/nscd/hstcache.c -+++ b/nscd/hstcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for host lookup. -- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. - -@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req, - MSG_NOSIGNAL)) != total) - all_written = false; - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c -index 4ac9942..2019991 100644 ---- a/nscd/initgrcache.c -+++ b/nscd/initgrcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for host lookup. -- Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. - -@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, - written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, - MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c -index 49e130c..e2ba09d 100644 ---- a/nscd/pwdcache.c -+++ b/nscd/pwdcache.c -@@ -1,5 +1,5 @@ - /* Cache handling for passwd lookup. -- Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. - -@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, - written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, - MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) -diff --git a/nscd/servicescache.c b/nscd/servicescache.c -index d3d5dce..a6337e3 100644 ---- a/nscd/servicescache.c -+++ b/nscd/servicescache.c -@@ -1,5 +1,5 @@ - /* Cache handling for services lookup. -- Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@drepper.com>, 2007. - -@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, - written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, - MSG_NOSIGNAL)); - -- /* If we cannot permanently store the result, so be it. */ -- if (__builtin_expect (db->negtimeout == 0, 0)) -+ /* If we have a transient error or cannot permanently store -+ the result, so be it. */ -+ if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0)) - { - /* Mark the old entry as obsolete. */ - if (dh != NULL) diff --git a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch b/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch deleted file mode 100644 index 4c104fa55..000000000 --- a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S -index f93c83d..d8aa889 100644 ---- a/sysdeps/x86_64/multiarch/strcmp.S -+++ b/sysdeps/x86_64/multiarch/strcmp.S -@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) - jne 1f - call __init_cpu_features - 1: --# ifdef HAVE_AVX_SUPPORT -- leaq __strcasecmp_avx(%rip), %rax -- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) -- jnz 2f --# endif - leaq __strcasecmp_sse42(%rip), %rax - testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) - jnz 2f -@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) - jne 1f - call __init_cpu_features - 1: --# ifdef HAVE_AVX_SUPPORT -- leaq __strncasecmp_avx(%rip), %rax -- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) -- jnz 2f --# endif - leaq __strncasecmp_sse42(%rip), %rax - testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) - jnz 2f -@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) - # include "strcmp-sse42.S" - - --# ifdef HAVE_AVX_SUPPORT --# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L --# define LABEL(l) .L##l##_avx --# define GLABEL(l) l##_avx --# define USE_AVX 1 --# undef STRCMP_SSE42 --# define STRCMP_SSE42 STRCMP_AVX --# define SECTION avx --# include "strcmp-sse42.S" --# endif --# endif -- -- - # undef ENTRY - # define ENTRY(name) \ - .type STRCMP_SSE2, @function; \ diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD new file mode 100644 index 000000000..8ceaba4b4 --- /dev/null +++ b/testing/ruby/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Thomas Dziedzic <gostrc@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: Jeramy Rutley <jrutley@gmail.com> + +pkgname=ruby +pkgver=1.9.3_p125 +pkgrel=1 +pkgdesc='An object-oriented language for quick and easy programming' +arch=('i686' 'x86_64') +url='http://www.ruby-lang.org/en/' +license=('BSD' 'custom') +backup=('etc/gemrc') +provides=('rubygems' 'rake') +conflicts=('rake') +depends=('openssl' 'libffi' 'libyaml') +makedepends=('tk') +optdepends=('tk: for Ruby/TK' + 'ruby-docs: Ruby documentation') +options=('!emptydirs' '!makeflags') +install='ruby.install' +source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" + 'gemrc') +md5sums=('341b8fc42aa18bd668314199f219db14' + '6fb8e7a09955e0f64be3158fb4a27e7a') + +build() { + cd ruby-${pkgver//_/-} + + PKG_CONFIG=/usr/bin/pkg-config ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-pthread \ + --disable-rpath \ + --disable-install-doc + + make +} + +check() { + cd ruby-${pkgver//_/-} + + make test +} + +package() { + cd ruby-${pkgver//_/-} + + make DESTDIR="${pkgdir}" install-nodoc + + install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc" + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL" +} diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc new file mode 100644 index 000000000..3d11de1ec --- /dev/null +++ b/testing/ruby/gemrc @@ -0,0 +1,5 @@ +# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 + +# --user-install is used to install to $HOME/.gem/ by default since we want to separate +# pacman installed gems and gem installed gems +gem: --user-install diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install new file mode 100644 index 000000000..f91254084 --- /dev/null +++ b/testing/ruby/ruby.install @@ -0,0 +1,11 @@ +#!/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 1.9.3_p125)" -lt 0 ]; then + echo 'The default location of gem installs has changed to $HOME/.gem/ruby' + echo 'If you want to install to the system wide location, you must either:' + echo 'edit /etc/gemrc or run gem with the --no-user-install flag.' + fi +} diff --git a/~aurelien/README b/~aurelien/README new file mode 100644 index 000000000..7fe764c4c --- /dev/null +++ b/~aurelien/README @@ -0,0 +1,5 @@ +Hello Parabolers of the World ;-) + +Have fun & be free! + +Thanks to Fauno! |