diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
commit | 93db7f2fb23cba78cde4343b506a676e376ca4a8 (patch) | |
tree | 3fec56215a344b1e01e49a27198f919ac981320b /extra | |
parent | c162e34d12c6cf76532a7f6b3d538d493a8bf17a (diff) | |
parent | 39e9111d76d232d65ca0c43285dea5bd5d58d28e (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/gnome-menus2/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpsim/PKGBUILD
community/kgraphviewer/PKGBUILD
community/kpovmodeler/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/python-basemap/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
community/qgo/PKGBUILD
community/ude/PKGBUILD
community/virtkey/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/aterm/PKGBUILD
extra/cups-pdf/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/libffado/PKGBUILD
extra/libtar/PKGBUILD
extra/maxima/PKGBUILD
extra/php-xcache/PKGBUILD
extra/postgresql/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xauth/PKGBUILD
Diffstat (limited to 'extra')
69 files changed, 588 insertions, 925 deletions
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD index 40f4b77c9..4bdf5059d 100644 --- a/extra/alsaplayer/PKGBUILD +++ b/extra/alsaplayer/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 170547 2012-11-08 15:28:30Z heftig $ +# $Id: PKGBUILD 196265 2013-10-10 02:58:34Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=alsaplayer pkgver=0.99.81 -pkgrel=5.1 +pkgrel=6 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit" arch=('i686' 'x86_64' 'mips64el') -url="http://www.alsaplayer.org/" +url="http://alsaplayer.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'desktop-file-utils') makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'mesa' 'audiofile' 'doxygen') @@ -22,7 +22,7 @@ optdepends=('gtk2: for the gtk2 GUI interface' \ 'libmikmod: for mod, s3m, it and xm formats supports') options=('!libtool') install=alsaplayer.install -source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2) +source=(http://alsaplayer.sourceforge.net/${pkgname}-${pkgver}.tar.bz2) sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd') build() { diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD deleted file mode 100644 index e122f00d5..000000000 --- a/extra/aterm/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 135001 2011-08-09 20:47:19Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=aterm -pkgver=1.0.1 -pkgrel=3.1 -pkgdesc="An xterm replacement with transparency support" -arch=('i686' 'x86_64' 'mips64el') -url="http://aterm.sourceforge.net/" -license=('GPL') -depends=('libx11') -makedepends=('libxt') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c2eede028e1011e0ec7035cf319c9b5a') -sha1sums=('a975753b415306a0734efc3773de8a86129bb54b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-transparency=yes \ - --enable-background-image --enable-fading --enable-menubar \ - --enable-graphics - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 8c5c4f89e..7af7bc8e7 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193497 2013-08-21 11:58:14Z andrea $ +# $Id: PKGBUILD 196349 2013-10-12 06:13:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -17,7 +17,7 @@ pkgname=('calligra-braindump' 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.7.2 +pkgver=2.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' @@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' [ "$CARCH" != "mips64el" ] && makedepends+=('vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") -md5sums=('645886d0fff6b1dd865850f3187004a6') +md5sums=('35165d00f38eba5de575662cafe3bf0f') prepare() { mkdir build @@ -91,7 +91,7 @@ package_calligra-karbon() { pkgdesc="Create scalable vector drawings" depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') optdepends=('calligra-filters: import/export filters' - 'calligra-tools: extra calligra tools') + 'calligra-extras: extra calligra tools') conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') install=calligra-karbon.install @@ -163,7 +163,7 @@ package_calligra-sheets() { depends=('calligra-libs' 'gsl' 'kdebase-runtime') optdepends=('calligra-filters: import/export filters' 'calligra-plugins: extra calligra plugins' - 'calligra-tools: extra calligra tools') + 'calligra-extras: extra calligra tools') conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') install=calligra-sheets.install @@ -177,7 +177,7 @@ package_calligra-sheets() { package_calligra-words() { pkgdesc="Word Processor" depends=('calligra-plugins' 'kdegraphics-okular') - optdepends=('calligra-tools: extra calligra tools') + optdepends=('calligra-extras: extra calligra tools') conflicts=('koffice-kword') replaces=('koffice-kword') install=calligra-words.install diff --git a/extra/celt0.5.1/PKGBUILD b/extra/celt0.5.1/PKGBUILD new file mode 100644 index 000000000..6eab9ed40 --- /dev/null +++ b/extra/celt0.5.1/PKGBUILD @@ -0,0 +1,28 @@ +# Contributor: Lauri Niskanen <ape@ape3000.com> +# Contributor: Ray Rashif <schivmeister@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> + +pkgname=celt0.5.1 +_basename=celt +pkgver=0.5.1.3 +pkgrel=2 +pkgdesc="Low-latency audio communication codec - SPICE version" +arch=(i686 x86_64 mips64el) +url="http://www.celt-codec.org" +license=('BSD') +depends=('libogg') +options=('!libtool') +source=(http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz) +md5sums=('67e7b5e45db57a6f1f0a6962f5ecb190') + +build() { + cd "$srcdir/celt-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/celt-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/BSD" +} diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 3e8043dc4..fa1eb7491 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192290 2013-08-09 19:48:53Z eric $ +# $Id: PKGBUILD 196220 2013-10-08 19:06:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.11.2 -pkgrel=2 +pkgver=2.8.12 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" @@ -13,18 +13,8 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'imagemagick.patch') -md5sums=('6f5d7b8e7534a5d9e1a7664ba63cf882' - '19c4cf0e6e9c9a890f3698c9df8062f1') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/imagemagick.patch - sed -i 's/Magick++-6.Q16/Magick++-6.Q16 Magick++-6.Q16HDRI/' Modules/FindImageMagick.cmake - sed -i 's/MagickWand-6.Q16/MagickWand-6.Q16 MagickWand-6.Q16HDRI/' Modules/FindImageMagick.cmake - sed -i 's/MagickCore-6.Q16/MagickCore-6.Q16 MagickCore-6.Q16HDRI/' Modules/FindImageMagick.cmake -} +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('105bc6d21cc2e9b6aff901e43c53afea') build() { cd ${pkgname}-${pkgver} diff --git a/extra/cmake/imagemagick.patch b/extra/cmake/imagemagick.patch deleted file mode 100644 index 8e5279030..000000000 --- a/extra/cmake/imagemagick.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 -From: Funda Wang <fundawang@gmail.com> -Date: Tue, 28 May 2013 06:17:49 +0000 -Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) - -The header files of ImageMagick are now located at -<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. ---- - Modules/FindImageMagick.cmake | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake -index cd97b38..02a5777 100644 ---- a/Modules/FindImageMagick.cmake -+++ b/Modules/FindImageMagick.cmake -@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) - ${ImageMagick_INCLUDE_DIRS} - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" - PATH_SUFFIXES -- ImageMagick -+ ImageMagick ImageMagick-6 - DOC "Path to the ImageMagick include dir." - ) - find_library(ImageMagick_${component}_LIBRARY --- -1.7.0 - diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD index b589dff05..93f458729 100644 --- a/extra/cups-pdf/PKGBUILD +++ b/extra/cups-pdf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140448 2011-10-14 16:56:59Z andyrtr $ +# $Id: PKGBUILD 196354 2013-10-12 07:52:56Z andyrtr $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: Thomas Baechler <thomas.baechler@rwth-aachen.de> pkgname=cups-pdf pkgver=2.6.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="PDF printer for cups" arch=(i686 x86_64 'mips64el') depends=('cups' 'ghostscript') @@ -31,4 +31,7 @@ package() { # Install config file install -D -m644 cups-pdf.conf $pkgdir/etc/cups/cups-pdf.conf + + # use lp group from cups pkg FS#36769 + chgrp -R lp ${pkgdir}/etc/cups } diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 991c98f64..3163d2747 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190057 2013-07-13 17:35:12Z andyrtr $ +# $Id: PKGBUILD 196352 2013-10-12 07:52:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -30,7 +30,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch get-ppd-file-for-statically-configured-ipp-shared-queues.patch ppd-poll-with-client-conf.patch) -md5sums=('3c50d396fef2ba721224fe65880fe3c3' +md5sums=('17c948b442dfdb3c53f5c8b7eaa1442f' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' @@ -137,11 +137,11 @@ backup=(etc/cups/client.conf) # install client.conf man page and config file install -dm755 ${pkgdir}/usr/share/man/man5 install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ - install -dm755 ${pkgdir}/etc/cups + install -dm755 -g lp ${pkgdir}/etc/cups touch ${pkgdir}/etc/cups/client.conf echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf - chgrp lp ${pkgdir}/etc/cups/client.conf + chgrp -R lp ${pkgdir}/etc/cups } package_cups() { @@ -185,7 +185,7 @@ optdepends=('xdg-utils: xdg .desktop file support') touch ${pkgdir}/etc/cups/printers.conf touch ${pkgdir}/etc/cups/classes.conf touch ${pkgdir}/etc/cups/subscriptions.conf - chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf} + chgrp -R lp ${pkgdir}/etc/cups # fix .desktop file sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD index 840977910..ba3691e76 100644 --- a/extra/dssi/PKGBUILD +++ b/extra/dssi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178955 2013-03-01 10:20:10Z andrea $ +# $Id: PKGBUILD 196279 2013-10-10 13:13:50Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=dssi pkgver=1.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="An API for audio processing plugins & softsynths with UIs" arch=(i686 x86_64 'mips64el') url="http://dssi.sourceforge.net/" @@ -20,7 +20,6 @@ md5sums=('619ab73c883b02dc37ddb37001591f8b' '258ca4d0ca28c5c4d4675147621fac18') build() { - . /etc/profile.d/qt4.sh cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 17525f0b1..c533c25eb 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 192419 2013-08-11 13:05:15Z bpiotrowski $ +# $Id: PKGBUILD 196252 2013-10-09 20:32:23Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.0.1 -pkgrel=1 +pkgver=2.0.2 +pkgrel=2 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" license=('GPL') depends=( - 'alsa-lib' 'bzip2' 'fontconfig' 'gsm' 'lame' 'libass' + 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libvorbis' 'libvpx' 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'x264' 'xvidcore' 'zlib' 'libxfixes' @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('611eae7e3485d5fd9ff03e0ac7575ea89bc8105e40e99a40de02324957482f95') +sha256sums=('986f63dc0785f473b1832d0eead502e39c9706fbe7f9677bbea0dad6fe0fab4a') build() { cd $pkgname-$pkgver @@ -41,6 +41,7 @@ build() { --enable-avresample \ --enable-dxva2 \ --enable-fontconfig \ + --enable-gnutls \ --enable-gpl \ --enable-libass \ --enable-libbluray \ diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD index 2867b3946..9eab21392 100644 --- a/extra/five-or-more/PKGBUILD +++ b/extra/five-or-more/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196037 2013-10-07 11:50:51Z jgc $ +# $Id: PKGBUILD 196387 2013-10-12 16:51:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=five-or-more -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Remove colored balls from the board by forming lines" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=five-or-more.install url="https://live.gnome.org/Five%20or%20more" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4198d713a2e29e4c1e5493cfb3880acee295d486e2f5b4d3c4780b154cad3a07') +sha256sums=('3614ad2548d4954c4069c348ba08b32b4ef92b22939e4d2955f44f50ecb0a15b') build() { cd $pkgname-$pkgver diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD index c5944b6c8..a30310c95 100644 --- a/extra/four-in-a-row/PKGBUILD +++ b/extra/four-in-a-row/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196039 2013-10-07 11:50:54Z jgc $ +# $Id: PKGBUILD 196384 2013-10-12 16:45:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=four-in-a-row -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Make lines of the same color to win" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=four-in-a-row.install url="https://live.gnome.org/Four-in-a-row" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4759dcc8483c5bbf89de8b10a5379539ec1df6392cf2f7b96e91ec9dd2897001') +sha256sums=('a54cf796b518bc4f561c56d5ab3160440bb4b340326a2eceda0f563031ab5bf5') build() { cd $pkgname-$pkgver diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index 2a7718ba0..0d7ab6e4c 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186276 2013-05-23 15:38:45Z giovanni $ +# $Id: PKGBUILD 196316 2013-10-11 13:19:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.5 +pkgver=3.6 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('2e17cb655aa4eb59b5a4a38a89e746ed') +md5sums=('997b1e998caff6ad5b28c48a5a8bf84b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index e6f2bfad4..449b04e68 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 188918 2013-06-25 14:14:01Z heftig $ +# $Id: PKGBUILD 196343 2013-10-11 16:51:57Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 pkgver=2.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://freetype.sourceforge.net" -depends=('zlib' 'bzip2' 'sh') +depends=('zlib' 'bzip2' 'sh' 'libpng') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.2.1-enable-valid.patch @@ -33,9 +33,7 @@ prepare() { build() { cd "${srcdir}/freetype-${pkgver}" - # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled - ./configure --prefix=/usr --disable-static \ - --without-png + ./configure --prefix=/usr --disable-static make } diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 7cb0e8679..180362e24 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196047 2013-10-07 11:51:06Z jgc $ +# $Id: PKGBUILD 196330 2013-10-11 14:50:36Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.37.93 +pkgver=2.38.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('a01031d7d05ba9df5915fc84867303c93341a8dd13a2aa5af78a71dfb46842f6') +sha256sums=('f37bab6bedb7b68045e356feca9e27760a5ce50d95df07156656a0e1deabc402') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index 6ccd272a2..121eae114 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196052 2013-10-07 11:51:13Z jgc $ +# $Id: PKGBUILD 196390 2013-10-12 16:54:13Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9bbc0b2819a3f6d9d688ea0089a0d5f826d368100af7a0f3e8361e0d6f9e77ee') +sha256sums=('6541db85d2ca5b843fce61bd3be9c08733cf456c6fdf9bbc02ad78d043ca71fd') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD index 2f76b3c90..e47c61929 100644 --- a/extra/gnome-dictionary/PKGBUILD +++ b/extra/gnome-dictionary/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196059 2013-10-07 11:51:24Z jgc $ +# $Id: PKGBUILD 196236 2013-10-09 09:41:32Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-dictionary -pkgver=3.9.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Look up words in dictionary sources" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ install=$pkgname.install options=(!libtool) groups=('gnome') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4881096d5952ca39e19e4ecfb37f16634d5f5c1e41ee1e74fa8550f59f5bd455') +sha256sums=('258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD index 97e5041df..9c7e3a4d2 100644 --- a/extra/gnome-mines/PKGBUILD +++ b/extra/gnome-mines/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196069 2013-10-07 11:51:38Z jgc $ +# $Id: PKGBUILD 196385 2013-10-12 16:47:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-mines -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Clear hidden mines from a minefield" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=gnome-mines.install url="https://live.gnome.org/Mines" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b0f71a58e864848f5dd1067488b7d1d31b7c8f30d6d9904411b755d29074826c') +sha256sums=('7b7c73a6f1cf4896ff0a650fca017869f2a7334682661062bdd0c863d0bacdd9') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD index 4a521a010..71864656a 100644 --- a/extra/gnome-nibbles/PKGBUILD +++ b/extra/gnome-nibbles/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# $Id: PKGBUILD 196347 2013-10-12 04:08:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-nibbles -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Guide a worm around a maze" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=gnome-nibbles.install url="https://live.gnome.org/Nibbles" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6bf774cbd86e617c49f1740e79d52a7d26bf23656a673db1efb20bcc893e614a') +sha256sums=('af659b52974493a618de5c288427aea2ebece9c90b5dd075a31c2a4d502d0ef9') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 3248f0e22..1507a5a05 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196077 2013-10-07 11:51:51Z jgc $ +# $Id: PKGBUILD 196333 2013-10-11 14:58:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') license=(GPL LGPL) @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('38d90c5d5a33ec8a3002f1e77e201c1554eeb8bbba8923d94fab81b3a8e0696e' +sha256sums=('f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') prepare() { diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index d31a65301..6c39e8b4d 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193817 2013-09-02 12:41:23Z jgc $ +# $Id: PKGBUILD 196206 2013-10-08 07:53:37Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.7 +pkgver=1.12.8 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('5de9cca87efb2ea190bcddf57bd83a34e7f9580f5b7c92c6757707d1164748ef' +sha256sums=('02688fb6c32c28db2eb4e9a8e012cf1386f4f3a18b4c94f5ecdd13342521ec76' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 0adf72294..1602c276c 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193815 2013-09-02 12:10:06Z jgc $ +# $Id: PKGBUILD 196195 2013-10-08 07:31:56Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.7 +pkgver=0.10.8 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ license=('GPL') options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d1663fc7851f0f50329b37311b1859db184ac088eea4b80472f163c036896597') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('11964b907b03dede6d8d8a1a4ae2d5727ffbe8d7bab5c92dec586acb616e807c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index bc6004fc4..75a97d1dd 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196102 2013-10-07 11:52:32Z jgc $ +# $Id: PKGBUILD 196328 2013-10-11 14:41:41Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.21 -pkgrel=2 +pkgver=2.24.22 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,16 +12,14 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - gtkrc xid-collision-debug.patch gtkrc-fix.patch) -sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3' + gtkrc xid-collision-debug.patch) +sha256sums=('b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f' 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d') + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') prepare() { cd gtk+-$pkgver patch -Np1 -i ../xid-collision-debug.patch - patch -Np1 -i ../gtkrc-fix.patch } build() { diff --git a/extra/gtk2/gtkrc-fix.patch b/extra/gtk2/gtkrc-fix.patch deleted file mode 100644 index 09e350e98..000000000 --- a/extra/gtk2/gtkrc-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Mon, 30 Sep 2013 16:50:34 +0000 -Subject: Actually look in /usr/share/gtk-2.0 for default rc files - -I managed to forget the 'share' component of the path. ---- -diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c -index b1f68e2..50b2563 100644 ---- a/gtk/gtkrc.c -+++ b/gtk/gtkrc.c -@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void) - const gchar * const *config_dirs; - const gchar *config_dir; - -- str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL); -+ str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL); - gtk_rc_add_default_file (str); - g_free (str); - --- -cgit v0.9.2 diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index bf8444926..c4ea72288 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 196103 2013-10-07 11:52:34Z jgc $ +# $Id: PKGBUILD 196329 2013-10-11 14:46:45Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gtk3 -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64 mips64el) url="http://www.gtk.org/" @@ -17,7 +18,7 @@ options=('!libtool') license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('6559feb360cd935d341cd7a0b69a72f8f4346ed6ee9b7c4040c02b73b75c53fe' +sha256sums=('c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8' '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119') build() { diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 6b7105aa7..3f324013c 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196104 2013-10-07 11:52:35Z jgc $ +# $Id: PKGBUILD 196332 2013-10-11 14:56:43Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.9.16 +pkgver=3.10.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('3a07679530c0c58ddaf3b2bdc7859d8f7050a1057ae99e2d3857004e36e7c879') +sha256sums=('5e45fed4a7cff1baa72d1ef67e0d9883063d3a575cb53190e7ecf27047d241f8') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD index e3a1312c3..e9e388d61 100644 --- a/extra/iagno/PKGBUILD +++ b/extra/iagno/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196108 2013-10-07 11:52:44Z jgc $ +# $Id: PKGBUILD 196392 2013-10-12 16:57:40Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=iagno -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Dominate the board in a classic version of Reversi" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=iagno.install url="https://live.gnome.org/Iagno" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('23a041b54fd4df817c8d507e87d19495ddfc8a23bfe812a3e7d500f32f8a49d0') +sha256sums=('abb4aee5fe6b2d668dbd4f5a06783419bebdfa8bbf8911262e4d217fed0be5f0') build() { cd $pkgname-$pkgver diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD deleted file mode 100644 index d0ad3cb44..000000000 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jakub Schmidtke <sjakub-at-gmail.com> - -pkgname=kdeplasma-applets-networkmanagement -epoch=1 -pkgver=0.9.0.9 -pkgrel=1 -pkgdesc="KDE control panel and widget network connections" -arch=('i686' 'x86_64' 'mips64el') -url='https://projects.kde.org/projects/extragear/base/networkmanagement' -license=('GPL') -depends=('kdebase-workspace' 'networkmanager') -makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info' - 'openconnect') -optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' - 'openconnect: Cisco AnyConnect compatible VPN client') -install=${pkgname}.install -source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2") -sha256sums=('d6a7603df2a48e14cef4c44dcaee5773d7ed3cad5b8780307b356df4639231ca') - -build() { - mkdir build - cd build - cmake ../networkmanagement-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} diff --git a/extra/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/extra/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdeplasma-applets-plasma-nm/PKGBUILD b/extra/kdeplasma-applets-plasma-nm/PKGBUILD new file mode 100644 index 000000000..ea548ab39 --- /dev/null +++ b/extra/kdeplasma-applets-plasma-nm/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 196399 2013-10-12 17:21:21Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Antonio Rojas < nqn1976 @ gmail.com > + +pkgname=kdeplasma-applets-plasma-nm +pkgver=0.9.3.0 +pkgrel=2 +pkgdesc="Plasma applet written in QML for managing network connections" +arch=('i686' 'x86_64') +url="https://projects.kde.org/projects/playground/network/plasma-nm" +license=('GPL') +depends=('kdebase-workspace' 'libnm-qt') +makedepends=('cmake' 'automoc4' 'openconnect') +optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' + 'openconnect: Cisco AnyConnect VPN plugin') +source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz") +md5sums=('cdc781eb6f62ebddbe4fafb444f72d9b') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../plasma-nm-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 3a61e5a17..5271b475f 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193566 2013-08-24 08:12:15Z andyrtr $ +# $Id: PKGBUILD 196341 2013-10-11 16:33:42Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.9 +pkgver=4.4.10 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,9 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) -md5sums=('f942d632d71b7bf35dca2e75a8432b83') +source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc}) +md5sums=('1b8d77f1a5a9cfe4e48e45636b775101' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD index c44f8e725..c6cedcb9c 100644 --- a/extra/libdvbpsi/PKGBUILD +++ b/extra/libdvbpsi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 195173 2013-09-26 15:48:02Z foutrelis $ +# $Id: PKGBUILD 196290 2013-10-10 15:39:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=libdvbpsi -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 epoch=1 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables" @@ -15,7 +15,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5') conflicts=('libdvbpsi4' 'libdvbpsi5') url="http://developers.videolan.org/libdvbpsi/" source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('1f84f9d1de08e15f94e6ff9957278064') +md5sums=('0c7c355201f325ea99c522d8ec97bf86') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index b67e0a6a3..37e9f3b75 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168113 2012-10-06 05:43:33Z schiv $ +# $Id: PKGBUILD 196292 2013-10-10 19:31:03Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.ffado.org/" @@ -17,9 +17,11 @@ optdepends=('python2: ffado-diag' 'python2-pyqt: mixer applet') provides=('ffado') source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz" - 'python2-qt.patch') + 'python2-qt.patch' + 'rules.patch') md5sums=('26bce2be0b9c1fa4e614f2f494edf388' - '10aa837f5521da213caa93e1ddc58c0e') + '10aa837f5521da213caa93e1ddc58c0e' + 'da1102bfb02e67b3dfcb3947435a81e9') _scons-conf() { scons DEBUG=False \ @@ -29,17 +31,25 @@ _scons-conf() { COMPILE_FLAGS="$CFLAGS" $@ } -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # python2 fix patch -Np1 -i "$srcdir/python2-qt.patch" - if [ "$CARCH" = "x86_64" ]; then + # rule comments must be on their own line + # see https://bugs.archlinux.org/task/36949 + # and http://subversion.ffado.org/ticket/373 + patch -Np0 -i "$srcdir/rules.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + if [ "$CARCH" = 'x86_64' ]; then _scons-conf ENABLE_OPTIMIZATIONS=True elif [ "$CARCH" = "mips64el" ]; then sed -i "s/-mn32/-mn32 $CFLAGS/g" SConstruct - _scons-conf ENABLE_OPTIMIZATIONS=True else _scons-conf fi @@ -55,7 +65,7 @@ package() { "$pkgdir/usr/share/applications/ffadomixer.desktop" install -Dm644 support/xdg/hi64-apps-ffado.png \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" + "$pkgdir/usr/share/pixmaps/ffado.png" } # vim:set ts=2 sw=2 et: diff --git a/extra/libffado/rules.patch b/extra/libffado/rules.patch new file mode 100644 index 000000000..8e37c164a --- /dev/null +++ b/extra/libffado/rules.patch @@ -0,0 +1,84 @@ +--- libffado/60-ffado.rules ++++ libffado/60-ffado.rules +@@ -1,35 +1,58 @@ + SUBSYSTEM!="firewire", GOTO="ffado_end" + +-ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S +-ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. (aka MOTU) +-ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp. +-ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation +-ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG +-ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation +-ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH +-ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio +-ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc. +-ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc. +-ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc. +-ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited +-ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation +-ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" # Phonic Corporation +-ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH +-ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems +-ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd. +-ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION +-ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" # DnR ++# TC GROUP A/S ++ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" ++# Mark of the Unicorn, Inc. (aka MOTU) ++ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" ++# Apogee Electronics Corp. ++ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" ++# Alesis Corporation ++ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" ++# Bridgeco Co AG ++ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" ++# Presonus Corporation ++ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" ++# TerraTec Electronic GmbH ++ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" ++# M-Audio ++ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" ++# Ego Systems Inc. ++ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" ++# Loud Technologies Inc. ++ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" ++# Stanton Magnetics,inc. ++ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" ++# Focusrite Audio Engineering Limited ++ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" ++# Echo Digital Audio Corporation ++ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" ++# Phonic Corporation ++ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" ++# BEHRINGER Spezielle Studiotechnik GmbH ++ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" ++# FlexRadio Systems ++ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" ++# Weiss Engineering Ltd. ++ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" ++# ROLAND DG CORPORATION ++ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" ++# DnR ++ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" + + # The devices below are by vendors who make other firewire devices in + # addition to their audio interfaces. They need more specific rules to + # ensure only audio interfaces are covered here. + +-ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" # Tascam, a subsiduary of TEAC (the OUI is TEAC's) ++# Tascam, a subsiduary of TEAC (the OUI is TEAC's) ++ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" + + # The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those. + +-ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW +-ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire +-ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME ++# CME, Matrix K FW ++ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" ++# Mackie, Onyx Firewire ++ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" ++# RME ++ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" + + LABEL="ffado_end" diff --git a/extra/libmm-qt/PKGBUILD b/extra/libmm-qt/PKGBUILD new file mode 100644 index 000000000..d6a6c6c22 --- /dev/null +++ b/extra/libmm-qt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 196394 2013-10-12 17:04:01Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libmm-qt +pkgver=0.5.1 +pkgrel=1 +pkgdesc='Qt-only wrapper for ModemManager DBus API' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/extragear/libs/libmm-qt' +license=('LGPL') +depends=('qt4') +makedepends=('cmake') +source=("http://download.kde.org/unstable/modemmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('97a61c398426ea596564d1c876025d93') + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libnm-qt/PKGBUILD b/extra/libnm-qt/PKGBUILD new file mode 100644 index 000000000..fb085736d --- /dev/null +++ b/extra/libnm-qt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 196395 2013-10-12 17:08:13Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libnm-qt +pkgver=0.9.0 +pkgrel=1 +pkgdesc='Qt-only wrapper for NetworkManager DBus API' +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/extragear/libs/libnm-qt' +license=('LGPL') +depends=('libmm-qt' 'networkmanager') +makedepends=('cmake') +source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha256sums=('1afc4b21efd656b34f45692e2c40c0337ca44d7238a56b4318f3bb6fc7df6e22') + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libtar/PKGBUILD b/extra/libtar/PKGBUILD index 0c518d5e8..e8379a7d0 100644 --- a/extra/libtar/PKGBUILD +++ b/extra/libtar/PKGBUILD @@ -1,40 +1,46 @@ -# $Id: PKGBUILD 155876 2012-04-08 10:03:47Z giovanni $ +# $Id: PKGBUILD 196404 2013-10-12 18:57:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=libtar -pkgver=1.2.11 -pkgrel=4 +pkgver=1.2.20 +pkgrel=1 pkgdesc="C library for manipulating POSIX tar files" arch=('i686' 'x86_64' 'mips64el') -url="http://www.feep.net/libtar/" +url="http://repo.or.cz/w/libtar.git/" license=('BSD') depends=('zlib') -source=("ftp://ftp.feep.net/pub/software/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'libtar-1.2.11-tar_header.patch' - 'libtar-1.2.11.patch') -md5sums=('604238e8734ce6e25347a58c4f1a1d7e' - '94b03c0fdee20671e1f6d1ecaf187258' - 'baef7da841c186e1830566296859c35b') +options=('!libtool') +source=("http://pkgbuild.com/~giovanni/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'libtar-1.2.20-free.patch') +md5sums=('32cd952ff74f1c78c06ffff5c0695b90' + '00c2d03a3c13e4b6bc6c3b30a4db9f64') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd "${srcdir}/${pkgname}" - export CFLAGS+=" -fPIC" + patch -Np0 -i "${srcdir}/libtar-1.2.20-free.patch" + sed -i \ + -e '/INSTALL_PROGRAM/s:-s::' {doc,lib{,tar}}/Makefile.in +} - # Fix FS#29322 - patch -Np1 -i "${srcdir}/libtar-1.2.11-tar_header.patch" +build() { + cd "${srcdir}/${pkgname}" + export CFLAGS+=" -fPIC" - patch -Np1 -i "${srcdir}/libtar-1.2.11.patch" + autoreconf -fi ./configure --prefix=/usr \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --disable-static \ + --disable-encap \ + --disable-epkg-install make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/libtar/libtar-1.2.11-tar_header.patch b/extra/libtar/libtar-1.2.11-tar_header.patch deleted file mode 100644 index 161f7da7b..000000000 --- a/extra/libtar/libtar-1.2.11-tar_header.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur libtar-1.2.11/lib/encode.c libtar-1.2.11.tar_header/lib/encode.c ---- libtar-1.2.11/lib/encode.c 2003-01-07 07:10:59.000000000 +0530 -+++ libtar-1.2.11.tar_header/lib/encode.c 2009-11-20 11:13:25.166756167 +0530 -@@ -30,7 +30,10 @@ - int i, sum = 0; - - if (t->options & TAR_GNU) -- strncpy(t->th_buf.magic, "ustar ", 8); -+ { -+ memcpy(t->th_buf.magic, "ustar ", 6); -+ memcpy(t->th_buf.version, " \0", 2); -+ } - else - { - strncpy(t->th_buf.version, TVERSION, TVERSLEN); diff --git a/extra/libtar/libtar-1.2.11.patch b/extra/libtar/libtar-1.2.11.patch deleted file mode 100644 index 347203dc3..000000000 --- a/extra/libtar/libtar-1.2.11.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -Naur libtar-1.2.11-orig/lib/decode.c libtar-1.2.11/lib/decode.c ---- libtar-1.2.11-orig/lib/decode.c 2003-01-06 17:40:59.000000000 -0800 -+++ libtar-1.2.11/lib/decode.c 2004-08-13 12:26:34.000000000 -0700 -@@ -26,7 +26,7 @@ - char * - th_get_pathname(TAR *t) - { -- char filename[MAXPATHLEN]; -+ static char filename[MAXPATHLEN]; - - if (t->th_buf.gnu_longname) - return t->th_buf.gnu_longname; -@@ -35,11 +35,11 @@ - { - snprintf(filename, sizeof(filename), "%.155s/%.100s", - t->th_buf.prefix, t->th_buf.name); -- return strdup(filename); -+ return filename; - } - - snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name); -- return strdup(filename); -+ return filename; - } - - -diff -Naur libtar-1.2.11-orig/lib/extract.c libtar-1.2.11/lib/extract.c ---- libtar-1.2.11-orig/lib/extract.c 2003-03-02 15:58:07.000000000 -0800 -+++ libtar-1.2.11/lib/extract.c 2004-08-13 12:26:34.000000000 -0700 -@@ -28,14 +28,6 @@ - #endif - - --struct linkname --{ -- char ln_save[MAXPATHLEN]; -- char ln_real[MAXPATHLEN]; --}; --typedef struct linkname linkname_t; -- -- - static int - tar_set_file_perms(TAR *t, char *realname) - { -@@ -98,7 +90,9 @@ - tar_extract_file(TAR *t, char *realname) - { - int i; -- linkname_t *lnp; -+ char *lnp; -+ int pathname_len; -+ int realname_len; - - if (t->options & TAR_NOOVERWRITE) - { -@@ -137,11 +131,13 @@ - if (i != 0) - return i; - -- lnp = (linkname_t *)calloc(1, sizeof(linkname_t)); -+ pathname_len = strlen(th_get_pathname(t)) + 1; -+ realname_len = strlen(realname) + 1; -+ lnp = (char *)calloc(1, pathname_len + realname_len); - if (lnp == NULL) - return -1; -- strlcpy(lnp->ln_save, th_get_pathname(t), sizeof(lnp->ln_save)); -- strlcpy(lnp->ln_real, realname, sizeof(lnp->ln_real)); -+ strcpy(&lnp[0], th_get_pathname(t)); -+ strcpy(&lnp[pathname_len], realname); - #ifdef DEBUG - printf("tar_extract_file(): calling libtar_hash_add(): key=\"%s\", " - "value=\"%s\"\n", th_get_pathname(t), realname); -@@ -288,7 +284,7 @@ - { - char *filename; - char *linktgt = NULL; -- linkname_t *lnp; -+ char *lnp; - libtar_hashptr_t hp; - - if (!TH_ISLNK(t)) -@@ -304,8 +300,8 @@ - if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t), - (libtar_matchfunc_t)libtar_str_match) != 0) - { -- lnp = (linkname_t *)libtar_hashptr_data(&hp); -- linktgt = lnp->ln_real; -+ lnp = (char *)libtar_hashptr_data(&hp); -+ linktgt = &lnp[strlen(lnp) + 1]; - } - else - linktgt = th_get_linkname(t); -diff -Naur libtar-1.2.11-orig/lib/libtar.h libtar-1.2.11/lib/libtar.h ---- libtar-1.2.11-orig/lib/libtar.h 2003-01-06 17:40:59.000000000 -0800 -+++ libtar-1.2.11/lib/libtar.h 2004-08-13 12:26:52.000000000 -0700 -@@ -63,9 +63,9 @@ - /***** handle.c ************************************************************/ - - typedef int (*openfunc_t)(const char *, int, ...); --typedef int (*closefunc_t)(int); --typedef ssize_t (*readfunc_t)(int, void *, size_t); --typedef ssize_t (*writefunc_t)(int, const void *, size_t); -+typedef int (*closefunc_t)(long); -+typedef ssize_t (*readfunc_t)(long, void *, size_t); -+typedef ssize_t (*writefunc_t)(long, const void *, size_t); - - typedef struct - { diff --git a/extra/libtar/libtar-1.2.20-free.patch b/extra/libtar/libtar-1.2.20-free.patch new file mode 100644 index 000000000..3a7b028d5 --- /dev/null +++ b/extra/libtar/libtar-1.2.20-free.patch @@ -0,0 +1,22 @@ +stdlib.h is required for free() + +--- lib/output.c ++++ lib/output.c +@@ -20,6 +20,7 @@ + #include <sys/param.h> + + #ifdef STDC_HEADERS ++# include <stdlib.h> + # include <string.h> + #endif + +--- lib/wrapper.c ++++ lib/wrapper.c +@@ -18,6 +18,7 @@ + #include <errno.h> + + #ifdef STDC_HEADERS ++# include <stdlib.h> + # include <string.h> + #endif + diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index de2c8f8fa..275cbd3a2 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192520 2013-08-13 12:39:35Z juergen $ +# $Id: PKGBUILD 196297 2013-10-11 08:53:38Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.30.0 -pkgrel=3 +pkgrel=4 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.10' 'texinfo' 'sh') + depends=('sbcl=1.1.12' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3186d2cc7..d42e69a3e 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193933 2013-09-07 05:53:52Z giovanni $ +# $Id: PKGBUILD 196286 2013-10-10 15:22:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -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=('3313de3667902ae4dc82f29f5280294d' +md5sums=('ec00ddc6aadfea1e11b23650cb741d53' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 15855b9e2..c0b4d752e 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 186257 2013-05-23 01:22:39Z eric $ +# $Id: PKGBUILD 196183 2013-10-08 02:41:01Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.15.4 +pkgver=1.16.0 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/mpg123" -license=('GPL2' 'LGPL2.1') +license=('LGPL2.1') depends=('libltdl' 'alsa-lib') makedepends=('sdl' 'jack' 'libpulse') optdepends=('sdl: for sdl audio support' @@ -15,7 +15,7 @@ optdepends=('sdl: for sdl audio support' 'libpulse: for pulse audio support') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa' +sha1sums=('73105629f8d4b9426ec9fe93455a8271a96c4ae4' 'SKIP') build() { diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 2b7eb91f4..8ea6c3cf7 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196155 2013-10-07 12:16:03Z jgc $ +# $Id: PKGBUILD 196312 2013-10-11 11:02:08Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -8,7 +8,7 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.8.6 +pkgver=0.9.8.8 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') @@ -28,7 +28,7 @@ install=networkmanager.install #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz NetworkManager.conf disable_set_hostname.patch) -sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369' +sha256sums=('8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') diff --git a/extra/ogle/PKGBUILD b/extra/ogle/PKGBUILD deleted file mode 100644 index fbd7846b5..000000000 --- a/extra/ogle/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 137878 2011-09-12 06:26:48Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=ogle -pkgver=0.9.2 -pkgrel=13 -pkgdesc="A simple DVD player for Linux" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.dtek.chalmers.se/groups/dvd/" -license=('GPL') -depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv' - 'alsa-lib' 'a52dec' 'libxxf86vm') -options=('!libtool') -# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz -source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \ - xvideofix.patch gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \ - ogle-vuln-scripts-makefile.patch) -md5sums=('a76a9892bdb807a4bcf859d15a91f0f9' - '57f1cf36eed82c56f24e9c0fc25ce2b3' - '4ebc822b252fade6b53c5ceb5be45bf5' - 'd08cff87c5ec41a7eebc0d2384835688' - '597906c64ff7f5185de8430fdae3107d' - 'd052b01f293c61d399fdd0ac2abb1cf4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/dvdread-4.1.3.patch" - patch -p1 -i "${srcdir}/xvideofix.patch" - patch -p1 -i "${srcdir}/gcc34alsafix.patch" - patch -p1 -i "${srcdir}/gcc4.patch" - patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch" - - # fix alsa detection - stolen from their cvs - sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure - sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LIBRARY_PATH="${pkgdir}/usr/lib/ogle" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/ogle/dvdread-4.1.3.patch b/extra/ogle/dvdread-4.1.3.patch deleted file mode 100644 index d928ac2aa..000000000 --- a/extra/ogle/dvdread-4.1.3.patch +++ /dev/null @@ -1,129 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/01/27 02:06:49 jmcneill Exp $ - ---- vmg/ifo_dump.c.orig 2009-01-26 21:00:17.000000000 -0500 -+++ vmg/ifo_dump.c 2009-01-26 21:00:33.000000000 -0500 -@@ -65,38 +65,38 @@ static void print_ifo(char *path, int ti - if(h->vmgi_mat != NULL) { - - printf("VMG top level\n-------------\n"); -- ifoPrint_VMGI_MAT(h->vmgi_mat); -+ ifo_print_VMGI_MAT(h->vmgi_mat); - - printf("\nFirst Play PGC\n--------------\n"); -- ifoPrint_PGC(h->first_play_pgc); -+ ifo_print_PGC(h->first_play_pgc); - - printf("\nTitle Track search pointer table\n"); - printf( "------------------------------------------------\n"); -- ifoPrint_TT_SRPT(h->tt_srpt); -+ ifo_print_TT_SRPT(h->tt_srpt); - - printf("\nMenu PGCI Unit table\n"); - printf( "--------------------\n"); - if(h->vmgi_mat->vmgm_pgci_ut != 0) { -- ifoPrint_PGCI_UT(h->pgci_ut); -+ ifo_print_PGCI_UT(h->pgci_ut); - } else - printf("No Menu PGCI Unit table present\n"); - - printf("\nParental Manegment Information table\n"); - printf( "------------------------------------\n"); - if(h->vmgi_mat->ptl_mait != 0) { -- ifoPrint_PTL_MAIT(h->ptl_mait); -+ ifo_print_PTL_MAIT(h->ptl_mait); - } else - printf("No Parental Management Information present\n"); - - printf("\nVideo Title Set Attribute Table\n"); - printf( "-------------------------------\n"); -- ifoPrint_VTS_ATRT(h->vts_atrt); -+ ifo_print_VTS_ATRT(h->vts_atrt); - - - printf("\nText Data Manager Information\n"); - printf( "-----------------------------\n"); - if(h->vmgi_mat->txtdt_mgi != 0) { -- //ifoPrint_TXTDT_MGI(h->txtdt_mgi); -+ //ifo_print_TXTDT_MGI(h->txtdt_mgi); - printf("Can't print Text Data Manager Information yet\n"); - } else - printf("No Text Data Manager Information present\n"); -@@ -106,14 +106,14 @@ static void print_ifo(char *path, int ti - printf("\nCell Address table\n"); - printf( "-----------------\n"); - if(h->vmgi_mat->vmgm_c_adt != 0) { -- ifoPrint_C_ADT(h->menu_c_adt); -+ ifo_print_C_ADT(h->menu_c_adt); - } else - printf("No Cell Address table present\n"); - - printf("\nVideo Title set Menu VOBU address map\n"); - printf( "-----------------\n"); - if(h->vmgi_mat->vmgm_vobu_admap != 0) { -- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap); - } else - printf("No Menu VOBU address map present\n"); - } -@@ -122,20 +122,20 @@ static void print_ifo(char *path, int ti - if(h->vtsi_mat != NULL) { - - printf("VTS top level\n-------------\n"); -- ifoPrint_VTSI_MAT(h->vtsi_mat); -+ ifo_print_VTSI_MAT(h->vtsi_mat); - - printf("\nPart of title search pointer table information\n"); - printf( "----------------------------------------------\n"); -- ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt); -+ ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt); - - printf("\nPGCI Unit table\n"); - printf( "--------------------\n"); -- ifoPrint_PGCIT(h->vts_pgcit); -+ ifo_print_PGCIT(h->vts_pgcit); - - printf("\nMenu PGCI Unit table\n"); - printf( "--------------------\n"); - if(h->vtsi_mat->vtsm_pgci_ut != 0) { -- ifoPrint_PGCI_UT(h->pgci_ut); -+ ifo_print_PGCI_UT(h->pgci_ut); - } else - printf("No Menu PGCI Unit table present\n"); - -@@ -144,31 +144,31 @@ static void print_ifo(char *path, int ti - printf("\nTime Map table\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vts_tmapt != 0) { -- ifoPrint_VTS_TMAPT(h->vts_tmapt); -+ ifo_print_VTS_TMAPT(h->vts_tmapt); - } else - printf("No Time Map table present\n"); - - printf("\nMenu Cell Address table\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vtsm_c_adt != 0) { -- ifoPrint_C_ADT(h->menu_c_adt); -+ ifo_print_C_ADT(h->menu_c_adt); - } else - printf("No Cell Address table present\n"); - - printf("\nVideo Title Set Menu VOBU address map\n"); - printf( "-----------------\n"); - if(h->vtsi_mat->vtsm_vobu_admap != 0) { -- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap); - } else - printf("No Menu VOBU address map present\n"); - - printf("\nCell Address table\n"); - printf( "-----------------\n"); -- ifoPrint_C_ADT(h->vts_c_adt); -+ ifo_print_C_ADT(h->vts_c_adt); - - printf("\nVideo Title Set VOBU address map\n"); - printf( "-----------------\n"); -- ifoPrint_VOBU_ADMAP(h->vts_vobu_admap); -+ ifo_print_VOBU_ADMAP(h->vts_vobu_admap); - - } - } diff --git a/extra/ogle/gcc34alsafix.patch b/extra/ogle/gcc34alsafix.patch deleted file mode 100644 index 76de3462d..000000000 --- a/extra/ogle/gcc34alsafix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ogle-0.9.2/libogleao/alsa_audio.c 2003-10-18 17:38:30.000000000 -0700 -+++ ogle-0.9.2-patch/libogleao/alsa_audio.c 2005-04-22 18:21:23.000000000 -0700 -@@ -248,10 +248,9 @@ - //Shouldn't ctl_handle be closed here? - } - -- snd_ctl_close(ctl_handle); -- -- __diga_end: -+ snd_ctl_close(ctl_handle); - } -+ __diga_end: - - return 0; - } diff --git a/extra/ogle/gcc4.patch b/extra/ogle/gcc4.patch deleted file mode 100644 index b6a10a325..000000000 --- a/extra/ogle/gcc4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ogle-0.9.2-old/ac3/ac3dec_wrap.c ogle-0.9.2/ac3/ac3dec_wrap.c ---- ogle-0.9.2-old/ac3/ac3dec_wrap.c 2003-03-02 15:50:03.000000000 +0000 -+++ ogle-0.9.2/ac3/ac3dec_wrap.c 2005-09-30 17:07:27.000000000 +0000 -@@ -48,7 +48,7 @@ - static void handle_events(MsgEventQ_t *q, MsgEvent_t *ev); - - --static char *program_name; -+char *program_name; - - static FILE *outfile; - diff --git a/extra/ogle/ogle-vuln-scripts-makefile.patch b/extra/ogle/ogle-vuln-scripts-makefile.patch deleted file mode 100644 index f25964378..000000000 --- a/extra/ogle/ogle-vuln-scripts-makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch inhibits the installation of debug scripts vulnerable to a symlink -attack, see bug 245921 for reference. - ---- scripts/Makefile.in.orig 2009-04-04 18:13:33.000000000 +0200 -+++ scripts/Makefile.in 2009-04-04 18:15:46.000000000 +0200 -@@ -133,10 +133,10 @@ - subdir = scripts - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = ogle --SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS) -+SCRIPTS = $(bin_SCRIPTS) - - DIST_SOURCES = --DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in -+DIST_COMMON = Makefile.am Makefile.in ogle.in - all: all-am - - .SUFFIXES: -@@ -279,7 +279,7 @@ - - install-data-am: - --install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS -+install-exec-am: install-binSCRIPTS - - install-info: install-info-am - -@@ -295,7 +295,7 @@ - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - --uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \ -+uninstall-am: uninstall-binSCRIPTS \ - uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ diff --git a/extra/ogle/xvideofix.patch b/extra/ogle/xvideofix.patch deleted file mode 100644 index aafde447a..000000000 --- a/extra/ogle/xvideofix.patch +++ /dev/null @@ -1,205 +0,0 @@ ---- ogle-0.9.2/mpeg2_video/video_output_x11.c 2003-11-04 04:02:10.000000000 -0800 -+++ ogle-0.9.2-patch/mpeg2_video/video_output_x11.c 2005-04-22 18:37:56.000000000 -0700 -@@ -286,6 +286,7 @@ - } - } - -+ - /* This section of the code looks for the Xv extension for hardware - * yuv->rgb and scaling. If it is not found, or any suitable adapter - * is not found, use_xv will be set to 0. Otherwise it allocates a -@@ -299,121 +300,136 @@ - { - int xv_found = 0; - #ifdef HAVE_XV -- int i, j; -+ int i, j, k; - int result; - - xv_port = 0; /* We have no port yet. */ -- -+ - /* Check for the Xvideo extension */ -- result = XvQueryExtension(mydisplay, &xv_version, &xv_release, -- &xv_request_base, &xv_event_base, -+ result = XvQueryExtension(mydisplay, &xv_version, &xv_release, -+ &xv_request_base, &xv_event_base, - &xv_error_base); - if(result != Success) { - WARNING("%s", "Xvideo extension not found\n"); - use_xv = 0; - return; - } -- -+ - NOTE("Found Xv extension %d.%d, checking for suitable adaptors\n", - xv_version, xv_release); -- -+ - /* Check for available adaptors */ -- result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay), -+ result = XvQueryAdaptors(mydisplay, DefaultRootWindow (mydisplay), - &xv_num_adaptors, &xv_adaptor_info); - if(result != Success) { - WARNING("%s", "No Xv adaptors found\n"); - use_xv = 0; - return; - } -- -+ - /* Check adaptors */ - for(i = 0; i < xv_num_adaptors; i++) { -- -+ - /* Is it usable for displaying XvImages */ - if(!(xv_adaptor_info[i].type & XvInputMask) || - !(xv_adaptor_info[i].type & XvImageMask)) - continue; -- -- xv_port = xv_adaptor_info[i].base_id; -- -- /* Check image formats of adaptor */ -- xv_formats = XvListImageFormats(mydisplay, xv_port, &xv_num_formats); -- for(j = 0; j < xv_num_formats; j++) { -- if(xv_formats[j].id == 0x32315659) { /* YV12 */ -- //if(xv_formats[j].id == 0x30323449) { /* I420 */ -- xv_id = xv_formats[j].id; -- break; -- } -- } -- /* No matching format found */ -- if(j == xv_num_formats) -- continue; -- -- NOTE("Xv adaptor \"%s\" port %li image format %i\n", -- xv_adaptor_info[i].name, xv_port, xv_id); -- -- /* Allocate XvImages */ -+ -+ /* Check Available Ports */ -+ for (j = 0; j < xv_adaptor_info[i].num_ports && !xv_port ; j++) { -+ -+ /* Check Image formats of adaptor */ -+ xv_formats = XvListImageFormats(mydisplay,xv_adaptor_info[i].base_id + j, &xv_num_formats); -+ for (k = 0; k < xv_num_formats; k ++) { -+ -+ /* Check for proper format (YV12) and see if we can grab the port */ -+ if ( (xv_formats[k].id == 0x32315659) && (XvGrabPort(mydisplay,xv_adaptor_info[i].base_id + j,0) == Success) ) { -+ xv_id = xv_formats[k].id; -+ xv_port = xv_adaptor_info[i].base_id + j; -+ break; -+ } -+ -+ } -+ -+ /* delete stuff nicely */ -+ XFree(xv_formats); -+ } -+ -+ /* Check next Adapter */ -+ if (xv_port==0) continue; -+ -+ /* Report what we found */ -+ NOTE("Xv adaptor \"%s\" port %li image format %i\n", xv_adaptor_info[i].name, xv_port, xv_id); -+ -+ /* Allocate XvImage */ - xv_image = XvShmCreateImage(mydisplay, xv_port, xv_id, NULL, - padded_width, -- padded_height, -+ padded_height, - &shm_info); -- -- /* Got an Image? */ -+ -+ /* Got an milk? */ - if(xv_image == NULL) - continue; -- -+ - /* Test and see if we really got padded_width x padded_height */ - if(xv_image->width != padded_width || - xv_image->height != padded_height) { - FATAL("XvShmCreateImage got size: %d x %d\n", - xv_image->width, xv_image->height); - exit(1); -- } -- -+ } -+ -+ /* Now Finish Up */ - shm_info.shmid = picture_buffer_shmid; - shm_info.shmaddr = picture_buffer_addr; -- -- /* Set the data pointer to the decoders picture segment. */ -+ -+ /* Set the data pointer to the decoders picture segment. */ - // xv_image->data = picture_data->y; - shm_info.readOnly = True; -- -+ - /* make sure we don't have any unhandled errors */ - XSync(mydisplay, False); -- -+ - /* set error handler so we can check if xshmattach failed */ - prev_xerrhandler = XSetErrorHandler(xshm_errorhandler); -- -+ - /* get the serial of the xshmattach request */ - req_serial = NextRequest(mydisplay); -- -+ - /* try to attach */ - XShmAttach(mydisplay, &shm_info); -- -+ - /* make sure xshmattach has been processed and any errors - have been returned to us */ - XSync(mydisplay, False); -- -+ - /* revert to the previous xerrorhandler */ - XSetErrorHandler(prev_xerrhandler); -- -+ - if(use_xshm) { - #if 0 - shmctl(shm_info.shmid, IPC_RMID, 0); // only works on Linux.. - #endif -- -+ - CompletionType = XShmGetEventBase(mydisplay) + ShmCompletion; - } - xv_found = 1; - - /* All set up! */ - break; -- } -+ } -+ -+ /* Clean up */ -+ XvFreeAdaptorInfo(xv_adaptor_info); -+ - #endif /* HAVE_XV */ -+ /* In case we didn't find a working Xv */ - if(!xv_found) { - use_xv = 0; -- } --} -- -+ } -+ -+ } -+ - - /* This section of the code tries to use the MIT XShm extension for - * accellerated transfers to to X. XShm extension is need and only -@@ -1726,6 +1742,8 @@ - - if(mydisplay) { - XSync(mydisplay,True); -+ if (use_xv) -+ XvUngrabPort(mydisplay,xv_port,CurrentTime); - if(use_xshm) - XShmDetach(mydisplay, &shm_info); - if(window.ximage != 0) diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 95f0f4dfd..ac07b0dcf 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191907 2013-08-01 06:53:40Z bpiotrowski $ +# $Id: PKGBUILD 196269 2013-10-10 11:00:54Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD index 470da9072..454c3a5d2 100644 --- a/extra/php-xcache/PKGBUILD +++ b/extra/php-xcache/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 195126 2013-09-25 11:18:14Z pierre $ +# $Id: PKGBUILD 196293 2013-10-11 06:26:09Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-xcache -pkgver=3.1.0dev -_svnrev=1394 -pkgrel=14 +pkgver=3.1.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A PHP opcode cacher' url='http://xcache.lighttpd.net/' depends=('php') -makedepends=('subversion') license=('custom') -source=("xcache-${pkgver}::svn://svn.lighttpd.net/xcache/trunk/#revision=${_svnrev}" +source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2" 'xcache.ini') backup=('etc/php/conf.d/xcache.ini') -md5sums=('SKIP' +md5sums=('e5816d47d52be200b959bf69a673ff74' '8fd9ce537ada9463c4b0c042243158c0') build() { diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 07109de00..ca2ff9e0f 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186424 2013-05-26 09:25:57Z bluewind $ +# $Id: PKGBUILD 196303 2013-10-11 09:53:41Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=9.1.9 +pkgver=9.2.5 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" @@ -47,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('6b5ea53dde48fcd79acfc8c196b83535') -sha256sums=('28a533e181009308722e8b3c51f1ea7224ab910c380ac1a86f07118667602dd8') +md5sums=('e8438e0ed5e6371741be7697886e7340') +sha256sums=('22c1edfd6a404bb15fba655863e94f09a10716ded1910a8bc98ee85f413007a4') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index d4e739b6c..beca39e8f 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186423 2013-05-26 09:25:56Z bluewind $ +# $Id: PKGBUILD 196301 2013-10-11 09:52:27Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.2.4 +pkgver=9.3.1 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') @@ -14,20 +14,20 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar postgresql-run-socket.patch postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('6ee5bb53b97da7c6ad9cb0825d3300dd' +md5sums=('c003d871f712d4d3895956b028a96e74' '75c579eed03ffb2312631f0b649175b4' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' '1c5a1f99e8e93776c593c468e2612985' - '505e0e4abfc746cae9558584d471a03c') -sha256sums=('d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93' + 'ea7f9f914900e60835d20cb95010e63c') +sha256sums=('8ea4a7a92a6f5a79359b02e683ace335c5eb45dffe7f8a681a9ce82470a8a0b8' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' '7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4' - '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') + 'b3ed31e5882e5bdf4515d488d3f2db874ff5561be3091eab29810f831038a888') build() { cd "${srcdir}/postgresql-${pkgver}" @@ -64,11 +64,14 @@ package_postgresql-libs() { install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" # install libs - for dir in src/interfaces src/bin/pg_config src/bin/psql; do + for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do make -C ${dir} DESTDIR="${pkgdir}" install done install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" + install -D -m644 doc/src/sgml/man1/pg_dump.1 "${pkgdir}/usr/share/man/man1/pg_dump.1" + install -D -m644 doc/src/sgml/man1/pg_dumpall.1 "${pkgdir}/usr/share/man/man1/pg_dumpall.1" + install -D -m644 doc/src/sgml/man1/pg_restore.1 "${pkgdir}/usr/share/man/man1/pg_restore.1" install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" cd src/include @@ -78,6 +81,7 @@ package_postgresql-libs() { # these headers are needed by the public headers of the interfaces install -m644 pg_config.h "${pkgdir}/usr/include/" install -m644 pg_config_os.h "${pkgdir}/usr/include/" + install -m644 pg_config_ext.h "${pkgdir}/usr/include/" install -m644 postgres_ext.h "${pkgdir}/usr/include/" install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/" install -m644 pg_config_manual.h "${pkgdir}/usr/include/" @@ -108,7 +112,7 @@ package_postgresql-docs() { package_postgresql() { pkgdesc="A sophisticated object-relational DBMS" - backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') + backup=('etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') optdepends=('python2: for PL/Python support' 'perl: for PL/Perl support' @@ -124,10 +128,13 @@ package_postgresql() { make -C doc/src/sgml DESTDIR="${pkgdir}" install-man # we don't want these, they are in the -libs package - for dir in src/interfaces src/bin/pg_config src/bin/psql; do + for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do make -C ${dir} DESTDIR="${pkgdir}" uninstall done rm "${pkgdir}/usr/share/man/man1/pg_config.1" + rm "${pkgdir}/usr/share/man/man1/pg_dump.1" + rm "${pkgdir}/usr/share/man/man1/pg_dumpall.1" + rm "${pkgdir}/usr/share/man/man1/pg_restore.1" rm "${pkgdir}/usr/share/man/man1/psql.1" # install license diff --git a/extra/postgresql/postgresql-check-db-dir b/extra/postgresql/postgresql-check-db-dir index 542c82209..e563d114c 100755 --- a/extra/postgresql/postgresql-check-db-dir +++ b/extra/postgresql/postgresql-check-db-dir @@ -16,9 +16,9 @@ then fi # PGMAJORVERSION is major version -PGMAJORVERSION=9.2 +PGMAJORVERSION=9.3 # PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades -PREVMAJORVERSION=9.1 +PREVMAJORVERSION=9.2 # Check for the PGDATA structure if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ] @@ -35,7 +35,7 @@ then else echo $"An old version of the database format was found." echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION." - echo $"See http://www.postgresql.org/docs/9.2/static/upgrading.html" + echo $"See http://www.postgresql.org/docs/$PGMAJORVERSION/static/upgrading.html" exit 1 fi else diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index b97721f09..282bc6307 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 195926 2013-10-05 14:25:32Z tpowa $ +# $Id: PKGBUILD 196267 2013-10-10 06:36:39Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=('qemu' 'libcacard') -pkgver=1.6.0 -pkgrel=4 +pkgver=1.6.1 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" -makedepends=('texi2html' 'perl' 'python2') +makedepends=('texi2html' 'perl' 'python2' 'spice-protocol') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 65-kvm.rules) @@ -20,7 +20,8 @@ build () ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \ - --disable-gtk --enable-linux-aio --enable-seccomp --localstatedir=/var + --disable-gtk --enable-linux-aio --enable-seccomp \ + --enable-spice --localstatedir=/var make } @@ -29,7 +30,7 @@ package_qemu() { depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' - 'libiscsi' 'libcacard') + 'libiscsi' 'libcacard' 'spice') backup=('etc/qemu/target-x86_64.conf') cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install @@ -54,6 +55,7 @@ package_qemu() { esac done # remove libcacard files + rm -rf ${pkgdir}/usr/include/cacard rm -rf ${pkgdir}/usr/lib/libcacard* rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc rm -rf ${pkgdir}/usr/bin/vscclient @@ -65,9 +67,11 @@ package_libcacard() { depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2') mkdir -p ${pkgdir}/usr/bin mkdir -p ${pkgdir}/usr/lib/pkgconfig + mkdir -p ${pkgdir}/usr/include/cacard + cp -a ${srcdir}/qemu-${pkgver}/libcacard/*.h ${pkgdir}/usr/include/cacard/ cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/ cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } -md5sums=('f3f39308472d629aca57a255a0c91ba9' +md5sums=('3a897d722457c5a895cd6ac79a28fda0' '9d6de26867a05c306157e3d3c612b28a') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 4ff6ed60a..878a7c708 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.9 +pkgver=4.0.10 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.9 +_realver=4.0.10 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" @@ -245,7 +245,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('f5f2ad0e2aabf024e2e3e2f297a0631a' +md5sums=('220740f75035b2221e3b9a848e19d1ea' '5697da77590ec092cc8a883bae06093c' 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 014f6d1f9..0c4e1146f 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 192518 2013-08-13 12:04:18Z juergen $ +# $Id: PKGBUILD 196298 2013-10-11 08:53:55Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.10 +pkgver=1.1.12 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -18,30 +18,13 @@ makedepends=('sbcl') makedepends=('clisp') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" - "arch-fixes.lisp" - "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" - "texinfo-4.13a-data_types.patch") -md5sums=('ccec396f1bef6468be1f18bcc60231fe' - '7ac0c1936547f4278198b8bf7725204d' - '71ba711519209b5fb583fed2b3d86fcb' - 'd8574782ff7def1e2dc5c291dbeaec18') - - -# Temporary Texinfo legacy build -# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919 - -build-texinfo-legacy() { - cd ${srcdir}/texinfo-4.13 - patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch - mkdir -p $srcdir/texinfo-instroot - ./configure --prefix=$srcdir/texinfo-instroot - make install -} + "arch-fixes.lisp") +md5sums=('817e0606e4615e758c0bf3d381197711' + '7ac0c1936547f4278198b8bf7725204d') -build() { - build-texinfo-legacy - export PATH=$srcdir/texinfo-instroot/bin:$PATH + +build() { cd "$srcdir/$pkgname-$pkgver" export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl" diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index 444f74dd0..f4aa76497 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189903 2013-07-11 07:11:16Z andrea $ +# $Id: PKGBUILD 196389 2013-10-12 16:52:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano -pkgver=2.9.3 +pkgver=2.9.4 pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('qt4' 'libiodbc' 'virtuoso-base' 'redland') makedepends=('cmake' 'doxygen') [ "$CARCH" != "mips64el" ] && makedepends+=('java-environment') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('714a729809943efd4b536ed15cd66aca') +md5sums=('91413e5783efeee0beb747ea4c5c9ef0') prepare() { mkdir build diff --git a/extra/spice/PKGBUILD b/extra/spice/PKGBUILD new file mode 100644 index 000000000..b5878e11d --- /dev/null +++ b/extra/spice/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 196189 2013-10-08 07:21:39Z tpowa $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=spice +pkgver=0.12.4 +pkgrel=2 +pkgdesc="SPICE client and server" +arch=('i686' 'x86_64') +url="http://spice-space.org" +license=('LGPL2.1') +depends=(alsa-lib celt0.5.1 libcacard libjpeg-turbo libsasl libxinerama libxfixes libxrandr pixman) +makedepends=(python2-pyparsing qemu spice-protocol) +options=(!libtool) +source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('325b1c42ce24e75de45a75876b73a8bd') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=python2 ./configure --prefix=/usr --disable-static --enable-smartcard --enable-client + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD index 6aaa1f6f6..b2e94ba4b 100644 --- a/extra/suil/PKGBUILD +++ b/extra/suil/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: speps <speps at aur dot archlinux dot org> pkgname=suil -pkgver=0.6.14 -pkgrel=2 +pkgver=0.6.16 +pkgrel=1 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" arch=('i686' 'x86_64' 'mips64el') url="http://drobilla.net/software/suil/" @@ -14,7 +14,7 @@ makedepends=('python2' 'qt4' 'gtk2') optdepends=('qt4: Qt 4.x UI wrapping support' 'gtk2: GTK+ 2.x UI wrapping support') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('c9738de0d6974aca1fe75dd280114158') +md5sums=('644ccd95179f32f01cee0107a1ad88c9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD index dccd864ce..dabe2ea53 100644 --- a/extra/swell-foop/PKGBUILD +++ b/extra/swell-foop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196138 2013-10-07 11:53:31Z jgc $ +# $Id: PKGBUILD 196386 2013-10-12 16:49:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=swell-foop -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Clear the screen by removing groups of colored and shaped tiles" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=swell-foop.install url="https://live.gnome.org/Swell%20Foop" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('d96c5cbd071a97038cc281d6a85902721ab5fc50d27981dc2c37b003126a43a6') +sha256sums=('5b750c3b5100d2b1a1c4d73387c478ac6dcdaf27dd3b168da652b0c26bceb611') build() { cd $pkgname-$pkgver diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index dc1da967f..cb424a7fb 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 189234 2013-07-01 01:03:08Z bisson $ +# $Id: PKGBUILD 196248 2013-10-09 16:10:58Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim pkgver=1.8.6 -pkgrel=1 +pkgrel=2 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') depends=('libxft' 'libedit' 'anthy' 'm17n-lib') -makedepends=('intltool' 'gettext' 'qt4' 'gtk2' 'gtk3' 'gnome-panel') +makedepends=('intltool' 'gettext' 'qt4' 'gtk2' 'gtk3') optdepends=('qt4: immodule and helper applications' 'gtk2: immodule and helper applications' - 'gtk3: immodules and helper applications' - 'gnome-panel: gnome applet indicator') + 'gtk3: immodules and helper applications') options=('!libtool') source=("https://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") sha1sums=('409c30b31b9e58e3c18cb7862933487b0585cd1d') diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 83c9ac161..32eba6ff4 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187074 2013-06-03 11:16:59Z allan $ +# $Id: PKGBUILD 196345 2013-10-11 18:25:19Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.9.5 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/libv4l" @@ -16,7 +16,7 @@ optdepends=('qt4') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) -sha256sums=('6c9f1be981d5763069e0969ebe426c39da5a7d738865367e390e3b486f1b502c' +sha256sums=('1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30' 'SKIP') options=(!libtool) diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 5884f67a8..24faa49fd 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193712 2013-08-28 20:08:20Z lcarlier $ +# $Id: PKGBUILD 196331 2013-10-11 14:56:14Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('libffi' 'expat') makedepends=('doxygen') options=(!libtool) source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('2214b690cb5a4f9695d287f27730c4368e6ef829') +sha1sums=('febbbfc8d76ed0b2157077d50cb6e5ceb1aa47de') build() { cd $pkgname-$pkgver diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index e61c92471..8154b0a98 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193946 2013-09-07 16:40:23Z andrea $ +# $Id: PKGBUILD 196288 2013-10-10 15:27:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.4.1 -pkgrel=4 +pkgver=0.4.2 +pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' ' optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('071d6f1cd21c892cae126af21095c43f') +md5sums=('fbbb4c319474d4a3b123fea7e8402fa2') prepare() { mkdir build diff --git a/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch b/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch new file mode 100644 index 000000000..b550bcedd --- /dev/null +++ b/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch @@ -0,0 +1,76 @@ +From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon, 16 Sep 2013 21:47:16 -0700 +Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText() + [CVE-2013-4396] + +Save a pointer to the passed in closure structure before copying it +and overwriting the *c pointer to point to our copy instead of the +original. If we hit an error, once we free(c), reset c to point to +the original structure before jumping to the cleanup code that +references *c. + +Since one of the errors being checked for is whether the server was +able to malloc(c->nChars * itemSize), the client can potentially pass +a number of characters chosen to cause the malloc to fail and the +error path to be taken, resulting in the read from freed memory. + +Since the memory is accessed almost immediately afterwards, and the +X server is mostly single threaded, the odds of the free memory having +invalid contents are low with most malloc implementations when not using +memory debugging features, but some allocators will definitely overwrite +the memory there, leading to a likely crash. + +Reported-by: Pedro Ribeiro <pedrib@gmail.com> +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> +--- + dix/dixfonts.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/dix/dixfonts.c b/dix/dixfonts.c +index feb765d..2e34d37 100644 +--- a/dix/dixfonts.c ++++ b/dix/dixfonts.c +@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + GC *pGC; + unsigned char *data; + ITclosurePtr new_closure; ++ ITclosurePtr old_closure; + + /* We're putting the client to sleep. We need to + save some state. Similar problem to that handled +@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c) + err = BadAlloc; + goto bail; + } ++ old_closure = c; + *new_closure = *c; + c = new_closure; + + data = malloc(c->nChars * itemSize); + if (!data) { + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + if (!pGC) { + free(c->data); + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c) + FreeScratchGC(pGC); + free(c->data); + free(c); ++ c = old_closure; + err = BadAlloc; + goto bail; + } +-- +1.7.9.2 + diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 8063d37e2..452ebc859 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 194374 2013-09-15 07:40:13Z andyrtr $ +# $Id: PKGBUILD 196227 2013-10-08 22:59:23Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.14.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -24,7 +24,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run.1 10-quirks.conf loongson.patch - fb-rename-wfbDestroyGlyphCache.patch) + fb-rename-wfbDestroyGlyphCache.patch + 0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch) sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' @@ -59,7 +60,12 @@ prepare() { # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch + + # CVE-2013-4396: Use after free in Xserver handling of ImageText requests + # (to be included in xorg-server 1.15.0 and 1.14.4) + patch -Np1 -i ../0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch } + build() { cd "${pkgbase}-${pkgver}" autoreconf -fi @@ -223,3 +229,14 @@ package_xorg-server-devel() { install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" } +sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e' + '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' + 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' + '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' + 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619' + 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' + '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' + 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1' + '2b90ce92a900b6d4edda9ef33acdd3d2c2708fec2344175c2d8dfd4265f56d32') diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD index 081b19d2c..6edbc76f4 100644 --- a/extra/xorg-xauth/PKGBUILD +++ b/extra/xorg-xauth/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 154150 2012-03-23 19:14:18Z andyrtr $ +# $Id: PKGBUILD 196360 2013-10-12 08:39:11Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xauth -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X.Org authorization settings program" arch=(i686 x86_64 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2) -sha1sums=('54f93f0539a98900c36c4f7c8ae933f77699dc7b') +sha256sums=('a8696ae7a50c699d5fb3a41408b60d98843d19ea46e9f09e391cb98c8f7fd4f7') build() { cd "${srcdir}/xauth-${pkgver}" |