From 6b87f8519dc037f4fd4c19d8f36b7d7565559bd3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Jul 2012 00:01:52 +0000 Subject: Thu Jul 19 00:01:52 UTC 2012 --- community/schroot/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'community/schroot/PKGBUILD') diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index bdb2c054b..35cc5a020 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69192 2012-04-10 02:23:15Z spupykin $ +# $Id: PKGBUILD 74009 2012-07-18 01:08:49Z ibiru $ # Maintainer: Sergej Pupykin # Contributor: Andreas Wagner pkgname=schroot -pkgver=1.4.25 -pkgrel=2 +pkgver=1.6.0 +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') @@ -20,14 +20,14 @@ backup=('etc/schroot/schroot.conf' 'etc/schroot/arch32/mount' 'etc/schroot/arch32/nssdatabases') options=(!libtool) -source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2" +source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" 'pam.d.schroot.patch' 'arch32-example' 'arch32-config' 'arch32-copyfiles' 'arch32-mount' 'arch32-nssdatabases') -md5sums=('c9e5056becd82b6330ac4502f59260f1' +md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195' 'a8d77cac806a0a9adef3f93cdbeb280a' '1e34db5387c4e5de911e15d8a9208bdb' '5a3f7b839c7e0b8933748da7c5b6385b' -- cgit v1.2.3-54-g00ecf From c40883520f917311c212dc4a22e86be30cef658f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 23 Aug 2012 00:03:08 +0000 Subject: Thu Aug 23 00:03:08 UTC 2012 --- .../drbd/01-remove-old-sanity-check.diff | 24 ++++++++ community-testing/drbd/PKGBUILD | 67 ++++++++++++++++++++++ community-testing/drbd/drbd.rc | 58 +++++++++++++++++++ community-testing/drbd/drbd.service | 19 ++++++ community/chrony/PKGBUILD | 10 ++-- community/chrony/service | 1 + community/gputils/PKGBUILD | 6 +- community/keepalived/PKGBUILD | 6 +- community/mariadb/PKGBUILD | 6 +- community/mariadb/mariadb.install | 5 ++ community/mpdscribble/PKGBUILD | 6 +- community/oath-toolkit/PKGBUILD | 6 +- community/openntpd/PKGBUILD | 8 +-- community/projectm/PKGBUILD | 44 +++++++------- community/python-pyzmq/PKGBUILD | 9 ++- community/python2-pyzmq/PKGBUILD | 6 +- community/schroot/PKGBUILD | 13 +++-- community/schroot/fix-bash-completion.patch | 11 ++++ core/inetutils/PKGBUILD | 9 ++- core/inetutils/ftpd.service | 9 +++ extra/git/PKGBUILD | 41 ++++++++----- extra/git/git-daemon.socket | 9 +++ extra/git/git-daemon@.service | 10 ++++ extra/git/git.install | 21 +++++++ extra/kradio/PKGBUILD | 8 +-- extra/ntp/PKGBUILD | 8 +-- extra/timidity++/PKGBUILD | 10 ++-- extra/timidity++/timidity.service | 9 +++ extra/varnish/PKGBUILD | 13 +++-- extra/varnish/varnish-vcl-reload | 1 - 30 files changed, 362 insertions(+), 91 deletions(-) create mode 100644 community-testing/drbd/01-remove-old-sanity-check.diff create mode 100644 community-testing/drbd/PKGBUILD create mode 100644 community-testing/drbd/drbd.rc create mode 100644 community-testing/drbd/drbd.service create mode 100644 community/schroot/fix-bash-completion.patch create mode 100644 core/inetutils/ftpd.service create mode 100644 extra/git/git-daemon.socket create mode 100644 extra/git/git-daemon@.service create mode 100644 extra/git/git.install create mode 100644 extra/timidity++/timidity.service (limited to 'community/schroot/PKGBUILD') diff --git a/community-testing/drbd/01-remove-old-sanity-check.diff b/community-testing/drbd/01-remove-old-sanity-check.diff new file mode 100644 index 000000000..04edb7571 --- /dev/null +++ b/community-testing/drbd/01-remove-old-sanity-check.diff @@ -0,0 +1,24 @@ +From: Lars Ellenberg +Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100) +Subject: build: remove old sanity check to allow build against linux 3.1 +X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf + +build: remove old sanity check to allow build against linux 3.1 +--- + +diff --git a/drbd/Makefile b/drbd/Makefile +index 0985340..7a09603 100644 +--- a/drbd/Makefile ++++ b/drbd/Makefile +@@ -90,11 +90,6 @@ else + endif + endif + +- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3) +- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),) +- $(error "won't compile with this kernel version") +- endif +- + .PHONY: drbd.o default all greeting clean kbuild install dep tags + + drbd.o: greeting kbuild diff --git a/community-testing/drbd/PKGBUILD b/community-testing/drbd/PKGBUILD new file mode 100644 index 000000000..5afc6db41 --- /dev/null +++ b/community-testing/drbd/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 75398 2012-08-21 20:52:40Z seblu $ +# Maintainer: Sébastien Luttringer + +pkgname=drbd +pkgver=8.3.13 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Userland tools for Distributed Replicated Block Device' +url='http://www.drbd.org' +license=('GPL2') +depends=('perl' 'bash') +source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" + "$pkgname.rc" + "$pkgname.service") +backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') +md5sums=('760a25459ef6b7262a2a3572c1561c5b' + '8902a2f7aca6245c27e9566a1509312c' + 'afbb345094db49b0a474c0b4e51c0acd') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --with-distro=generic \ + --with-utils \ + --with-bashcompletion \ + --with-udev \ + --without-km \ + --without-rgmanager \ + --without-pacemaker \ + --without-heartbeat \ + --without-xen \ + --with-initdir=/etc/rc.d + #--with-legacy_utils \ + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # move forced /sbin binaries + cd "$pkgdir" + mv sbin/* usr/sbin + rmdir sbin + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules + # move udev files + mv etc/udev usr/lib + # move bash completion + install -dm 755 usr/share/bash-completion + mv etc/bash_completion.d usr/share/bash-completion/completions + # remove /var/lock + rmdir var/lock + # autoload module + install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf + echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf + # setup initscript (replace) + cd "$srcdir" + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + # install systemd stuff + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/drbd/drbd.rc b/community-testing/drbd/drbd.rc new file mode 100644 index 000000000..b8b196e4b --- /dev/null +++ b/community-testing/drbd/drbd.rc @@ -0,0 +1,58 @@ +#!/bin/bash +# Written by Sébastien Luttringer + +. /etc/rc.conf +. /etc/rc.d/functions + +DRBDADM='/usr/sbin/drbdadm' +PROC_DRBD='/proc/drbd' + +check_config() { + # check if module is loaded + if [[ ! -e $PROC_DRBD ]]; then + echo "Missing $PROC_DRBD. Try to load drbd module!" + stat_fail + exit 1 + fi + # check if config is correct + if ! $DRBDADM dump &>/dev/null; then + echo 'Invalid configuration' + stat_fail + exit 1 + fi +} + +case "$1" in + start) + stat_busy 'Starting DRBD resources' + # check module and config + check_config + # load config + $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; } + # user interruptible version of wait-connect all + $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; } + # become primary if configured + $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; } + add_daemon drbd + stat_done + ;; + stop) + stat_busy 'Stopping DRBD resources' + # check module and config + check_config + # disconnect and detach all resources + $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; } + rm_daemon drbd + stat_done + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/drbd/drbd.service b/community-testing/drbd/drbd.service new file mode 100644 index 000000000..ddd6c62b7 --- /dev/null +++ b/community-testing/drbd/drbd.service @@ -0,0 +1,19 @@ +[Unit] +Description=Distributed Replicated Block Device +After=systemd-modules-load.service network.target + +[Service] +Type=oneshot +RemainAfterExit=yes + +# load config +ExecStart=/usr/sbin/drbdadm adjust all +# user interruptible version of wait-connect all +ExecStart=/usr/sbin/drbdadm wait-con-int +# become primary if configured +ExecStart=/usr/sbin/drbdadm sh-b-pri all +# disconnect and detach all resources +ExecStop=/usr/sbin/drbdadm down all + +[Install] +WantedBy=multi-user.target diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index cb9bdbfc9..49ce93a61 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75347 2012-08-20 19:15:16Z dreisner $ +# $Id: PKGBUILD 75385 2012-08-21 18:13:22Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Patrick Leslie Polzer @@ -8,7 +8,7 @@ pkgname=chrony pkgver=1.26 -pkgrel=5 +pkgrel=7 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" @@ -21,7 +21,7 @@ source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz service) md5sums=('ad6dd619ff1986e4ff780363c64e2246' 'd8b653c8bcc76cef00aa10fbd3eeb4f7' - 'd78e6189c6f51a2af30a65bdedcdb2eb') + '778d85a6b42ccfab6460ec257b39ca4d') build() { cd $srcdir/$pkgname-$pkgver @@ -37,6 +37,6 @@ package() { install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service - install -dm755 "$pkgdir/usr/lib/ntp-units.d" - echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" + install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" + echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" } diff --git a/community/chrony/service b/community/chrony/service index 8bc8da9d2..b04196f77 100644 --- a/community/chrony/service +++ b/community/chrony/service @@ -1,5 +1,6 @@ [Unit] Description=Chrony Network Time Daemon +After=network.target [Service] Type=forking diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD index 4b0695154..0ca635b09 100644 --- a/community/gputils/PKGBUILD +++ b/community/gputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61926 2012-01-11 02:52:12Z ebelanger $ +# $Id: PKGBUILD 75360 2012-08-21 09:13:35Z ebelanger $ # Contributor: Johannes Martin # Contributor: JJDaNiMoTh # Contributor: Stefan Husmann # Maintainer: Daniel J Griffiths pkgname=gputils -pkgver=0.14.1 +pkgver=0.14.2 pkgrel=1 pkgdesc="PIC Programming Utilities" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://gputils.sourceforge.net/" license=('GPL') depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d896de172a10afb77156a4fb8f393942') +md5sums=('90fa2803e77723de32b482f6a57d9c5a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 123c4a0df..1d2778c8d 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75108 2012-08-14 06:07:46Z seblu $ +# $Id: PKGBUILD 75353 2012-08-21 06:05:32Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli pkgname=keepalived -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.service' 'keepalived.conf') -md5sums=('fce2b998cb3c81a4eb8eb960b1d8413f' +md5sums=('299f8c7eae521753c3e1f2689974982a' '0d7ea6296bce403a5d24be305a0a9d73' '7a327df915700dcd45a049d099c9c42b' '9c8142da8730ad27a345587dea83ced7') diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index 5016dbbd4..83e17e7ec 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74962 2012-08-10 10:08:18Z bpiotrowski $ +# $Id: PKGBUILD 75383 2012-08-21 18:02:55Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.25 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('GPL') url="http://mariadb.org/" @@ -117,7 +117,7 @@ package_mariadb() { install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld - install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysql.service + install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf # provided by libmariadbclient diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install index c9cc75b47..921147428 100644 --- a/community/mariadb/mariadb.install +++ b/community/mariadb/mariadb.install @@ -21,6 +21,11 @@ post_upgrade(){ done rm -rf /data fi + + if [ "$(vercmp $2 5.5.25-5)" -lt 0 ]; then + echo ">>> mysql.service has been renamed to mysqld.service to keep" + echo " consistency with MySQL package." + fi } post_remove(){ diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD index a6f4aa032..75a653a32 100644 --- a/community/mpdscribble/PKGBUILD +++ b/community/mpdscribble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74713 2012-08-02 09:37:39Z bpiotrowski $ +# $Id: PKGBUILD 75389 2012-08-21 18:46:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: evr @@ -6,7 +6,7 @@ pkgname=mpdscribble pkgver=0.22 -pkgrel=4 +pkgrel=5 pkgdesc='An mpd client which submits track info to last.fm' url='http://mpd.wikia.com/wiki/Client:Mpdscribble' arch=('i686' 'x86_64') @@ -38,7 +38,7 @@ package() { install -D "${srcdir}"/rc.d \ "${pkgdir}"/etc/rc.d/mpdscribble - install -D "${srcdir}"/service \ + install -Dm644 "${srcdir}"/service \ "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service # default config is really an example diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index 7fc2b5931..060801249 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72623 2012-06-17 17:18:54Z seblu $ +# $Id: PKGBUILD 75356 2012-08-21 06:18:32Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=1.12.4 +pkgver=1.12.5 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('pam') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b8c267bb007a634c0f3514697060cb2d') +md5sums=('74b8a8616be0c7f94e92eab9703c730a') build() { cd $pkgname-$pkgver diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index 899ae7e15..a02bd13c1 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75345 2012-08-20 19:14:50Z dreisner $ +# $Id: PKGBUILD 75378 2012-08-21 16:04:24Z dreisner $ # Maintainer: Vesa Kaihlavirta # Contributor: Mark Rosenstand # Contributor: Giorgio Lando (adjtimex patch) @@ -6,7 +6,7 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=18 +pkgrel=19 pkgdesc="Free, easy to use implementation of the Network Time Protocol." url="http://www.openntpd.org/" arch=('x86_64' 'i686') @@ -53,8 +53,8 @@ package() { # avoid conflict with filesystem>=2012.06 rm -r "$pkgdir/run" - install -dm755 "$pkgdir/usr/lib/ntp-units.d" - echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" + install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" + echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" } # vim:set ts=2 sw=2 et: diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index cd9d13003..7f17289f9 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,34 +1,38 @@ -# $Id: PKGBUILD 74623 2012-07-31 19:56:37Z ebelanger $ +# $Id: PKGBUILD 75395 2012-08-21 20:06:54Z ebelanger $ # Maintainer: Lukas Fleischer # Contributor: Alexander Baldeck -pkgname=projectm -pkgver=2.0.1 -pkgrel=6 -pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' +pkgbase=projectm +pkgname=('projectm' 'libvisual-projectm') +pkgver=2.1.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://projectm.sourceforge.net/' license=('LGPL') -depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext') -makedepends=('pkg-config' 'cmake') -source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" - 'libprojectM-2.0.1-pkg-config.patch' - 'libprojectM-2.0.1-fix-linking.patch') -md5sums=('f8bf795878cdbbef54784cf2390b4c89' - '4f258f4e7c2ab612931936bfd7f1f0fb' - '5c178cadf1e00ee4baf32cd9ccbc818c') +makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext') +source=("http://downloads.sourceforge.net/${pkgname}/projectM-complete-${pkgver}-Source.tar.gz") +md5sums=('debf30f7ce94ff0102f06fbb0cc4e92b') build() { - cd "${srcdir}/projectM-${pkgver}-Source" + cd "${srcdir}/projectM-complete-${pkgver}-Source/src" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \ + -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF + make +} - patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch" - patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch" +package_projectm() { + pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' + depends=('ftgl' 'glew' 'gtkglext') - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - make + cd "${srcdir}/projectM-complete-${pkgver}-Source/src/libprojectM" + make DESTDIR="${pkgdir}" install + install -m644 fonts/Vera.ttf "${pkgdir}/usr/share/projectM/fonts/Vera.ttf" } -package() { - cd "${srcdir}/projectM-${pkgver}-Source" +package_libvisual-projectm() { + pkgdesc='ProjectM XMMS plugin.' + depends=("projectm>=$pkgver" 'libvisual' 'sdl') + + cd "${srcdir}/projectM-complete-${pkgver}-Source/src/projectM-libvisual" make DESTDIR="${pkgdir}" install } diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index 78ff87669..8307aa178 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 71478 2012-05-27 09:02:29Z kkeen $ +# $Id: PKGBUILD 75372 2012-08-21 15:10:09Z kkeen $ # Maintainer: Kyle Keen pkgname=python-pyzmq -pkgver=2.2.0 +pkgver=2.2.0.1 pkgrel=1 pkgdesc="Python3 bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -9,9 +9,12 @@ url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python) source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('100b73973d6fb235b8da6adea403566e') +md5sums=('f2f80709e84c8ac72d6671eee645d804') build() { cd "$srcdir/pyzmq-$pkgver" + # py3 errors added in 2.2.0.1 + sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py + sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py python3 setup.py install --root="$pkgdir" --optimize=0 } diff --git a/community/python2-pyzmq/PKGBUILD b/community/python2-pyzmq/PKGBUILD index 32fd23136..3863778a3 100644 --- a/community/python2-pyzmq/PKGBUILD +++ b/community/python2-pyzmq/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 71479 2012-05-27 09:07:00Z kkeen $ +# $Id: PKGBUILD 75374 2012-08-21 15:13:14Z kkeen $ # Maintainer: Kyle Keen pkgname=python2-pyzmq -pkgver=2.2.0 +pkgver=2.2.0.1 pkgrel=1 pkgdesc="Python2 bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -9,7 +9,7 @@ url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python2) source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('100b73973d6fb235b8da6adea403566e') +md5sums=('f2f80709e84c8ac72d6671eee645d804') build() { cd "$srcdir/pyzmq-$pkgver" diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 35cc5a020..e62abfb7e 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74009 2012-07-18 01:08:49Z ibiru $ +# $Id: PKGBUILD 75387 2012-08-21 18:40:56Z bpiotrowski $ # Maintainer: Sergej Pupykin # Contributor: Andreas Wagner pkgname=schroot -pkgver=1.6.0 +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" @@ -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/schroot/fix-bash-completion.patch b/community/schroot/fix-bash-completion.patch new file mode 100644 index 000000000..fb22fd92d --- /dev/null +++ b/community/schroot/fix-bash-completion.patch @@ -0,0 +1,11 @@ +--- a/etc/bash_completion/schroot ++++ b/etc/bash_completion/schroot +@@ -15,7 +15,7 @@ + # along with this program. If not, see + # . + +-have schroot && ++_have schroot && + _schroot() + { + local cur prev options diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index a4bf827ca..c8908f544 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157926 2012-04-30 06:14:42Z eric $ +# $Id: PKGBUILD 165512 2012-08-21 19:57:33Z eric $ # Maintainer: Eric Bélanger pkgname=inetutils pkgver=1.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" @@ -16,7 +16,7 @@ options=('!emptydirs') install=inetutils.install source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ - dnsdomainname) + ftpd.service dnsdomainname) sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' 'ff0aad9946a38915580b094dadf67e790e8a2f87' '84dc802b5e57b5e04c847572225a3b9612017155' @@ -25,10 +25,12 @@ sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' '27d99b910eec0fc26bd79ccc2c1de26608330298' '81f10b3b688e3952f793b35bcef63b5bf257a92b' '81f4a8da823cf0bb14284fc71ee6108849691eda' + '1c5ff1b6166c7401ef0956ce6eab30450ff95eaf' 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ --without-wrap --with-pam \ @@ -66,4 +68,5 @@ package() { install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" + install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service" } diff --git a/core/inetutils/ftpd.service b/core/inetutils/ftpd.service new file mode 100644 index 000000000..985eb9756 --- /dev/null +++ b/core/inetutils/ftpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=FTPD Daemon + +[Service] +ExecStart=/usr/sbin/ftpd -D +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index b12951682..738fdd14b 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165345 2012-08-16 02:47:11Z dan $ +# $Id: PKGBUILD 165509 2012-08-21 14:11:50Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.11.5 +pkgver=1.7.12 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -22,11 +22,13 @@ optdepends=('tk: gitk and git gui' replaces=('git-core') provides=('git-core') backup=('etc/conf.d/git-daemon.conf') +install=git.install source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" git-daemon - git-daemon.conf) -changelog=ChangeLog + git-daemon.conf + git-daemon@.service + git-daemon.socket) build() { export PYTHON_PATH='/usr/bin/python2' @@ -46,6 +48,10 @@ check() { cd "$srcdir/$pkgname-$pkgver" local jobs jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + mkdir -p /dev/shm/git-test + # We used to use this, but silly git regressions: + #GIT_TEST_OPTS="--root=/dev/shm/" \ + # http://comments.gmane.org/gmane.comp.version-control.git/202020 make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -53,7 +59,7 @@ check() { NO_SVN_TESTS=y \ DEFAULT_TEST_TARGET=prove \ GIT_PROVE_OPTS="$jobs -Q" \ - GIT_TEST_OPTS="--root=/dev/shm/" \ + GIT_TEST_OPTS="--root=/dev/shm/git-test" \ test } @@ -67,14 +73,13 @@ package() { INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion - # until this is fixed, no point in loading it dynamically: - # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html - #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git - mkdir -p "$pkgdir"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git + mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + # fancy git prompt + mkdir -p "$pkgdir"/usr/share/git/ + install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ + cp -a ./contrib/* $pkgdir/usr/share/git/ # scripts are for python 2.x sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ @@ -98,9 +103,15 @@ package() { # git daemon script install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf + + # systemd stuff + install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('9985d35c11531d546426ebefb327c847' - 'f08a5a60e57f00399bbd384cfd7791f3' +md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c' + '0070ad185cfc29da545abe35ba8862e7' '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') + '2e42bf97779a1c6411d89043334c9e78' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/git/git-daemon.socket b/extra/git/git-daemon.socket new file mode 100644 index 000000000..58ed2f154 --- /dev/null +++ b/extra/git/git-daemon.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Git Daemon Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/extra/git/git-daemon@.service b/extra/git/git-daemon@.service new file mode 100644 index 000000000..55ca7141b --- /dev/null +++ b/extra/git/git-daemon@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Git Daemon Instance + +[Service] +User=git +# The '-' is to ignore non-zero exit statuses +ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/extra/git/git.install b/extra/git/git.install new file mode 100644 index 000000000..c0578dc1d --- /dev/null +++ b/extra/git/git.install @@ -0,0 +1,21 @@ +post_install() { + if ! getent group git >/dev/null; then + groupadd --system git + fi + if ! getent passwd git >/dev/null; then + useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd git >/dev/null; then + userdel git + fi + if getent group git >/dev/null; then + groupdel git + fi +} diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD index 2acd824e7..d9b7b3375 100644 --- a/extra/kradio/PKGBUILD +++ b/extra/kradio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164981 2012-08-07 18:56:07Z eric $ +# $Id: PKGBUILD 165496 2012-08-21 08:58:19Z eric $ # Maintainer: # Contributor: Tobias Powalowski pkgname=kradio -pkgver=4.0.5 +pkgver=4.0.6 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -13,8 +13,8 @@ depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') makedepends=('automoc4' 'cmake' 'boost') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) -md5sums=('d2ce6b9c12e66c8cdb300013aa0cb26a' - '3faef5c46547b14804839f367fd09d29') +md5sums=('ee9214156465e0416bb369f78b4a5eae' + 'f43706e63d24788f2278bada7b10cc6f') build() { cd "$srcdir" diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 2ad69005a..959a9f7bb 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165490 2012-08-20 19:14:16Z dreisner $ +# $Id: PKGBUILD 165511 2012-08-21 15:29:07Z dreisner $ # Maintainer: Gaetan Bisson # Contributor: kevin pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=10 +pkgrel=11 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -62,6 +62,6 @@ package() { mv man/man* "${pkgdir}"/usr/share/man mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd - install -dm755 "$pkgdir/usr/lib/ntp-units.d" - echo "ntpd.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" + install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" + echo "ntpd.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" } diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD index 253bd1146..37f707e9e 100644 --- a/extra/timidity++/PKGBUILD +++ b/extra/timidity++/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163107 2012-07-07 06:45:30Z eric $ +# $Id: PKGBUILD 165513 2012-08-21 19:57:50Z eric $ # Maintainer: Eric Bélanger pkgname=timidity++ pkgver=2.14.0 -pkgrel=1 +pkgrel=3 pkgdesc="A MIDI to WAVE converter and player" arch=('i686' 'x86_64') url="http://timidity.sourceforge.net" @@ -14,10 +14,11 @@ optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface 'xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \ - timidity.cfg timidity++.sh) + timidity.cfg timidity++.sh timidity.service) sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b' '660b3afbb720d26e8f008034cee66dd8da082d6e' - '9f3e732a7ca1e97119a76df62ecf154df04d4f77') + '9f3e732a7ca1e97119a76df62ecf154df04d4f77' + 'f0351b9eb8928d3d82c380107654a7dbe7cd2d54') build() { cd "${srcdir}/TiMidity++-${pkgver}" @@ -33,4 +34,5 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg" install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++" + install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service" } diff --git a/extra/timidity++/timidity.service b/extra/timidity++/timidity.service new file mode 100644 index 000000000..4d6ceea6a --- /dev/null +++ b/extra/timidity++/timidity.service @@ -0,0 +1,9 @@ +[Unit] +Description=TiMidity++ Daemon +After=sound.target + +[Service] +ExecStart=/usr/bin/timidity -iA + +[Install] +WantedBy=multi-user.target diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 89e9a668e..126dbd27b 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 165295 2012-08-15 00:30:47Z dreisner $ +# $Id: PKGBUILD 165515 2012-08-21 21:58:47Z dreisner $ # Maintainer: Dave Reisner # Contributor: Jaroslav Lichtblau # Contributor: Douglas Soares de Andrade # Contributor: Roberto Alsina pkgname=varnish -pkgver=3.0.2 -pkgrel=6 +pkgver=3.0.3 +pkgrel=1 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64') url="http://www.varnish-cache.org/" @@ -21,15 +21,18 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" "rc.$pkgname" varnish-vcl-reload varnish.service) -md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a' +md5sums=('714310c83fdbd2061d897dacd3f63d8b' 'edd1237d097d72173d9772754335890c' '40b4c83b3ad225ed2f4bd7e677fe41a2' - '56be884f43b8b4c900a073d9282f124a' + '03196dee7fc68e75069393d52c370762' '45cc1fd57aa2ffc22d6af62f9eedc842') build() { cd "$pkgname-$pkgver" + # disable JIT compilation for now, as it's crashy on VCL reload + sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/varnish/varnish-vcl-reload b/extra/varnish/varnish-vcl-reload index aaac385c4..7e84a258b 100644 --- a/extra/varnish/varnish-vcl-reload +++ b/extra/varnish/varnish-vcl-reload @@ -1,7 +1,6 @@ #!/bin/sh cfg=${1:-/etc/varnish/default.vcl} - if [ ! -e "$cfg" ]; then printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2 exit 1 -- cgit v1.2.3-54-g00ecf From e5a77fe6a2fd0e3eb7d877c942959b53fdff2a0c Mon Sep 17 00:00:00 2001 From: root Date: Sat, 1 Sep 2012 00:41:47 +0000 Subject: Sat Sep 1 00:41:47 UTC 2012 --- community-testing/freedroidrpg/PKGBUILD | 35 ++ .../freedroidrpg/freedroidrpg.desktop | 11 + community-testing/freedroidrpg/freedroidrpg.jpg | Bin 0 -> 12697 bytes community-testing/girara/PKGBUILD | 81 +++++ community-testing/lincity-ng/PKGBUILD | 27 ++ community-testing/tmw/PKGBUILD | 28 ++ community-testing/vdrift/PKGBUILD | 36 +- community-testing/warmux/PKGBUILD | 41 +++ community-testing/warmux/gcc-fix.patch | 36 ++ community-testing/warmux/include-zlib.patch | 11 + community-testing/widelands/PKGBUILD | 4 +- community-testing/zathura-djvu/PKGBUILD | 26 ++ community-testing/zathura-pdf-poppler/PKGBUILD | 25 ++ community-testing/zathura/PKGBUILD | 32 ++ community-testing/zathura/bash-completion | 29 ++ community-testing/zathura/zathura.install | 13 + community/apper/PKGBUILD | 6 +- community/c++-gtk-utils/PKGBUILD | 4 +- community/couchdb/PKGBUILD | 12 +- community/freemat/PKGBUILD | 4 +- community/hedgewars/PKGBUILD | 4 +- community/kdenlive/PKGBUILD | 4 +- community/nemiver/PKGBUILD | 8 +- community/openscenegraph/PKGBUILD | 4 +- community/passenger/PKGBUILD | 14 +- community/passenger/build-fix.patch | 12 + community/schroot/PKGBUILD | 15 +- community/sigil/PKGBUILD | 10 +- community/wt/PKGBUILD | 12 +- core/cracklib/PKGBUILD | 8 +- core/rpcbind/PKGBUILD | 6 +- core/rpcbind/rpcbind.service | 4 +- core/systemd/PKGBUILD | 166 +++------ core/systemd/systemd.install | 14 +- extra/calligra/PKGBUILD | 8 +- extra/gnutls/PKGBUILD | 8 +- extra/ifplugd/PKGBUILD | 6 +- extra/ifplugd/ifplugd | 2 +- extra/imagemagick/PKGBUILD | 10 +- extra/libdrm/PKGBUILD | 8 +- extra/libdrm/no-pthread-stubs.patch | 2 +- extra/mesa/PKGBUILD | 38 +- extra/watchdog/PKGBUILD | 18 +- extra/watchdog/watchdog.sh | 4 +- extra/watchdog/watchdog.systemd | 10 + ...Make-the-Reset-Firefox-feature-more-gener.patch | 143 ++++---- libre/iceweasel-libre/PKGBUILD | 14 +- multilib/lib32-glibc/PKGBUILD | 28 +- .../glibc-2.16-strncasecmp-segfault.patch | 65 ++++ .../lib32-glibc/glibc-2.16-strtod-overflow.patch | 389 ++++++++++++++++++++ testing/libreoffice/PKGBUILD | 94 +++-- testing/mpfr/PKGBUILD | 13 +- testing/mpfr/mpfr-3.1.1-p2.patch | 405 +++++++++++++++++++++ testing/perl-sdl/PKGBUILD | 42 +++ testing/ppp/PKGBUILD | 83 +++++ testing/ppp/ip-down | 12 + testing/ppp/ip-down.d.dns.sh | 3 + testing/ppp/ip-up | 12 + testing/ppp/ip-up.d.dns.sh | 7 + testing/ppp/options | 352 ++++++++++++++++++ testing/ppp/plog | 7 + testing/ppp/poff | 103 ++++++ testing/ppp/pon | 32 ++ testing/ppp/pon.1 | 121 ++++++ testing/ppp/ppp | 36 ++ testing/ppp/ppp.systemd | 9 + testing/sdl_gfx/PKGBUILD | 33 ++ testing/systemd/PKGBUILD | 3 +- testing/sysvinit/PKGBUILD | 44 ++- testing/yp-tools/PKGBUILD | 6 +- 70 files changed, 2497 insertions(+), 415 deletions(-) create mode 100644 community-testing/freedroidrpg/PKGBUILD create mode 100644 community-testing/freedroidrpg/freedroidrpg.desktop create mode 100644 community-testing/freedroidrpg/freedroidrpg.jpg create mode 100644 community-testing/girara/PKGBUILD create mode 100644 community-testing/lincity-ng/PKGBUILD create mode 100644 community-testing/tmw/PKGBUILD create mode 100644 community-testing/warmux/PKGBUILD create mode 100644 community-testing/warmux/gcc-fix.patch create mode 100644 community-testing/warmux/include-zlib.patch create mode 100644 community-testing/zathura-djvu/PKGBUILD create mode 100644 community-testing/zathura-pdf-poppler/PKGBUILD create mode 100644 community-testing/zathura/PKGBUILD create mode 100644 community-testing/zathura/bash-completion create mode 100644 community-testing/zathura/zathura.install create mode 100644 community/passenger/build-fix.patch create mode 100644 extra/watchdog/watchdog.systemd create mode 100644 multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch create mode 100644 multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch create mode 100644 testing/mpfr/mpfr-3.1.1-p2.patch create mode 100644 testing/perl-sdl/PKGBUILD create mode 100644 testing/ppp/PKGBUILD create mode 100644 testing/ppp/ip-down create mode 100644 testing/ppp/ip-down.d.dns.sh create mode 100644 testing/ppp/ip-up create mode 100644 testing/ppp/ip-up.d.dns.sh create mode 100644 testing/ppp/options create mode 100644 testing/ppp/plog create mode 100644 testing/ppp/poff create mode 100644 testing/ppp/pon create mode 100644 testing/ppp/pon.1 create mode 100644 testing/ppp/ppp create mode 100644 testing/ppp/ppp.systemd create mode 100644 testing/sdl_gfx/PKGBUILD (limited to 'community/schroot/PKGBUILD') diff --git a/community-testing/freedroidrpg/PKGBUILD b/community-testing/freedroidrpg/PKGBUILD new file mode 100644 index 000000000..c4f67ddbb --- /dev/null +++ b/community-testing/freedroidrpg/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 75738 2012-08-30 16:55:50Z heftig $ +# Maintainer: Sergej Pupykin +# Contributor: nut543 + +#pkgbase=freedroidrpg +#pkgname=('freedroidrpg' 'freedroidrpg-data') +pkgname='freedroidrpg' +pkgver=0.15.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') +optdepends=('python2' 'espeak') +pkgdesc="a mature science fiction role playing game set in the future" +url="http://freedroid.sourceforge.net" +license=("GPL") +source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidRPG-$pkgver.tar.gz + freedroidrpg.jpg + freedroidrpg.desktop) +md5sums=('b95ea6abae46bea6ee3ace9a1902f682' + 'b73d9dac44c7e83a6c80fbe4eb96ba79' + '9a10c2a2064439cdcff5b945dfb1c3ac') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir/ install + install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg + install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop +} diff --git a/community-testing/freedroidrpg/freedroidrpg.desktop b/community-testing/freedroidrpg/freedroidrpg.desktop new file mode 100644 index 000000000..33ee2f5b8 --- /dev/null +++ b/community-testing/freedroidrpg/freedroidrpg.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=freedroidrpg +Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG +Exec=freedroidRPG +Encoding=UTF-8 +Icon=/usr/share/icons/freedroidrpg.jpg +Categories=Game;RolePlaying; +Terminal=false +StartupNotify=false diff --git a/community-testing/freedroidrpg/freedroidrpg.jpg b/community-testing/freedroidrpg/freedroidrpg.jpg new file mode 100644 index 000000000..4daa89313 Binary files /dev/null and b/community-testing/freedroidrpg/freedroidrpg.jpg differ diff --git a/community-testing/girara/PKGBUILD b/community-testing/girara/PKGBUILD new file mode 100644 index 000000000..f9973b8c1 --- /dev/null +++ b/community-testing/girara/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 75776 2012-08-31 00:57:20Z dwallace $ +# Maintainer: Daniel Wallace +# Maintainer: Sergej Pupykin +# Maintainer: mlq + +pkgbase=girara +pkgname=(girara-common girara-gtk2 girara-gtk3) +pkgver=0.1.4 +pkgrel=1 +pkgdesc="user interface library" +arch=('i686' 'x86_64') +url="http://pwmt.org/projects/girara" +license=('custom') +makedepends=('gtk3' 'gtk2') +source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) +md5sums=('f348fbe96ceda4a89142cec92de08d25') + +build() { + true +} + +package_girara-common() { + depends=() + pkgdesc="user interface library - common files" + + cd "$srcdir/girara-$pkgver" + + make clean + + # install header + make DESTDIR="$pkgdir/" install-headers + + # install language files + make DESTDIR="$pkgdir/" -C po install + + # remove pkgconfig files + rm -r $pkgdir/usr/lib/pkgconfig + + # install license + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_girara-gtk2() { + depends=('gtk2' 'girara-common') + provides=('girara') + + cd "$srcdir/girara-$pkgver" + + make clean + make GIRARA_GTK_VERSION=2 + + # install files + make GIRARA_GTK_VERSION=2 DESTDIR="$pkgdir/" install + + # remove common files + rm -r "$pkgdir/usr/include" + rm -r "$pkgdir/usr/share" + + # install license + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_girara-gtk3() { + depends=('gtk3' 'girara-common') + provides=('girara') + + cd "$srcdir/girara-$pkgver" + + make clean + make GIRARA_GTK_VERSION=3 + + # install files + make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install + + # remove common files + rm -r "$pkgdir/usr/include" + rm -r "$pkgdir/usr/share" + + # install license + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-testing/lincity-ng/PKGBUILD b/community-testing/lincity-ng/PKGBUILD new file mode 100644 index 000000000..8f6d046ef --- /dev/null +++ b/community-testing/lincity-ng/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 75765 2012-08-30 21:20:22Z lcarlier $ +# Maintainer: Eric Bélanger + +pkgname=lincity-ng +pkgver=2.0 +pkgrel=5.1 +pkgdesc="A city simulation game" +arch=('i686' 'x86_64') +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://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-testing/tmw/PKGBUILD b/community-testing/tmw/PKGBUILD new file mode 100644 index 000000000..09fe4712c --- /dev/null +++ b/community-testing/tmw/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 75740 2012-08-30 16:55:56Z heftig $ +# Contributor: Bjorn Lindeijer +# Maintainer: Mateusz Herych + +pkgname=tmw +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') +makedepends=('cmake' 'mesa') +#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/mana-mana-* + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/mana-mana-* + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD index 7c483876c..d869dfaa5 100644 --- a/community-testing/vdrift/PKGBUILD +++ b/community-testing/vdrift/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 74524 2012-07-29 21:16:42Z ebelanger $ +# $Id: PKGBUILD 75741 2012-08-30 16:56:01Z heftig $ # Maintainer: Sven-Hendrik Haase # Contributor: Anton Bazhenov # 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-testing/warmux/PKGBUILD b/community-testing/warmux/PKGBUILD new file mode 100644 index 000000000..901d43506 --- /dev/null +++ b/community-testing/warmux/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 75742 2012-08-30 16:56:08Z heftig $ +# Contributor: Eric Belanger +# Contributor: pukyxd +# Maintainer: Daenyth + +pkgname=warmux +pkgver=11.04.1 +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.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' + 'ab50d613d3fa3f71262b1d2fc71641b1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver/.1/}" + + # libpng 1.5 fix + patch -Np1 -i ../include-zlib.patch + # gcc fix + patch -Np1 -i ../gcc-fix.patch + + ./configure --prefix=/usr + make +} + +package() { + depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}") + + cd "${srcdir}/${pkgname}-${pkgver/.1/}" + + make DESTDIR="${pkgdir}" install + rm -r ${pkgdir}/usr/share/warmux +} diff --git a/community-testing/warmux/gcc-fix.patch b/community-testing/warmux/gcc-fix.patch new file mode 100644 index 000000000..1ac476b92 --- /dev/null +++ b/community-testing/warmux/gcc-fix.patch @@ -0,0 +1,36 @@ +## i-love-you-lordheavy.patch [diff] +diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp +--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 +@@ -81,7 +81,7 @@ + } + + // Build an action from a network packet +-Action::Action(const char *buffer, DistantComputer* _creator) ++Action::Action(char *buffer, DistantComputer* _creator) + { + m_creator = _creator; + +diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h +--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 +@@ -168,7 +168,7 @@ + Action(Action_t type, Double value1, Double value2); + + // Build an action from a network packet +- Action(const char* buffer, DistantComputer* _creator); ++ Action(char* buffer, DistantComputer* _creator); + + ~Action(); + +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer + +--- 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 ++#include + #include + #include + #include diff --git a/community-testing/warmux/include-zlib.patch b/community-testing/warmux/include-zlib.patch new file mode 100644 index 000000000..c7e77aba1 --- /dev/null +++ b/community-testing/warmux/include-zlib.patch @@ -0,0 +1,11 @@ +diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp +--- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200 ++++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "graphic/surface.h" + #include "tool/math_tools.h" diff --git a/community-testing/widelands/PKGBUILD b/community-testing/widelands/PKGBUILD index b98a6dbc6..fad42b7a9 100644 --- a/community-testing/widelands/PKGBUILD +++ b/community-testing/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74525 2012-07-29 21:16:58Z ebelanger $ +# $Id: PKGBUILD 75743 2012-08-30 16:56:23Z heftig $ # Maintainer: Sven-Hendrik Haase # Contributor: Arkham # Contributor: Christoph Zeiler @@ -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-testing/zathura-djvu/PKGBUILD b/community-testing/zathura-djvu/PKGBUILD new file mode 100644 index 000000000..be797feb3 --- /dev/null +++ b/community-testing/zathura-djvu/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 75779 2012-08-31 00:57:33Z dwallace $ +# Maintainer: Daniel Wallace +# Maintainer: Sergej Pupykin +# Contributor: karnath + +pkgname=zathura-djvu +pkgver=0.2.1 +pkgrel=1 +pkgdesc="Adds DjVu support to zathura by using the djvulibre library" +arch=('i686' 'x86_64') +url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" +license=('custom') +depends=('djvulibre' 'zathura') +source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz") +md5sums=('c3525b43b74bb0777a2b3561f7dcde06') + +build(){ + cd "${srcdir}/$pkgname-$pkgver" + make +} +package(){ + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + diff --git a/community-testing/zathura-pdf-poppler/PKGBUILD b/community-testing/zathura-pdf-poppler/PKGBUILD new file mode 100644 index 000000000..b1320b1cb --- /dev/null +++ b/community-testing/zathura-pdf-poppler/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 67819 2012-03-14 16:22:14Z spupykin $ +# Maintainer: Daniel Wallace +# Maintainer: Sergej Pupykin +# Contributor: karnath + +pkgname=zathura-pdf-poppler +pkgver=0.2.1 +pkgrel=1 +pkgdesc="Adds pdf support to zathura by using the poppler engine" +arch=('i686' 'x86_64') +url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" +license=('custom') +depends=('poppler-glib' 'zathura') +source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") +md5sums=('6f36fe141f8e5e9e8d71eb143eaaa1c1') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + make +} +package(){ + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-testing/zathura/PKGBUILD b/community-testing/zathura/PKGBUILD new file mode 100644 index 000000000..cd7da39a5 --- /dev/null +++ b/community-testing/zathura/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 75777 2012-08-31 00:57:27Z dwallace $ +# Maintainer: Daniel Wallace +# Maintainer: Sergej Pupykin +# Contributor: ML + +pkgname=zathura +pkgver=0.2.1 +pkgrel=1 +pkgdesc="a document viewer" +arch=('i686' 'x86_64') +url="http://pwmt.org/projects/zathura/" +license=('custom') +depends=('girara-gtk2' 'cairo' 'sqlite') +makedepends=('python2-docutils') +optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') +install=zathura.install +source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz + bash-completion) +md5sums=('2b606a5db61c80b0f1208e9f1df468c2' + 'cac20c37f0e77ba62a8138788f4ccabb') + +build() { + cd $srcdir/zathura-$pkgver + make ZATHURA_GTK_VERSION=2 +} + +package() { + cd $srcdir/zathura-$pkgver + make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura +} diff --git a/community-testing/zathura/bash-completion b/community-testing/zathura/bash-completion new file mode 100644 index 000000000..41c3825b6 --- /dev/null +++ b/community-testing/zathura/bash-completion @@ -0,0 +1,29 @@ +_zathura() { + _init_completion || return + + EXTENTIONS='' + for PLUGIN in /usr/lib/zathura/*.so; do + case ${PLUGIN##*/} in + pdf.so) + EXTENTIONS="$EXTENTIONS|pdf" + ;; + ps.so) + EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf" + ;; + djvu.so) + EXTENTIONS="$EXTENTIONS|djvu|djv" + ;; + epub.so) + EXTENTIONS="$EXTENTIONS|epub" + ;; + cb.so) + EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar" + ;; + *) + ;; + esac + done + + _filedir "${EXTENTIONS#|}" +} && +complete -F _zathura zathura diff --git a/community-testing/zathura/zathura.install b/community-testing/zathura/zathura.install new file mode 100644 index 000000000..f450cf9b8 --- /dev/null +++ b/community-testing/zathura/zathura.install @@ -0,0 +1,13 @@ +post_install() { + which gtk-update-icon-cache >/dev/null && \ + [ -d usr/share/icons/hicolor ] && \ + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD index 5fa8a5cca..66c3ae307 100644 --- a/community/apper/PKGBUILD +++ b/community/apper/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74244 2012-07-23 06:20:32Z idevolder $ +# $Id: PKGBUILD 75748 2012-08-30 17:50:49Z idevolder $ # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor: Valeriy Lyasotskiy # Contributor: Zom @@ -6,7 +6,7 @@ pkgname=apper _pkgmainver=0.7 pkgver=0.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="KDE tools for PackageKit" arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php/Apper?content=84745" @@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17') makedepends=('cmake' 'automoc4' 'chrpath') install="$pkgname.install" provides=('kpackagekit') -conflicts=('kpackagekit') +conflicts=('kpackagekit' 'gnome-packagekit') replaces=('kpackagekit') source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2") sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f') diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 5ddde2fff..4256d4599 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74790 2012-08-05 09:41:39Z giovanni $ +# $Id: PKGBUILD 75753 2012-08-30 21:02:36Z spupykin $ # Maintainer: Giovanni Scafora pkgname=c++-gtk-utils pkgver=2.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') url="http://cxx-gtk-utils.sourceforge.net/" diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 6afbea62a..144add3db 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69752 2012-04-23 09:14:35Z ibiru $ +# $Id: PKGBUILD 75754 2012-08-30 21:02:43Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger pkgname=couchdb pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" @@ -17,18 +17,14 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} - "rc-script.patch" "configure-fix.patch") + "rc-script.patch") md5sums=('a5cbbcaac288831b3d8a08b725657f10' '890a85b22219ea113a4901a289c442f8' - '8a3b1a1ff98a6411827ad991db7a355b' - 'fd1669544d08bda09c3318873d51db1e') + '8a3b1a1ff98a6411827ad991db7a355b') build() { cd "$srcdir/apache-$pkgname-$pkgver" - # workaround for FS#26827 - patch -Np1 < $srcdir/configure-fix.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 36d2597c8..c3eedb732 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70011 2012-04-28 09:24:04Z allan $ +# $Id: PKGBUILD 75755 2012-08-30 21:02:52Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: William Rea pkgname=freemat pkgver=4.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64') url="http://freemat.sourceforge.net" diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 7bb03e77d..1da471ef9 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72406 2012-06-13 13:47:51Z tdziedzic $ +# $Id: PKGBUILD 75756 2012-08-30 21:02:59Z spupykin $ # Maintainer: Sergej Pupykin pkgname=hedgewars pkgver=0.9.17 -pkgrel=3 +pkgrel=4 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index d547101ce..67f1ffc63 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73620 2012-07-12 08:51:08Z spupykin $ +# $Id: PKGBUILD 75757 2012-08-30 21:03:04Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Zuf # Contributor: Darwin Bautista pkgname=kdenlive pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') # http://download.kde.org/stable/kdenlive/ diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 1bcf9cf0a..49ec571c1 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69742 2012-04-23 09:08:05Z ibiru $ +# $Id: PKGBUILD 75745 2012-08-30 17:41:15Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: jordz pkgname=nemiver -pkgver=0.9.2 -pkgrel=2 +pkgver=0.9.3 +pkgrel=1 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') @@ -14,7 +14,7 @@ makedepends=('boost' 'intltool' 'gnome-doc-utils') install=nemiver.install source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") options=('!libtool' '!emptydirs') -sha256sums=('770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520') +sha256sums=('27b8845e54a61ba597050eb16640aaaf2bf21be3191081c9ddd3a34fc2ae617d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 068a93971..2cc27e414 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73482 2012-07-08 09:31:14Z ibiru $ +# $Id: PKGBUILD 75758 2012-08-30 21:03:09Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Hans Janssen # Contributor: my64 @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 79448d605..8eaf95828 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72940 2012-06-25 10:53:59Z spupykin $ +# $Id: PKGBUILD 75759 2012-08-30 21:03:16Z spupykin $ # Maintainer: Sergej Pupykin pkgname=passenger -pkgver=3.0.13 +pkgver=3.0.15 pkgrel=1 -_pkgdlnr=76249 +_pkgdlnr=76337 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64') url="http://www.modrails.com" @@ -14,13 +14,13 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz - build-fix-git-2012-05-17.diff) -md5sums=('1b3a65c77feee86e64891daae66c0c3d' - 'e2d3409bae3676232f411f03abac440c') + build-fix.patch) +md5sums=('532d977eabb4acd5a831b3526ddd8ac4' + 'ee4699596dffb5357fdac4e3b2c98ee1') build(){ cd $srcdir/passenger-$pkgver -# patch -p1 <$srcdir/build-fix-git-2012-05-17.diff + patch -p1 <$srcdir/build-fix.patch ./bin/passenger-install-apache2-module -a rake nginx diff --git a/community/passenger/build-fix.patch b/community/passenger/build-fix.patch new file mode 100644 index 000000000..cdbb78e68 --- /dev/null +++ b/community/passenger/build-fix.patch @@ -0,0 +1,12 @@ +diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp +--- passenger-3.0.15/ext/boost/thread/xtime.hpp 2012-04-16 11:43:52.000000000 +0400 ++++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp 2012-08-29 11:06:02.000000000 +0400 +@@ -18,6 +18,8 @@ + + namespace boost { + ++#undef TIME_UTC ++ + enum xtime_clock_types + { + TIME_UTC=1 diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index e62abfb7e..86e125f10 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75387 2012-08-21 18:40:56Z bpiotrowski $ +# $Id: PKGBUILD 75760 2012-08-30 21:03:31Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Andreas Wagner pkgname=schroot -pkgver=1.6.3 -pkgrel=1 +pkgver=1.6.0 +pkgrel=2 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,20 +26,17 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'arch32-config' 'arch32-copyfiles' 'arch32-mount' - 'arch32-nssdatabases' - 'fix-bash-completion.patch') -md5sums=('f6b1badef213ce8e9ef37bb3fc213390' + 'arch32-nssdatabases') +md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195' 'a8d77cac806a0a9adef3f93cdbeb280a' '1e34db5387c4e5de911e15d8a9208bdb' '5a3f7b839c7e0b8933748da7c5b6385b' '06db41d42f9fce5449a28feb76ded556' 'f0d5d5b5e34a860f6f90b5628c680f46' - 'af1da6edd8c8c0dafeeb2c2c4e0c840b' - '5ba775d4f401e2c167414caa548b71e5') + 'af1da6edd8c8c0dafeeb2c2c4e0c840b') 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/sigil/PKGBUILD b/community/sigil/PKGBUILD index d993271e7..badf5d828 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 73075 2012-06-30 11:58:09Z giovanni $ +# $Id: PKGBUILD 75761 2012-08-30 21:03:36Z spupykin $ # Maintainer: Giovanni Scafora # Contributor: Larry Hajali pkgname=sigil -pkgver=0.5.902 +pkgver=0.5.3 pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" license=('GPL3') -depends=('qtwebkit') -makedepends=('cmake' 'gendesk') +depends=('qtwebkit' 'boost-libs') +makedepends=('cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('7e44ce266fc2539888edd0e1ee66b05d') +md5sums=('83c1a5608a2ec59a83c86ccc1429b5cc') build() { cd "${srcdir}" diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 8c4860871..d82b56e83 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74507 2012-07-29 20:16:09Z svenstaro $ +# $Id: PKGBUILD 75763 2012-08-30 21:03:49Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Sven-Hendrik Haase # Contributor: Denis Martinez pkgname=wt -pkgver=3.2.2.1 -_pkgver=3.2.2-p1 +pkgver=3.2.2 +_pkgver=3.2.2 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') -makedepends=('boost' 'cmake>=2.8' +depends=('boost-libs>=1.36') +makedepends=('boost>=1.36' '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=('d436430a4f1ae5fbcf038e645e4b5260') +md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa') build() { cd ${srcdir}/${pkgname}-${_pkgver} diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index d25d26ad6..0e9cbee21 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142311 2011-11-08 10:56:31Z tpowa $ +# $Id: PKGBUILD 165794 2012-08-30 15:23:51Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Federico Quagliata (quaqo) pkgname=cracklib -pkgver=2.8.18 -pkgrel=2 +pkgver=2.8.19 +pkgrel=1 pkgdesc="Password Checking Library" arch=('i686' 'x86_64') license=('GPL') @@ -12,7 +12,7 @@ url="http://sourceforge.net/projects/cracklib" depends=('glibc' 'zlib') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('79053ad8bc714a44cd660cb12116211b') +md5sums=('ca0ec168d9c6466612204e8dfb2df8a9') build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index 75cb39840..e536a2cbb 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157234 2012-04-26 13:06:13Z tpowa $ +# $Id: PKGBUILD 165796 2012-08-30 15:24:19Z tpowa $ # Maintainer: Tobias Powalowski pkgname=rpcbind pkgver=0.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64) depends=('bash' 'glibc' 'libtirpc') @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.b rpcbind) md5sums=('1a77ddb1aaea8099ab19c351eeb26316' 'c02ac36a98baac70b8a26190524b7b73' - 'd2615f4c0d58f154aab6e294997ac9be' + 'a7b23a32be2eb52d7dec52da36d4eba1' '78a963654f57cbb209e228884767836e') build() { diff --git a/core/rpcbind/rpcbind.service b/core/rpcbind/rpcbind.service index 418ba1e05..3bc764efc 100644 --- a/core/rpcbind/rpcbind.service +++ b/core/rpcbind/rpcbind.service @@ -1,6 +1,8 @@ [Unit] Description=RPC Bind -Requires=network.target +After=network.target +Wants=rpcbind.target +Before=rpcbind.target [Service] Type=forking diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index b20882fd5..aff028c9e 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -2,48 +2,37 @@ # Contributor: Tom Gundersen pkgbase=systemd -pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=188 -pkgrel=2 +pkgname=('systemd' 'systemd-sysvcompat') +pkgver=189 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' - 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz') + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' + 'pam' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - 'locale.sh' - 0001-shutdown-recursively-mark-root-as-private-before-piv.patch - 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch 'use-split-usr-path.patch') -md5sums=('d89b42699695554949d072ef46c0dfc9' +md5sums=('ac2eb313f5dce79622f60aac56bca66d' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - 'f15956945052bb911e5df81cf5e7e5dc' - '49d145ef3ca299025c085555314212b6' - 'bccb994f4cfbd251b6c34d7d90a6ba0f' '482dba45a783f06c2239f1355f4ce72f') build() { cd "$pkgname-$pkgver" - # still waiting on ipw2x00 to get fixed... + # still waiting on ipw2x00, et al to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" - patch -Np1 <"$srcdir/use-split-usr-path.patch" - - # http://bugs.archlinux.org/task/31089 - # upstream c516c8d17f77a1c761447f4c40c8dfffeda2e06d - patch -Np1 <"$srcdir/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch" - # http://bugs.archlinux.org/task/31092 - # upstream 4bfa638d43c05e8db052cd55818765bb3575a405 - patch -Np1 <"$srcdir/0001-shutdown-recursively-mark-root-as-private-before-piv.patch" + # hang onto this until we do the /{,s}bin merge + patch -Np1 <"$srcdir/use-split-usr-path.patch" ./configure \ --libexecdir=/usr/lib \ @@ -53,25 +42,25 @@ build() { --enable-gtk-doc \ --disable-audit \ --disable-ima \ - --with-pamlibdir=/usr/lib/security \ --with-distro=arch \ --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + --with-pci-ids-path=/usr/share/hwdata/pci.ids make } package_systemd() { pkgdesc="system and service manager" - depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' - "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: legacy generator for initialization scripts' + depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' + 'pam' 'util-linux' 'xz') + provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('libsystemd' 'systemd-tools' 'udev') + conflicts=('libsystemd' 'systemd-tools' 'udev') + optdepends=('initscripts: legacy support for /etc/rc.conf' 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'cryptsetup: required for encrypted block devices') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -80,7 +69,8 @@ package_systemd() { etc/systemd/system.conf etc/systemd/user.conf etc/systemd/logind.conf - etc/systemd/journald.conf) + etc/systemd/journald.conf + etc/udev/udev.conf) install="systemd.install" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install @@ -101,104 +91,13 @@ package_systemd() { rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" - ### get rid of RPM macros - rm -r "$pkgdir/etc/rpm/macros.systemd" + # get rid of RPM macros + rm -r "$pkgdir/etc/rpm" # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. # https://pokersource.info/show_bug.cgi?id=50989 sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - ### split off libsystemd (libs, includes, pkgconfig, man3) - rm -rf "$srcdir/_libsystemd" - install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} - cd "$srcdir"/_libsystemd - mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib - mv "$pkgdir/usr/include/systemd" usr/include - mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig - - ### split out manpages for sysvcompat - rm -rf "$srcdir/_sysvcompat" - install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ - mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ - "$srcdir"/_sysvcompat/usr/share/man/man8 - - ### split out systemd-tools/udev - rm -rf "$srcdir/_tools" - install -dm755 \ - "$srcdir"/_tools/etc/udev \ - "$srcdir"/_tools/usr/bin \ - "$srcdir"/_tools/usr/include \ - "$srcdir"/_tools/usr/lib/udev \ - "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ - "$srcdir"/_tools/usr/lib/girepository-1.0 \ - "$srcdir"/_tools/usr/share/pkgconfig \ - "$srcdir"/_tools/usr/share/gir-1.0 \ - "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \ - "$srcdir"/_tools/usr/share/man/man{1,5,7,8} - - cd "$srcdir/_tools" - mv "$pkgdir"/etc/udev etc - mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc - mv "$pkgdir"/usr/bin/udevadm usr/bin - mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin - mv "$pkgdir"/usr/lib/pkgconfig usr/lib - mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd - mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system - mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants - mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants - mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib - mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib - mv "$pkgdir"/usr/lib/udev usr/lib - mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include - mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib - mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig - mv "$pkgdir"/usr/share/gir-1.0 usr/share - mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html - mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7 - mv "$pkgdir"/usr/share/man/man8/{systemd-tmpfiles,udevadm}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man8/systemd-udevd{,.service,{-control,-kernel}.socket}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 - mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 - mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin - mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd -} - -package_systemd-sysvcompat() { - pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit' 'initscripts') - - mv "$srcdir/_sysvcompat"/* "$pkgdir" - - install -dm755 "$pkgdir/sbin" - for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" - done - - ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" - - install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" -} - -package_libsystemd() { - pkgdesc="systemd client libraries" - depends=('xz') - - mv "$srcdir/_libsystemd"/* "$pkgdir" -} - -package_systemd-tools() { - pkgdesc='standalone tools from systemd' - url='http://www.freedesktop.org/wiki/Software/systemd' - depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') - optdepends=('cryptsetup: required for encrypted block devices') - provides=("udev=$pkgver") - conflicts=('udev') - replaces=('udev') - install='systemd-tools.install' - - mv "$srcdir/_tools/"* "$pkgdir" - # the path to udevadm is hardcoded in some places install -d "$pkgdir/sbin" ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" @@ -220,8 +119,27 @@ package_systemd-tools() { install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" # XXX: kill off coredump rule until the journal can recover coredumps - # this file needs to come back as part of systemd, not systemd-tools rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit') + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" } # vim: ft=sh syn=sh et diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index e369f094d..784926e17 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -8,22 +8,14 @@ post_install() { # enable getty@tty1 by default, but don't track the file systemctl enable getty@.service + systemd-machine-id-setup + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" echo " bootloader to replace sysvinit with systemd" } post_upgrade() { - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi + systemd-machine-id-setup # getty@tty1.service is no longer enabled by default, but we don't want to break # existing setups. diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 51081072d..ea67c706d 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165455 2012-08-20 08:43:02Z andrea $ +# $Id: PKGBUILD 165807 2012-08-30 18:32:15Z andrea $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -21,8 +21,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.5.0 -pkgrel=2 +pkgver=2.5.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('bea9b5e9d95691caaba385ef5522a60d') +md5sums=('7bc75d770bfd7ffd5f70386c25970888') build() { mkdir build diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 88bbf5dcd..cfc157013 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164788 2012-08-05 11:49:39Z andyrtr $ +# $Id: PKGBUILD 165815 2012-08-30 20:33:31Z andyrtr $ # Maintainer: Jan de Groot pkgname=gnutls -pkgver=3.0.22 +pkgver=3.1.0 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ options=('!libtool' '!zipman') depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('valgrind' 'strace') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('7b3db90934c2d410c573e37efce3d579' - '33aab6d202af8d6f8f51cfb9249b6d50') +md5sums=('db88d8fc44e44be4a0a14b24aa204bbf' + 'c3fa5f3bda5ebe7f37cc997717bb8476') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD index 6d30aefbd..91c354179 100644 --- a/extra/ifplugd/PKGBUILD +++ b/extra/ifplugd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165779 2012-08-29 20:42:40Z thomas $ +# $Id: PKGBUILD 165791 2012-08-30 09:38:27Z thomas $ # Contributor: Manolis Tzanidakis # Contributor: kevin # Maintainer: pkgname=ifplugd pkgver=0.28 -pkgrel=12 +pkgrel=13 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal." arch=('i686' 'x86_64') url="http://0pointer.de/lennart/projects/ifplugd" @@ -23,7 +23,7 @@ source=($url/${pkgname}-${pkgver}.tar.gz md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '54eb22844b5aeed161c0b80aa9008570' 'f26dbd7597d9d637f0b2b104b11ab820' - '158bda9014eb35979af9b094feca5fe1' + '1ea9aa64415a5a9e27b84634cd08a7f2' 'f2e8a37af52b79ee0e3c5bcc2470ce10' '3dc2ce45d0e12d155ecc7a5bc9e3ee04') diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd index f6c8db938..354238fe2 100644 --- a/extra/ifplugd/ifplugd +++ b/extra/ifplugd/ifplugd @@ -24,7 +24,7 @@ case $1 in for nic in "${net_ifs[@]}"; do # only start if a PID doesn't already exist - if [[ ! -f /var/run/ifplugd.$nic.pid ]]; + if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then /usr/bin/ifplugd-daemon $nic # use presence of PID file to check for start success diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 5cdde6f54..c5f844f46 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165104 2012-08-11 06:10:43Z eric $ +# $Id: PKGBUILD 165819 2012-08-30 20:53:00Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.8.9 +pkgver=6.7.9.2 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('531a150014119573a04eed28df6192137f4799bc' +sha1sums=('a22342f53903f2fe6debc099136263412f2b6571' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -25,7 +25,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ --without-gvc --without-djvu --without-autotrace --without-webp \ --without-jbig --without-fpx --without-dps --without-fftw make @@ -33,7 +33,7 @@ build() { check() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make check +# make check } package_imagemagick() { diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index dcf1819f0..b69376a05 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165281 2012-08-14 20:41:57Z andyrtr $ +# $Id: PKGBUILD 165816 2012-08-30 20:33:39Z andyrtr $ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.38 +pkgver=2.4.39 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -15,8 +15,8 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9' - 'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7' +sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d' + '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch index 6745f4bc4..a8de91d9d 100644 --- a/extra/libdrm/no-pthread-stubs.patch +++ b/extra/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/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 9e408c899..94c6d2c76 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163968 2012-07-23 03:03:08Z allan $ +# $Id: PKGBUILD 165814 2012-08-30 20:33:25Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke @@ -15,10 +15,10 @@ if [ "${_git}" = "true" ]; then else pkgver=8.0.4 fi -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') + 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'systemd-tools') url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE @@ -48,7 +48,9 @@ if [ "${_git}" = "true" ]; then --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ --enable-gallium-llvm \ - --enable-gallium-egl \ + --enable-egl \ + --enable-gallium-egl \ + --with-egl-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -57,7 +59,6 @@ if [ "${_git}" = "true" ]; then --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ - --enable-egl \ --enable-texture-float \ --enable-xa \ --enable-shared-dricore @@ -71,7 +72,9 @@ if [ "${_git}" = "true" ]; then --with-gallium-drivers=r300,r600,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,swrast \ --enable-gallium-llvm \ + --enable-egl \ --enable-gallium-egl \ + --with-egl-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -80,7 +83,6 @@ if [ "${_git}" = "true" ]; then --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ - --enable-egl \ --enable-texture-float \ --enable-xa \ --enable-shared-dricore @@ -132,12 +134,15 @@ package_libglapi() { } package_libgbm() { - depends=('glibc') + depends=('systemd-tools') pkgdesc="Mesa gbm library" cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" + install -m755 -d ${pkgdir}/usr/{include,lib/gbm} bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + bin/minstall src/gbm/main/gbm.h "${pkgdir}/usr/include/" + bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + bin/minstall lib/gbm/gbm_gallium_drm.so* "${pkgdir}/usr/lib/gbm/" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" @@ -167,7 +172,7 @@ package_libgles() { } package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'libgbm' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" cd ${srcdir}/?esa-* @@ -218,12 +223,14 @@ package_mesa() { rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" rm -f "${pkgdir}/usr/lib/libOSMesa"* + rm -rf "${pkgdir}/usr/lib/gbm" rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} rm -rf "${pkgdir}/usr/lib/xorg" rm -f "${pkgdir}/usr/include/GL/glew.h" rm -f "${pkgdir}/usr/include/GL/glxew.h" rm -f "${pkgdir}/usr/include/GL/wglew.h" rm -f "${pkgdir}/usr/include/GL/glut.h" + rm -f "${pkgdir}/usr/include/gbm.h" rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} install -m755 -d "${pkgdir}/usr/share/licenses/mesa" @@ -231,7 +238,7 @@ package_mesa() { } package_ati-dri() { - depends=("libgl=${pkgver}") + depends=("libgl=${pkgver}" 'libffi') pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') @@ -241,6 +248,11 @@ package_ati-dri() { # gallium3D driver for r300,r600 make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install + # gallium egl drivers + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib/gbm" + bin/minstall lib/gbm/pipe_r{300,600}.so* "${pkgdir}/usr/lib/gbm/" + } package_intel-dri() { @@ -262,8 +274,12 @@ package_nouveau-dri() { } package_svga-dri() { - depends=("mesa=${pkgver}") + depends=("mesa=${pkgver}" 'libffi') pkgdesc="Gallium3D VMware guest GL driver" make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install + # gallium egl driver + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib/gbm" + bin/minstall lib/gbm/pipe_vmwgfx.so* "${pkgdir}/usr/lib/gbm/" } diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index 4c45af820..f1c3d4986 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158941 2012-05-13 14:21:11Z thomas $ +# $Id: PKGBUILD 165803 2012-08-30 17:35:28Z thomas $ # Maintainer: Thomas Bächler pkgname=watchdog pkgver=5.12 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64) url="http://sourceforge.net/projects/watchdog" @@ -15,11 +15,13 @@ backup=(etc/watchdog.conf source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.sh watchdog.cf - watchdog-5.12-fix-oom-in-wd_keepalive.patch) + watchdog-5.12-fix-oom-in-wd_keepalive.patch + watchdog.systemd) md5sums=('cea28bea70e54f3625062bc808aef9af' - '854451f554718b55186599faaa8d85f6' + 'f57d33967eb9404dd52e3c4e73795a20' '01c1e2e13f515131180b4ebe9b8b7cc3' - 'c90c2686975b5254f82b3de683f1f442') + 'c90c2686975b5254f82b3de683f1f442' + 'a835ae5cbdbb21c19a468dedb5d734e4') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -29,7 +31,10 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var \ + --with-pidfile=/run/watchdog.pid \ + --with-ka_pidfile=/run/wd_keepalive.pid + make } @@ -40,6 +45,7 @@ package() { install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} done + install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive diff --git a/extra/watchdog/watchdog.sh b/extra/watchdog/watchdog.sh index 00d5078a9..54f78454f 100644 --- a/extra/watchdog/watchdog.sh +++ b/extra/watchdog/watchdog.sh @@ -3,7 +3,7 @@ . /etc/rc.conf . /etc/rc.d/functions -PID="$( cat /var/run/watchdog.pid 2>/dev/null )" +PID="$( cat /run/watchdog.pid 2>/dev/null )" [ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog case "$1" in @@ -31,7 +31,7 @@ case "$1" in stat_done fi - rm -f /var/run/watchdog.pid + rm -f /run/watchdog.pid ;; restart) $0 stop diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd new file mode 100644 index 000000000..57c73fb45 --- /dev/null +++ b/extra/watchdog/watchdog.systemd @@ -0,0 +1,10 @@ +[Unit] +Description=Watchdog Daemon + +[Service] +Type=forking +PIDFile=/run/watchdog.pid +ExecStart=/usr/sbin/watchdog + +[Install] +WantedBy=multi-user.target diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 4a0507271..240c3d4e8 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -41,10 +41,10 @@ index 0e8ccf5..fa46c08 100644 brandBundle.getFormattedString("homePageImport", [appName]); var oldHomePage = document.getElementById("oldHomePage"); diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul -index 4bcc1d9..c4db956 100644 +index f030756..23e37ff 100644 --- a/browser/components/migration/content/migration.xul +++ b/browser/components/migration/content/migration.xul -@@ -74,7 +74,7 @@ +@@ -42,7 +42,7 @@ #elifdef XP_UNIX #endif @@ -54,7 +54,7 @@ index 4bcc1d9..c4db956 100644 diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest -index 527771f..782b38f 100644 +index d7fec75..d531b83 100644 --- a/browser/components/migration/src/BrowserProfileMigrators.manifest +++ b/browser/components/migration/src/BrowserProfileMigrators.manifest @@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737 @@ -63,11 +63,11 @@ index 527771f..782b38f 100644 component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js -contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386} +contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386} + #ifdef HAS_IE_MIGRATOR component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4} - component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js -index 8f14f49..8dc175d 100644 +index a6598fe..8f83da8 100644 --- a/browser/components/migration/src/FirefoxProfileMigrator.js +++ b/browser/components/migration/src/FirefoxProfileMigrator.js @@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", { @@ -80,7 +80,7 @@ index 8f14f49..8dc175d 100644 const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]); diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm -index 9460e6d..8db6827 100644 +index 0669aa8..19552e3 100644 --- a/browser/components/migration/src/MigrationUtils.jsm +++ b/browser/components/migration/src/MigrationUtils.jsm @@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({ @@ -126,10 +126,10 @@ index 744f117..59e5a4c 100644 classDescription: "Profile Migrator", contractID: "@mozilla.org/toolkit/profile-migrator;1", diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd -index 0b4b776..ce26fbd 100644 +index 21cf405..f3c1a6b 100644 --- a/browser/locales/en-US/chrome/browser/migration/migration.dtd +++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd -@@ -13,8 +13,6 @@ +@@ -17,8 +17,6 @@ @@ -139,10 +139,10 @@ index 0b4b776..ce26fbd 100644 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties -index f522a66..be26460 100644 +index ab82d85..915f6b8 100644 --- a/browser/locales/en-US/chrome/browser/migration/migration.properties +++ b/browser/locales/en-US/chrome/browser/migration/migration.properties -@@ -4,7 +4,6 @@ profileName_format=%S %S +@@ -8,7 +8,6 @@ profileName_format=%S %S sourceNameIE=Internet Explorer sourceNameSafari=Safari sourceNameChrome=Google Chrome @@ -150,7 +150,7 @@ index f522a66..be26460 100644 importedBookmarksFolder=From %S -@@ -18,29 +17,29 @@ importedSafariReadingList=Reading List (From Safari) +@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari) 2_ie=Cookies 2_safari=Cookies 2_chrome=Cookies @@ -177,79 +177,72 @@ index f522a66..be26460 100644 32_ie=Favorites 32_safari=Bookmarks - 32_chrome=Bookmarks --32_firefox=Bookmarks -+32_self=Bookmarks - +@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari) 64_ie=Other Data 64_safari=Other Data 64_chrome=Other Data -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups -diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js -index 957d4d8..1af3629 100644 ---- a/toolkit/content/aboutSupport.js -+++ b/toolkit/content/aboutSupport.js -@@ -616,13 +616,13 @@ function populateResetBox() { - .getService(Ci.nsIToolkitProfileService); +diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn +index 697b217..b6e1709 100644 +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -38,7 +38,7 @@ toolkit.jar: + + content/global/mozilla.xhtml (mozilla.xhtml) + *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js) + content/global/resetProfile.css (resetProfile.css) +-* content/global/resetProfile.js (resetProfile.js) ++ content/global/resetProfile.js (resetProfile.js) + * content/global/resetProfile.xul (resetProfile.xul) + * content/global/resetProfileProgress.xul (resetProfileProgress.xul) + * content/global/treeUtils.js (treeUtils.js) +diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js +index dcb4065..09c1146 100644 +--- a/toolkit/content/resetProfile.js ++++ b/toolkit/content/resetProfile.js +@@ -36,13 +36,13 @@ function resetSupported() { + getService(Ci.nsIToolkitProfileService); let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile); -#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; -#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; - - // Only show the reset box for the default profile if the self-migrator used for reset exists. + // Reset is only supported for the default profile if the self-migrator used for reset exists. try { - if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) || -- !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc)) -+ !("@mozilla.org/toolkit/profile-migrator;1" in Cc)) -+ return; -+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); -+ if (!("canMigrate" in pm) || !pm.canMigrate("self")) - return; - document.getElementById("reset-box").style.visibility = "visible"; +- return currentProfileDir.equals(profileService.selectedProfile.rootDir) && +- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc); ++ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) && ++ "@mozilla.org/toolkit/profile-migrator;1" in Cc) { ++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); ++ return ("canMigrate" in pm) && pm.canMigrate("self"); ++ } } catch (e) { -diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js -index 84de6cd..3126da6 100644 ---- a/toolkit/content/resetProfile.js -+++ b/toolkit/content/resetProfile.js -@@ -6,6 +6,7 @@ Components.utils.import("resource://gre/modules/Services.jsm"); + // Catch exception when there is no selected profile. + Cu.reportError(e); +@@ -53,9 +53,6 @@ function resetSupported() { + function getMigratedData() { + Components.utils.import("resource:///modules/MigrationUtils.jsm"); - // based on onImportItemsPageShow from migration.js - function onResetProfileLoad() { -+<<<<<<< HEAD - #expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; - #expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; - -@@ -16,16 +17,22 @@ function onResetProfileLoad() { - "8_" + MOZ_APP_NAME, // Form History - "2_" + MOZ_APP_NAME, // Cookies - ]; -+======= -+ Components.utils.import("resource:///modules/MigrationUtils.jsm"); -+ const MAX_MIGRATED_TYPES = 16; -+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic - - var migratedItems = document.getElementById("migratedItems"); -- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP + -- "/locale/migration/migration.properties"); - - // Loop over possible data to migrate to give the user a list of what will be preserved. - for (var itemStringName of MIGRATED_TYPES) { +-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; +-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; +- + // From migration.properties + const MIGRATED_TYPES = [ + 4, // History and Bookmarks +@@ -68,7 +65,7 @@ function getMigratedData() { + let dataTypes = []; + for (let itemID of MIGRATED_TYPES) { try { - var checkbox = document.createElement("label"); -+<<<<<<< HEAD - checkbox.setAttribute("value", bundle.GetStringFromName(itemStringName)); -+======= -+ checkbox.setAttribute("value", MigrationUtils.getLocalizedString(itemID + "_self")); -+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic - migratedItems.appendChild(checkbox); +- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME); ++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self"); + dataTypes.push(typeName); } catch (x) { // Catch exceptions when the string for a data type doesn't exist. diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl -index e941336..5b264af 100644 +index f35c227..7062886 100644 --- a/toolkit/profile/nsIProfileMigrator.idl +++ b/toolkit/profile/nsIProfileMigrator.idl -@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports +@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports * @client Toolkit (Startup code) * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1") */ @@ -258,7 +251,7 @@ index e941336..5b264af 100644 interface nsIProfileMigrator : nsISupports { /** -@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports +@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports * @note The startup code ignores COM exceptions thrown from this method. */ void migrate(in nsIProfileStartup aStartup, in ACString aKey); @@ -274,15 +267,15 @@ index e941336..5b264af 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index d2db0e2..45a4b0d 100644 +index e5d3042..6de3390 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3642,7 +3642,7 @@ XREMain::XRE_mainRun() - if (gDoProfileReset) { - // Automatically migrate from the current application if we just - // reset the profile. -- aKey = MOZ_APP_NAME; -+ aKey = "self"; +@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun() + if (gDoProfileReset) { + // Automatically migrate from the current application if we just + // reset the profile. +- aKey = MOZ_APP_NAME; ++ aKey = "self"; + } pm->Migrate(&mDirProvider, aKey); - // Set the new profile as the default after migration. - rv = SetCurrentProfileAsDefault(mProfileSvc, mProfD); + } diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 259413591..59435e71a 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,15 +14,15 @@ _pgo=false # We're getting this from Debian Experimental _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/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -52,8 +52,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('8e4f3987d37c8e73b168948d0771b872' - '8689c150a4d3a0a688ad2db6044feac6' +md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25' + 'b93090724434e3801375730744e79950' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' @@ -61,7 +61,7 @@ md5sums=('8e4f3987d37c8e73b168948d0771b872' 'e529742c0a425648087bc3ce537fe4c5' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' - '88350bc611361a1ff635f5c960c6d6ee') + 'c52fac65c1e06290a5108b75c31ace79') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") @@ -129,7 +129,7 @@ package() { cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" + install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" # I don't even know why we're hitting the objdir, and ConnOS didn't. _brandingdir=debian/branding diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 6fc66149f..4c03ea5a5 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75203 2012-08-16 01:54:21Z allan $ +# $Id: PKGBUILD 75735 2012-08-30 10:49:53Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.16.0 -pkgrel=3 +pkgrel=4 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" @@ -20,12 +20,16 @@ source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch glibc-2.15-revert-c5a0802a.patch glibc-2.16-rpcgen-cpp-path.patch + glibc-2.16-strncasecmp-segfault.patch + glibc-2.16-strtod-overflow.patch lib32-glibc.conf) md5sums=('80b181b02ab249524ec92822c0174cf7' '2a1221a15575820751c325ef4d2fbb90' '31f415b41197d85d3bbee3d1eecd06a3' '0a0383d50d63f1c02919fe9943b82014' 'ea6a43915474e8276e9361eed6a01280' + 'f042d37cc8ca3459023431809039bc88' + '61d322f7681a85d3293ada5c3ccc2c7e' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -43,14 +47,26 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch + # strncasecmp segfault on i686 + # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737 + patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch + + # strtod integer/buffer overflow + # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319 + patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch + + # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux + sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h + cd ${srcdir} mkdir glibc-build cd glibc-build - - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - # TODO: make separate glibc-xen package for i686 - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + #if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + #fi export CC="gcc -m32" export CXX="g++ -m32" diff --git a/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch b/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch new file mode 100644 index 000000000..ce91bbe82 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch @@ -0,0 +1,65 @@ +diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c +index 6c17530..acfe668 100644 +--- a/string/test-strncasecmp.c ++++ b/string/test-strncasecmp.c +@@ -1,5 +1,5 @@ + /* Test and measure strncasecmp functions. +- Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc. ++ Copyright (C) 1999-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Written by Jakub Jelinek , 1999. + +@@ -251,9 +251,9 @@ do_random_tests (void) + } + } + +- ++/* Regression test for BZ #12205 */ + static void +-check1 (void) ++bz12205 (void) + { + static char cp [4096+16] __attribute__ ((aligned(4096))); + static char gotrel[4096] __attribute__ ((aligned(4096))); +@@ -270,6 +270,15 @@ check1 (void) + check_result (impl, s1, s2, n, exp_result); + } + ++/* Regression test for BZ #14195 */ ++static void ++bz14195 (void) ++{ ++ const char *empty_string = ""; ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, empty_string, "", 5, 0); ++} ++ + int + test_main (void) + { +@@ -277,7 +286,8 @@ test_main (void) + + test_init (); + +- check1 (); ++ bz12205 (); ++ bz14195 (); + + printf ("%23s", ""); + FOR_EACH_IMPL (impl, 0) +diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S +index 5e6321e..9735ad0 100644 +--- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S ++++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S +@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp): + # endif + jne L(neq_sncmp) + test %cl, %cl +- je L(eq) ++ je L(eq_sncmp) + + cmp $1, REM + je L(eq_sncmp) +-- +1.7.3.4 + diff --git a/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch b/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch new file mode 100644 index 000000000..526296325 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch @@ -0,0 +1,389 @@ +diff --git a/stdlib/Makefile b/stdlib/Makefile +index f7811c5..79c9acb 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -68,7 +68,8 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ + tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \ + tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \ + tst-makecontext2 tst-strtod6 tst-unsetenv1 \ +- tst-makecontext3 bug-getcontext bug-fmtmsg1 ++ tst-makecontext3 bug-getcontext bug-fmtmsg1 \ ++ tst-strtod-overflow + + include ../Makeconfig + +diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c +index 2166a08..a8a7ea8 100644 +--- a/stdlib/strtod_l.c ++++ b/stdlib/strtod_l.c +@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **, + #include + #include + #include ++#include + + /* The gmp headers need some configuration frobs. */ + #define HAVE_ALLOCA 1 +@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **, + #include "longlong.h" + #include "fpioconst.h" + +-#define NDEBUG 1 + #include + + +@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1]; + /* Return a floating point number of the needed type according to the given + multi-precision number after possible rounding. */ + static FLOAT +-round_and_return (mp_limb_t *retval, int exponent, int negative, ++round_and_return (mp_limb_t *retval, intmax_t exponent, int negative, + mp_limb_t round_limb, mp_size_t round_bit, int more_bits) + { + if (exponent < MIN_EXP - 1) + { +- mp_size_t shift = MIN_EXP - 1 - exponent; +- +- if (shift > MANT_DIG) ++ if (exponent < MIN_EXP - 1 - MANT_DIG) + { + __set_errno (ERANGE); + return 0.0; + } + ++ mp_size_t shift = MIN_EXP - 1 - exponent; ++ + more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0; + if (shift == MANT_DIG) + /* This is a special case to handle the very seldom case where +@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + __set_errno (ERANGE); + } + ++ if (exponent > MAX_EXP) ++ goto overflow; ++ + if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0 + && (more_bits || (retval[0] & 1) != 0 + || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0)) +@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + } + + if (exponent > MAX_EXP) ++ overflow: + return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; + + return MPN2FLOAT (retval, exponent, negative); +@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + factor for the resulting number (see code) multiply by it. */ + static const STRING_TYPE * + str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, +- int *exponent ++ intmax_t *exponent + #ifndef USE_WIDE_CHAR + , const char *decimal, size_t decimal_len, const char *thousands + #endif +@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + cy += __mpn_add_1 (n, n, *nsize, low); + if (cy != 0) + { ++ assert (*nsize < MPNSIZE); + n[*nsize] = cy; + ++(*nsize); + } +@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + } + while (--digcnt > 0); + +- if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB) ++ if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt) + { + low *= _tens_in_limb[*exponent]; + start = _tens_in_limb[cnt + *exponent]; +@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + cy = __mpn_mul_1 (n, n, *nsize, start); + cy += __mpn_add_1 (n, n, *nsize, low); + if (cy != 0) +- n[(*nsize)++] = cy; ++ { ++ assert (*nsize < MPNSIZE); ++ n[(*nsize)++] = cy; ++ } + } + + return str; +@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + { + int negative; /* The sign of the number. */ + MPN_VAR (num); /* MP representation of the number. */ +- int exponent; /* Exponent of the number. */ ++ intmax_t exponent; /* Exponent of the number. */ + + /* Numbers starting `0X' or `0x' have to be processed with base 16. */ + int base = 10; +@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* Points at the character following the integer and fractional digits. */ + const STRING_TYPE *expp; + /* Total number of digit and number of digits in integer part. */ +- int dig_no, int_no, lead_zero; ++ size_t dig_no, int_no, lead_zero; + /* Contains the last character read. */ + CHAR_TYPE c; + +@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + are all or any is really a fractional digit will be decided + later. */ + int_no = dig_no; +- lead_zero = int_no == 0 ? -1 : 0; ++ lead_zero = int_no == 0 ? (size_t) -1 : 0; + + /* Read the fractional digits. A special case are the 'american + style' numbers like `16.' i.e. with decimal point but without +@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c); + lo >= L_('a') && lo <= L_('f'); }))) + { +- if (c != L_('0') && lead_zero == -1) ++ if (c != L_('0') && lead_zero == (size_t) -1) + lead_zero = dig_no - int_no; + ++dig_no; + c = *++cp; + } + } ++ assert (dig_no <= (uintmax_t) INTMAX_MAX); + + /* Remember start of exponent (if any). */ + expp = cp; +@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + + if (c >= L_('0') && c <= L_('9')) + { +- int exp_limit; ++ intmax_t exp_limit; + + /* Get the exponent limit. */ + if (base == 16) +- exp_limit = (exp_negative ? +- -MIN_EXP + MANT_DIG + 4 * int_no : +- MAX_EXP - 4 * int_no + 4 * lead_zero + 3); ++ { ++ if (exp_negative) ++ { ++ assert (int_no <= (uintmax_t) (INTMAX_MAX ++ + MIN_EXP - MANT_DIG) / 4); ++ exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no; ++ } ++ else ++ { ++ if (int_no) ++ { ++ assert (lead_zero == 0 ++ && int_no <= (uintmax_t) INTMAX_MAX / 4); ++ exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3; ++ } ++ else if (lead_zero == (size_t) -1) ++ { ++ /* The number is zero and this limit is ++ arbitrary. */ ++ exp_limit = MAX_EXP + 3; ++ } ++ else ++ { ++ assert (lead_zero ++ <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4); ++ exp_limit = (MAX_EXP ++ + 4 * (intmax_t) lead_zero ++ + 3); ++ } ++ } ++ } + else +- exp_limit = (exp_negative ? +- -MIN_10_EXP + MANT_DIG + int_no : +- MAX_10_EXP - int_no + lead_zero + 1); ++ { ++ if (exp_negative) ++ { ++ assert (int_no ++ <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG)); ++ exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no; ++ } ++ else ++ { ++ if (int_no) ++ { ++ assert (lead_zero == 0 ++ && int_no <= (uintmax_t) INTMAX_MAX); ++ exp_limit = MAX_10_EXP - (intmax_t) int_no + 1; ++ } ++ else if (lead_zero == (size_t) -1) ++ { ++ /* The number is zero and this limit is ++ arbitrary. */ ++ exp_limit = MAX_10_EXP + 1; ++ } ++ else ++ { ++ assert (lead_zero ++ <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1)); ++ exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1; ++ } ++ } ++ } ++ ++ if (exp_limit < 0) ++ exp_limit = 0; + + do + { +- exponent *= 10; +- exponent += c - L_('0'); +- +- if (__builtin_expect (exponent > exp_limit, 0)) ++ if (__builtin_expect ((exponent > exp_limit / 10 ++ || (exponent == exp_limit / 10 ++ && c - L_('0') > exp_limit % 10)), 0)) + /* The exponent is too large/small to represent a valid + number. */ + { +@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* We have to take care for special situation: a joker + might have written "0.0e100000" which is in fact + zero. */ +- if (lead_zero == -1) ++ if (lead_zero == (size_t) -1) + result = negative ? -0.0 : 0.0; + else + { +@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* NOTREACHED */ + } + ++ exponent *= 10; ++ exponent += c - L_('0'); ++ + c = *++cp; + } + while (c >= L_('0') && c <= L_('9')); +@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + } + #endif + startp += lead_zero + decimal_len; +- exponent -= base == 16 ? 4 * lead_zero : lead_zero; ++ assert (lead_zero <= (base == 16 ++ ? (uintmax_t) INTMAX_MAX / 4 ++ : (uintmax_t) INTMAX_MAX)); ++ assert (lead_zero <= (base == 16 ++ ? ((uintmax_t) exponent ++ - (uintmax_t) INTMAX_MIN) / 4 ++ : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN))); ++ exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero; + dig_no -= lead_zero; + } + +@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + } + + /* Adjust the exponent for the bits we are shifting in. */ +- exponent += bits - 1 + (int_no - 1) * 4; ++ assert (int_no <= (uintmax_t) (exponent < 0 ++ ? (INTMAX_MAX - bits + 1) / 4 ++ : (INTMAX_MAX - exponent - bits + 1) / 4)); ++ exponent += bits - 1 + ((intmax_t) int_no - 1) * 4; + + while (--dig_no > 0 && idx >= 0) + { +@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + really integer digits or belong to the fractional part; i.e. we normalize + 123e-2 to 1.23. */ + { +- register int incr = (exponent < 0 ? MAX (-int_no, exponent) +- : MIN (dig_no - int_no, exponent)); ++ register intmax_t incr = (exponent < 0 ++ ? MAX (-(intmax_t) int_no, exponent) ++ : MIN ((intmax_t) dig_no - (intmax_t) int_no, ++ exponent)); + int_no += incr; + exponent -= incr; + } + +- if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0)) ++ if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0)) + { + __set_errno (ERANGE); + return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; +@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + digits we should have enough bits for the result. The remaining + decimal digits give us the information that more bits are following. + This can be used while rounding. (Two added as a safety margin.) */ +- if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2) ++ if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2) + { + dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2; + more_bits = 1; +@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + else + more_bits = 0; + +- neg_exp = dig_no - int_no - exponent; ++ neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent; + + /* Construct the denominator. */ + densize = 0; +diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c +new file mode 100644 +index 0000000..668d55b +--- /dev/null ++++ b/stdlib/tst-strtod-overflow.c +@@ -0,0 +1,48 @@ ++/* Test for integer/buffer overflow in strtod. ++ Copyright (C) 2012 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++#define EXPONENT "e-2147483649" ++#define SIZE 214748364 ++ ++static int ++do_test (void) ++{ ++ char *p = malloc (1 + SIZE + sizeof (EXPONENT)); ++ if (p == NULL) ++ { ++ puts ("malloc failed, cannot test for overflow"); ++ return 0; ++ } ++ p[0] = '1'; ++ memset (p + 1, '0', SIZE); ++ memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT)); ++ double d = strtod (p, NULL); ++ if (d != 0) ++ { ++ printf ("strtod returned wrong value: %a\n", d); ++ return 1; ++ } ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +-- +1.7.3.4 + diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 00702eaa6..cc4be1fea 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165332 2012-08-15 21:19:58Z andyrtr $ +# $Id: PKGBUILD 165822 2012-08-31 03:31:02Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -24,17 +24,17 @@ pkgname=('libreoffice-common' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.6.2 -pkgver=3.5.6 +_LOver=3.6.1.2 +pkgver=3.6.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.3' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" @@ -49,6 +49,7 @@ makedepends=( # makedepends _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @@ -76,12 +77,11 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - fix_broken_hebrew_wordwrapping.diff + ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz + ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + buildfix.diff libreoffice-common.sh libreoffice-common.csh) noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz @@ -92,8 +92,8 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz + 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -111,10 +111,11 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1' - 'ecf485e13adfe8d5d4428b68787d390f' - '41696d482cb90db0acb6c45acd9047ea' +md5sums=('3ddcf145b74daa4361e48dafe97e7d21' + '7966e66099729d23d9ee594f526a50ed' + '2555590c1b4395857fc5c469f7f1bd0c' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' '94e7f271e38c976462558b4278590178' @@ -141,12 +142,11 @@ md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' + '6097739c841f671cb21332b9cc593ae7' + '0d2dcdfbf28d6208751b33057f5361f0' + 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '025d9b17d9eb90dc282c5c1289a666aa' + '234e91ac65945ce1ab1e3839780e90f7' 'f0e72d0e1bc93a50a3aa9d31350b156c' '867c682b45f477f916786e00c45d7ab7') @@ -169,17 +169,8 @@ build() { ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e - patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - + patch -Np1 -i ${srcdir}/buildfix.diff + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -191,12 +182,12 @@ build() { # python2 fix export PYTHON=python2 -# autoconf -f + #autoconf -f # non-SMP test build -# export MAKEFLAGS="-j1" + #export MAKEFLAGS="-j1" #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ @@ -230,12 +221,14 @@ build() { --without-afms\ --without-ppds\ --without-system-libwps\ + --without-system-libcdr \ --without-system-mdds\ --without-myspell-dicts \ --without-system-libvisio \ --without-system-libcmis \ - --without-system-sampleicc \ --without-system-libexttextcat \ + --without-system-jfreereport \ + --without-system-apache-commons \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -250,7 +243,7 @@ build() { --disable-mozilla \ --without-system-mozilla \ --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ + --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ --with-system-cairo\ --with-system-libs\ @@ -258,9 +251,8 @@ build() { --with-system-headers\ --with-system-hsqldb \ --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-system-clucene\ + --without-system-servlet-api \ --with-java-target-version=1.5 \ $EXTRAOPTS @@ -299,10 +291,11 @@ 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' - 'lucene: full-text search engine library for Java needed in the help section' + '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') + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) @@ -342,6 +335,11 @@ package_libreoffice-common() { install -dm755 ${pkgdir}/usr/share/bash-completion/completions mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb } package_libreoffice-base() { @@ -382,7 +380,7 @@ package_libreoffice-postgresql-connector() { install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry -# # create directories from *list.txt file + # create directories from *list.txt file # for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do # install -dm755 ${pkgdir}/${directory/\%dir/} # done @@ -629,7 +627,7 @@ package_libreoffice-extension-pdfimport() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport } package_libreoffice-extension-presenter-screen() { @@ -681,8 +679,8 @@ package_libreoffice-scripting-javascript() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ } package_libreoffice-extension-scripting-python() { diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD index 5f53b5efa..44e679f75 100644 --- a/testing/mpfr/PKGBUILD +++ b/testing/mpfr/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 162956 2012-07-04 03:39:00Z allan $ +# $Id: PKGBUILD 165793 2012-08-30 12:11:01Z allan $ # Maintainer: Allan McRae # Contributor: damir 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/testing/mpfr/mpfr-3.1.1-p2.patch b/testing/mpfr/mpfr-3.1.1-p2.patch new file mode 100644 index 000000000..43dfcbfe3 --- /dev/null +++ b/testing/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 /* 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/testing/perl-sdl/PKGBUILD b/testing/perl-sdl/PKGBUILD new file mode 100644 index 000000000..682be8a60 --- /dev/null +++ b/testing/perl-sdl/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 165797 2012-08-30 16:55:08Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae +# Contributor: Sarah Hay + +pkgname=perl-sdl +pkgver=2.540 +pkgrel=2 +pkgdesc="Simple DirectMedia Layer for Perl" +arch=(i686 x86_64) +license=(LGPL) +url="http://sdl.perl.org" +depends=(perl-alien-sdl perl-tie-simple + sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg) +makedepends=('perl-module-build>=0.40') +options=('!emptydirs') +replaces=(sdl_perl) +conflicts=(sdl_perl) +provides=("sdl_perl=$pkgver") +# http://search.cpan.org/dist/SDL/ +_author=JTPALMER +source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz) +md5sums=('1a5d7849cbdfde4982b28458e38ab172') + +build() { + cd SDL-$pkgver + # Perl selects the proper CFLAGS set for binary modules + unset CFLAGS + # install module in vendor directories + perl Build.PL installdirs=vendor + perl Build +} + +check() { + cd SDL-$pkgver + perl Build test || true +} + +package() { + cd SDL-$pkgver + perl Build install destdir="$pkgdir" +} diff --git a/testing/ppp/PKGBUILD b/testing/ppp/PKGBUILD new file mode 100644 index 000000000..d91c4a825 --- /dev/null +++ b/testing/ppp/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 165805 2012-08-30 17:53:10Z thomas $ +# Maintainer: Thomas Baechler +pkgname=ppp +pkgver=2.4.5 +pkgrel=4 +pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" +arch=(i686 x86_64) +url="http://www.samba.org/ppp/" +license=('custom:GPL/BSD') +groups=('base') +depends=('glibc' 'libpcap>=1.0.0') +backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down}) +source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz + options + pon + poff + ppp + plog + pon.1 + ip-up + ip-down + ip-up.d.dns.sh + ip-down.d.dns.sh + ppp.systemd) +md5sums=('4621bc56167b6953ec4071043fe0ec57' + '7a9259a8f038073eeea7e4552ff1849f' + '48c024f73a80c8b69c4def22f86902cc' + '2d811f8470ccdea3b8c4505a438483e9' + '7561c73b557292d5ba1a9c5dbd270fde' + '86cdaf133f7a79fb464f02d83afc7734' + '44cc662ba9aa61dd9add3ddd4c5ded57' + 'e4beb16ed600b61336d50b2bd2df7cd5' + '2fa0671f40711e69194ccf60979f8b33' + '4a074d74c29625b254a1db720cb87b99' + '8d1be5af8e46393ba6eb273377831e38' + 'fafead5c9d66d0574e6f0a2e5f4d4631') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix CFLAGS + # -D_GNU_SOURCE is needed for IPv6 to work apparently + export CFLAGS="$CFLAGS -D_GNU_SOURCE" + sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux + sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux + sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux + sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux + sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux + + # enable active filter + sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux + # enable ipv6 support + sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux + # Enable Microsoft proprietary Callback Control Protocol + sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux + + # Fix build error with recent kernels + rm include/linux/if_pppol2tp.h + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/usr" install + install -D -m644 ../options "${pkgdir}/etc/ppp/options" + install -D -m755 ../ip-up "${pkgdir}/etc/ppp/ip-up" + install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down" + install -d -m755 "${pkgdir}/etc/ppp/ip-up.d" + install -d -m755 "${pkgdir}/etc/ppp/ip-down.d" + install -m755 ../ip-up.d.dns.sh "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh" + install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh" + install -D -m755 ../pon "${pkgdir}/usr/bin/pon" + install -D -m755 ../poff "${pkgdir}/usr/bin/poff" + install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" + install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" + install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" + install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp" + install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" + install -d -m755 "${pkgdir}/etc/ppp/peers" + chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so + install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service +} diff --git a/testing/ppp/ip-down b/testing/ppp/ip-down new file mode 100644 index 000000000..301f3ab9b --- /dev/null +++ b/testing/ppp/ip-down @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd after the connection has ended. +# + +# Execute all scripts in /etc/ppp/ip-up.d/ +for ipdown in /etc/ppp/ip-down.d/*.sh; do + if [ -x $ipdown ]; then + # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam + $ipdown "$@" + fi +done diff --git a/testing/ppp/ip-down.d.dns.sh b/testing/ppp/ip-down.d.dns.sh new file mode 100644 index 000000000..9e19f7d1b --- /dev/null +++ b/testing/ppp/ip-down.d.dns.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf diff --git a/testing/ppp/ip-up b/testing/ppp/ip-up new file mode 100644 index 000000000..20473d73a --- /dev/null +++ b/testing/ppp/ip-up @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd when there's a successful ppp connection. +# + +# Execute all scripts in /etc/ppp/ip-up.d/ +for ipup in /etc/ppp/ip-up.d/*.sh; do + if [ -x $ipup ]; then + # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam + $ipup "$@" + fi +done diff --git a/testing/ppp/ip-up.d.dns.sh b/testing/ppp/ip-up.d.dns.sh new file mode 100644 index 000000000..f9df543a4 --- /dev/null +++ b/testing/ppp/ip-up.d.dns.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then + [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} + mv /etc/ppp/resolv.conf /etc/resolv.conf + chmod 644 /etc/resolv.conf +fi diff --git a/testing/ppp/options b/testing/ppp/options new file mode 100644 index 000000000..63691842c --- /dev/null +++ b/testing/ppp/options @@ -0,0 +1,352 @@ +# /etc/ppp/options +# +# Originally created by Jim Knoble +# Modified for Debian by alvar Bray +# Modified for PPP Server setup by Christoph Lameter +# Modified for ArchLinux by Manolis Tzanidakis +# +# To quickly see what options are active in this file, use this command: +# egrep -v '#|^ *$' /etc/ppp/options + +# Specify which DNS Servers the incoming Win95 or WinNT Connection should use +# Two Servers can be remotely configured +# ms-dns 192.168.1.1 +# ms-dns 192.168.1.2 + +# Specify which WINS Servers the incoming connection Win95 or WinNT should use +# ms-wins 192.168.1.50 +# ms-wins 192.168.1.51 + +# Run the executable or shell command specified after pppd has +# terminated the link. This script could, for example, issue commands +# to the modem to cause it to hang up if hardware modem control signals +# were not available. +#disconnect "chat -- \d+++\d\c OK ath0 OK" + +# async character map -- 32-bit hex; each bit is a character +# that needs to be escaped for pppd to receive it. 0x00000001 +# represents '\x01', and 0x80000000 represents '\x1f'. +asyncmap 0 + +# Require the peer to authenticate itself before allowing network +# packets to be sent or received. +# Please do not disable this setting. It is expected to be standard in +# future releases of pppd. Use the call option (see manpage) to disable +# authentication for specific peers. +auth + +# Use hardware flow control (i.e. RTS/CTS) to control the flow of data +# on the serial port. +crtscts + +# Use software flow control (i.e. XON/XOFF) to control the flow of data +# on the serial port. +#xonxoff + +# Specifies that certain characters should be escaped on transmission +# (regardless of whether the peer requests them to be escaped with its +# async control character map). The characters to be escaped are +# specified as a list of hex numbers separated by commas. Note that +# almost any character can be specified for the escape option, unlike +# the asyncmap option which only allows control characters to be +# specified. The characters which may not be escaped are those with hex +# values 0x20 - 0x3f or 0x5e. +#escape 11,13,ff + +# Don't use the modem control lines. +#local + +# Specifies that pppd should use a UUCP-style lock on the serial device +# to ensure exclusive access to the device. +lock + +# Don't show the passwords when logging the contents of PAP packets. +# This is the default. +hide-password + +# When logging the contents of PAP packets, this option causes pppd to +# show the password string in the log message. +#show-password + +# Use the modem control lines. On Ultrix, this option implies hardware +# flow control, as for the crtscts option. (This option is not fully +# implemented.) +modem + +# Set the MRU [Maximum Receive Unit] value to for negotiation. pppd +# will ask the peer to send packets of no more than bytes. The +# minimum MRU value is 128. The default MRU value is 1500. A value of +# 296 is recommended for slow links (40 bytes for TCP/IP header + 256 +# bytes of data). +#mru 542 + +# Set the interface netmask to , a 32 bit netmask in "decimal dot" +# notation (e.g. 255.255.255.0). +#netmask 255.255.255.0 + +# Disables the default behaviour when no local IP address is specified, +# which is to determine (if possible) the local IP address from the +# hostname. With this option, the peer will have to supply the local IP +# address during IPCP negotiation (unless it specified explicitly on the +# command line or in an options file). +#noipdefault + +# Enables the "passive" option in the LCP. With this option, pppd will +# attempt to initiate a connection; if no reply is received from the +# peer, pppd will then just wait passively for a valid LCP packet from +# the peer (instead of exiting, as it does without this option). +#passive + +# With this option, pppd will not transmit LCP packets to initiate a +# connection until a valid LCP packet is received from the peer (as for +# the "passive" option with old versions of pppd). +#silent + +# Don't request or allow negotiation of any options for LCP and IPCP +# (use default values). +#-all + +# Disable Address/Control compression negotiation (use default, i.e. +# address/control field disabled). +#-ac + +# Disable asyncmap negotiation (use the default asyncmap, i.e. escape +# all control characters). +#-am + +# Don't fork to become a background process (otherwise pppd will do so +# if a serial device is specified). +#-detach + +# Disable IP address negotiation (with this option, the remote IP +# address must be specified with an option on the command line or in +# an options file). +#-ip + +# Disable IPCP negotiation and IP communication. This option should +# only be required if the peer is buggy and gets confused by requests +# from pppd for IPCP negotiation. +#noip + +# Disable magic number negotiation. With this option, pppd cannot +# detect a looped-back line. +#-mn + +# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e. +# 1500). +#-mru + +# Disable protocol field compression negotiation (use default, i.e. +# protocol field compression disabled). +#-pc + +# Require the peer to authenticate itself using PAP. +#+pap + +# Don't agree to authenticate using PAP. +#-pap + +# Require the peer to authenticate itself using CHAP [Cryptographic +# Handshake Authentication Protocol] authentication. +#+chap + +# Don't agree to authenticate using CHAP. +#-chap + +# Disable negotiation of Van Jacobson style IP header compression (use +# default, i.e. no compression). +#-vj + +# Increase debugging level (same as -d). If this option is given, pppd +# will log the contents of all control packets sent or received in a +# readable form. The packets are logged through syslog with facility +# daemon and level debug. This information can be directed to a file by +# setting up /etc/syslog.conf appropriately (see syslog.conf(5)). (If +# pppd is compiled with extra debugging enabled, it will log messages +# using facility local2 instead of daemon). +#debug + +# Append the domain name to the local host name for authentication +# purposes. For example, if gethostname() returns the name porsche, +# but the fully qualified domain name is porsche.Quotron.COM, you would +# use the domain option to set the domain name to Quotron.COM. +#domain + +# Enable debugging code in the kernel-level PPP driver. The argument n +# is a number which is the sum of the following values: 1 to enable +# general debug messages, 2 to request that the contents of received +# packets be printed, and 4 to request that the contents of transmitted +# packets be printed. +#kdebug n + +# Set the MTU [Maximum Transmit Unit] value to . Unless the peer +# requests a smaller value via MRU negotiation, pppd will request that +# the kernel networking code send data packets of no more than n bytes +# through the PPP network interface. +#mtu + +# Set the name of the local system for authentication purposes to . +# This is a privileged option. With this option, pppd will use lines in the +# secrets files which have as the second field when looking for a +# secret to use in authenticating the peer. In addition, unless overridden +# with the user option, will be used as the name to send to the peer +# when authenticating the local system to the peer. (Note that pppd does +# not append the domain name to .) +#name + +# Enforce the use of the hostname as the name of the local system for +# authentication purposes (overrides the name option). +#usehostname + +# Set the assumed name of the remote system for authentication purposes +# to . +#remotename + +# Add an entry to this system's ARP [Address Resolution Protocol] +# table with the IP address of the peer and the Ethernet address of this +# system. +proxyarp + +# Use the system password database for authenticating the peer using +# PAP. Note: mgetty already provides this option. If this is specified +# then dialin from users using a script under Linux to fire up ppp wont work. +# login + +# If this option is given, pppd will send an LCP echo-request frame to the +# peer every n seconds. Normally the peer should respond to the echo-request +# by sending an echo-reply. This option can be used with the +# lcp-echo-failure option to detect that the peer is no longer connected. +lcp-echo-interval 30 + +# If this option is given, pppd will presume the peer to be dead if n +# LCP echo-requests are sent without receiving a valid LCP echo-reply. +# If this happens, pppd will terminate the connection. Use of this +# option requires a non-zero value for the lcp-echo-interval parameter. +# This option can be used to enable pppd to terminate after the physical +# connection has been broken (e.g., the modem has hung up) in +# situations where no hardware modem control lines are available. +lcp-echo-failure 4 + +# Set the LCP restart interval (retransmission timeout) to seconds +# (default 3). +#lcp-restart + +# Set the maximum number of LCP terminate-request transmissions to +# (default 3). +#lcp-max-terminate + +# Set the maximum number of LCP configure-request transmissions to +# (default 10). +#lcp-max-configure + +# Set the maximum number of LCP configure-NAKs returned before starting +# to send configure-Rejects instead to (default 10). +#lcp-max-failure + +# Set the IPCP restart interval (retransmission timeout) to +# seconds (default 3). +#ipcp-restart + +# Set the maximum number of IPCP terminate-request transmissions to +# (default 3). +#ipcp-max-terminate + +# Set the maximum number of IPCP configure-request transmissions to +# (default 10). +#ipcp-max-configure + +# Set the maximum number of IPCP configure-NAKs returned before starting +# to send configure-Rejects instead to (default 10). +#ipcp-max-failure + +# Set the PAP restart interval (retransmission timeout) to seconds +# (default 3). +#pap-restart + +# Set the maximum number of PAP authenticate-request transmissions to +# (default 10). +#pap-max-authreq + +# Set the maximum time that pppd will wait for the peer to authenticate +# itself with PAP to seconds (0 means no limit). +#pap-timeout + +# Set the CHAP restart interval (retransmission timeout for +# challenges) to seconds (default 3). +#chap-restart + +# Set the maximum number of CHAP challenge transmissions to +# (default 10). +#chap-max-challenge + +# If this option is given, pppd will rechallenge the peer every +# seconds. +#chap-interval + +# With this option, pppd will accept the peer's idea of our local IP +# address, even if the local IP address was specified in an option. +#ipcp-accept-local + +# With this option, pppd will accept the peer's idea of its (remote) IP +# address, even if the remote IP address was specified in an option. +#ipcp-accept-remote + +# Disable the IPXCP and IPX protocols. +# To let pppd pass IPX packets comment this out --- you'll probably also +# want to install ipxripd, and have the Internal IPX Network option enabled +# in your kernel. /usr/doc/HOWTO/IPX-HOWTO.gz contains more info. +noipx + +# Exit once a connection has been made and terminated. This is the default, +# unless the `persist' or `demand' option has been specified. +#nopersist + +# Do not exit after a connection is terminated; instead try to reopen +# the connection. +#persist + +# Terminate after n consecutive failed connection attempts. +# A value of 0 means no limit. The default value is 10. +#maxfail + +# Initiate the link only on demand, i.e. when data traffic is present. +# With this option, the remote IP address must be specified by the user on +# the command line or in an options file. Pppd will initially configure +# the interface and enable it for IP traffic without connecting to the peer. +# When traffic is available, pppd will connect to the peer and perform +# negotiation, authentication, etc. When this is completed, pppd will +# commence passing data packets (i.e., IP packets) across the link. +#demand + +# Specifies that pppd should disconnect if the link is idle for seconds. +# The link is idle when no data packets (i.e. IP packets) are being sent or +# received. Note: it is not advisable to use this option with the persist +# option without the demand option. If the active-filter option is given, +# data packets which are rejected by the specified activity filter also +# count as the link being idle. +#idle + +# Specifies how many seconds to wait before re-initiating the link after +# it terminates. This option only has any effect if the persist or demand +# option is used. The holdoff period is not applied if the link was +# terminated because it was idle. +#holdoff + +# Wait for up n milliseconds after the connect script finishes for a valid +# PPP packet from the peer. At the end of this time, or when a valid PPP +# packet is received from the peer, pppd will commence negotiation by +# sending its first LCP packet. The default value is 1000 (1 second). +# This wait period only applies if the connect or pty option is used. +#connect-delay + +# Packet filtering: for more information, see pppd(8) +# Any packets matching the filter expression will be interpreted as link +# activity, and will cause a "demand" connection to be activated, and reset +# the idle connection timer. (idle option) +# The filter expression is akin to that of tcpdump(1) +#active-filter + +# uncomment the line below this if you use PPPoE +#plugin /usr/lib/pppd/plugins/pppoe.so + +# ------ diff --git a/testing/ppp/plog b/testing/ppp/plog new file mode 100644 index 000000000..84d2c7340 --- /dev/null +++ b/testing/ppp/plog @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -s /var/log/ppp.log ]; then + exec tail "$@" /var/log/ppp.log +else + exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' +fi diff --git a/testing/ppp/poff b/testing/ppp/poff new file mode 100644 index 000000000..8b4dffc59 --- /dev/null +++ b/testing/ppp/poff @@ -0,0 +1,103 @@ +#!/bin/sh + +# Written by John Hasler and based on work +# by Phil Hands . Distributed under the GNU GPL + +if [ -x /usr/bin/kill ]; then + KILL="/usr/bin/kill" +else + KILL="/bin/kill" +fi +SIG=TERM +DONE="stopped" +MODE="" + +usage () +{ + cat < pon.txt +.\" +.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" +.SH NAME +pon, poff, plog \- starts up, shuts down or lists the log of PPP connections +.SH SYNOPSIS +.B pon +[ isp-name [ options ] ] +.br +.B poff +[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ] +.br +.B plog +[ arguments ] +.SH DESCRIPTION +This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP +scripts, which allow users to control PPP connections. +.. +.SS pon +\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP +file, if it exists and is executable. Otherwise, a PPP connection will be +started using configuration from \fI/etc/ppp/peers/provider\fP. +This is the default behaviour unless an \fBisp-name\fP argument is given. +.PP +For instance, to use ISP configuration "myisp" run: +.IP +pon myisp +.PP +\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. +You can pass additional \fBoptions\fP after the ISP name, too. +\fBpon\fP can be used to run multiple, simultaneous PPP connections. +.. +.SS poff +\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, +the one named in the argument to \fBpoff\fP will be killed, e.g. +.IP +poff myprovider2 +.PP +will terminate the connection to myprovider2, and leave the PPP connections +to e.g. "myprovider1" or "myprovider3" up and running. +.PP +\fBpoff\fP takes the following command line options: +.RS +.TP +.B "\-r" +causes the connection to be redialed after it is dropped. +.TP +.B "\-d" +toggles the state of pppd's debug option. +.TP +.B "\-c" +causes +.BR pppd (8) +to renegotiate compression. +.TP +.B "\-a" +stops all running ppp connections. If the argument \fBisp-name\fP +is given it will be ignored. +.TP +.B "\-h" +displays help information. +.TP +.B "\-v" +prints the version and exits. +.PP +If no argument is given, \fBpoff\fP will stop or signal pppd if and only +if there is exactly one running. If more than one connection is active, +it will exit with an error code of 1. +.. +.SS plog +\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that +file doesn't exist, it shows you the last few lines of your +\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. +This script makes use of the +.BR tail (1) +command, so arguments that can be passed to +.BR tail (1) +can also be passed to \fBplog\fP. +.PP +Note: the \fBplog\fP script can only be used by root or another system +administrator in group "adm", due to security reasons. Also, to have all +pppd-generated information in one logfile, that plog can show, you need the +following line in your \fI/etc/syslog.conf\fP file: +.PP +local2.* -/var/log/ppp.log +.RE +.SH FILES +.TP +.I /etc/ppp/options +PPPd system options file. +.TP +.I /etc/ppp/pap-secrets +System PAP passwords file. +.TP +.I /etc/ppp/chap-secrets +System CHAP passwords file. +.TP +.I /etc/ppp/peers/ +Directory holding the peer options files. The default file is called +\fIprovider\fP. +.TP +.I /etc/chatscripts/provider +The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. +.TP +.I /var/log/ppp.log +The default PPP log file. +.SH AUTHORS +The p-commands were written by Christoph Lameter . +Updated and revised by Philip Hands . +.br +This manual was written by Othmar Pasteka . Modified +by Rob Levin , with some extensions taken from +the old p-commands manual written by John Hasler . +.SH "SEE ALSO" +.BR pppd (8), +.BR chat (8), +.BR tail (1). + diff --git a/testing/ppp/ppp b/testing/ppp/ppp new file mode 100644 index 000000000..16e01bad7 --- /dev/null +++ b/testing/ppp/ppp @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/pppd` +case "$1" in + start) + stat_busy "Starting PPP daemon" + [ -z "$PID" ] && /usr/bin/pon + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ppp + stat_done + fi + ;; + stop) + stat_busy "Stopping PPP daemon" + [ ! -z "$PID" ] && poff -a &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ppp + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/ppp/ppp.systemd b/testing/ppp/ppp.systemd new file mode 100644 index 000000000..a5c490a73 --- /dev/null +++ b/testing/ppp/ppp.systemd @@ -0,0 +1,9 @@ +[Unit] +Description=PPP link to %I +Before=network.target + +[Service] +ExecStart=/usr/sbin/pppd call %I nodetach + +[Install] +WantedBy=multi-user.target diff --git a/testing/sdl_gfx/PKGBUILD b/testing/sdl_gfx/PKGBUILD new file mode 100644 index 000000000..3a6b7c442 --- /dev/null +++ b/testing/sdl_gfx/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 165798 2012-08-30 16:55:11Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae +# Contributor: Tom Newsom + +pkgname=sdl_gfx +pkgver=2.0.24 +pkgrel=1 +pkgdesc="SDL Graphic Primitives" +arch=('i686' 'x86_64') +license=('LGPL') +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=('838514185ff9a3b6377760aaa52fef8a') + +build() { + cd SDL_gfx-${pkgver} + + if [ "${CARCH}" == "x86_64" ]; then + ./configure --prefix=/usr --disable-mmx + else + ./configure --prefix=/usr + fi + + make +} + +package() { + cd SDL_gfx-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index aff028c9e..29479db75 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/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/testing/sysvinit/PKGBUILD b/testing/sysvinit/PKGBUILD index 5c5abe74d..254c7cae0 100644 --- a/testing/sysvinit/PKGBUILD +++ b/testing/sysvinit/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 162300 2012-06-24 19:35:10Z bluewind $ +# $Id: PKGBUILD 165813 2012-08-30 20:27:27Z tomegun $ # Maintainer: Eric Belanger -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/testing/yp-tools/PKGBUILD b/testing/yp-tools/PKGBUILD index c4214a550..0e9a14891 100644 --- a/testing/yp-tools/PKGBUILD +++ b/testing/yp-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161940 2012-06-16 17:17:17Z dreisner $ +# $Id: PKGBUILD 165811 2012-08-30 19:22:40Z tomegun $ # Mantainer: Tom Gundersen # Contributor: Gaetan Bisson # Contributor: dorphell @@ -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') -- cgit v1.2.3-54-g00ecf From 8b7b4f2e5a808cb0c1226c23469fa57751eba190 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Sep 2012 00:04:04 +0000 Subject: Tue Sep 4 00:04:04 UTC 2012 --- artistic/gimp-art/PKGBUILD | 98 ++++ artistic/gimp-art/gimp-splash-artwork.license | 13 + artistic/gimp-art/gimp-splash-artwork.png | Bin 0 -> 375245 bytes artistic/gimp-art/gimp.install | 12 + community/apcupsd/PKGBUILD | 46 +- community/apcupsd/apcupsd | 2 - community/apcupsd/apcupsd-tmpfiles.conf | 2 + community/freedroidrpg/PKGBUILD | 4 +- community/lazarus/PKGBUILD | 22 +- community/libvirt/PKGBUILD | 19 +- community/lincity-ng/PKGBUILD | 16 +- community/mlt/PKGBUILD | 10 +- community/mythtv/PKGBUILD | 6 +- community/mythtv/mythbackend.service | 4 +- community/pcsclite/PKGBUILD | 8 +- community/pkgfile/PKGBUILD | 6 +- community/pkgfile/pkgfile.install | 2 +- community/python2-netifaces/PKGBUILD | 24 + community/python2-pymongo/PKGBUILD | 9 +- community/schroot/PKGBUILD | 15 +- community/spring/PKGBUILD | 8 +- community/tmw/PKGBUILD | 19 +- community/vdrift/PKGBUILD | 36 +- community/warmux/PKGBUILD | 8 +- community/warmux/gcc-fix.patch | 11 + community/widelands/PKGBUILD | 4 +- community/wt/PKGBUILD | 12 +- core/libedit/PKGBUILD | 6 +- core/libevent/PKGBUILD | 8 +- core/mpfr/PKGBUILD | 13 +- core/mpfr/mpfr-3.1.1-p2.patch | 405 +++++++++++++++ core/openssh/PKGBUILD | 23 +- core/openssh/sshd | 1 - core/openssh/sshd.service | 7 +- core/systemd/PKGBUILD | 3 +- core/sysvinit/PKGBUILD | 44 +- extra/digikam/PKGBUILD | 6 +- extra/gtkmm3/PKGBUILD | 8 +- extra/help2man/PKGBUILD | 6 +- extra/java7-openjdk/PKGBUILD | 50 +- extra/libwebkit/PKGBUILD | 6 +- extra/live-media/PKGBUILD | 6 +- extra/openjdk6/PKGBUILD | 12 +- extra/openjdk6/disable_Werror.diff | 11 + extra/perl-alien-sdl/PKGBUILD | 9 +- extra/perl-sdl/PKGBUILD | 4 +- extra/sdl_gfx/PKGBUILD | 13 +- extra/spamassassin/PKGBUILD | 13 +- extra/spamassassin/spamassassin.install | 16 +- extra/spamassassin/spamassassin.service | 14 + extra/xf86-video-intel/PKGBUILD | 6 +- extra/yp-tools/PKGBUILD | 6 +- libre/iceape-libre/PKGBUILD | 8 +- libre/iceweasel-i18n/PKGBUILD | 182 +++---- libre/sdl-libre/PKGBUILD | 33 +- libre/sdl-libre/fix_joystick_misc_axes.diff | 13 + libre/sdl-libre/libre.patch | 578 +++++++++++++++++++++ multilib/chuck/PKGBUILD | 59 ++- multilib/lib32-gdk-pixbuf2/PKGBUILD | 6 +- multilib/lib32-libdrm/PKGBUILD | 8 +- multilib/lib32-libdrm/no-pthread-stubs.patch | 2 +- multilib/wine/PKGBUILD | 7 +- testing/fetchmail/PKGBUILD | 42 ++ testing/fetchmail/fetchmail.conf | 5 + testing/fetchmail/fetchmail.install | 26 + testing/fetchmail/fetchmail.rc | 38 ++ testing/fetchmail/fetchmail.service | 12 + testing/fetchmail/fetchmail.tmpfiles | 1 + testing/inetutils/PKGBUILD | 6 +- testing/inetutils/ftpd.service | 1 + testing/libreoffice/PKGBUILD | 9 +- testing/libwps/PKGBUILD | 30 ++ testing/modemmanager/PKGBUILD | 10 +- testing/qpdf/PKGBUILD | 39 ++ ...-signal-when-built-with-systemd-and-using.patch | 35 ++ testing/upower/PKGBUILD | 13 +- 76 files changed, 1849 insertions(+), 426 deletions(-) create mode 100644 artistic/gimp-art/PKGBUILD create mode 100644 artistic/gimp-art/gimp-splash-artwork.license create mode 100644 artistic/gimp-art/gimp-splash-artwork.png create mode 100644 artistic/gimp-art/gimp.install create mode 100644 community/apcupsd/apcupsd-tmpfiles.conf create mode 100644 community/python2-netifaces/PKGBUILD create mode 100644 core/mpfr/mpfr-3.1.1-p2.patch create mode 100644 extra/openjdk6/disable_Werror.diff create mode 100644 extra/spamassassin/spamassassin.service create mode 100644 libre/sdl-libre/fix_joystick_misc_axes.diff create mode 100644 libre/sdl-libre/libre.patch create mode 100644 testing/fetchmail/PKGBUILD create mode 100644 testing/fetchmail/fetchmail.conf create mode 100644 testing/fetchmail/fetchmail.install create mode 100644 testing/fetchmail/fetchmail.rc create mode 100644 testing/fetchmail/fetchmail.service create mode 100644 testing/fetchmail/fetchmail.tmpfiles create mode 100644 testing/libwps/PKGBUILD create mode 100644 testing/qpdf/PKGBUILD create mode 100644 testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch (limited to 'community/schroot/PKGBUILD') 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 + +_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 and Márcio Silva +Idea by André Silva + +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 new file mode 100644 index 000000000..76c9e8c94 Binary files /dev/null and b/artistic/gimp-art/gimp-splash-artwork.png differ 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 # Maintainer: Todd Musall +# Maintainer: Massimiliano Torromeo 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 # Contributor: nut543 @@ -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 # Contributor: Jens Adam (byte/jra) # Contributor: BlackIkeEagle 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 # Contributor: Jonathan Wiersma 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 -# Contributor: tranquility +# $Id: PKGBUILD 75818 2012-09-01 20:39:35Z heftig $ +# Maintainer: Eric Bélanger 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 # Contributor: Fabian Schoelzel # Contributor: funkyou @@ -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 # Contributor: Giovanni Scafora # Contributor: Juergen Hoetzel @@ -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 # Contributor: Daniel Plaza 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 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 +# Contributor: Gergely Imreh +# Contributor: Ghost of Kendo + +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 +# Maintainer: Jelle va nder Waa # Contributor: Piotr Husiatyński # Contributor: lp76 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 # Contributor: Andreas Wagner 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 # Contributor: Arkham # Contributor: Christoph Zeiler 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 # Maintainer: Mateusz Herych 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 # Contributor: Anton Bazhenov # 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 # Contributor: pukyxd # Maintainer: Daenyth 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 + +--- 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 ++#include + #include + #include + #include 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 # Contributor: Arkham # Contributor: Christoph Zeiler @@ -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 # Maintainer: Sven-Hendrik Haase # Contributor: Denis Martinez 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 # Maintainer: Vesa Kaihlavirta # Contributor: Roman Cheplyaka 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 # Contributor: Judd 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 # Contributor: damir 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 /* 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 # Contributor: Aaron Griffin # Contributor: judd 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 -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 # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski 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 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 # Contributor: Paul Mattal 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 # Contributor: Jan de Groot -# Contributor: Guillaume ALAUX +# Maintainer: Guillaume ALAUX 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 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 # Contributor: Gilles CHAUVIN 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 # Contributor: Jan de Groot 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) # Contributor: Allan McRae # Contributor: Sarah Hay @@ -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) # Contributor: Allan McRae # Contributor: Sarah Hay 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 +# $Id: PKGBUILD 165865 2012-09-01 20:41:32Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: Tom Newsom 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 +# $Id: PKGBUILD 165860 2012-09-01 18:36:23Z bluewind $ +# Maintainer: Florian Pritz +# Contributor: Dale Blount # 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 # Maintainer: Jan de Groot 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 # Contributor: Gaetan Bisson # Contributor: dorphell @@ -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 -# Maintainer : André Silva +# Maintainer : André Silva # 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 +# $Id: PKGBUILD 165847 2012-09-01 12:22:15Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: dorphell -# Maintainer (Connochaetos): Henry Jensen # Maintainer (Parabola): André Silva # Maintainer (Parabola): Márcio Silva +# Maintainer (Connochaetos): Henry Jensen 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; iFifoFree >> 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 +# $Id: PKGBUILD 75783 2012-08-31 07:48:07Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Laurent Carlier +# Contributor: Brad Fanella # Contributor: SpepS # Contributor: Jeff Mickey # Contributor: tardo 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 _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 # Contributor: Jan de Groot _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 # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero # Contributor: Giovanni Scafora 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 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 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 +# Contributor: Robert McCathie + +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 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 +# Contributor: Miguel Revilla +# Contributor: David Sotelo +# Contributor: Nuno Araujo + +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)" +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) +--- + 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 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 \ -- cgit v1.2.3-54-g00ecf