diff options
76 files changed, 1849 insertions, 426 deletions
diff --git a/artistic/gimp-art/PKGBUILD b/artistic/gimp-art/PKGBUILD new file mode 100644 index 000000000..4236ce271 --- /dev/null +++ b/artistic/gimp-art/PKGBUILD @@ -0,0 +1,98 @@ +# $Id$ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +_pkgname=gimp +pkgname=gimp-art +pkgver=2.8.2 +pkgrel=1 +pkgdesc='GNU Image Manipulation Program (changed splash artwork)' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.$_pkgname.org/ +license=( + GPL + LGPL +) +depends=( + babl + dbus-glib + desktop-file-utils + gegl + hicolor-icon-theme + jasper + lcms + libexif + libmng + librsvg + libxmu + libxpm + libwmf + pygtk +) +makedepends=( + alsa-lib + curl + ghostscript + intltool + iso-codes + libwebkit + poppler-glib +) +optdepends=( + 'alsa-lib: for MIDI event controller module' + 'curl: for URI support' + 'ghostscript: for postscript support' + 'gutenprint: for sophisticated printing only as gimp has built-in cups print support' + 'libwebkit: for the help browser' + 'poppler-glib: for pdf support' +) +options=( + '!libtool' + '!makeflags' +) +conflicts=( + $_pkgname + $_pkgname-devel +) +install=$_pkgname.install +source=( + ftp://ftp.$_pkgname.org/pub/$_pkgname/v${pkgver%.*}/$_pkgname-$pkgver.tar.bz2 + $_pkgname-splash-artwork.png + $_pkgname-splash-artwork.license +) +sha512sums=( + 82a15072aba97d41a7dd74920f5db4e89442ff83841ac614f6fadfd964bdb8d3ae478ac0ba2e906bcf4569c8de00a1616fd6d626032f093060f28df3655d9111 + 1a2930e612b339f49aa85f98275c24202e056f2fff5c1fda94e662bfd45ed5b6226e6ab1947f3daf758f4e5106fd3f7e4f286d63b258f008b6a5d9e5cd6f0611 + d3f055ce278f25b33a6b11f3b031ae801206390fa1f62e3383daf35570e5f68b98ddfac30dea71d89d4916eaf3263e642ad06805c3175f620412e546784335ac +) + +build() { + cd $srcdir/$_pkgname-$pkgver + + ## Add artwork splash image ## + install -Dm644 $srcdir/$_pkgname-splash-artwork.png \ + $srcdir/$_pkgname-$pkgver/data/images/$_pkgname-splash.png + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-mp --enable-$_pkgname-console --enable-python --without-aa \ + --with-gif-compression=lzw --with-libcurl --without-gvfs + make +} + +package() { + cd $srcdir/$_pkgname-$pkgver + make DESTDIR=$pkgdir install + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgdir/usr/lib/$_pkgname/${pkgver::2}0/plug-ins/*.py + + ## Add artwork splash license ## + install -Dm644 $srcdir/$_pkgname-splash-artwork.license \ + $pkgdir/usr/share/licenses/$_pkgname/$_pkgname-splash-artwork.license + + rm $pkgdir/usr/share/man/man1/$_pkgname-console.1 + ln -s $_pkgname-console-${pkgver%.*}.1.gz $pkgdir/usr/share/man/man1/$_pkgname-console.1.gz + ln -s ${_pkgname}tool-${pkgver::2}0 $pkgdir/usr/bin/${_pkgname}tool + ln -sf ${_pkgname}tool-${pkgver::2}0.1.gz $pkgdir/usr/share/man/man1/${_pkgname}tool.1.gz +} diff --git a/artistic/gimp-art/gimp-splash-artwork.license b/artistic/gimp-art/gimp-splash-artwork.license new file mode 100644 index 000000000..64267a6c0 --- /dev/null +++ b/artistic/gimp-art/gimp-splash-artwork.license @@ -0,0 +1,13 @@ +GIMP LIBRE SPLASH LICENSE + +Logo and Effects is created by Zé Lara <ze.lara@adinet.com.uy> and Márcio Silva <coadde@adinet.com.uy> +Idea by André Silva <andre.paulista@adinet.com.uy> + +The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. +To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street, +Suite 900, Mountain View, California, 94041, USA. + +Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain). +To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. +This work is published from: United States. +https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
\ No newline at end of file diff --git a/artistic/gimp-art/gimp-splash-artwork.png b/artistic/gimp-art/gimp-splash-artwork.png Binary files differnew file mode 100644 index 000000000..76c9e8c94 --- /dev/null +++ b/artistic/gimp-art/gimp-splash-artwork.png diff --git a/artistic/gimp-art/gimp.install b/artistic/gimp-art/gimp.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/artistic/gimp-art/gimp.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 6a2070b14..26336fecb 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,40 +1,48 @@ -# $Id: PKGBUILD 74550 2012-07-30 13:54:14Z mtorromeo $ +# $Id: PKGBUILD 75815 2012-09-01 11:15:13Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=apcupsd pkgver=3.14.10 -pkgrel=2 -pkgdesc="power mangement and controlling most of APC's UPS models" +pkgrel=3 +pkgdesc="Power mangement and controlling most of APC's UPS models" arch=(i686 x86_64) url="http://www.apcupsd.org" license=('GPL') depends=('gcc-libs') optdepends=('gd: for CGI' - 'gconf: for frontend' - 'gtk2: for frontend') + 'gconf: for frontend' + 'gtk2: for frontend') makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2') backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf etc/apcupsd/multimon.conf) source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz - apcupsd - apcupsd.service) -md5sums=('5928822d855c5cf7ac29655e3e0b8c23' - '8bc674da24188c69b0ad5d7fe7510f73' - '3baf366b2cfabf83a206a1cb0c8f4c26') + apcupsd + apcupsd.service + apcupsd-tmpfiles.conf) +sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' + 'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a' + 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' + 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ --enable-cgi --enable-usb --enable-net \ --with-upstype=usb --with-upscable=usb \ --with-serial-dev=/dev/usb/hid/hiddev[0-9] \ --enable-pthreads --enable-gapcmon - make - make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd" - install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service" - chmod 755 "$pkgdir"/sbin/* - install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin" - mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin" + make } + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd" + install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service" + install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf" + chmod 755 "$pkgdir"/sbin/* + install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin" + mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin" +}
\ No newline at end of file diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd index 73ca2b4bf..8a96e9b07 100755 --- a/community/apcupsd/apcupsd +++ b/community/apcupsd/apcupsd @@ -7,8 +7,6 @@ PID=`pidof -o %PPID /sbin/apcupsd` case "$1" in start) stat_busy "Starting APCUPSD Daemon" - rm -f /etc/apcupsd/powerfail - rm -f /etc/nologin [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf if [ $? -gt 0 ]; then stat_fail diff --git a/community/apcupsd/apcupsd-tmpfiles.conf b/community/apcupsd/apcupsd-tmpfiles.conf new file mode 100644 index 000000000..0ceb4106b --- /dev/null +++ b/community/apcupsd/apcupsd-tmpfiles.conf @@ -0,0 +1,2 @@ +r /etc/apcupsd/powerfail +r /etc/nologin
\ No newline at end of file diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index a17fa153d..b3c2fb45d 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69136 2012-04-09 18:24:09Z jelle $ +# $Id: PKGBUILD 75817 2012-09-01 20:39:32Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> @@ -6,7 +6,7 @@ #pkgname=('freedroidrpg' 'freedroidrpg-data') pkgname='freedroidrpg' pkgver=0.15.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index fc1a1ebcf..54e8cd33c 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,32 +1,26 @@ -# $Id: PKGBUILD 70866 2012-05-18 06:01:51Z ebelanger $ +# $Id: PKGBUILD 75791 2012-08-31 12:11:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=0.9.30.4 -pkgrel=5 +pkgver=1.0 +_pkgsubver=0 +pkgrel=1 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64') makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') -source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2" - 'lazcontrols2.diff' -) -md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84' - '288bca6ad5ade79deec34c3602daaaa9' -) +source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" + 'lazcontrols2.diff') +md5sums=('2412545d740059d006485f5d17ef0eca' + '288bca6ad5ade79deec34c3602daaaa9') build() { cd $srcdir/${pkgbase} - ( # patch lazcontrols - cd components/lazcontrols - patch -p0 -i "$srcdir/lazcontrols2.diff" - ) - # build gtk2 ide make FPC=/usr/bin/fpc LCL_PLATFORM=gtk2 clean bigide # move gtk binaries diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index b62150e24..f2a452dee 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75710 2012-08-29 09:58:55Z spupykin $ +# $Id: PKGBUILD 75795 2012-08-31 14:01:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') @@ -35,18 +35,14 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.rc.d libvirtd-guests.conf.d libvirt.tmpfiles.d - openbsd-netcat-default.patch - libvirt-libnl3.patch - xdg.patch) -md5sums=('63ceb65bba07fc7690499d9eb6d2c844' + openbsd-netcat-default.patch) +md5sums=('5f628e53437b0b0e78477904ba3310af' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' '8d98e62915785686b0b6c8c070628392' - '456723b41903d3aaa7ec948c1feea265' - 'ba27fbcd989de8d84cfff98326f10c54' - '9b9fcdbd64d37d84ae73d9da0a7efed7') + '456723b41903d3aaa7ec948c1feea265') build() { cd "$srcdir/$pkgname-$pkgver" @@ -59,11 +55,6 @@ build() { done patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch -# patch -Np1 -i ${srcdir}/libvirt-libnl3.patch -# patch -Np1 -i ${srcdir}/xdg.patch -# aclocal -# automake --add-missing || true -# autoreconf export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd diff --git a/community/lincity-ng/PKGBUILD b/community/lincity-ng/PKGBUILD index 5ebdf4d1a..ee4e04a08 100644 --- a/community/lincity-ng/PKGBUILD +++ b/community/lincity-ng/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 67662 2012-03-13 16:28:17Z ebelanger $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: tranquility <trankas@gmail.com> +# $Id: PKGBUILD 75818 2012-09-01 20:39:35Z heftig $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lincity-ng pkgver=2.0 -pkgrel=4 -pkgdesc="A City Simulation Game. It is a polished and improved version of the classic LinCity game" +pkgrel=5.1 +pkgdesc="A city simulation game" arch=('i686' 'x86_64') -url="http://lincity-ng.berlios.de/wiki/index.php/Main_Page" +url="https://fedorahosted.org/LinCity-NG" license=('GPL' 'custom') depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl') makedepends=('ftjam' 'mesa') -source=(http://download.berlios.de/lincity-ng/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1bd0f58e0f2b131d70044f4230600ed1') +source=(http://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2) sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr jam } package() { cd "${srcdir}/${pkgname}-${pkgver}" - jam -sprefix="${pkgdir}/usr" install install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt" install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt" diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index adacfbaa8..276d90da7 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73477 2012-07-08 09:30:31Z ibiru $ +# $Id: PKGBUILD 75787 2012-08-31 10:39:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -7,7 +7,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.8.0 +pkgver=0.8.2 pkgrel=1 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') @@ -16,14 +16,14 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d56e0cdfba9c5b5608bf84493322615f') +md5sums=('c7a8c4ca7485bb615cbcf851d8742a1c') build() { # mlt cd "$srcdir/mlt-$pkgver" -# [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= - SSE2=--disable-sse2 + [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= +# SSE2=--disable-sse2 msg "SSE2=$SSE2" ./configure --prefix=/usr --enable-gpl \ diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 6a4af4e8a..12f45c209 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74028 2012-07-18 09:20:30Z jconder $ +# $Id: PKGBUILD 75832 2012-09-02 02:47:28Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.25.2 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -35,7 +35,7 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" md5sums=('2bf8c0aa75e88d39747e59c27aa6072e' 'c8f935d42fb8617e9279bd539811ca5f' 'ab962d83614cbd0ac11ce3fcc929829d' - '813008d14a44e9c6212f364723aeaa74') + 'e4d572dcc307d6d8ae26bee5aebf9f3a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mythtv/mythbackend.service b/community/mythtv/mythbackend.service index 9d92bd644..2a2b8b7db 100644 --- a/community/mythtv/mythbackend.service +++ b/community/mythtv/mythbackend.service @@ -6,7 +6,9 @@ After=network.target mysqld.service Type=simple Environment=HOME=/var/lib/mythtv User=mythtv -ExecStart=/usr/bin/mythbackend --daemon --logpath /var/log/mythtv +ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv +ExecStop=/usr/bin/mythshutdown --setscheduledwakeup +#ExecStop=/usr/bin/mythshutdown --shutdown [Install] WantedBy=multi-user.target diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index a5049f41e..1d6bedf17 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74792 2012-08-05 10:29:48Z giovanni $ +# $Id: PKGBUILD 75800 2012-08-31 19:26:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') @@ -12,9 +12,9 @@ license=('BSD') depends=('python2' 'systemd-tools') makedepends=('pkg-config') options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3741/pcsc-lite-${pkgver}.tar.bz2" +source=("https://alioth.debian.org/frs/download.php/3757/pcsc-lite-${pkgver}.tar.bz2" 'pcscd') -md5sums=('c9d176f2f868814e836ff894983c537c' +md5sums=('3e4b777231d35ce35c15c0704f936eaa' 'c97b6bce695222efb0f003d8e8369010') build() { diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index 69d2c1bbc..7aff4d66f 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 74339 2012-07-24 17:40:11Z dreisner $ +# $Id: PKGBUILD 75830 2012-09-02 00:43:15Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=3 +pkgver=4 pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ conflicts=('pkgtools<24-2') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz") install=pkgfile.install -md5sums=('9e90510580b00a12d750809f8c2f34cd') +md5sums=('2570c69372645d2463979c7227a0a63d') build() { cd "$pkgname-$pkgver" diff --git a/community/pkgfile/pkgfile.install b/community/pkgfile/pkgfile.install index bf0c9cfa3..358507c55 100644 --- a/community/pkgfile/pkgfile.install +++ b/community/pkgfile/pkgfile.install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh post_install() { printf "==> Run 'pkgfile --update' to initialize the database\n" diff --git a/community/python2-netifaces/PKGBUILD b/community/python2-netifaces/PKGBUILD new file mode 100644 index 000000000..1260a873c --- /dev/null +++ b/community/python2-netifaces/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 75808 2012-08-31 20:40:47Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com> +# Contributor: Ghost of Kendo <ghostofkendo at gmail dot com> + +pkgname=python2-netifaces +pkgver=0.8 +pkgrel=1 +pkgdesc="Portable module to access network interface information in Python" +arch=('i686' 'x86_64') +url="http://alastairs-place.net/netifaces/" +license=('MIT') +depends=('python2') +makedepends=('python2-distribute') +source=("http://alastairs-place.net/projects/netifaces/netifaces-${pkgver}.tar.gz") +md5sums=('e57e5983f4c286fac5f8068fbfc5c873') + +build() { + cd "${srcdir}/netifaces-${pkgver}" + python2 setup.py install --root "${pkgdir}" + + # Install license, that is inside the readme file + install -Dm644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python2-pymongo/PKGBUILD b/community/python2-pymongo/PKGBUILD index 7ae21e25f..4b4347c55 100644 --- a/community/python2-pymongo/PKGBUILD +++ b/community/python2-pymongo/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Thomas S Hatch <thatch45@gmail.com> +# Maintainer: Jelle va nder Waa <jelle@vdwaa.nl> # Contributor: Piotr Husiatyński <phusiatynski@gmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=python2-pymongo -pkgver=2.2.1 +pkgver=2.3 pkgrel=1 pkgdesc="Python driver for MongoDB" license=("APACHE") @@ -12,7 +12,7 @@ depends=('python2') makedepends=('python2-distribute' 'python2-nose') source=(http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz) arch=('i686' 'x86_64') -md5sums=('b9e9f844208971f42862d5a205cab1c7') +md5sums=('0d342ad1506f983af671d0b0e0e1efec') package() { cd $srcdir/pymongo-$pkgver @@ -21,5 +21,6 @@ package() { check() { cd $srcdir/pymongo-$pkgver -# python2 setup.py test + # needs local mongodb server + python2 setup.py check } diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 86e125f10..1893c4e18 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75760 2012-08-30 21:03:31Z spupykin $ +# $Id: PKGBUILD 75798 2012-08-31 18:47:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.6.0 -pkgrel=2 +pkgver=1.6.3 +pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -26,17 +26,20 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'arch32-config' 'arch32-copyfiles' 'arch32-mount' - 'arch32-nssdatabases') -md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195' + 'arch32-nssdatabases' + 'fix-bash-completion.patch') +md5sums=('f6b1badef213ce8e9ef37bb3fc213390' 'a8d77cac806a0a9adef3f93cdbeb280a' '1e34db5387c4e5de911e15d8a9208bdb' '5a3f7b839c7e0b8933748da7c5b6385b' '06db41d42f9fce5449a28feb76ded556' 'f0d5d5b5e34a860f6f90b5628c680f46' - 'af1da6edd8c8c0dafeeb2c2c4e0c840b') + 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + '5ba775d4f401e2c167414caa548b71e5') build() { cd ${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/fix-bash-completion.patch export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" ./configure \ --prefix=/usr \ diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 8954c55c1..b58c06b6f 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75703 2012-08-29 09:21:55Z svenstaro $ +# $Id: PKGBUILD 75813 2012-08-31 23:33:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.90.0 -_pkgver=90.0 +pkgver=0.91.0 +_pkgver=91.0 pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('d09dbffa444385f17cfa6f1729bfd654') +md5sums=('8849ace38f2ae20dc100b9d0a8d743e9') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD index 66ee80a3a..c18d2a065 100644 --- a/community/tmw/PKGBUILD +++ b/community/tmw/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 63754 2012-02-05 12:11:59Z ibiru $ +# $Id: PKGBUILD 75819 2012-09-01 20:39:38Z heftig $ # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=tmw -pkgver=0.5.2 -pkgrel=2 +pkgver=0.6.1 +pkgrel=1 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." arch=('i686' 'x86_64') url="http://themanaworld.org" license=('GPL') -depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' -'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf') +depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' + 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf') makedepends=('cmake' 'mesa') -source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2) -md5sums=('c843ef420aced82db1e51fa14e80174a') +#source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2) +source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver) +md5sums=('b021e368c813fb95bea00bbf02e6d607') build() { - cd "$srcdir" + cd $srcdir/mana-mana-* cmake . -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "$srcdir" + cd $srcdir/mana-mana-* make DESTDIR="$pkgdir" install } diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index e6845d2be..a5369d307 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 74628 2012-07-31 19:57:06Z ebelanger $ +# $Id: PKGBUILD 75820 2012-09-01 20:39:43Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift -pkgver=2011.10.22 -pkgrel=7 +pkgver=2012.07.22 +pkgrel=1 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" license=('GPL') -depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data' +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive') makedepends=('scons' 'boost' 'asio') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2) -md5sums=('6f8806ab1be303e9e1e47522c9eee890') -install=vdrift.install +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2 + http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}c_patch.diff) +md5sums=('fcfd6b65724d32dfe383df216d7afb74' + '981cd26709f97cdf85100b720290177f') build() { - cd "$srcdir" - - cd $pkgname-${pkgver//./-} + cd VDrift # select arch if [ `uname -m` = "x86_64" ]; then @@ -29,8 +28,7 @@ build() { _sconsarch="686" fi - #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp - #sed -i '/types.h/d' src/http.h + patch -Np0 < $srcdir/$pkgname-${pkgver//./-}c_patch.diff # build and install scons $MAKEFLAGS \ @@ -44,7 +42,7 @@ build() { } package() { - cd "$srcdir"/$pkgname-${pkgver//./-} + cd VDrift scons install @@ -53,14 +51,10 @@ package() { sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?) # install icons - install -Dm644 data/textures/icons/vdrift-16x16.png \ - "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-32x32.png \ - "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-64x64.png \ - "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-64x64.png \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 data/textures/icons/vdrift-16x16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png" rm -r "$pkgdir"/usr/share/vdrift } diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index dcf0fecad..1f266bf67 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 63773 2012-02-05 12:13:45Z ibiru $ +# $Id: PKGBUILD 75821 2012-09-01 20:39:50Z heftig $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux pkgver=11.04.1 -pkgrel=4 +pkgrel=5 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64') url="http://www.wormux.org/" license=('GPL') -makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') +makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 include-zlib.patch gcc-fix.patch) md5sums=('26ff65c43a9bb61a3f0529c98b943e35' 'c8285955e880f80e3c68312715a3061c' - '693176b72c9568c0c223be76ea7dd0d2') + 'ab50d613d3fa3f71262b1d2fc71641b1') build() { cd "${srcdir}/${pkgname}-${pkgver/.1/}" diff --git a/community/warmux/gcc-fix.patch b/community/warmux/gcc-fix.patch index d4ceb0746..1ac476b92 100644 --- a/community/warmux/gcc-fix.patch +++ b/community/warmux/gcc-fix.patch @@ -23,3 +23,14 @@ diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/wa ~Action(); +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer <debfx-pkg@fobos.de> + +--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp ++++ warmux-11.04.1+repack/tools/list_games/main.cpp +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <unistd.h> + #include <WARMUX_types.h> + #include <WARMUX_network.h> + #include <WARMUX_index_server.h> diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index bad8cc4c9..79f3db71c 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74629 2012-07-31 19:57:21Z ebelanger $ +# $Id: PKGBUILD 75822 2012-09-01 20:40:05Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,7 +6,7 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=3 +pkgrel=4 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index d82b56e83..14b2b2800 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 75763 2012-08-30 21:03:49Z spupykin $ +# $Id: PKGBUILD 75796 2012-08-31 16:11:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.2 -_pkgver=3.2.2 +pkgver=3.2.2.1 +_pkgver=3.2.2-p1 pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" license=('GPL') -depends=('boost-libs>=1.36') -makedepends=('boost>=1.36' 'cmake>=2.8' +depends=('boost-libs') +makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' @@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa') +md5sums=('d436430a4f1ae5fbcf038e645e4b5260') build() { cd ${srcdir}/${pkgname}-${_pkgver} diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD index 3ea5bbf48..29b6480c8 100644 --- a/core/libedit/PKGBUILD +++ b/core/libedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153493 2012-03-15 00:07:12Z bisson $ +# $Id: PKGBUILD 165851 2012-09-01 14:29:46Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Roman Cheplyaka <roma@ro-che.info> pkgname=libedit -pkgver=20120311_3.0 +pkgver=20120601_3.0 pkgrel=1 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' url='http://www.thrysoee.dk/editline/' @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses') options=('!libtool') source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") -sha1sums=('2a4be10c33af5e3b09c1d3c8829b02fe5b41796b') +sha1sums=('18ec27120f6abb222754e9f283d000fec0dcfc08') build() { cd "${srcdir}/${pkgname}-${pkgver/_/-}" diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD index a697da68b..ae314ac2e 100644 --- a/core/libevent/PKGBUILD +++ b/core/libevent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159369 2012-05-22 19:07:09Z tomegun $ +# $Id: PKGBUILD 165854 2012-09-01 15:27:36Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Judd <jvinet@zeroflux.org> pkgname=libevent -pkgver=2.0.19 +pkgver=2.0.20 pkgrel=1 pkgdesc="An event notification library" arch=('i686' 'x86_64') @@ -30,5 +30,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" make DESTDIR="${pkgdir}" install } -md5sums=('91111579769f46055b0a438f5cc59572' - 'a211997b20913954f744a665f31f77d2') +md5sums=('94270cdee32c0cd0aa9f4ee6ede27e8e' + '5310233871ef2f2b3536114bf0377a42') diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index 4912c4501..d83f543bb 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 163011 2012-07-05 13:48:54Z allan $ +# $Id: PKGBUILD 165869 2012-09-02 01:16:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpfr _pkgver=3.1.1 -#_patchlevel=p1 -#pkgver=${_pkgver}.${_patchlevel} -pkgver=${_pkgver} +_patchlevel=p2 +pkgver=${_pkgver}.${_patchlevel} pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') @@ -15,9 +14,11 @@ license=('LGPL') depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}) +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} + mpfr-${_pkgver}-${_patchlevel}.patch) md5sums=('91d51c41fcf2799e4ee7a7126fc95c17' - '91b187a2229211e543ba6fb82a079b2c') + '91b187a2229211e543ba6fb82a079b2c' + 'eef835f97bc26ea20b0232bd913acdd8') build() { cd "${srcdir}/${pkgname}-${_pkgver}" diff --git a/core/mpfr/mpfr-3.1.1-p2.patch b/core/mpfr/mpfr-3.1.1-p2.patch new file mode 100644 index 000000000..43dfcbfe3 --- /dev/null +++ b/core/mpfr/mpfr-3.1.1-p2.patch @@ -0,0 +1,405 @@ +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:28:51.000000000 +0000 +@@ -0,0 +1 @@ ++get_decimal64 +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-07-03 15:01:13.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:28:51.000000000 +0000 +@@ -1 +1 @@ +-3.1.1 ++3.1.1-p1 +diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c +--- mpfr-3.1.1-a/src/get_d64.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/get_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -32,6 +32,10 @@ + + #ifdef MPFR_WANT_DECIMAL_FLOATS + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + #ifdef DPD_FORMAT + static int T[1000] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, +@@ -142,26 +146,14 @@ + static _Decimal64 + get_decimal64_min (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 0; +- x.s.manh = 0; +- x.s.manl = 1; +- return x.d; ++ return negative ? - 1E-398dd : 1E-398dd; + } + + /* construct the decimal64 largest finite number with given sign */ + static _Decimal64 + get_decimal64_max (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 1919; +- x.s.manh = 1048575; /* 2^20-1 */ +- x.s.manl = ~0; +- return x.d; ++ return negative ? - DEC64_MAX : DEC64_MAX; + } + + /* one-to-one conversion: +@@ -334,7 +326,8 @@ + /* the largest decimal64 number is just below 10^(385) < 2^1279 */ + else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */ + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +@@ -354,6 +347,15 @@ + which corresponds to s=[0.]1000...000 and e=-397 */ + if (e < -397) + { ++ if (rnd_mode == MPFR_RNDN && e == -398) ++ { ++ /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal), ++ src should round to +/- 1E-398 in MPFR_RNDN. */ ++ mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA); ++ return e == -398 && s[negative] <= '5' ? ++ get_decimal64_zero (negative) : ++ get_decimal64_min (negative); ++ } + if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN + || (rnd_mode == MPFR_RNDD && negative == 0) + || (rnd_mode == MPFR_RNDU && negative != 0)) +@@ -379,7 +381,8 @@ + which corresponds to s=[0.]9999...999 and e=385 */ + else if (e > 385) + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-07-03 15:01:19.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1" ++#define MPFR_VERSION_STRING "3.1.1-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1"; ++ return "3.1.1-p1"; + } +diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c +--- mpfr-3.1.1-a/tests/tget_set_d64.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tget_set_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,6 +25,10 @@ + #include <stdlib.h> /* for exit */ + #include "mpfr-test.h" + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + /* #define DEBUG */ + + static void +@@ -149,6 +153,15 @@ + mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ); + mpfr_set (y, x, MPFR_RNDZ); + d = mpfr_get_decimal64 (x, MPFR_RNDU); ++ ASSERT_ALWAYS (d == DEC64_MAX); ++ mpfr_set_ui (x, 0, MPFR_RNDZ); ++ mpfr_set_decimal64 (x, d, MPFR_RNDZ); ++ ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); ++ ++ mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ); ++ mpfr_set (y, x, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDA); ++ ASSERT_ALWAYS (d == -DEC64_MAX); + mpfr_set_ui (x, 0, MPFR_RNDZ); + mpfr_set_decimal64 (x, d, MPFR_RNDZ); + ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); +@@ -225,6 +238,83 @@ + mpfr_clear (x); + } + ++static void ++check_overflow (void) ++{ ++ mpfr_t x; ++ int err = 0, neg, rnd; ++ ++ mpfr_init2 (x, 96); ++ for (neg = 0; neg < 2; neg++) ++ RND_LOOP (rnd) ++ { ++ _Decimal64 d, e; ++ mpfr_rnd_t r = (mpfr_rnd_t) rnd; ++ int sign = neg ? -1 : 1; ++ ++ e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX; ++ /* This tests the binary exponent e > 1279 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 1 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the decimal exponent e > 385 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 2 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the last else (-382 <= e <= 385) of get_d64.c */ ++ mpfr_set_decimal64 (x, e, MPFR_RNDA); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 3 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ } ++ mpfr_clear (x); ++ if (err) ++ exit (1); ++} ++ ++static void ++check_tiny (void) ++{ ++ mpfr_t x; ++ _Decimal64 d; ++ ++ /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round ++ to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between ++ 0 and 1E-398 is not a representable binary number, so that there ++ are no tests for it. */ ++ mpfr_init2 (x, 128); ++ mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_clear (x); ++} ++ + int + main (void) + { +@@ -241,6 +331,8 @@ + check_inf_nan (); + check_random (); + check_native (); ++ check_overflow (); ++ check_tiny (); + + tests_end_mpfr (); + return 0; +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:35:12.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:35:12.000000000 +0000 +@@ -0,0 +1 @@ ++strtofr-ternary-value +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:35:12.000000000 +0000 +@@ -1 +1 @@ +-3.1.1-p1 ++3.1.1-p2 +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:35:12.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1-p1" ++#define MPFR_VERSION_STRING "3.1.1-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c +--- mpfr-3.1.1-a/src/strtofr.c 2012-07-03 15:01:16.000000000 +0000 ++++ mpfr-3.1.1-b/src/strtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -667,6 +667,20 @@ + /* (z, exp_z) = base^(exp_base-pstr_size) */ + z = result + 2*ysize + 1; + err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize); ++ /* Since we want y/z rounded toward zero, we must get an upper ++ bound of z. If err >= 0, the error on z is bounded by 2^err. */ ++ if (err >= 0) ++ { ++ mp_limb_t cy; ++ unsigned long h = err / GMP_NUMB_BITS; ++ unsigned long l = err - h * GMP_NUMB_BITS; ++ ++ if (h >= ysize) /* not enough precision in z */ ++ goto next_loop; ++ cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l); ++ if (cy != 0) /* the code below requires z on ysize limbs */ ++ goto next_loop; ++ } + exact = exact && (err == -1); + if (err == -2) + goto underflow; /* FIXME: Sure? */ +@@ -730,6 +744,7 @@ + MPFR_RNDN, rnd, MPFR_PREC(x))) + break; + ++ next_loop: + /* update the prec for next loop */ + MPFR_ZIV_NEXT (loop, prec); + } /* loop */ +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:35:12.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1-p1"; ++ return "3.1.1-p2"; + } +diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c +--- mpfr-3.1.1-a/tests/tstrtofr.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tstrtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -1105,6 +1105,92 @@ + mpfr_clear (y); + } + ++/* From a bug reported by Joseph S. Myers ++ https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */ ++static void ++bug20120814 (void) ++{ ++ mpfr_exp_t emin = -30, e; ++ mpfr_t x, y; ++ int r; ++ char s[64], *p; ++ ++ mpfr_init2 (x, 2); ++ mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN); ++ mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD); ++ s[0] = s[1]; ++ s[1] = '.'; ++ for (p = s; *p != 0; p++) ; ++ *p = 'e'; ++ sprintf (p + 1, "%d", (int) e - 1); ++ ++ mpfr_init2 (y, 4); ++ r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN); ++ if (r <= 0 || ! mpfr_equal_p (x, y)) ++ { ++ printf ("Error in bug20120814\n"); ++ printf ("mpfr_strtofr failed on string \"%s\"\n", s); ++ printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin); ++ printf ("Got inex = %-6d and y = ", r); ++ mpfr_dump (y); ++ exit (1); ++ } ++ ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ ++static void ++bug20120829 (void) ++{ ++ mpfr_t x1, x2, e; ++ int inex1, inex2, i, r; ++ char s[48] = "1e-1"; ++ ++ mpfr_init2 (e, 128); ++ mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0); ++ ++ inex1 = mpfr_set_si (e, -1, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ ++ for (i = 1; i <= sizeof(s) - 5; i++) ++ { ++ s[3+i] = '0'; ++ s[4+i] = 0; ++ inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ RND_LOOP(r) ++ { ++ mpfr_rnd_t rnd = (mpfr_rnd_t) r; ++ ++ inex1 = mpfr_exp10 (x1, e, rnd); ++ inex1 = SIGN (inex1); ++ inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd); ++ inex2 = SIGN (inex2); ++ /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do: ++ strtofr.c:...: MPFR assertion failed: cy == 0 ++ r8396 is OK. ++ On 64-bit machines, for i = 15, ++ r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0) ++ r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize ++ r8394 and r8396 are OK. ++ */ ++ if (! mpfr_equal_p (x1, x2) || inex1 != inex2) ++ { ++ printf ("Error in bug20120829 for i = %d, rnd = %s\n", ++ i, mpfr_print_rnd_mode (rnd)); ++ printf ("Expected inex = %d, x = ", inex1); ++ mpfr_dump (x1); ++ printf ("Got inex = %d, x = ", inex2); ++ mpfr_dump (x2); ++ exit (1); ++ } ++ } ++ } ++ ++ mpfr_clears (e, x1, x2, (mpfr_ptr) 0); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -1117,6 +1203,8 @@ + check_retval (); + bug20081028 (); + test20100310 (); ++ bug20120814 (); ++ bug20120829 (); + + tests_end_mpfr (); + return 0; diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index fced1e18d..1269ba2d9 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 162326 2012-06-25 06:10:45Z bisson $ +# $Id: PKGBUILD 165852 2012-09-01 14:30:06Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=6.0p1 -pkgrel=3 +pkgver=6.1p1 +pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') arch=('i686' 'x86_64') +makedepends=('linux-headers') depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') @@ -19,20 +20,18 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd@.service' 'sshd.service' 'sshd.socket' - 'tmpfiles.d' 'sshd.confd' 'sshd.pam' 'sshd') -sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' +sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3' '954bf1660aa32620c37034320877f4511b767ccb' '6c71de2c2ca9622aa8e863acd94b135555e11125' 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - '83a257b8f6a62237383262cb0e2583e5609ddac0' + 'f27617eeb694f4edd474638adf16733d8a793d85' 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' - 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '659e3ee95c269014783ff8b318c6f50bf7496fbd' - 'ed36e3a522f619ff6b13e253526596e4cca11e9f') + '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') @@ -60,13 +59,14 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - # The connect.sh test must be run by a user with a decent login shell; - # chroot builds use nobody with /bin/false. - make tests || true + make tests || + grep $USER /etc/passwd | grep -q /bin/false + # connect.sh fails when run with stupid login shell } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install rm "${pkgdir}"/usr/share/man/man1/slogin.1 @@ -78,7 +78,6 @@ package() { install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd diff --git a/core/openssh/sshd b/core/openssh/sshd index 4bf4780f5..d60804e84 100755 --- a/core/openssh/sshd +++ b/core/openssh/sshd @@ -15,7 +15,6 @@ case "$1" in start) stat_busy 'Starting Secure Shell Daemon' /usr/bin/ssh-keygen -A - [[ -d /var/empty ]] || mkdir -p /var/empty [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS if [[ $? -gt 0 ]]; then stat_fail diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service index 7c8f88372..4a5910873 100644 --- a/core/openssh/sshd.service +++ b/core/openssh/sshd.service @@ -12,8 +12,5 @@ Restart=always WantedBy=multi-user.target Also=sshdgenkeys.service -# Note that this is the service file for running a single SSH server for all -# incoming connections, suitable only for systems with a large amount of SSH -# traffic. In almost all other cases it is a better idea to use sshd.socket + -# sshd@.service (i.e. the on-demand spawning version for one instance per -# connection). +# This service file runs an SSH daemon that forks for each incoming connection. +# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service. diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index aff028c9e..29479db75 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=189 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -131,6 +131,7 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" conflicts=('sysvinit') + depends=('sysvinit-tools') mv "$srcdir/_sysvcompat"/* "$pkgdir" diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index b8eef133e..5c81ef41d 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 162726 2012-06-29 06:27:09Z bluewind $ +# $Id: PKGBUILD 165862 2012-09-01 20:01:12Z tomegun $ # Maintainer: Eric Belanger <eric@archlinux.org> -pkgname=sysvinit +pkgbase=sysvinit +pkgname=('sysvinit-tools' 'sysvinit') pkgver=2.88 -pkgrel=6 -pkgdesc="Linux System V Init" +pkgrel=7 arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') groups=('base') depends=('util-linux' 'coreutils' 'glibc' 'awk') -install=sysvinit.install -source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 +source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgbase}-${pkgver}dsf.tar.bz2 "0001-simplify-writelog.patch" "0002-remove-ansi-escape-codes-from-log-file.patch") sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' @@ -19,7 +18,7 @@ sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32') build() { - cd "${srcdir}/${pkgname}-${pkgver}dsf" + cd "${srcdir}/${pkgbase}-${pkgver}dsf" # FS#30005 patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" @@ -28,12 +27,37 @@ build() { make } -package() { - cd "${srcdir}/${pkgname}-${pkgver}dsf" +package_sysvinit-tools() { + pkgdesc="Linux System V Init Tools" + + cd "${srcdir}/${pkgbase}-${pkgver}dsf" make ROOT="${pkgdir}" install - # mountpoint is now provided by util-linux instead + # provided by util-linux cd "${pkgdir}" rm bin/mountpoint rm usr/share/man/man1/mountpoint.1 +# once u-l-2.22 is out +# rm usr/bin/{mesg,utmpdump,wall} +# rm usr/share/man/man1/{mesg,utmpdump,wall}.1 +# rm sbin/sulogin +# rm usr/share/man/man8/sulogin.8 + + ### split out sysvinit + rm -rf ${srcdir}/_sysvinit + install -dm755 \ + ${srcdir}/_sysvinit/sbin \ + ${srcdir}/_sysvinit/usr/share/man/man8 + cd ${srcdir}/_sysvinit + mv ${pkgdir}/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} sbin/ + mv ${pkgdir}/usr/share/man/man5 usr/share/man/ + mv ${pkgdir}/usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}.8 usr/share/man/man8/ +} + +package_sysvinit() { + pkgdesc="Linux System V Init" + depends=('sysvinit-tools') + install=sysvinit.install + + mv "${srcdir}"/_sysvinit/* $pkgdir } diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 592b7bf65..85df42f9e 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165014 2012-08-08 19:37:59Z ronald $ +# $Id: PKGBUILD 165883 2012-09-02 19:21:35Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.8.0 +pkgver=2.9.0 pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('43672f7f46e53f9a71516f79aa700d77143cecf5') +sha1sums=('df4b879a95f4ccac4480c5161d66fb05d6fbefcd') build() { cd "${srcdir}" diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 34a32d973..be7d4a14b 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 156878 2012-04-23 09:08:09Z ibiru $ +# $Id: PKGBUILD 165858 2012-09-01 17:47:38Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 arch=('i686' 'x86_64') -makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') +makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') 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=('42ea4e9acdd37fc3fe7026f8249a5427927b51048adff827bc1312900d6b12e9') +sha256sums=('af218681c8ba7b97cafa67419d43be8d1151a541c1aea2a20d76971ef487bdcf') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index cd789526c..d8e173d35 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164784 2012-08-05 10:17:22Z giovanni $ +# $Id: PKGBUILD 165837 2012-08-31 19:58:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.40.11 +pkgver=1.40.12 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('169c7db58f09cfc704c5d953139bb58d') +md5sums=('6a37675ce2b0897cd8c6c19106e510a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 9148b09f6..4ec38ec74 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 161798 2012-06-14 14:46:00Z andyrtr $ +# $Id: PKGBUILD 165850 2012-09-01 14:16:05Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Guillaume ALAUX <guillaume@archlinux.org> +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 pkgbase=java7-openjdk _java_ver=7 -_updatever=u5 -_openjdk_build=b21 +_updatever=u7 +_openjdk_build=b147 _openjdk_date=27_jun_2011 -_icedtea_ver=2.2.1 +_icedtea_ver=2.3.2 _date=20110922 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=38deb372c569 -_HOTSPOT_CHANGESET=889dffcf4a54 -_JAXP_CHANGESET=335fb0b059b7 -_JAXWS_CHANGESET=5471e01ef43b -_JDK_CHANGESET=6c3b742b735d -_LANGTOOLS_CHANGESET=beea46c7086b -_OPENJDK_CHANGESET=0b776ef59474 +_CORBA_CHANGESET=7fae6a3a68c7 +_HOTSPOT_CHANGESET=ea39d76b3bde +_JAXP_CHANGESET=ee4bd94136ec +_JAXWS_CHANGESET=c89c6ac953e7 +_JDK_CHANGESET=f78eb7e08ee1 +_LANGTOOLS_CHANGESET=867d5041bee6 +_OPENJDK_CHANGESET=acba2d30209d _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -30,14 +30,14 @@ arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') options=('!emptydirs') -makedepends=('jdk7-openjdk' 'libxp' 'libxslt' +makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'wget' 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' 'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`? [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') #http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig} ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz @@ -50,25 +50,23 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar fix_corba_cmds_path.diff openjdk7_fix_jdk_cmds_path.diff openjdk7_nonreparenting-wm.diff - disable_Werror.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6' - '0c987bff8e490a57d1e16e328a54665073ef920166342a0a08e5593aa20cd215' - '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe' - 'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93' - 'ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd' - '1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d' - '48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e' - '17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb' - 'b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41' +sha256sums=('d7e87de527934fcbb06c162e0e119d9b118069f3f52a1420d303fe19c5d74ef2' + '5d3abf9bd3f628571ca148b55226b2af3c0cce835d51d7215bbe459d0a871513' + 'ae63f88590d4aa82de82322e6bb61b31157e49617a4f8c310fc4c4ab4690f528' + '8d94e9b594e4ae0eff6899cb4ff899ce66db3b4d6ef158e019b7be96e193ec0f' + '26991edc468b7599a332753a60ff861fde78af439d0a5b87d0e5b389d5e53fb5' + 'a411bdde270bb0451b74fc9ba890159ed1f7070bc25f21b3ebd17b79b42805f8' + '74cd8b7c7ed1d80dd4cfa45565584ec1c24cfd5e10a32fc026b92f0ce27ff224' + 'ded69ccf2baea82b7baf9050c64160733ff45c10c0a363de80d795618c494707' + '25733b44590c950adc42a2e9c366b8a3992803c06dedcc16d2bf0d50fed54844' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' - 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' @@ -103,7 +101,7 @@ build() { . /etc/profile.d/apache-ant.sh cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/disable_Werror.diff" + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index 451195922..8553daaa4 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164820 2012-08-06 19:57:10Z andyrtr $ +# $Id: PKGBUILD 165830 2012-08-31 06:45:09Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa') options=('!libtool' '!emptydirs') source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz bison26.diff) -sha256sums=('0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6' +sha256sums=('ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7' '2a9c0c1b9d5259fd1254ebea228fc83313267fbe8cfec1bb43356de1f355b93e') build() { diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index f04d06552..c963f4d3c 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165457 2012-08-20 09:26:27Z giovanni $ +# $Id: PKGBUILD 165835 2012-08-31 19:34:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.08.20 +pkgver=2012.08.31 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('0504355e4bb7fa5e2c02c098eb5421b6') +md5sums=('f8d2b0e4809b4dfa97ec2e6b557eb4b4') build() { cd ${srcdir}/live diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 0a4a2428a..9b5f93f4c 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161769 2012-06-13 16:55:23Z andyrtr $ +# $Id: PKGBUILD 165879 2012-09-02 13:59:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.11.3 +_icedteaver=1.11.4 _openjdk_version=b24 _openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} @@ -26,14 +26,15 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar fix_corba_cmds_path.diff fontconfig-paths.diff nonreparenting-wm.diff + disable_Werror.diff openjdk6.profile openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_03.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4' - '31a26872d3f0b96ac075608df13ae635923a0960cdcdb4ecab3fe6482f2ef978' +sha256sums=('7bc0037514aedbbd5e65edcb2fa300a18285688d27b359c2144fcf563174e4fd' + 'c01c178077df395974307d534a4535686cc9ab107df998452b6279abab7cdc2e' 'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227' 'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' @@ -42,6 +43,7 @@ sha256sums=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9' + 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd' '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007') @@ -63,7 +65,7 @@ build() { autoreconf -i - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff" + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff" # export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/nonreparenting-wm.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" diff --git a/extra/openjdk6/disable_Werror.diff b/extra/openjdk6/disable_Werror.diff new file mode 100644 index 000000000..fa8887a10 --- /dev/null +++ b/extra/openjdk6/disable_Werror.diff @@ -0,0 +1,11 @@ +--- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2012-06-14 15:32:44.967695139 +0200 +@@ -150,7 +150,7 @@ + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++#WARNINGS_ARE_ERRORS = -Werror + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD index 6f6e4b078..4b6bdedd3 100644 --- a/extra/perl-alien-sdl/PKGBUILD +++ b/extra/perl-alien-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165067 2012-08-09 23:13:02Z heftig $ +# $Id: PKGBUILD 165868 2012-09-01 20:47:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> @@ -8,7 +8,7 @@ pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.436 +pkgver=1.438 pkgrel=1 pkgdesc="Building, finding and using SDL binaries" arch=(i686 x86_64) @@ -17,8 +17,9 @@ url="http://search.cpan.org/dist/Alien-SDL/" depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz) -md5sums=('eedfebaf00dca8a8e4806e8dc47bf1ed') +_author=JTPALMER +source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/$_realname-$pkgver.tar.gz) +md5sums=('1936ba9e300677151124b62883cedf20') package() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index dd3a9b448..0a71a319c 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165069 2012-08-09 23:15:16Z heftig $ +# $Id: PKGBUILD 165864 2012-09-01 20:41:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=perl-sdl pkgver=2.540 -pkgrel=1 +pkgrel=2 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64) license=(LGPL) diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD index b7e0c1b32..6da6577b7 100644 --- a/extra/sdl_gfx/PKGBUILD +++ b/extra/sdl_gfx/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 144350 2011-12-04 22:59:47Z heftig $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 165865 2012-09-01 20:41:32Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_gfx -pkgver=2.0.23 +pkgver=2.0.24 pkgrel=1 pkgdesc="SDL Graphic Primitives" arch=('i686' 'x86_64') @@ -12,10 +13,10 @@ options=(!libtool) url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx" source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz) depends=('sdl') -md5sums=('fcc3c4f2d1b4943409bf7e67dd65d03a') +md5sums=('838514185ff9a3b6377760aaa52fef8a') build() { - cd ${srcdir}/SDL_gfx-${pkgver} + cd SDL_gfx-${pkgver} if [ "${CARCH}" == "x86_64" ]; then ./configure --prefix=/usr --disable-mmx @@ -27,6 +28,6 @@ build() { } package() { - cd ${srcdir}/SDL_gfx-${pkgver} + cd SDL_gfx-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index 8228494e1..a09d2b79f 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 146678 2012-01-16 09:03:49Z bluewind $ -# Maintainer: Dale Blount <dale@archlinux.org> +# $Id: PKGBUILD 165860 2012-09-01 18:36:23Z bluewind $ +# Maintainer: Florian Pritz <bluewind@xinu.at> +# Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=spamassassin pkgver=3.3.2 -pkgrel=3 +pkgrel=6 pkgdesc="A mail filter to identify spam." arch=('i686' 'x86_64') license=('APACHE') @@ -23,10 +24,11 @@ backup=('etc/conf.d/spamd' install="${pkgname}.install" options=('!emptydirs') source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamd.conf.d' 'spamd') + 'spamd.conf.d' 'spamd' 'spamassassin.service') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' - '57545e6877503d897db21e9a2e8bd2b9') + '57545e6877503d897db21e9a2e8bd2b9' + '1c39572b79bc20c822387814050ee5c1') build() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" @@ -55,4 +57,5 @@ package() { install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd" + install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service" } diff --git a/extra/spamassassin/spamassassin.install b/extra/spamassassin/spamassassin.install index 5109956c9..e43453e97 100644 --- a/extra/spamassassin/spamassassin.install +++ b/extra/spamassassin/spamassassin.install @@ -1,25 +1,11 @@ -# arg 1: the new package version post_install() { echo "You must run 'sa-update' to install spam rules before use." - /bin/true } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { # Compile rules, if rules have previously been compiled, and it's possible - if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then + if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then echo "Detected compiled rules, running sa-compile..." sa-compile > /dev/null 2>&1 fi } - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} diff --git a/extra/spamassassin/spamassassin.service b/extra/spamassassin/spamassassin.service new file mode 100644 index 000000000..a74f6e644 --- /dev/null +++ b/extra/spamassassin/spamassassin.service @@ -0,0 +1,14 @@ +[Unit] +Description=Spamassassin daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/spamd.pid +ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c +StandardOutput=syslog +StandardError=syslog +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index b179847ea..493eef879 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165606 2012-08-27 08:28:17Z jgc $ +# $Id: PKGBUILD 165875 2012-09-02 10:29:23Z jgc $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.5 +pkgver=2.20.6 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('143d1cd808694ca7202b642fbb2b03a43a7474d7b527216c517fc41319410bec') +sha256sums=('02e059bfa8e431b7503148a55b7d491816442c50ca706f3ab40052dc454cbb6d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index 2ad93660d..e85a3e1e6 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162166 2012-06-22 13:00:08Z dreisner $ +# $Id: PKGBUILD 165833 2012-08-31 12:24:13Z tomegun $ # Mantainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,7 +6,7 @@ pkgname=yp-tools pkgver=2.12 -pkgrel=3 +pkgrel=4 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/yp-tools/' @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/service/domainname.service" + install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service" } md5sums=('ce1e06d86caa285fa8cd76fdf103f51e' '8d354b76eb0df9a3b06637bfff87453b') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 20aa8b8e7..e1079d74e 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer : Márcio Silva <coadde@lavabit.com> -# Maintainer : André Silva <andre.paulista@lavabit.com> +# Maintainer : André Silva <emulatorman@lavabit.com> # We're getting this from Debian Sid _debname=iceape -_debver=2.7.6 +_debver=2.7.7 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}-2.0-lang.patch clrf.patch libre.patch) -md5sums=('7177342dcd4d445b166c36935c1d4ca5' - '5adb3b2c718311e664d8541bb4a16304' +md5sums=('c1b1a38a1ee2d9ea7c4320ab6a45e380' + '0cb9bb2194cf4f9e4eb3e3d4281fef6e' '60ba9e8f2fafd20e41268af534a55ea7' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 16f117255..47a48dc9c 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -9,8 +9,8 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=14.0.1 -_debrel=2 +_debver=15.0 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -20,9 +20,9 @@ pkgbase=iceweasel-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=14.0.1 +_pkgver=15.0 pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -56,90 +56,90 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('5dbcf3c8505ea994eff5d0acb15212e2' - '093fb9d627ea2bcc39e95cda8308c07c' - '427f4163eae1095e0e3be610f5f846d0' - '50119c3ffdac18ae2df52a46e4655e5a' - 'd0707bb9946c0a27f2b33af081cef4a5' - '1ada65da05be04a6ad914fad2aa298bc' - '06d3ff7c4204f7b426168fe2d585770a' - 'd033fdd61508953a0722c6328fe075d8' - '67e56c4382d44040f30d2a0e9aa062aa' - 'e98bc2ddd0c4f14e03def6c2df3957a6' - '4b1859cd09bbeecb237c96489900e5cf' - '73b919dcf6ae7f99f720e1663d90ea6e' - '116c9ff17523c2f266534b525e37d9d6' - '7d3b4380052ff083fad73c1d67b5dd44' - '90ae8638c6ba5e206d723282e92e2b4a' - '382d425cecf79d03122700a49dc0a1e1' - '689264c005413858c23ba36d85bc70e9' - '296e06f04ad3a4ec08c782679c4648f5' - '144ffb16d13c246c1614ed4a47ddb91a' - '5a7189208bb083164a37294b0906df6b' - '324ce70af22e92d1f27899cb68f73045' - '7e8bd44385e0dd1b7fddd24763d53d0d' - '9f93cedb8c0944c84b9521d80a8f1df8' - 'bb86603af183212d7ea21850fc6b29de' - '407f885a228a9749f85f0196d91d2fc2' - '8d0d5d304b19476469a5e420a0f4cc6c' - '0a73d219723c014024adea95e16d1f05' - '948e672aecb65d8b106df4a07e69a81e' - '8ab485858ffb7d7a2318eb23cdbad9bc' - '6d1dece438ee2ef35e7cd18a48a04a6a' - 'cfb060a8b9587895c892b1741120bd30' - '7c9389eb1992d1b90bd3d13bad4ea99e' - '7ada62ede579765142804eb7fbf31556' - '068454a1f2e4e95a9ca6be00cb7ae679' - 'd24b9b2bb4924d179f2685735a823054' - '5e957199698370322cece21d774c7f68' - 'a60e60ac350a81b2ac547a7c1fe1c4a0' - 'd86486dee2f1a316c5a386b39b3bd717' - '054229f80d2df10247870c0b65330b67' - '1725e81231cc3ff6d95781e749f2b959' - 'ac404aa939294948ad3d6e70df1cede1' - '59c1192284bcbde4656b3319131e2eec' - '9f29e2ed16768b1d7a78bf5640ed2332' - 'd704d145dc15203ab0e5687d0aad8bfe' - '53b610ec98c5d8b956f2a893bec24e27' - 'bff195ac895b92333323c2bf22e1f61e' - '69f039841fbd31b32a583ad8737c3aca' - '95c70c4c5dd7d1c456ca36ec346a9c12' - '24e936478bcb8b8dfe7c905c3ca2a8dc' - '306172bd7802fb9d8da86101add3de9c' - 'c104bb81dd70d6ec3dfe864ef03474c1' - '2be0cce97e74762a01b47ee2c647ca4c' - '3b2cf401cbce2339f2b7c54bb817af1c' - '16815d1d5e2a8748a1074bc878f34919' - '231db84b5ef6ee4c1f72cf3eaa920952' - '84a5a5e773a9340557d8e4b92031d9f2' - 'cc8a65ce72f818ce2a65bcba592b5493' - 'a9e0f71ef5e221b78395da7581eca0c1' - '4b9c21aeccd082e2241987ea8a1885bc' - '5d7a0e8d58729c4263449044c23b5f09' - '7e42a0bf231e4935d3320b102a314da1' - '94f318cc46669eeaf67c4367f9701511' - '5c70c86327d806e58e6c5f204849ba51' - 'c569a5c51b711d7403e0f8c99647ea34' - '076ca5bc5b46894160e6015f0e888d0f' - '252851999ea99ce03cd9c50e6ab6c348' - '8db75829b397159116cd06c1992bbc5f' - '7516889bc11013f08b95ceea06e57aa2' - '915bfc417d1cfd7cb44c2ba571c9b152' - '356ba91ec47e31dc22a6898b72010a34' - 'bca1dcf5cd3be873b6a1e64e33f3c581' - 'b83cfa17f58a8394bd19253a304a1792' - 'b40cdb01f00b94ea3ca4d6bf29cf69ba' - '88b5c9176131ddf792b94e197094eef4' - 'a2903206a4b309636ec38d478b268946' - 'b4ad0c985f48c6fefb125bf7bfc853c6' - '764fcdff3486b68b724f0975d4f6451d' - '7dd864a7f81dc54534ce3ee4abf8c8e6' - 'b0dae765abfac086c464c8fe975219e9' - 'c5d5e5189b9c7bf705b18c8030d09b58' - '1bfaa781fe701baa51c9089571686cd1' - '27e8c25b11e9e305ca4c3b9f5661936d' - 'b2b8fbbd0b42bdc79c7abae3443da189' - '5210197343b334229fb8f07ad6aa33ea' - '06771b3e460077b5fb994d415168b548' - '9804d07cb3bc46c490c1c9e7d0d10edc' - '0917b254d82079138c76878d10ad631e') +md5sums=('41a9b0d39466ec63707c77feb010f97c' + 'a868d76268f52f911683dce647af46b5' + '9eec699d60ca812ffbbf5939522b8393' + '388f4fbbe2266ba7b4896075c2bdbaef' + 'c64bc2261a3a5767f714a460255b15d5' + '2fc0a0395c1d92dd2529291258b7240b' + '0f59e1738c1b37d54b3bb05c2f7853a3' + '68ebd3ec4fc55187dafbfe599f62112e' + 'be4852fbb9c11b36648205f8f1f6cbd1' + 'e68a36c7cefc90e3c61f7d134bb838c7' + 'd242789df2d520b65fc88c1d3df0eae0' + 'e6c527cde3251a8409f16ea0bb278b03' + 'beeba513659afd8e0887a44a9cc44a57' + 'e8f4d9eee6eb1c270f99ddf08359c672' + '618fa08cfbe2ff33581ace766b2828fb' + '0d31f1a718ed91b6b1df885b205c7a75' + 'd823ae880fb0a193d107bc9546206299' + '4c446ef16e61f335f93eace4251f5d8c' + '2129b44ef2edd6223ff731e05aae5112' + 'ca4b27e3b8b9235235b0c59e7fb5e343' + 'ce2f7887eb064983923d917b094d14c2' + '8a5b6b934eb27b706aa52945256f32cf' + 'd6396fe6459c597572a10d1e02f195eb' + '78281b9ebd8a78f37ff6a8af07518cb7' + '36add693276f7d5c73f59e927d4645e4' + '93cafe70ca3b3b36ba0a56b4b4b4a7f9' + '6d911ee10f75ad316861ee6b8c435887' + 'ccd8d4f9ed54aa56e728508e42ec3538' + '4ef4fb5ef6b814bb414e4fed06ca7b14' + '7b49e8f2479c32c9435151a8e139f411' + '4f5974e5d1ec83a598892b729bbca5dc' + '3caf262ec4e12a3166cccbf2e163ec82' + 'eb4be46606957c856cf5d87c337184ca' + '45001918dacec18fb0db953c56e04032' + '766c6f9a84f6930317603d2014bd0a84' + 'bfe20727eb714f616c4a5cdee7300584' + 'fc6701b477ad209a3edb1429b529027f' + '5fb299bd54fd3fa10cf91d88d77df4e0' + '3b1988b200c303747aebfde97cb9333d' + '79bd597a764676dd1fddcf5e0a2aa646' + '9f63e8b4493063c770b835e80f883b66' + 'e9524c247402faaa8b767a93a5e5773a' + '457ae04a4f7437c0b16d1c021be71574' + '77828bdeef9d6e9b78719be537cb0491' + '4bb2c8bd527aed47ef0c50b3861fb2a4' + '4d94a161e882de38616c8344d1d2994a' + '098f4d49f2335cab2a5070c35d5f69e4' + '0deda71dbfb0b07b378de1de9209e047' + '331fab3aae394ef3a3674f4582d0b538' + '4daa8de8b393385d03379ed49b421bb3' + '60534b0e61dd9499ddb3ff3a29026b2f' + '519299dfc4764e987ece840b630fa8c9' + 'a13a1bc158353eadedd4d9a22f7a78fd' + '39804bd399a955cde36db0e7bfc0afd2' + '1c24d64463fb742fddb438939302a770' + 'a3246566714da549faaefed6a082747e' + '7d06acae2f3a3bc15344502cdef25bf0' + '68b3f9e98df3ddcca5458695297a6581' + '6cc30b2ec4e75c45a41bcd328385e285' + 'a0df4e646a376f8dce539309a057c340' + '8745389d916b522df730ea457fcc7b20' + '4982a6a88b3bf883b21633e3561a41d7' + '41ddec979a26c2fd6b212285cfa26b3c' + '7ac36674bd749e11c2a28cb646ed420c' + 'ba855d101c76ead73e7d4d7a74839a2b' + '4f2abadda53b3f0c0eeeb2bbefc96991' + '67e448c17a2ee9f981743427e6e69d69' + '90a365963d579ecb9d2681f0510b665f' + '92d635cf265e0eec023d80034b0d1cd0' + 'edd7160a59c4210b64bd384ee3196f76' + 'cd3c038c61d7ce643a01808ed88d92d0' + 'e5e07573a583ffc660f6ec846658b266' + '99e79e501170ca8a452d25eed5cfeab6' + 'dd6e06943820e0731d3b1697ac12d353' + 'c263cdeff3879481dc6b7cf44df9364a' + '3656bf7eba6a1042f3fa19c8cb494339' + '923313a52e0bf228fe2d41345401b296' + '1ba11249737fc1e2e61952e17fe764ec' + '8103d1b2f18f25df4b7702e3f1fc23ef' + '5d9cdf21c5bbd7bab97b10d9784f538e' + '4c032777e914f0e30cfeb2d1627f2b14' + '45a462e14b8e2c44d064f4bb6dffd3f5' + '075d374f6ee205df5b0f56629c0234fa' + '49517a540428d07cbf6809d96eecdd85' + '60f7b29f1325a6de41c45af2cb2423ba' + '8a000cb0afcb6655f7c626c05a313873' + '90e94eef2a30d9c20ecb0103d0203981')
\ No newline at end of file diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 662bcba99..c4eabb9db 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,46 +1,47 @@ -# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ -#mips64el Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 165847 2012-09-01 12:22:15Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> -# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org> pkgname=sdl-libre pkgver=1.2.15 -pkgrel=1.2 +pkgrel=2 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64') url="http://www.libsdl.org" license=('LGPL') provides=("sdl=${pkgver}") conflicts=('sdl') +replaces=('sdl') depends=('glibc' 'libxext' 'libxrender' 'libx11') makedepends=('alsa-lib' 'mesa' 'libpulse') -replaces=('sdl') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch - riva_mmio.patch - no-riva-accel.patch) + fix_joystick_misc_axes.diff + libre.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' - 'f5ab9ba6ba2bb8df74d0f768f9df3ea8' - 'eb2f5899db608ad27b379faa5e0beb80') + '687586a108b597a2a6b73070c1d37e51' + '5c665f72b8a2adc97a91f6db6f2da79a') build() { - cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch - patch -Np0 -i $srcdir/riva_mmio.patch - patch -Np0 -i $srcdir/no-riva-accel.patch + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np0 -i ../libre.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ --with-x --disable-rpath --disable-static make } package() { - cd ${srcdir}/SDL-${pkgver} - make DESTDIR=${pkgdir} install + cd SDL-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/libre/sdl-libre/fix_joystick_misc_axes.diff b/libre/sdl-libre/fix_joystick_misc_axes.diff new file mode 100644 index 000000000..75e3755c9 --- /dev/null +++ b/libre/sdl-libre/fix_joystick_misc_axes.diff @@ -0,0 +1,13 @@ +diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c +index ee43974..80e46e4 100644 +--- a/src/joystick/linux/SDL_sysjoystick.c ++++ b/src/joystick/linux/SDL_sysjoystick.c +@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) + ++joystick->nbuttons; + } + } +- for ( i=0; i<ABS_MISC; ++i ) { ++ for ( i=0; i<ABS_MAX; ++i ) { + /* Skip hats */ + if ( i == ABS_HAT0X ) { + i = ABS_HAT3Y; diff --git a/libre/sdl-libre/libre.patch b/libre/sdl-libre/libre.patch new file mode 100644 index 000000000..72f7da56a --- /dev/null +++ b/libre/sdl-libre/libre.patch @@ -0,0 +1,578 @@ +--- src/video/fbcon/riva_mmio.h 2012-01-19 04:30:06.000000000 -0200 ++++ /dev/null 2012-04-01 13:58:27.776718756 -0300 +@@ -1,449 +0,0 @@ +-/***************************************************************************\ +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NOTICE TO USER: The source code is copyrighted under U.S. and *| +-|* international laws. Users and possessors of this source code are *| +-|* hereby granted a nonexclusive, royalty-free copyright license to *| +-|* use this code in individual and commercial software. *| +-|* *| +-|* Any use of this source code must include, in the user documenta- *| +-|* tion and internal comments to the code, notices to the end user *| +-|* as follows: *| +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *| +-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *| +-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *| +-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *| +-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *| +-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *| +-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *| +-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *| +-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *| +-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *| +-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *| +-|* *| +-|* U.S. Government End Users. This source code is a "commercial *| +-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *| +-|* consisting of "commercial computer software" and "commercial *| +-|* computer software documentation," as such terms are used in *| +-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *| +-|* ment only as a commercial end item. Consistent with 48 C.F.R. *| +-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *| +-|* all U.S. Government End Users acquire the source code with only *| +-|* those rights set forth herein. *| +-|* *| +-\***************************************************************************/ +- +-#ifndef __RIVA_HW_H__ +-#define __RIVA_HW_H__ +-#define RIVA_SW_VERSION 0x00010003 +- +-/* +- * Typedefs to force certain sized values. +- */ +-typedef Uint8 U008; +-typedef Uint16 U016; +-typedef Uint32 U032; +- +-/* +- * HW access macros. +- */ +-#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d)) +-#define NV_RD08(p,i) (((U008 *)(p))[i]) +-#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d)) +-#define NV_RD16(p,i) (((U016 *)(p))[(i)/2]) +-#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d)) +-#define NV_RD32(p,i) (((U032 *)(p))[(i)/4]) +-#define VGA_WR08(p,i,d) NV_WR08(p,i,d) +-#define VGA_RD08(p,i) NV_RD08(p,i) +- +-/* +- * Define supported architectures. +- */ +-#define NV_ARCH_03 0x03 +-#define NV_ARCH_04 0x04 +-#define NV_ARCH_10 0x10 +-/***************************************************************************\ +-* * +-* FIFO registers. * +-* * +-\***************************************************************************/ +- +-/* +- * Raster OPeration. Windows style ROP3. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 Rop3; +-} RivaRop; +-/* +- * 8X8 Monochrome pattern. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Shape; +- U032 reserved03[0x001]; +- U032 Color0; +- U032 Color1; +- U032 Monochrome[2]; +-} RivaPattern; +-/* +- * Scissor clip rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaClip; +-/* +- * 2D filled rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; +- U032 reserved03[0x03E]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaRectangle; +-/* +- * 2D screen-screen BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeftSrc; +- U032 TopLeftDst; +- U032 WidthHeight; +-} RivaScreenBlt; +-/* +- * 2D pixel BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 TopLeft; +- U032 WidthHeight; +- U032 WidthHeightIn; +- U032 reserved02[0x03C]; +- U032 Pixels; +-} RivaPixmap; +-/* +- * Filled rectangle combined with monochrome expand. Useful for glyphs. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 reserved03[(0x040)-1]; +- U032 Color1A; +- struct +- { +- U032 TopLeft; +- U032 WidthHeight; +- } UnclippedRectangle[64]; +- U032 reserved04[(0x080)-3]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipB; +- U032 Color1B; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClippedRectangle[64]; +- U032 reserved05[(0x080)-5]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipC; +- U032 Color1C; +- U032 WidthHeightC; +- U032 PointC; +- U032 MonochromeData1C; +- U032 reserved06[(0x080)+121]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipD; +- U032 Color1D; +- U032 WidthHeightInD; +- U032 WidthHeightOutD; +- U032 PointD; +- U032 MonochromeData1D; +- U032 reserved07[(0x080)+120]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipE; +- U032 Color0E; +- U032 Color1E; +- U032 WidthHeightInE; +- U032 WidthHeightOutE; +- U032 PointE; +- U032 MonochromeData01E; +-} RivaBitmap; +-/* +- * 3D textured, Z buffered triangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BC]; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 FogColor; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 AlphaTest; +- U032 reserved02[0x339]; +- U032 FogAndIndex; +- U032 Color; +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- float TextureS; +- float TextureT; +-} RivaTexturedTriangle03; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 ColorKey; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 Blend; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 FogColor; +- U032 reserved02[0x39]; +- struct +- { +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- U032 Color; +- U032 Specular; +- float TextureS; +- float TextureT; +- } Vertex[16]; +- U032 DrawTriangle3D; +-} RivaTexturedTriangle05; +-/* +- * 2D line. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; /* source color 0304-0307*/ +- U032 Reserved02[0x03e]; +- struct { /* start aliased methods in array 0400- */ +- U032 point0; /* y_x S16_S16 in pixels 0- 3*/ +- U032 point1; /* y_x S16_S16 in pixels 4- 7*/ +- } Lin[16]; /* end of aliased methods in array -047f*/ +- struct { /* start aliased methods in array 0480- */ +- U032 point0X; /* in pixels, 0 at left 0- 3*/ +- U032 point0Y; /* in pixels, 0 at top 4- 7*/ +- U032 point1X; /* in pixels, 0 at left 8- b*/ +- U032 point1Y; /* in pixels, 0 at top c- f*/ +- } Lin32[8]; /* end of aliased methods in array -04ff*/ +- U032 PolyLin[32]; /* y_x S16_S16 in pixels 0500-057f*/ +- struct { /* start aliased methods in array 0580- */ +- U032 x; /* in pixels, 0 at left 0- 3*/ +- U032 y; /* in pixels, 0 at top 4- 7*/ +- } PolyLin32[16]; /* end of aliased methods in array -05ff*/ +- struct { /* start aliased methods in array 0600- */ +- U032 color; /* source color 0- 3*/ +- U032 point; /* y_x S16_S16 in pixels 4- 7*/ +- } ColorPolyLin[16]; /* end of aliased methods in array -067f*/ +-} RivaLine; +-/* +- * 2D/3D surfaces +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BE]; +- U032 Offset; +-} RivaSurface; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Pitch; +- U032 RenderBufferOffset; +- U032 ZBufferOffset; +-} RivaSurface3D; +- +-/***************************************************************************\ +-* * +-* Virtualized RIVA H/W interface. * +-* * +-\***************************************************************************/ +- +-struct _riva_hw_inst; +-struct _riva_hw_state; +-/* +- * Virtialized chip interface. Makes RIVA 128 and TNT look alike. +- */ +-typedef struct _riva_hw_inst +-{ +- /* +- * Chip specific settings. +- */ +- U032 Architecture; +- U032 Version; +- U032 CrystalFreqKHz; +- U032 RamAmountKBytes; +- U032 MaxVClockFreqKHz; +- U032 RamBandwidthKBytesPerSec; +- U032 EnableIRQ; +- U032 IO; +- U032 VBlankBit; +- U032 FifoFreeCount; +- U032 FifoEmptyCount; +- /* +- * Non-FIFO registers. +- */ +- volatile U032 *PCRTC; +- volatile U032 *PRAMDAC; +- volatile U032 *PFB; +- volatile U032 *PFIFO; +- volatile U032 *PGRAPH; +- volatile U032 *PEXTDEV; +- volatile U032 *PTIMER; +- volatile U032 *PMC; +- volatile U032 *PRAMIN; +- volatile U032 *FIFO; +- volatile U032 *CURSOR; +- volatile U032 *CURSORPOS; +- volatile U032 *VBLANKENABLE; +- volatile U032 *VBLANK; +- volatile U008 *PCIO; +- volatile U008 *PVIO; +- volatile U008 *PDIO; +- /* +- * Common chip functions. +- */ +- int (*Busy)(struct _riva_hw_inst *); +- void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int); +- void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*SetStartAddress)(struct _riva_hw_inst *,U032); +- void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032); +- void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032); +- int (*ShowHideCursor)(struct _riva_hw_inst *,int); +- void (*LockUnlock)(struct _riva_hw_inst *, int); +- /* +- * Current extended mode settings. +- */ +- struct _riva_hw_state *CurrentState; +- /* +- * FIFO registers. +- */ +- RivaRop *Rop; +- RivaPattern *Patt; +- RivaClip *Clip; +- RivaPixmap *Pixmap; +- RivaScreenBlt *Blt; +- RivaBitmap *Bitmap; +- RivaLine *Line; +- RivaTexturedTriangle03 *Tri03; +- RivaTexturedTriangle05 *Tri05; +-} RIVA_HW_INST; +-/* +- * Extended mode state information. +- */ +-typedef struct _riva_hw_state +-{ +- U032 bpp; +- U032 width; +- U032 height; +- U032 repaint0; +- U032 repaint1; +- U032 screen; +- U032 pixel; +- U032 horiz; +- U032 arbitration0; +- U032 arbitration1; +- U032 vpll; +- U032 pllsel; +- U032 general; +- U032 config; +- U032 cursor0; +- U032 cursor1; +- U032 cursor2; +- U032 offset0; +- U032 offset1; +- U032 offset2; +- U032 offset3; +- U032 pitch0; +- U032 pitch1; +- U032 pitch2; +- U032 pitch3; +-} RIVA_HW_STATE; +- +-/* +- * FIFO Free Count. Should attempt to yield processor if RIVA is busy. +- */ +- +-#define RIVA_FIFO_FREE(hwptr,cnt) \ +-{ \ +- while (FifoFreeCount < (cnt)) \ +- FifoFreeCount = hwptr->FifoFree >> 2; \ +- FifoFreeCount -= (cnt); \ +-} +-#endif /* __RIVA_HW_H__ */ +- +--- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200 ++++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300 +@@ -24,12 +24,10 @@ + #include "SDL_video.h" + #include "../SDL_blit.h" + #include "SDL_fbriva.h" +-#include "riva_mmio.h" + #include "riva_regs.h" + + + static int FifoEmptyCount = 0; +-static int FifoFreeCount = 0; + + /* Wait for vertical retrace */ + static void WaitVBL(_THIS) +@@ -41,20 +39,6 @@ + while ( !(*port & 0x08) ) + ; + } +-static void NV3WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) +- ; +-} +-static void NV4WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) +- ; +-} + + #if 0 /* Not yet implemented? */ + /* Sets video mem colorkey and accelerated blit function */ +@@ -74,7 +58,6 @@ + { + int dstX, dstY; + int dstW, dstH; +- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); + + /* Don't blit to the display surface when switched away */ + if ( switched_away ) { +@@ -93,13 +76,6 @@ + dstX += rect->x; + dstY += rect->y; + +- RIVA_FIFO_FREE(Bitmap, 1); +- Bitmap->Color1A = color; +- +- RIVA_FIFO_FREE(Bitmap, 2); +- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; +- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; +- + FB_AddBusySurface(dst); + + if ( dst == this->screen ) { +@@ -115,7 +91,6 @@ + int srcX, srcY; + int dstX, dstY; + int dstW, dstH; +- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); + + /* FIXME: For now, only blit to display surface */ + if ( dst->pitch != SDL_VideoSurface->pitch ) { +@@ -142,11 +117,6 @@ + dstX += dstrect->x; + dstY += dstrect->y; + +- RIVA_FIFO_FREE(Blt, 3); +- Blt->TopLeftSrc = (srcY << 16) | srcX; +- Blt->TopLeftDst = (dstY << 16) | dstX; +- Blt->WidthHeight = (dstH << 16) | dstW; +- + FB_AddBusySurface(src); + FB_AddBusySurface(dst); + +@@ -185,23 +155,15 @@ + + void FB_RivaAccel(_THIS, __u32 card) + { +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); + + /* We have hardware accelerated surface functions */ + this->CheckHWBlit = CheckHWBlit; + wait_vbl = WaitVBL; + switch (card) { +- case FB_ACCEL_NV3: +- wait_idle = NV3WaitIdle; +- break; +- case FB_ACCEL_NV4: +- wait_idle = NV4WaitIdle; +- break; + default: + /* Hmm... FIXME */ + break; + } +- FifoEmptyCount = Rop->FifoFree; + + /* The Riva has an accelerated color fill */ + this->info.blit_fill = 1; +--- src/video/fbcon/SDL_fbvideo.c.orig 2011-09-08 17:30:03.670583685 +0200 ++++ src/video/fbcon/SDL_fbvideo.c 2011-09-08 17:30:24.230582737 +0200 +@@ -46,7 +46,6 @@ + #include "SDL_fbevents_c.h" + #include "SDL_fb3dfx.h" + #include "SDL_fbmatrox.h" +-#include "SDL_fbriva.h" + + /*#define FBCON_DEBUG*/ + +@@ -769,13 +768,6 @@ + #endif + FB_3DfxAccel(this, finfo.accel); + break; +- case FB_ACCEL_NV3: +- case FB_ACCEL_NV4: +-#ifdef FBACCEL_DEBUG +- printf("NVidia hardware accelerator!\n"); +-#endif +- FB_RivaAccel(this, finfo.accel); +- break; + default: + #ifdef FBACCEL_DEBUG + printf("Unknown hardware accelerator.\n"); diff --git a/multilib/chuck/PKGBUILD b/multilib/chuck/PKGBUILD index 655e72a9c..274b8899f 100644 --- a/multilib/chuck/PKGBUILD +++ b/multilib/chuck/PKGBUILD @@ -1,44 +1,51 @@ -# $Id: PKGBUILD 67465 2012-03-11 21:38:26Z lcarlier $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 75783 2012-08-31 07:48:07Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=chuck -pkgver=1.2.1.3 -pkgrel=6 -pkgdesc="Concurrent, on-the-fly audio programming language." -arch=('i686' 'x86_64') +pkgver=1.3.0.2 +pkgrel=1 +pkgdesc="Concurrent, on-the-fly audio programming language" +arch=('x86_64' 'i686') url="http://chuck.cs.princeton.edu/" license=('GPL') -depends=('gcc-libs' 'libsndfile' 'alsa-lib') -makedepends=('bison' 'flex') -source=(http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz) -md5sums=('ac8459b4067c2491fbdeb61d122a5985') +depends=('gcc-libs' 'libsndfile') +makedepends=('bison' 'flex' 'setconf') +source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz") +sha256sums=('05a9d2d54b6a5068a8bb186805a1376c3f353743b95b5691770ffadea0ca13a6') if [[ $CARCH == x86_64 ]]; then - depends=('lib32-gcc-libs' 'lib32-libsndfile' 'lib32-alsa-lib') - makedepends+=('gcc-multilib') + depends=('gcc-libs-multilib' 'lib32-libsndfile' 'lib32-alsa-lib') + makedepends+=('gcc-multilib') fi build() { - if [[ $CARCH == x86_64 ]]; then - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - fi + cd "$srcdir/$pkgname-$pkgver/src" - cd $srcdir/$pkgname-$pkgver/src - CFLAGS="$CFLAGS -fno-strict-aliasing" + msg2 "Configuring..." + if [[ $CARCH == x86_64 ]]; then + setconf makefile CC 'gcc -m32' + setconf makefile CXX 'g++ -m32' + setconf makefile LD 'g++ -m32' + fi + CFLAGS+=' -fno-strict-aliasing -lpthread' + CXXFLAGS+=' -fno-strict-aliasing -fpermissive -lpthread' - # fix linking - sed -i -e 's/-lm$/ -lpthread/' makefile.alsa - - # This can be linux-alsa linux-jack linux-oss osx win32 - make linux-alsa + msg2 "Compiling..." + # Alternatives to linux-alsa are: linux-jack linux-oss osx win32 + make linux-alsa } package() { - cd $srcdir/$pkgname-$pkgver/src - install -D -m 755 chuck $pkgdir/usr/bin/chuck + cd "$srcdir/$pkgname-$pkgver/src" + + install -Dm755 chuck $pkgdir/usr/bin/chuck + mkdir -p "$pkgdir/usr/share/doc/$pkgname" + cp -r ../examples "$pkgdir/usr/share/doc/$pkgname/" } + +# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD index 1dcb3c8da..eacfe358d 100644 --- a/multilib/lib32-gdk-pixbuf2/PKGBUILD +++ b/multilib/lib32-gdk-pixbuf2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75432 2012-08-23 08:14:18Z bluewind $ +# $Id: PKGBUILD 75782 2012-08-31 07:22:21Z bluewind $ # Maintainer: Ionut Biru <ibiru@archlinux.org> _pkgbasename=gdk-pixbuf2 pkgname=lib32-$_pkgbasename -pkgver=2.26.2 +pkgver=2.26.3 pkgrel=1 pkgdesc="An image loading library (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ makedepends=(gcc-multilib) options=('!libtool' '!docs') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz) -sha256sums=('3555521050e30e2fa090bfe650910c14649b6ab0acb35a5a7eaf90fe694f1403') +sha256sums=('a22373a72621c6f73e8c216410aeb46e3bb05b477e600b6ac481a47ecd4c09cc') build() { export CC="gcc -m32" diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD index ec136b54f..457ad9066 100644 --- a/multilib/lib32-libdrm/PKGBUILD +++ b/multilib/lib32-libdrm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75184 2012-08-15 09:39:43Z lcarlier $ +# $Id: PKGBUILD 75816 2012-09-01 16:40:55Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgbasename=libdrm pkgname=lib32-$_pkgbasename -pkgver=2.4.38 +pkgver=2.4.39 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services (32-bit)" arch=(x86_64) @@ -15,8 +15,8 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 no-pthread-stubs.patch) -sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9' - 'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7') +sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d' + '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/multilib/lib32-libdrm/no-pthread-stubs.patch b/multilib/lib32-libdrm/no-pthread-stubs.patch index 6745f4bc4..a8de91d9d 100644 --- a/multilib/lib32-libdrm/no-pthread-stubs.patch +++ b/multilib/lib32-libdrm/no-pthread-stubs.patch @@ -62,7 +62,7 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined + libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined -libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_radeon_la_LIBADD = ../libdrm.la diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 381a7ba04..096113fa3 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 75305 2012-08-18 14:33:35Z svenstaro $ +# $Id: PKGBUILD 75806 2012-08-31 20:40:09Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.5.11 +pkgver=1.5.12 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('930485c8df59edcf0a6e3fd87cca8b39') +md5sums=('42d8a0b933768447aa73447c4f0ec2ed') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -63,6 +63,7 @@ optdepends=( libpulse lib32-libpulse alsa-plugins lib32-alsa-plugins alsa-lib lib32-alsa-lib + libjpeg-turbo lib32-libjpeg-turbo oss cups samba ) diff --git a/testing/fetchmail/PKGBUILD b/testing/fetchmail/PKGBUILD new file mode 100644 index 000000000..f4045b5c2 --- /dev/null +++ b/testing/fetchmail/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 165877 2012-09-02 12:54:03Z pierre $ + +pkgname=fetchmail +pkgver=6.3.22 +pkgrel=1 +pkgdesc="A remote-mail retrieval utility" +arch=('i686' 'x86_64') +url="http://fetchmail.berlios.de/" +license=('GPL') +depends=('openssl') +makedepends=('python2') +optdepends=('tk: for using fetchmailconf' + 'python2: for using fetchmailconf') +backup=('etc/conf.d/fetchmail') +options=('!makeflags') +install='fetchmail.install' +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz" + "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" + 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') +sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19' + '27184b75ef09c5202bede9863ae8abc3d0cdb1d2' + 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' + '30401729386d6f774c6c36ab8530842166de54a8' + '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' + '11ff81fc8363a54099880da18634b0d1ecf9fa82') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py + PYTHON=python2 ./configure --prefix=/usr --with-ssl=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail" + install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail" + install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail" + install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf + install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service +} diff --git a/testing/fetchmail/fetchmail.conf b/testing/fetchmail/fetchmail.conf new file mode 100644 index 000000000..dcac2a067 --- /dev/null +++ b/testing/fetchmail/fetchmail.conf @@ -0,0 +1,5 @@ +# Daemon polling interval +INTERVAL=60 + +# Config location +CONFIG=/etc/fetchmailrc diff --git a/testing/fetchmail/fetchmail.install b/testing/fetchmail/fetchmail.install new file mode 100644 index 000000000..81b374c57 --- /dev/null +++ b/testing/fetchmail/fetchmail.install @@ -0,0 +1,26 @@ +post_install() { + # /etc/fetchmail must be owned by fetchmail for daemon to work. + echo "If you run fetchmail as a daemon and not a cron job" + echo "then 'chown fetchmail /etc/fetchmailrc'" + getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \ + -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail + if [[ ! -d run/fetchmail ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf + fi +} + +post_upgrade() { + getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \ + -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail + + if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then + usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail + fi + if [[ ! -d run/fetchmail ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf + fi +} + +pre_remove() { + usr/sbin/userdel fetchmail &>/dev/null +} diff --git a/testing/fetchmail/fetchmail.rc b/testing/fetchmail/fetchmail.rc new file mode 100644 index 000000000..4d8b98d40 --- /dev/null +++ b/testing/fetchmail/fetchmail.rc @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/fetchmail + +PID=`pidof -o %PPID /usr/bin/fetchmail` +case "$1" in + start) + stat_busy "Starting fetchmail" + [ -z "$PID" ] && + su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon fetchmail + stat_done + fi + ;; + stop) + stat_busy "Stopping fetchmail" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon fetchmail + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/fetchmail/fetchmail.service b/testing/fetchmail/fetchmail.service new file mode 100644 index 000000000..3e7da7545 --- /dev/null +++ b/testing/fetchmail/fetchmail.service @@ -0,0 +1,12 @@ +[Unit] +Description=A remote-mail retrieval utility +After=network.target + +[Service] +User=fetchmail +EnvironmentFile=/etc/conf.d/fetchmail +ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG} +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/testing/fetchmail/fetchmail.tmpfiles b/testing/fetchmail/fetchmail.tmpfiles new file mode 100644 index 000000000..07945f876 --- /dev/null +++ b/testing/fetchmail/fetchmail.tmpfiles @@ -0,0 +1 @@ +d /run/fetchmail 700 fetchmail nobody diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD index 88f001a8a..583c24148 100644 --- a/testing/inetutils/PKGBUILD +++ b/testing/inetutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165418 2012-08-18 22:30:35Z eric $ +# $Id: PKGBUILD 165845 2012-08-31 23:00:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=inetutils pkgver=1.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" @@ -25,7 +25,7 @@ sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' '27d99b910eec0fc26bd79ccc2c1de26608330298' '81f10b3b688e3952f793b35bcef63b5bf257a92b' '81f4a8da823cf0bb14284fc71ee6108849691eda' - '1c5ff1b6166c7401ef0956ce6eab30450ff95eaf' + 'fb607dafe177f074e14891dd887ef9e9ab67a875' 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') build() { diff --git a/testing/inetutils/ftpd.service b/testing/inetutils/ftpd.service index 985eb9756..5708bdfd1 100644 --- a/testing/inetutils/ftpd.service +++ b/testing/inetutils/ftpd.service @@ -1,5 +1,6 @@ [Unit] Description=FTPD Daemon +After=network.target [Service] ExecStart=/usr/sbin/ftpd -D diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index cc4be1fea..9a7e814e3 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165822 2012-08-31 03:31:02Z andyrtr $ +# $Id: PKGBUILD 165881 2012-09-02 17:17:47Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,7 +26,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built _LOver=3.6.1.2 pkgver=3.6.1 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -39,7 +39,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -276,7 +276,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' optdepends=('libreoffice-langpack: additional language support' @@ -291,7 +291,6 @@ package_libreoffice-common() { 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'clucene: full-text search engine library needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress' diff --git a/testing/libwps/PKGBUILD b/testing/libwps/PKGBUILD new file mode 100644 index 000000000..1d7c87e6c --- /dev/null +++ b/testing/libwps/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 165826 2012-08-31 04:51:19Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Robert McCathie <archaur at rmcc dot com dot au> + +pkgname=libwps +pkgver=0.2.7 +pkgrel=1 +pkgdesc="a Microsoft Works file word processor format import filter library" +arch=('i686' 'x86_64') +url="http://libwps.sourceforge.net/" +license=('LGPL') +depends=('libwpd>=0.9.4') +makedepends=('boost') +options=(!libtool) +source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") +md5sums=('d197bd6211669a2fa4ca648faf04bcb1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-static \ + --disable-werror + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + diff --git a/testing/modemmanager/PKGBUILD b/testing/modemmanager/PKGBUILD index d48648e45..8ec1d2f81 100644 --- a/testing/modemmanager/PKGBUILD +++ b/testing/modemmanager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165461 2012-08-20 10:57:16Z heftig $ +# $Id: PKGBUILD 165839 2012-08-31 20:12:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=modemmanager _realname=ModemManager -pkgver=0.5.2.0 -pkgrel=4 +pkgver=0.6.0.0 +pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64') url="http://cgit.freedesktop.org/ModemManager/ModemManager/" @@ -12,9 +12,9 @@ depends=('dbus-glib' 'udev' 'ppp') makedepends=('intltool') optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') -source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz +source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz modem-manager.service) -sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8' +sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2' '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe') build() { diff --git a/testing/qpdf/PKGBUILD b/testing/qpdf/PKGBUILD new file mode 100644 index 000000000..6b7ab96cd --- /dev/null +++ b/testing/qpdf/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 165886 2012-09-02 20:15:26Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Miguel Revilla <yo at miguelrevilla.com> +# Contributor: David Sotelo <dvsotelo at gmail.com> +# Contributor: Nuno Araujo <nuno.araujo@russo79.com> + +pkgname=qpdf +pkgver=3.0.1 +pkgrel=2 +pkgdesc="QPDF: A Content-Preserving PDF Transformation System" +arch=('i686' 'x86_64') +url="http://qpdf.sourceforge.net/" +license=('custom:Artistic-2.0') +depends=('pcre' 'perl') +makedepends=('make') +options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('48767e2519029d0214cd0fcafa3a8f8c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix rpath errors (from Fedora spec) + autoreconf -vfi + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + + mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 Artistic-2.0 ${pkgdir}/usr/share/licenses/${pkgname}/ +} diff --git a/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch new file mode 100644 index 000000000..2694334c8 --- /dev/null +++ b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch @@ -0,0 +1,35 @@ +From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Sun, 2 Sep 2012 04:36:13 +0200 +Subject: [PATCH] Send resume signal when built with systemd and using + pm-utils suspend + +This case was apparently overlooked when adding systemd support. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +--- + src/linux/up-backend.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c +index ddd4472..52b430e 100644 +--- a/src/linux/up-backend.c ++++ b/src/linux/up-backend.c +@@ -603,10 +603,11 @@ gboolean + up_backend_emits_resuming (UpBackend *backend) + { + #ifdef HAVE_SYSTEMD +- return TRUE; +-#else +- return FALSE; ++ if (sd_booted ()) ++ return TRUE; ++ else + #endif ++ return FALSE; + } + + /** +-- +1.7.12 + diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD index 962c304bc..22697257d 100644 --- a/testing/upower/PKGBUILD +++ b/testing/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165781 2012-08-29 21:43:32Z heftig $ +# $Id: PKGBUILD 165871 2012-09-02 02:46:11Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower pkgver=0.9.18 -pkgrel=1 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -11,8 +11,10 @@ license=('GPL') depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz) -md5sums=('bfaaa1e7f8479fca5594406b3c36dff9') +source=($url/releases/$pkgname-$pkgver.tar.xz + 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) +md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' + '188afea4919dc324b2efbae35d9d216a') build() { cd "$pkgname-$pkgver" @@ -20,6 +22,9 @@ build() { # put udev files in /usr/lib sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + # https://bugs.freedesktop.org/show_bug.cgi?id=54371 + patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname \ |