diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
| commit | cebf33d7109e0157a80f34d6136e212f0a28d274 (patch) | |
| tree | a6464302c970f72581105b50ff0896e1f56def3d | |
| parent | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (diff) | |
| parent | 5cb95ceee39e4691f768ea2fef60b8a106e92209 (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
1487 files changed, 14290 insertions, 19067 deletions
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 6b4ab3159..0b3ff7969 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 86363 2013-03-15 22:40:51Z seblu $ +# $Id: PKGBUILD 91937 2013-05-29 23:05:51Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.18 -pkgrel=2 +pkgver=2.0.19 +pkgrel=1 pkgdesc='A daemon for delivering ACPI power management events with netlink support' -arch=('i686' 'x86_64' 'mips64el') -url='http://tedfelix.com/linux/acpid-netlink.html' +arch=('i686' 'x86_64') +url='http://sourceforge.net/projects/acpid2/' license=('GPL') depends=('bash') optdepends=('perl: use perl based examples') @@ -20,15 +20,15 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta 'acpid.service' 'anything' 'handler.sh') -md5sums=('7c4ff315ae960c54eea303c71c49f152' +md5sums=('0b07a982e3e28cf37645f2c6269af72e' 'd11700eb136e0489835ddaf977a7905b' - '10290f69491206cd104654e5b900b661' + '79cc7a9dceacdeffd51f070c2ba5f023' '2d37b98d6e74bab815604b8b48c6cfd4' '47f44ff5f02685dce8bcdab8568f0c38') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -46,7 +46,7 @@ package() { install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service" # fix acpid rights - chmod 755 "$pkgdir/usr/sbin/acpid" + chmod 755 "$pkgdir/usr/bin/acpid" } # vim:set ts=2 sw=2 et: diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service index e4ddacdbe..022f72a71 100644 --- a/community/acpid/acpid.service +++ b/community/acpid/acpid.service @@ -3,7 +3,7 @@ Description=ACPI event daemon Requires=acpid.socket [Service] -ExecStart=/usr/sbin/acpid -f +ExecStart=/usr/bin/acpid -f [Install] WantedBy=multi-user.target diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD index 17692b130..5b24b552b 100644 --- a/community/aircrack-ng/PKGBUILD +++ b/community/aircrack-ng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64237 2012-02-11 00:32:23Z arodseth $ +# $Id: PKGBUILD 92023 2013-05-30 23:34:33Z seblu $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,30 +7,30 @@ pkgbase=aircrack-ng pkgname=(aircrack-ng aircrack-ng-scripts) pkgver=1.1 -pkgrel=8.1 +pkgrel=9 arch=('i686' 'x86_64' 'mips64el') url="http://www.aircrack-ng.org" license=('GPL2') source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz") md5sums=('f7a24ed8fad122c4187d06bfd6f998b4') -depends=('openssl' 'sqlite3' 'iw' 'net-tools') +depends=('openssl' 'sqlite' 'iw' 'net-tools') build() { - cd ${srcdir}/${pkgbase}-${pkgver} - make SQLITE=true unstable=true + cd ${srcdir}/${pkgbase}-${pkgver} + make SQLITE=true unstable=true } package_aircrack-ng() { pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols" - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} SQLITE=true unstable=true bindir=/usr/bin \ - mandir=/usr/share/man/man1 sbindir=/usr/sbin install + mandir=/usr/share/man/man1 sbindir=/usr/bin install ### Remove installed scripts/corresponding man pages (installed in aircrack-ng-scripts) ### # Scripts - rm ${pkgdir}/usr/sbin/airdriver-ng - rm ${pkgdir}/usr/sbin/airodump-ng-oui-update + rm ${pkgdir}/usr/bin/airdriver-ng + rm ${pkgdir}/usr/bin/airodump-ng-oui-update # Man pages mkdir -p ${srcdir}/tmp/ mv ${pkgdir}/usr/share/man/man1/airdriver-ng.1 ${srcdir}/tmp/ @@ -38,15 +38,15 @@ package_aircrack-ng() { package_aircrack-ng-scripts() { pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols" - depends=('python2' 'graphviz' 'python2-pylorcon') + depends=('python2' 'graphviz' 'python2-pylorcon') cd ${srcdir}/aircrack-ng-${pkgver}/scripts mkdir -p ${pkgdir}/usr/share/man/man1/ \ - ${pkgdir}/usr/sbin + ${pkgdir}/usr/bin ### AIRDRIVER-NG ### # Script - install -Dm644 airdriver-ng ${pkgdir}/usr/sbin/ + install -Dm644 airdriver-ng ${pkgdir}/usr/bin/ # Libs mkdir -p ${pkgdir}/usr/lib/airdrop-ng/ install -Dm644 airdrop-ng/lib/{colorize.py,libDumpParse.py,libOuiParse.py} \ @@ -54,14 +54,14 @@ package_aircrack-ng-scripts() { # Man page mv ${srcdir}/tmp/airdriver-ng.1 ${pkgdir}/usr/share/man/man1/ - ### AIRDROP-NG ### + ### AIRDROP-NG ### # Man page install -Dm644 airdrop-ng/docs/airdrop-ng.1 ${pkgdir}/usr/share/man/man1/ # Script sed s/python/python2/ -i airdrop-ng/airdrop-ng.py - install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/sbin/airdrop-ng - chmod +x ${pkgdir}/usr/sbin/airdrop-ng - + install -Dm644 airdrop-ng/airdrop-ng.py ${pkgdir}/usr/bin/airdrop-ng + chmod +x ${pkgdir}/usr/bin/airdrop-ng + ### AIRGRAPH-NG ### # Libs mkdir -p ${pkgdir}/usr/lib/airgraph-ng/ @@ -72,20 +72,20 @@ package_aircrack-ng-scripts() { # Script sed s/python/python2/ -i airgraph-ng/airgraph-ng.py sed s_/usr/local/bin/lib_/usr/lib_ -i airgraph-ng/airgraph-ng.py - install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/sbin/airgraph-ng - chmod +x ${pkgdir}/usr/sbin/airgraph-ng + install -Dm644 airgraph-ng/airgraph-ng.py ${pkgdir}/usr/bin/airgraph-ng + chmod +x ${pkgdir}/usr/bin/airgraph-ng ### DUMP-JOIN.PY ### # Man page install -Dm644 airgraph-ng/man/dump-join.1 ${pkgdir}/usr/share/man/man1/ # Script sed s/python/python2/ -i airgraph-ng/dump-join.py - install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/sbin/dump-join.py - chmod +x ${pkgdir}/usr/sbin/dump-join.py - + install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/bin/dump-join.py + chmod +x ${pkgdir}/usr/bin/dump-join.py + ### AIRODUMP-NG-OUI-UPDATE ### # Script - install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/sbin/ - chmod +x ${pkgdir}/usr/sbin/airodump-ng-oui-update + install -Dm644 airodump-ng-oui-update ${pkgdir}/usr/bin/ + chmod +x ${pkgdir}/usr/bin/airodump-ng-oui-update } diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD index c817624ef..e47861ba1 100644 --- a/community/almanah/PKGBUILD +++ b/community/almanah/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88674 2013-04-21 22:16:40Z heftig $ +# $Id: PKGBUILD 90849 2013-05-14 21:40:34Z andrea $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=almanah pkgver=0.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="Small GTK+ application to allow you to keep a diary of your life" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Almanah_Diary" diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD index b96198172..9cfb60279 100644 --- a/community/anyfs-tools/PKGBUILD +++ b/community/anyfs-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66269 2012-02-23 06:54:24Z spupykin $ +# $Id: PKGBUILD 91828 2013-05-28 17:03:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=anyfs-tools pkgver=0.85.1c -pkgrel=3 +pkgrel=4 pkgdesc="unix-way toolset for recovering and converting filesystems" arch=('i686' 'x86_64' 'mips64el') url="http://anyfs-tools.sourceforge.net/" @@ -17,6 +17,11 @@ source=(http://downloads.sourceforge.net/sourceforge/anyfs-tools/${pkgname}-${pk md5sums=('d3da0004cd0f037ec3e926acd3f520c2' '5ea91297b605d51b03243adda1efed27') +prepare() { + cd $srcdir/$pkgname-${pkgver} + find . -name Makefile.in -exec sed -i 's|$(INSTALLPATH)/sbin|$(INSTALLPATH)/bin|g' {} \; +} + build() { cd $srcdir/$pkgname-${pkgver} @@ -25,8 +30,13 @@ build() { patch -p1 <$srcdir/disable-build-ext2fs.patch #Dirty Arch64 fix which doesn't affect i686 - CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" ./configure --prefix=/usr --build=i686-linux-gnu + CFLAGS="-DNO_INLINE_FUNCS -D_INLINE_=static" \ + ./configure --prefix=/usr --build=i686-linux-gnu make -j1 sed -i 's|ldconfig||' src/anysurrect/Makefile +} + +package() { + cd $srcdir/$pkgname-${pkgver} make INSTALLPATH=$pkgdir/usr install } diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 129a0263a..e47e1b16f 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75815 2012-09-01 11:15:13Z mtorromeo $ +# $Id: PKGBUILD 91912 2013-05-29 10:15:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=apcupsd pkgver=3.14.10 -pkgrel=3 +pkgrel=5 pkgdesc="Power mangement and controlling most of APC's UPS models" arch=(i686 x86_64 mips64el) url="http://www.apcupsd.org" @@ -14,21 +14,20 @@ depends=('gcc-libs') optdepends=('gd: for CGI' 'gconf: for frontend' 'gtk2: for frontend') -makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2') +makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2' 'systemd-sysvcompat') 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 apcupsd-tmpfiles.conf) sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' - 'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a' - 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' + '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7' 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --build=$CHOST --libexecdir=/usr/lib/$pkgname \ + --sbindir=/usr/bin \ --enable-cgi --enable-usb --enable-net \ --with-upstype=usb --with-upscable=usb \ --with-serial-dev=/dev/usb/hid/hiddev[0-9] \ @@ -39,10 +38,9 @@ build() { 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/* + chmod 755 "$pkgdir"/usr/bin/* install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin" mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin" } diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd deleted file mode 100644 index 8a96e9b07..000000000 --- a/community/apcupsd/apcupsd +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /sbin/apcupsd` -case "$1" in - start) - stat_busy "Starting APCUPSD Daemon" - [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon apcupsd - stat_done - fi - ;; - stop) - stat_busy "Stopping APCUPSD Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon apcupsd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - status) - /sbin/apcaccess status - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/community/apcupsd/apcupsd.service b/community/apcupsd/apcupsd.service index 9cec6e441..b8dfb9b4a 100644 --- a/community/apcupsd/apcupsd.service +++ b/community/apcupsd/apcupsd.service @@ -2,7 +2,7 @@ Description=APC UPS Monitor [Service] -ExecStart=/sbin/apcupsd -b +ExecStart=/usr/bin/apcupsd -b [Install] WantedBy=multi-user.target diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 2b521e3f1..60e5462fd 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88658 2013-04-21 10:47:57Z bpiotrowski $ +# $Id: PKGBUILD 91644 2013-05-26 08:19:25Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.17.0 +pkgver=1.17.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz) -sha256sums=('e3b533a33d33ad2392acc37d4510e5cd660af8ac23943c6402a0172f4a347c9c') +sha256sums=('7e18cf15afa17cf725c2ab4338751bc165e33d41917a4af9927da0855298efc0') build() { cd $pkgname-$pkgver diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD index 03485a112..bcd5a98c7 100644 --- a/community/arptables/PKGBUILD +++ b/community/arptables/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82774 2013-01-24 11:14:44Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90489 2013-05-12 22:21:54Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=arptables pkgver=0.0.4 -pkgrel=1 +pkgrel=2 pkgdesc='ARP filtering utility' arch=('i686' 'x86_64' 'mips64el') url='http://ebtables.sourceforge.net/' @@ -30,7 +30,7 @@ package() { DESTDIR="$pkgdir" \ PREFIX=/usr \ LIBDIR=/usr/lib/arptables \ - BINDIR=/usr/sbin \ + BINDIR=/usr/bin \ MANDIR=/usr/share/man \ INITDIR=/etc/rc.d \ SYSCONFIGDIR=/etc diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD index a5d2f0975..108c360e6 100644 --- a/community/arpwatch/PKGBUILD +++ b/community/arpwatch/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87787 2013-04-06 15:38:17Z seblu $ +# $Id: PKGBUILD 91484 2013-05-23 10:11:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sébastien Luttringer pkgname=arpwatch pkgver=2.1a15 -pkgrel=10 +pkgrel=11 pkgdesc='Ethernet/FDDI station activity monitor' arch=('i686' 'x86_64' 'mips64el') url='ftp://ftp.ee.lbl.gov/' @@ -16,7 +16,7 @@ source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz" "$pkgname.service") md5sums=('cebfeb99c4a7c2a6cee2564770415fe7' '9359518c500562281e76cdb0b2fa9062' - '2324a202222303daa1a41d8abd7a7e4a') + '43e2358ba0532da38e5296250a7fcfd8') prepare() { cd $pkgname-$pkgver @@ -28,13 +28,13 @@ prepare() { build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man - make SENDMAIL=/usr/sbin/sendmail + ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin + make SENDMAIL=`which sendmail` } package() { cd $pkgname-$pkgver - install -d -m 0755 "$pkgdir"/usr/{sbin,share/man} + install -d -m 0755 "$pkgdir"/usr/{bin,share/man} make DESTDIR="$pkgdir" install install-man # install ether prefix database install -Dm644 ethercodes.dat "$pkgdir/var/lib/$pkgname/ethercodes.dat" diff --git a/community/arpwatch/arpwatch.service b/community/arpwatch/arpwatch.service index 570f93852..ede31f3f7 100644 --- a/community/arpwatch/arpwatch.service +++ b/community/arpwatch/arpwatch.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking ExecStartPre=/usr/bin/touch /var/lib/arpwatch/%I.dat -ExecStart=/usr/sbin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I +ExecStart=/usr/bin/arpwatch -f /var/lib/arpwatch/%I.dat -i %I [Install] WantedBy=multi-user.target diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index b0f8ccfde..627051703 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79031 2012-10-29 09:19:40Z spupykin $ +# $Id: PKGBUILD 90647 2013-05-13 14:18:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: John Gerritse <john.gerritse@gmail.com> pkgname=atop pkgver=2.0_1 -pkgrel=1 +pkgrel=2 pkgdesc="A system and process level monitor." arch=(i686 x86_64 'mips64el') url="http://www.atoptool.nl/" @@ -25,6 +25,6 @@ package() { rm -f $pkgdir/etc/cron.d/atop install -dm0755 $pkgdir/etc/cron.daily mv $pkgdir/etc/atop/atop.daily $pkgdir/etc/cron.daily/atop - sed -i 's|/etc/atop/atop.daily|/etc/cron.daily/atop|g' $pkgdir/etc/rc.d/atop install -Dm0644 atop.service $pkgdir/usr/lib/systemd/system/atop.service + rm -rf $pkgdir/etc/rc.d } diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 69c6234ab..2b07c46b2 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75188 2012-08-15 18:36:09Z lfleischer $ +# $Id: PKGBUILD 90885 2013-05-15 08:03:41Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,13 +6,13 @@ pkgname=autofs pkgver=5.0.7 -pkgrel=1 +pkgrel=2 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://freshmeat.net/projects/autofs' license=('GPL2') depends=('libxml2') -makedepends=('libldap' 'krb5') +makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') backup=('etc/autofs/auto.master' 'etc/autofs/auto.misc' diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index 39e47c3db..d36c8b1c2 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 87805 2013-04-06 19:56:39Z jelle $ +# $Id: PKGBUILD 92157 2013-06-01 20:12:04Z jelle $ # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=avrdude pkgver=5.11.1 -pkgrel=3 +pkgrel=4 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/avrdude/" license=('GPL') -depends=('libusb-compat' 'readline' 'libftdi') +depends=('libusbx' 'readline' 'libftdi') source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('3a43e288cb32916703b6945e3f260df9' '0c23b005d4090aef4e081476aabc1958') diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD index fe96c58ce..3dae21e26 100644 --- a/community/balsa/PKGBUILD +++ b/community/balsa/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 88630 2013-04-20 17:58:41Z jlichtblau $ +# $Id: PKGBUILD 91059 2013-05-18 15:38:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=balsa -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc="An e-mail client for GNOME" arch=('i686' 'x86_64' 'mips64el') url='http://pawsa.fedorapeople.org/balsa/' license=('GPL') depends=('gmime' 'webkitgtk3' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview3' 'gtkspell3' 'gnome-icon-theme' 'desktop-file-utils') -makedepends=('perlxml' 'gnome-doc-utils' 'intltool') +makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool') install=$pkgname.install +changelog=$pkgname.changelog source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('67eaddbc33a079a74b65bf5f71ef163573f7d4a6f29ed6dca2ad6811d95519b4') +sha256sums=('52ce445dca86eb42e2e402a5b76616a1a522b89acbb631215079022ef80a7a10') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/balsa/balsa.changelog b/community/balsa/balsa.changelog new file mode 100644 index 000000000..8fa27a1bf --- /dev/null +++ b/community/balsa/balsa.changelog @@ -0,0 +1,2 @@ +2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * balsa 2.5.1-1 diff --git a/community/bind/01-remove-tools.patch b/community/bind/01-remove-tools.patch deleted file mode 100644 index 29b4c9c5f..000000000 --- a/community/bind/01-remove-tools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools nsupdate \ - check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@ - TARGETS = - diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD index 55857058c..1d4b89dc4 100644 --- a/community/bind/PKGBUILD +++ b/community/bind/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 90480 2013-05-12 21:56:44Z seblu $ +# $Id: PKGBUILD 91985 2013-05-30 17:41:01Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind -_pkgver=9.9.2-P2 +_pkgver=9.9.3 pkgver=${_pkgver//-/.} -pkgrel=3 +pkgrel=1 pkgdesc='The ISC BIND nameserver' url='http://www.isc.org/software/bind/' license=('custom:ISC') @@ -25,20 +25,19 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.service' 'named.logrotate' 'localhost.zone' - '127.0.0.zone' - '01-remove-tools.patch') -sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d' + '127.0.0.zone') +sha1sums=('0d770a68ccdb98db7930951cf380d5c7ed9b5b67' '029f89c49550c40ec7a95116b6a33f0e5a041094' 'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11' 'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726' 'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec' '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b' '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9' - '14264affa71bcfe7703d0fb7c3556c4c47efaa8b') + '53be0f1437ebe595240d8dbdd819939582b97fb9') prepare() { - patch -p1 -d bind-$_pkgver < 01-remove-tools.patch + # remove dig to avoid conflict with dnsutils + sed -i 's/dig//' $pkgname-$_pkgver/bin/Makefile.in } build() { diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 5103e34e7..f7fa72f0a 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90166 2013-05-07 19:14:15Z seblu $ +# $Id: PKGBUILD 90843 2013-05-14 17:50:10Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') pkgver=1.3.10 -pkgrel=1 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url='http://bird.network.cz/' license=('GPL2') @@ -13,8 +13,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') md5sums=('553c331b32bca9e926519cb2f67d68be' - 'ccd12c994501e28a7256a6a2a17154b2' - '631eea3de9be2f259aaf91f281d2d39a') + '01360e3b71ff2ed2223e87a3176e0659' + 'b895b473cbc98cfd54751f737536eb1e') build() { cd $pkgbase-$pkgver @@ -24,12 +24,23 @@ build() { # build ipv4 bird cd _build4 - ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ../configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/share/doc/$pkgname make # build ipv6 bird cd ../_build6 - ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-ipv6 + ../configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/share/doc/$pkgname \ + --enable-ipv6 make } @@ -38,8 +49,14 @@ package_bird () { backup=('etc/bird.conf') cd $pkgbase-$pkgver/_build4 - make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install - make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs + make \ + prefix="$pkgdir/usr" \ + sysconfdir="$pkgdir/etc" \ + sbindir="$pkgdir/usr/bin" \ + localstatedir="$pkgdir/var" \ + docdir="$pkgdir/usr/share/doc/$pkgname" \ + install + #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs # no /var inside pkg rm -r "$pkgdir/var" @@ -53,8 +70,14 @@ package_bird6 () { backup=('etc/bird6.conf') cd $pkgbase-$pkgver/_build6 - make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install - make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs + make \ + prefix="$pkgdir/usr" \ + sysconfdir="$pkgdir/etc" \ + sbindir="$pkgdir/usr/bin" \ + localstatedir="$pkgdir/var" \ + docdir="$pkgdir/usr/share/doc/$pkgname" \ + install + #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs # no /var inside pkg rm -r "$pkgdir/var" diff --git a/community/bird/bird.service b/community/bird/bird.service index f40068646..faee0d845 100644 --- a/community/bird/bird.service +++ b/community/bird/bird.service @@ -3,9 +3,9 @@ Description=BIRD routing daemon After=network.target [Service] -ExecStart=/usr/sbin/bird -d -ExecReload=/usr/sbin/birdc configure -ExecStop=/usr/sbin/birdc down +ExecStart=/usr/bin/bird -d +ExecReload=/usr/bin/birdc configure +ExecStop=/usr/bin/birdc down [Install] WantedBy=multi-user.target diff --git a/community/bird/bird6.service b/community/bird/bird6.service index 284c75842..d852fb52c 100644 --- a/community/bird/bird6.service +++ b/community/bird/bird6.service @@ -3,9 +3,9 @@ Description=BIRD IPv6 routing daemon After=network.target [Service] -ExecStart=/usr/sbin/bird6 -d -ExecReload=/usr/sbin/bird6c configure -ExecStop=/usr/sbin/bird6c down +ExecStart=/usr/bin/bird6 -d +ExecReload=/usr/bin/birdc6 configure +ExecStop=/usr/bin/birdc6 down [Install] WantedBy=multi-user.target diff --git a/community/bmp-musepack/PKGBUILD b/community/bmp-musepack/PKGBUILD deleted file mode 100644 index b5637201c..000000000 --- a/community/bmp-musepack/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 83122 2013-01-27 16:08:38Z pierre $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Nikos Kouremenos <nk@ebox.gr> - -pkgname=bmp-musepack -pkgver=1.2 -pkgrel=4.1 -pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format" -arch=('i686' 'x86_64' 'mips64el') -url="http://musepack.net/" -license=('BSD') -depends=('bmp' 'libmpcdec' 'taglib') -groups=('bmp-plugins' 'bmp-io-plugins') -options=('!libtool') -source=("http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5fe0c9d341ca37d05c780a478f829a5f') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/bmp-wma/PKGBUILD b/community/bmp-wma/PKGBUILD deleted file mode 100644 index 62dfc89ef..000000000 --- a/community/bmp-wma/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 83124 2013-01-27 16:09:09Z pierre $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com> - -pkgname=bmp-wma -pkgver=0.1.1 -pkgrel=4.1 -pkgdesc="WMA plugin for Beep Media Player" -url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma" -license=('GPL') -arch=('x86_64' 'i686' 'mips64el') -depends=('bmp') -groups=('bmp-plugins' 'bmp-io-plugins') -options=('!libtool' '!emptydirs') -source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz" - 'bmp-wma-gcc4.patch') -md5sums=('8dcf3fcdb10e8e2e386f70745812412b' - '730eba8f41e989dd8b56c18bcc826cc4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" - if [ "${CARCH}" != "i686" ]; then - export CFLAGS="${CFLAGS} -fPIC" - fi - ./configure --prefix=/usr --disable-static - echo '#define HAVE_LRINTF 1' >> config.h - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/bmp-wma/bmp-wma-gcc4.patch b/community/bmp-wma/bmp-wma-gcc4.patch deleted file mode 100644 index 9d773e89e..000000000 --- a/community/bmp-wma/bmp-wma-gcc4.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400 -+++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400 -@@ -11,6 +11,43 @@ - extern "C" { - #endif - -+ -+/** -+ * AVOption. -+ */ -+typedef struct AVOption { -+ /** options' name */ -+ const char *name; /* if name is NULL, it indicates a link to next */ -+ /** short English text help or const struct AVOption* subpointer */ -+ const char *help; // const struct AVOption* sub; -+ /** offset to context structure where the parsed value should be stored */ -+ int offset; -+ /** options' type */ -+ int type; -+#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) -+#define FF_OPT_TYPE_DOUBLE 2 ///< double -+#define FF_OPT_TYPE_INT 3 ///< integer -+#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) -+#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags -+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option -+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) -+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) -+ /** min value (min == max -> no limits) */ -+ double min; -+ /** maximum value for double/int */ -+ double max; -+ /** default boo [0,1]l/double/int value */ -+ double defval; -+ /** -+ * default string value (with optional semicolon delimited extra option-list -+ * i.e. option1;option2;option3 -+ * defval might select other then first argument as default -+ */ -+ const char *defstr; -+#define FF_OPT_MAX_DEPTH 10 -+} AVOption; -+ -+ - #include "common.h" - #include <sys/types.h> /* size_t */ - -@@ -1396,41 +1433,6 @@ - - - /** -- * AVOption. -- */ --typedef struct AVOption { -- /** options' name */ -- const char *name; /* if name is NULL, it indicates a link to next */ -- /** short English text help or const struct AVOption* subpointer */ -- const char *help; // const struct AVOption* sub; -- /** offset to context structure where the parsed value should be stored */ -- int offset; -- /** options' type */ -- int type; --#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) --#define FF_OPT_TYPE_DOUBLE 2 ///< double --#define FF_OPT_TYPE_INT 3 ///< integer --#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) --#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags --//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option --#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) --#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) -- /** min value (min == max -> no limits) */ -- double min; -- /** maximum value for double/int */ -- double max; -- /** default boo [0,1]l/double/int value */ -- double defval; -- /** -- * default string value (with optional semicolon delimited extra option-list -- * i.e. option1;option2;option3 -- * defval might select other then first argument as default -- */ -- const char *defstr; --#define FF_OPT_MAX_DEPTH 10 --} AVOption; -- --/** - * Parse option(s) and sets fields in passed structure - * @param strct structure where the parsed results will be written - * @param list list with AVOptions ---- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400 -+++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400 -@@ -28,7 +28,6 @@ - #ifndef DSPUTIL_H - #define DSPUTIL_H - --#include "common.h" - #include "avcodec.h" - - diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index 28d4c6a9b..8836306f5 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -4,19 +4,20 @@ pkgname=bonnie++ pkgver=1.03e -pkgrel=6.1 +pkgrel=7 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64' 'mips64el') url="http://www.coker.com.au/bonnie++/" license=('GPL') depends=('perl') -source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz) -sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb') +source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch) +sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb' + 'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814') build() { cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile make } @@ -24,6 +25,8 @@ build() { package() { cd $srcdir/${pkgname}-${pkgver} + # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/ + patch -Np1 -i $srcdir/move_away_from_sbin.patch make prefix="${pkgdir}/usr" install install -d $pkgdir/usr/share/doc/bonnie++ diff --git a/community/bonnie++/move_away_from_sbin.patch b/community/bonnie++/move_away_from_sbin.patch new file mode 100644 index 000000000..18e99e976 --- /dev/null +++ b/community/bonnie++/move_away_from_sbin.patch @@ -0,0 +1,14 @@ +diff -aur bonnie++-1.03e/Makefile bonnie++-1.03ef/Makefile +--- bonnie++-1.03e/Makefile 2013-05-13 08:40:45.122959831 +0000 ++++ bonnie++-1.03ef/Makefile 2013-05-13 08:43:20.365248937 +0000 +@@ -33,8 +33,8 @@ + $(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS) + + install-bin: $(EXES) +- mkdir -p $(eprefix)/bin $(eprefix)/sbin +- ${INSTALL} -s $(EXES) $(eprefix)/sbin ++ mkdir -p $(eprefix)/bin ++ ${INSTALL} -s $(EXES) $(eprefix)/bin + ${INSTALL} $(SCRIPTS) $(eprefix)/bin + + install: install-bin diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD index f91561543..d95896ebd 100644 --- a/community/bsd-games/PKGBUILD +++ b/community/bsd-games/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86789 2013-03-22 02:13:44Z eric $ +# $Id: PKGBUILD 90951 2013-05-16 09:13:23Z lcarlier $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> pkgname=bsd-games pkgver=2.17 -pkgrel=13 +pkgrel=14 pkgdesc="A linux port for a collection of BSD command line games." url="ftp://ftp.ibiblio.org/pub/Linux/games/" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz number.c.diff bsd-games-2.17-64bit.patch bad-ntohl-cast.diff null-check.diff) md5sums=('238a38a3a017ca9b216fc42bde405639' - '9916baef5cb8aa09361f67de12ca7bef' + '2ea80281ee9993a9ee47323e78349a2a' '784f68c796b9e099ac008aecef1af998' '9c0fa6e2345bd0a7945c9a41d5ba68aa' '5356bd6999ae53dd27cb2a0f837a3e70' @@ -27,8 +27,9 @@ md5sums=('238a38a3a017ca9b216fc42bde405639' '3d21a9dad2e603ddf3842972e4ff85a1' 'a43ca0b4b9ebc4eec26372c52014ac0a') -build() { +prepare() { cd "${srcdir}/$pkgname-$pkgver" + [ "$CARCH" = "x86_64" ] && patch -p1 < "$srcdir/bsd-games-2.17-64bit.patch" cp "${srcdir}/config.params" . @@ -63,8 +64,11 @@ build() { # Prior to release 2.17-10 of the ArchLinux package, wargames was # broken, since binaries are in /usr/bin instead. sed -i -e 's|/usr/games|/usr/bin|g' wargames/wargames +} + +build() { + cd "${srcdir}/$pkgname-$pkgver" -# Build. ./configure make } diff --git a/community/bsd-games/config.params b/community/bsd-games/config.params index 6afa0e43f..f061d8f26 100644 --- a/community/bsd-games/config.params +++ b/community/bsd-games/config.params @@ -2,7 +2,7 @@ bsd_games_cfg_non_interactive=y bsd_games_cfg_install_prefix=PKGDIR bsd_games_cfg_no_build_dirs='banner fortune wtf factor monop' bsd_games_cfg_gamesdir=/usr/bin -bsd_games_cfg_sbindir=/usr/sbin +bsd_games_cfg_sbindir=/usr/bin bsd_games_cfg_man6dir=/usr/share/man/man6 bsd_games_cfg_man5dir=/usr/share/man/man5 bsd_games_cfg_man8dir=/usr/share/man/man8 diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 1c696163b..f7ee72159 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85655 2013-03-04 13:07:52Z spupykin $ +# $Id: PKGBUILD 91555 2013-05-23 15:08:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox pkgver=1.20.2 -pkgrel=2 +pkgrel=5 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64" 'mips64el') url="http://www.busybox.net" @@ -27,5 +27,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm755 busybox $pkgdir/bin/busybox + install -Dm755 busybox $pkgdir/usr/bin/busybox } diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index ecbeec39a..7bf2a83ac 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -1,13 +1,14 @@ post_install() { - echo "You may want to do setuid on /bin/busybox" - echo " chmod 4555 /bin/busybox" + echo "You may want to do setuid on /usr/bin/busybox" + echo " chmod 4555 /usr/bin/busybox" } pre_upgrade() { - busybox stat -c %a bin/busybox >tmp/busybox.upgrade.script + busybox stat -c %a usr/bin/busybox >tmp/busybox.upgrade.script } post_upgrade() { - [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` bin/busybox + [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox busybox rm -f tmp/busybox.upgrade.script + echo "busybox is un /usr/bin now. Readjust its mode if you modified it." } diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD index cad086944..3de7f286e 100755 --- a/community/cairo-dock-plugins/PKGBUILD +++ b/community/cairo-dock-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88927 2013-04-24 21:31:30Z alucryd $ +# $Id: PKGBUILD 90850 2013-05-14 21:40:35Z andrea $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Tofe <chris.chapuis@gmail.com> # Contributor: zhuqin <zhuqin83@gmail.com> @@ -7,7 +7,7 @@ pkgname=cairo-dock-plugins pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for Cairo-Dock" url="https://launchpad.net/cairo-dock" license=('GPL') diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index 8eb49da90..29ca00f84 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 86462 2013-03-17 20:07:56Z cinelli $ +# $Id: PKGBUILD 92187 2013-06-02 15:36:24Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> # Contributor: MisterFred <mister.fred[at]free[dot]fr> pkgname=cantata -pkgver=0.9.2 +pkgver=1.0.3 pkgdesc="A KDE client for the music player daemon (MPD)" -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Cantata?content=147733" license=('GPL') -depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp') +depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp' 'libcddb' 'libmusicbrainz5') makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2") -md5sums=('882cec90eb01d190b899689675e990b0') +md5sums=('fd942d25127a7936efaf1fe887d66189') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 636e4284c..c530f0575 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87406 2013-03-31 19:18:09Z stephane $ +# $Id: PKGBUILD 90790 2013-05-13 22:47:24Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -7,18 +7,18 @@ pkgbase=cegui pkgname=('cegui' 'cegui-docs') pkgver=0.7.9 -pkgrel=2 +pkgrel=3 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" #options=('!libtool') license=("MIT") depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly') -makedepends=('python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz') +makedepends=('python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht') optdepends=("python2: python bindings" "ogre: ogre module" - "gtk2: gtk2 module") - #"irrlicht: irrlicht module") maybe again at some point + "gtk2: gtk2 module" + "irrlicht: irrlicht module") options=(!libtool) source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) md5sums=('a8b682daf82e383edc169c2e6eb2b321') diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index bdda0434f..b15cef97e 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88266 2013-04-15 11:13:22Z spupykin $ +# $Id: PKGBUILD 91791 2013-05-27 21:33:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -6,9 +6,9 @@ # Development: http://closure.ath.cx/aur-dev pkgname=cgit -pkgver=0.9.1 -_gitver=1.7.4 -pkgrel=2 +pkgver=0.9.2 +_gitver=1.8.3 +pkgrel=1 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') url="http://hjemli.net/git/cgit" @@ -19,8 +19,8 @@ install=cgit.install source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz" "git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz" "apache.example.conf") -md5sums=('272ee8fec2d81ac1e65117578e64df1e' - 'c63cc7ca8a4bbf97c8802f354511223e' +md5sums=('fe11018eff8d79caad112f4fac64b90f' + '73224d3dc86c4999cc49484b49c9acc4' 'bd5696bea0654bfcf98f249b1a36737d') build() { diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD index c0ed0cbbc..6cf08ad70 100644 --- a/community/checkinstall/PKGBUILD +++ b/community/checkinstall/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65086 2012-02-20 03:34:38Z spupykin $ +# $Id: PKGBUILD 91846 2013-05-28 17:24:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=checkinstall pkgver=1.6.2 -pkgrel=2.1 +pkgrel=3 pkgdesc="spy for 'make install' and build rpm or deb" arch=('i686' 'x86_64' 'mips64el') url="http://asic-linux.com.mx/~izto/checkinstall/" @@ -13,11 +13,15 @@ backup=(etc/checkinstall/checkinstallrc) source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('d7b43c92001e68243a93bcce8b1e5480' - '5c68cb7e29cf6da4b845ce57fb5ea080') + 'eac0c843781c300e7bc15c55be262e51') build() { cd $srcdir/$pkgname-$pkgver patch -Np1 <../build-fix.patch make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/checkinstall/build-fix.patch b/community/checkinstall/build-fix.patch index 341b7dfca..9ab00cde5 100644 --- a/community/checkinstall/build-fix.patch +++ b/community/checkinstall/build-fix.patch @@ -134,7 +134,7 @@ diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile -LCDIR=$(PREFIX)/lib/checkinstall/locale -CONFDIR=$(PREFIX)/lib/checkinstall +PREFIX=/usr -+BINDIR=$(DESTDIR)/$(PREFIX)/sbin ++BINDIR=$(DESTDIR)/$(PREFIX)/bin +LCDIR=$(DESTDIR)/$(PREFIX)/share/locale +CONFDIR=$(DESTDIR)/etc/checkinstall diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index c49379b51..083c66c2b 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 88085 2013-04-11 09:03:50Z lcarlier $ +# $Id: PKGBUILD 90845 2013-05-14 19:53:14Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=2.0 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>18.0' 'xulrunner<21.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>18.0' 'xulrunner<22.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver #source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip @@ -25,7 +25,7 @@ build() { cp Makefile.arch Makefile sed -i -e 's/17.*/18.0/g' ../application.ini - sed -i -e 's/19.*/20.0/g' ../application.ini + sed -i -e 's/19.*/21.0/g' ../application.ini make -j1 } diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD index e7c294cca..81b8728c0 100644 --- a/community/chromium-bsu/PKGBUILD +++ b/community/chromium-bsu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 85755 2013-03-06 11:30:49Z jelle $ +# $Id: PKGBUILD 91634 2013-05-25 20:26:07Z jelle $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=chromium-bsu -pkgver=0.9.15 -pkgrel=4 +pkgver=0.9.15.1 +pkgrel=1 pkgdesc="A fast paced top scrolling shooter" arch=('i686' 'x86_64' 'mips64el') url="http://chromium-bsu.sourceforge.net/" license=('custom:artistic') -depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'ftgl' 'fontconfig' 'sdl_image') +depends=('freeglut' 'glu' 'sdl_image' 'openal' 'freealut' 'ftgl' 'fontconfig') install=chromium-bsu.install -source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('d57137a1ac2292363b35192724c7e3be') +source=(http://downloads.sourceforge.net/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/chromium-bsu-$pkgver.tar.gz) +md5sums=('bd332a890ae9e5115f2808198a51a92b') build(){ cd $srcdir/$pkgname-$pkgver diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD index 8f907410c..70049c9c8 100644 --- a/community/chrootuid/PKGBUILD +++ b/community/chrootuid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65090 2012-02-20 03:36:03Z spupykin $ +# $Id: PKGBUILD 91848 2013-05-28 17:25:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Frop Doe <mrmr@rizla.org> # Contributor: Guillermo A. Amaral <me@guillermoamaral.com> (thewonka) @@ -6,7 +6,7 @@ pkgname=chrootuid pkgver=1.3 -pkgrel=5.1 +pkgrel=6 arch=(i686 x86_64 'mips64el') pkgdesc="Runs a command in a restricted environment." url="ftp://ftp.porcupine.org/pub/security/index.html" @@ -20,7 +20,11 @@ md5sums=('15510abadf5de189e1c22a1544dc926a' build() { cd $srcdir/$pkgname$pkgver make - install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/sbin/chrootuid +} + +package() { + cd $srcdir/$pkgname$pkgver + install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/bin/chrootuid install -D -m644 $srcdir/$pkgname$pkgver/chrootuid.1 $pkgdir/usr/share/man/man1/chrootuid.1 install -D -m644 $srcdir/chrootuid_license $pkgdir/usr/share/licenses/$pkgname/license } diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 725fb6e40..3f91c7ad4 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90134 2013-05-06 22:58:48Z faidoc $ +# $Id: PKGBUILD 91472 2013-05-23 01:19:04Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Jan de Groot <jgc@archlinux.org> pkgname=cinnamon-control-center -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64' 'mips64el') @@ -19,8 +19,8 @@ options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" "gnomerrlabeler.patch" "idle-delay.patch") -sha256sums=('7230d509f5837906b5497279cfbd96180e5c8dad89777fb31a81fd0c73354fa9' - '604f0a30369d0380a0c5634f1fd50f3f44a89c0b3caec66b60d9e2648b569b90' +sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f' + 'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') build() { diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch index b263613c4..7160bc788 100644 --- a/community/cinnamon-control-center/gnomerrlabeler.patch +++ b/community/cinnamon-control-center/gnomerrlabeler.patch @@ -1,5 +1,6 @@ ---- cinnamon-control-center-1.8.0.orig/panels/display/cc-display-panel.c 2013-05-05 13:12:28.000000000 +0200 -+++ cinnamon-control-center-1.8.0/panels/display/cc-display-panel.c 2013-05-07 00:27:44.901035877 +0200 +diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c +--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.000000000 +0200 ++++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200 @@ -31,12 +31,13 @@ #define GNOME_DESKTOP_USE_UNSTABLE_API #include <libgnome-desktop/gnome-rr.h> @@ -33,7 +34,7 @@ g_object_unref (self->priv->labeler); G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object); -@@ -293,14 +294,14 @@ +@@ -293,16 +294,16 @@ self->priv->current_output = NULL; if (self->priv->labeler) { @@ -42,26 +43,36 @@ g_object_unref (self->priv->labeler); } - self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); +- self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); ++ self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration); if (cc_panel_get_shell (CC_PANEL (self)) == NULL) - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); else - gnome_rr_labeler_show (self->priv->labeler); +- gnome_rr_labeler_show (self->priv->labeler); ++ cc_rr_labeler_show (self->priv->labeler); -@@ -2596,7 +2597,7 @@ + select_current_output_from_dialog_position (self); + +@@ -2594,9 +2595,9 @@ + if (self->priv->labeler == NULL) + return; if (gtk_window_has_toplevel_focus (window)) - gnome_rr_labeler_show (self->priv->labeler); +- gnome_rr_labeler_show (self->priv->labeler); ++ cc_rr_labeler_show (self->priv->labeler); else - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); } static void -@@ -2608,7 +2609,7 @@ +@@ -2606,9 +2607,9 @@ + if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL) + return; if (gtk_widget_get_visible (widget)) { - gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); +- gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); ++ cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); } else { - gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); + cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 950712169..753844d83 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90347 2013-05-11 17:08:40Z faidoc $ +# $Id: PKGBUILD 92190 2013-06-02 15:47:25Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.8.2 -pkgrel=2 +pkgver=1.8.8 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64' 'mips64el') url="http://cinnamon.linuxmint.com/" @@ -31,14 +31,16 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('83179f98f9e6c88928146d43a9d3f581c64706c0a60dac5e58d845a30a275a91' +sha256sums=('4b6495c0294283e649e9e3fc5ae630c9d63cd6e8177bc3dfc29170f8d32efbc0' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' - '9a091c0b651a5af1700c8eca90b9e81bb9a50a8a9bfa6a7352d0c0daa2f3f271' + '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e' '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262' 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100') + + build() { cd ${srcdir}/linuxmint-Cinnamon* diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch index 5af7c3a79..b79ea497a 100644 --- a/community/cinnamon/gnome-3.8.patch +++ b/community/cinnamon/gnome-3.8.patch @@ -1404,7 +1404,9 @@ index 50c4e1e..c8427ac 100644 this._trackInfosTop.set_child(this.infos_top); this._trackInfosBottom.set_child(this.infos_bottom); -@@ -414,90 +256,39 @@ Player.prototype = { +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -414,45 +414,20 @@ this._trackControls.set_child(this.controls); this.addActor(this._trackControls); @@ -1463,14 +1465,8 @@ index 50c4e1e..c8427ac 100644 + } /* this players don't support seek */ -- if (support_seek.indexOf(this._name) == -1) { -+ if (support_seek.indexOf(this._name) == -1) - this._time.hide(); -- this.showPosition = false; -- this._positionSlider.hide(); -- } - this._getStatus(); - this._trackId = {}; + if (support_seek.indexOf(this._name) == -1) { +@@ -465,39 +440,23 @@ this._getMetadata(); this._currentTime = 0; this._getPosition(); @@ -1486,14 +1482,17 @@ index 50c4e1e..c8427ac 100644 - this._setMetadata(iface, value["Metadata"]); - //qmmp - if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { -- if (value["playbackStatus"]) ++ this._setMetadata(value["Metadata"]); ++ // qmmp ++ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { + if (value["playbackStatus"]) - this._setStatus(iface, value["playbackStatus"]); -- if (value["metadata"]) ++ this._setStatus(value["playbackStatus"]); + if (value["metadata"]) - this._setMetadata(sender, value["metadata"]); - } -+ this._setMetadata(value["Metadata"]); - })); - +- })); +- - this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) { - if (value > 0) { - this._setPosition(value); @@ -1504,17 +1503,20 @@ index 50c4e1e..c8427ac 100644 - // when the track is seeked so we set the position at the - // value we set on the slider - this._setPosition(this._wantedSeekValue); -- } ++ this._setMetadata(value["metadata"]); + } - // Seek value send by the player - else - this._setPosition(value); -- ++ })); + - this._wantedSeekValue = 0; + this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { + this._setPosition(sender, value); })); Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); + @@ -512,45 +303,26 @@ Player.prototype = { this._playerInfo.setText(this._getName() + " - " + _(status)); }, @@ -3923,20 +3925,7 @@ index c8427ac..a7b2e09 100644 /* dummy vars for translation */ let x = _("Playing"); x = _("Paused"); -@@ -285,6 +285,13 @@ Player.prototype = { - this._setStatus(value["PlaybackStatus"]); - if (value["Metadata"]) - this._setMetadata(value["Metadata"]); -+ // qmmp -+ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { -+ if (value["playbackStatus"]) -+ this._setStatus(value["playbackStatus"]); -+ if (value["metadata"]) -+ this._setMetadata(value["metadata"]); -+ } - })); - - this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { + @@ -377,7 +384,8 @@ Player.prototype = { cover.read_async(null, null, Lang.bind(this, this._onReadCover)); } @@ -4181,3 +4170,17 @@ index 418fb60..773fb65 100644 static void -- 1.8.1.6 + +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -801,7 +801,7 @@ + this._players = {}; + // watch players + for (var p=0; p<compatible_players.length; p++) { +- DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false, ++ Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE, + Lang.bind(this, this._addPlayer), + Lang.bind(this, this._removePlayer) + ); +-- +1.8.1.6
\ No newline at end of file diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index ec2720150..9f8449bbb 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88406 2013-04-17 07:01:42Z bisson $ +# $Id: PKGBUILD 91648 2013-05-26 09:24:29Z bluewind $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.3.0 -pkgrel=1 +pkgrel=3 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -40,12 +40,10 @@ depends=('libltdl' 'iptables') source=("${url}files/${pkgname}-${pkgver}.tar.gz" 'libperl.patch' - 'service' - 'rc.d') + 'service') sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539' '245c098d121a4a05594553583310953b3a2f6461' - 'b56907f532b9174e1b6995aadb518228d7464d3b' - '0f441718d5519cb043b1130e5a1d0379078adbcc') + '04f676d0b76c34df0bbf94629813e035b1febe04') backup=('etc/collectd.conf') options=('!libtool') @@ -64,7 +62,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ + --sbindir=/usr/bin \ + --disable-static \ --with-python=/usr/bin/python2 make all } @@ -73,7 +72,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install rmdir "${pkgdir}/var/run" # FS#30201 - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl } diff --git a/community/collectd/rc.d b/community/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community/collectd/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=collectd -prog="/usr/sbin/collectdmon" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && $prog \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -reload) - stat_busy "Sending SIGHUP to $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community/collectd/service b/community/collectd/service index 9581ec0c9..30540645a 100644 --- a/community/collectd/service +++ b/community/collectd/service @@ -5,7 +5,7 @@ After=local-fs.target network.target [Service] Type=forking PIDFile=/run/collectdmon.pid -ExecStart=/usr/sbin/collectdmon +ExecStart=/usr/bin/collectdmon ExecReload=/bin/kill -HUP $MAINPID Restart=always diff --git a/community/compiz-bcop/PKGBUILD b/community/compiz-bcop/PKGBUILD deleted file mode 100644 index b4f3b7b5a..000000000 --- a/community/compiz-bcop/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68296 2012-03-21 10:32:03Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-bcop -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz option code generator" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core>=0.8.8' 'libxslt') -makedepends=('intltool' 'pkgconfig') -conflicts=('compiz-bcop-git') -source=(http://releases.compiz-fusion.org/$pkgver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9210bd2a537480bdb11df0e3cc5f6d4548fd12da') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/compiz-fusion-plugins-extra/PKGBUILD b/community/compiz-fusion-plugins-extra/PKGBUILD deleted file mode 100644 index b006aea7b..000000000 --- a/community/compiz-fusion-plugins-extra/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68298 2012-03-21 10:33:42Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-fusion-plugins-extra -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Extra plugins" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'compiz-bcop' 'compiz-fusion-plugins-main' 'libnotify') -makedepends=('intltool' 'pkg-config' 'gettext' 'gconf') -groups=('compiz-fusion' 'compiz-fusion-gtk' 'compiz-fusion-kde') -conflicts=('compiz-fusion-plugins-extra-git') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-extra-${pkgver}.tar.bz2) -sha1sums=('ce592993696c0b5d4e0bb13171897b4c25b3844e') - -build() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - - sed -i 's/if text "x$use/if test "x$use/' configure - sed -i 's/iconUri, NULL);/iconUri);/' src/notification/notification.c - ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/compiz-plugins-extra-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/PKGBUILD b/community/compiz-fusion-plugins-main/PKGBUILD deleted file mode 100644 index 868d26369..000000000 --- a/community/compiz-fusion-plugins-main/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 68300 2012-03-21 10:35:13Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compiz-fusion-plugins-main -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz Fusion Main plugins" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libjpeg>=7' 'librsvg' 'compiz-bcop' 'libxdamage' 'libxcomposite' - 'libxinerama' 'startup-notification') -makedepends=('intltool' 'pkgconfig' 'gettext') -groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') -conflicts=('compiz-fusion-plugins-main-git') -source=(http://releases.compiz-fusion.org/${pkgver}/compiz-plugins-main-${pkgver}.tar.bz2) -options=(!libtool) -sha1sums=('3c99841b744ae6c4a3edf2019626484880607dc6') - -build() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - - CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \ - -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd "${srcdir}/compiz-plugins-main-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/compiz-fusion-plugins-main/magiclamp.patch b/community/compiz-fusion-plugins-main/magiclamp.patch deleted file mode 100644 index 3a9e4a21e..000000000 --- a/community/compiz-fusion-plugins-main/magiclamp.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/animation/animation.c.orig 2007-12-01 02:22:12.008115484 +0100 -+++ src/animation/animation.c 2007-12-01 02:27:41.541651382 +0100 -@@ -1148,7 +1148,7 @@ - { "horizontal_folds_zoom_to_taskbar", "bool", 0, 0, 0 }, - { "magic_lamp_moving_end", "bool", 0, 0, 0 }, - { "magic_lamp_grid_res", "int", "<min>4</min>", 0, 0 }, -- { "magic_lamp_max_waves", "int", "<min>3</min>", 0, 0 }, -+ { "magic_lamp_max_waves", "int", "<min>0</min>", 0, 0 }, - { "magic_lamp_amp_min", "float", "<min>200</min>", 0, 0 }, - { "magic_lamp_amp_max", "float", "<min>200</min>", 0, 0 }, - { "magic_lamp_open_start_width", "int", "<min>0</min>", 0, 0 }, ---- metadata/animation.xml.in.orig 2007-12-01 02:25:24.011432269 +0100 -+++ metadata/animation.xml.in 2007-12-01 02:27:02.724750938 +0100 -@@ -1272,7 +1272,7 @@ - <_short>Magic Lamp Max Waves</_short> - <_long>The maximum number of waves for Magic Lamp.</_long> - <default>3</default> -- <min>3</min> -+ <min>0</min> - <max>20</max> - </option> - <option name="magic_lamp_amp_min" type="float"> ---- metadata/animation.xml.orig 2007-12-01 02:25:14.584765435 +0100 -+++ metadata/animation.xml 2007-12-01 02:35:07.068035601 +0100 -@@ -3962,7 +3962,7 @@ - <long xml:lang="pt">Número máximo de ondas para Lâmpada Mágica.</long> - <long xml:lang="sv">Den Magiska Lampans maximala antal vågor</long> - <default>3</default> -- <min>3</min> -+ <min>0</min> - <max>20</max> - </option> - <option type="float" name="magic_lamp_amp_min"> diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD deleted file mode 100644 index b69e9e0f5..000000000 --- a/community/compiz/PKGBUILD +++ /dev/null @@ -1,142 +0,0 @@ -# $Id: PKGBUILD 90011 2013-05-06 19:36:27Z foutrelis $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Hussam Al-Tayeb ht990332@gmail.com -# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net> -# Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> - -pkgbase=compiz -pkgname=('compiz-core' - 'compiz-decorator-kde' - 'compiz-decorator-gtk') -pkgver=0.8.8 -pkgrel=5 -pkgdesc="Composite manager for Aiglx and Xgl" -url="http://www.compiz.org/" -license=('GPL' 'LGPL' 'MIT') -arch=('i686' 'x86_64' 'mips64el') -groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') -makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity') -options=(!libtool !emptydirs) -conflicts=('compiz' 'compiz-core-git' 'compiz-git') -replaces=('compiz') -source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz - compiz-kde-4.8.patch - compiz-kde-4.9.patch - compiz-kde-4.10.patch - compiz-gcc-4.7.patch) -sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' - '148656352f8a20b3781ee185025c5c8d4b7d720f' - '2b6fa7398ccb96172a99f4d12990bbc0491e355c' - 'f3c97cc9835643d48058682506eac98d6deceeb7' - '2138342ae9f253bae003e96e91fdd0bc9918291a') - -prepare() -{ - cd "$srcdir/compiz-$pkgver" - - patch -p0 -i ../compiz-gcc-4.7.patch - patch -p1 -i ../compiz-kde-4.8.patch - patch -p1 -i ../compiz-kde-4.9.patch - patch -p0 -i ../compiz-kde-4.10.patch -} - -build() -{ - cd "$srcdir/compiz-$pkgver" - - ./configure --prefix=/usr \ - --enable-gnome \ - --enable-gtk \ - --enable-metacity \ - --enable-gconf \ - --with-gconf-schema-file-dir=/etc/gconf/schemas \ - --enable-dbus \ - --enable-librsvg \ - --disable-kde \ - --enable-kde4 - - make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4 -} - -package_compiz-core() -{ - - pkgdesc="Composite manager for Aiglx and Xgl" - depends=('startup-notification' 'librsvg' \ - 'libgl' 'dbus' 'glu' 'libxslt' 'fuse') - - cd "$srcdir/compiz-$pkgver" - make DESTDIR="$pkgdir" install - - # remove stuff which is in one of the decorations - rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator} - rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center} - rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*} - rm -rf "${pkgdir}"/etc - - # install MIT license - install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \ - "$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT" -} - -package_compiz-decorator-gtk() -{ - pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity') - install=compiz-decorator-gtk.install - - cd "$srcdir/compiz-$pkgver" - - pushd gtk - make DESTDIR="$pkgdir" install - install -Dm644 window-decorator/gwd.schemas \ - "$pkgdir/usr/share/gconf/schemas/gwd.schemas" - popd - - for i in dbus gconf ini inotify png regex svg glib kconfig - do - rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas - done - - gconf-merge-schema \ - "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \ - "${srcdir}"/compiz-$pkgver/metadata/*.schemas - - make DESTDIR="$pkgdir" install - - # remove stuff which is in one of the other packages - rm -rf "${pkgdir}"/etc - rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator} - rm -rf "$pkgdir"/usr/include - cd "$pkgdir"/usr/lib - rm libdecoration* - rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc} - cd "${pkgdir}"/usr/lib/compiz - rm $(ls --hide=*gconf*) - rm -rf "${pkgdir}"/usr/share/{compiz,locale} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT -} - -package_compiz-decorator-kde() -{ - pkgdesc="Compiz decorator for KDE" - depends=('kdebase-workspace' 'compiz-core') - - cd "$srcdir"/compiz-$pkgver - make DESTDIR="$pkgdir" install - - # Let's remove stuff that are in compiz-core package or gtk decorator - rm -rf "$pkgdir"/usr/{include,lib} - rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator} - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz} - - # install MIT license - install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \ - "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT -} - diff --git a/community/compiz/compiz-decorator-gtk.install b/community/compiz/compiz-decorator-gtk.install deleted file mode 100644 index b3738fda9..000000000 --- a/community/compiz/compiz-decorator-gtk.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q - -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null - usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null -} - -post_remove() { - kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1 - update-desktop-database -q -} - diff --git a/community/compiz/compiz-gcc-4.7.patch b/community/compiz/compiz-gcc-4.7.patch deleted file mode 100644 index 28315baec..000000000 --- a/community/compiz/compiz-gcc-4.7.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- kde/window-decorator-kde4/window.cpp 2010-05-21 11:18:14.000000000 +0000 -+++ kde/window-decorator-kde4/window.cpp 2012-09-12 18:05:00.000000000 +0000 -@@ -59,6 +59,9 @@ - - #include "paintredirector.h" - -+// header for gcc-4.7 compatibility -+#include "unistd.h" -+ - KWD::Window::Window (WId parentId, - WId clientId, - WId frame, ---- configure.ac.orig 2012-09-12 23:39:54.093812000 +0400 -+++ configure.ac 2012-09-12 23:40:37.253686000 +0400 -@@ -72,11 +72,6 @@ - *) CFLAGS="$CFLAGS -Wnested-externs" ;; - esac - -- case " $CFLAGS " in -- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; -- *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;; -- esac -- - if test "x$enable_ansi" = "xyes"; then - case " $CFLAGS " in - *[[\ \ ]]-ansi[[\ \ ]]*) ;; -@@ -95,11 +90,6 @@ - *[[\ \ ]]-Wall[[\ \ ]]*) ;; - *) CXXFLAGS="$CXXFLAGS -Wall" ;; - esac -- -- case " $CXXFLAGS " in -- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; -- *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;; -- esac - fi - - AC_C_BIGENDIAN diff --git a/community/compiz/compiz-kde-4.10.patch b/community/compiz/compiz-kde-4.10.patch deleted file mode 100644 index a30d54b90..000000000 --- a/community/compiz/compiz-kde-4.10.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- kde/window-decorator-kde4/window.cpp 2012-11-14 10:17:09 +0000 -+++ kde/window-decorator-kde4/window.cpp 2012-11-23 06:43:18 +0000 -@@ -554,6 +554,15 @@ - showWindowMenu (pos.bottomLeft ()); - } - -+void KWD::Window::showApplicationMenu (const QPoint &p) -+{ -+} -+ -+bool KWD::Window::menuAvailable () const -+{ -+ return false; -+} -+ - KWD::Options::MouseCommand - KWD::Window::buttonToCommand (Qt::MouseButtons button) - { - ---- kde/window-decorator-kde4/window.h 2012-09-03 07:19:30 +0000 -+++ kde/window-decorator-kde4/window.h 2012-11-23 06:43:18 +0000 -@@ -92,6 +92,8 @@ - virtual void processMousePressEvent (QMouseEvent *); - virtual void showWindowMenu (const QRect &); - virtual void showWindowMenu (const QPoint &); -+ virtual void showApplicationMenu (const QPoint &); -+ virtual bool menuAvailable () const; - virtual void performWindowOperation (WindowOperation); - virtual void setMask (const QRegion &, int); - virtual bool isPreview (void) const; diff --git a/community/compiz/compiz-kde-4.8.patch b/community/compiz/compiz-kde-4.8.patch deleted file mode 100644 index f22a3fa21..000000000 --- a/community/compiz/compiz-kde-4.8.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp ---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp 2012-01-29 22:05:54.000000000 -0500 -+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-01-29 22:10:38.000000000 -0500 -@@ -986,10 +986,10 @@ - { - Atom atom = Atoms::compizWindowBlurDecor; - QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -- Region topRegion = NULL; -- Region bottomRegion = NULL; -- Region leftRegion = NULL; -- Region rightRegion = NULL; -+ ::Region topRegion = NULL; -+ ::Region bottomRegion = NULL; -+ ::Region leftRegion = NULL; -+ ::Region rightRegion = NULL; - int size = 0; - int w, h; - diff --git a/community/compiz/compiz-kde-4.9.patch b/community/compiz/compiz-kde-4.9.patch deleted file mode 100644 index 7b56da95c..000000000 --- a/community/compiz/compiz-kde-4.9.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001 -From: Dennis Kasprzyk <onestone@compiz.org> -Date: Mon, 06 Aug 2012 18:23:17 +0000 -Subject: KDE 4.9 support. - -Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov - ---- -diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp -index a65f99f..78d1a47 100644 ---- a/kde/window-decorator-kde4/window.cpp -+++ b/kde/window-decorator-kde4/window.cpp -@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const - return QRect (); - } - -+KDecorationDefines::WindowOperation -+KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) -+{ -+ Options::MouseCommand com = buttonToCommand (button); -+ -+ if (com == Options::MouseOperationsMenu) -+ return KDecorationDefines::OperationsOp; -+ -+ return KDecorationDefines::NoOp; -+} -+ -+ -+#endif -+ -+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) -+ - bool - KWD::Window::isClientGroupActive () - { -@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos) - showWindowMenu (pos); - } - --KDecorationDefines::WindowOperation --KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) -+#endif -+ -+#if KDE_IS_VERSION(4,8,80) -+QString -+KWD::Window::caption(int idx) const - { -- Options::MouseCommand com = buttonToCommand (button); -+ return mName; -+} - -- if (com == Options::MouseOperationsMenu) -- return KDecorationDefines::OperationsOp; -+void -+KWD::Window::closeTab(long id) -+{ -+ closeWindow (); -+} - -- return KDecorationDefines::NoOp; -+void -+KWD::Window::closeTabGroup() -+{ -+ closeWindow (); -+} -+ -+long -+KWD::Window::currentTabId() const -+{ -+ return (long) mClientId; -+} -+ -+QIcon -+KWD::Window::icon(int idx) const -+{ -+ QIcon icon (mIcon); -+ icon.addPixmap (mMiniIcon); -+ return icon; -+} -+ -+void -+KWD::Window::setCurrentTab(long id) -+{ -+} -+ -+void -+KWD::Window::showWindowMenu(const QPoint& pos, long id) -+{ -+ showWindowMenu (pos); -+} -+ -+void -+KWD::Window::tab_A_before_B(long A, long B) -+{ -+} -+ -+void -+KWD::Window::tab_A_behind_B(long A, long B) -+{ -+} -+ -+int -+KWD::Window::tabCount() const -+{ -+ return 1; -+} -+ -+long -+KWD::Window::tabId(int idx) const -+{ -+ return (long) mClientId; -+} -+ -+void -+KWD::Window::untab(long id, const QRect& newGeom) -+{ - } - - #endif - -+ - void - KWD::Window::createDecoration (void) - { -@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset, - int leftOffset, - int rightOffset) - { -- Atom atom = Atoms::compizWindowBlurDecor; -- QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -- ::Region topRegion = NULL; -- ::Region bottomRegion = NULL; -- ::Region leftRegion = NULL; -- ::Region rightRegion = NULL; -- int size = 0; -- int w, h; -+ Atom atom = Atoms::compizWindowBlurDecor; -+ QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -+ _XRegion *topRegion = NULL; -+ _XRegion *bottomRegion = NULL; -+ _XRegion *leftRegion = NULL; -+ _XRegion *rightRegion = NULL; -+ int size = 0; -+ int w, h; - - w = mGeometry.width () + mBorder.left + mBorder.right; - h = mGeometry.height () + mBorder.top + mBorder.bottom; -diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h -index c2b274b..1ddfbd1 100644 ---- a/kde/window-decorator-kde4/window.h -+++ b/kde/window-decorator-kde4/window.h -@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable { - virtual bool compositingActive () const; - #if KDE_IS_VERSION(4,3,90) - virtual QRect transparentRect () const; -- -+ virtual WindowOperation -+ buttonToWindowOperation(Qt::MouseButtons button); -+#endif -+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) - virtual bool isClientGroupActive (); - virtual QList<ClientGroupItem> clientGroupItems () const; - virtual long itemId (int index); -@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable { - virtual void closeClientGroupItem (int index); - virtual void closeAllInClientGroup (); - virtual void displayClientMenu (int index, const QPoint& pos); -- -- virtual WindowOperation -- buttonToWindowOperation(Qt::MouseButtons button); -+ -+#endif -+#if KDE_IS_VERSION(4,8,80) -+ using KDecorationBridge::caption; -+ virtual QString caption(int idx) const; -+ virtual void closeTab(long id); -+ virtual void closeTabGroup(); -+ virtual long currentTabId() const; -+ using KDecorationBridge::icon; -+ virtual QIcon icon(int idx) const; -+ virtual void setCurrentTab(long id); -+ using KDecorationBridge::showWindowMenu; -+ virtual void showWindowMenu(const QPoint& pos, long id); -+ virtual void tab_A_before_B(long A, long B); -+ virtual void tab_A_behind_B(long A, long B); -+ virtual int tabCount() const; -+ virtual long tabId(int idx) const; -+ virtual void untab(long id, const QRect& newGeom); - #endif -+ -+ - virtual bool eventFilter (QObject* o, QEvent* e); - - void handleActiveChange (void); --- -cgit v0.8.3.1-30-gff3a diff --git a/community/compizconfig-backend-gconf/PKGBUILD b/community/compizconfig-backend-gconf/PKGBUILD deleted file mode 100644 index 43c8e29b7..000000000 --- a/community/compizconfig-backend-gconf/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 68302 2012-03-21 10:36:50Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: kasa <biuta.jr@gmail.com> - -pkgname=compizconfig-backend-gconf -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compizconfig backend for gconf" -arch=('i686' 'x86_64' 'mips64el') -url="http://opencompositing.org" -license=('GPL') -depends=('libcompizconfig' 'gconf') -makedepends=('intltool' 'pkgconfig') -conflicts=('compizconfig-backend-gconf-git') -groups=('compiz-fusion-gtk' 'compiz-fusion') -options=('!libtool') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('3869e83a50e82caa4bfda5474a3bf44095ee78dc') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --sysconfdir=/etc - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} - diff --git a/community/compizconfig-python/PKGBUILD b/community/compizconfig-python/PKGBUILD deleted file mode 100644 index 6ae0eea50..000000000 --- a/community/compizconfig-python/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 68381 2012-03-23 15:45:56Z rvanharen $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=compizconfig-python -pkgver=0.8.4 -pkgrel=4 -pkgdesc="Compizconfig bindings for python" -arch=('i686' 'x86_64' 'mips64el') -url="http://opencompositing.org" -license=('GPL') -depends=('compiz-core' 'libcompizconfig' 'glib2' 'python2' 'libxrandr') -makedepends=('intltool' 'pkgconfig' 'pyrex') -conflicts=('compizconfig-python-git') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('702f83f63ce5dc3c6c1d27e07fb62fc3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - PYTHON=python2 ./configure --prefix=/usr - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD index 53a011a4a..5d0dbf36c 100644 --- a/community/conntrack-tools/PKGBUILD +++ b/community/conntrack-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85682 2013-03-04 23:03:57Z seblu $ +# $Id: PKGBUILD 90503 2013-05-12 23:32:26Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Valere Monseur <valere_monseur@hotmail.com> # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> @@ -6,7 +6,7 @@ pkgname=conntrack-tools pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/conntrack-tools' @@ -22,7 +22,7 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b '01-config-file-path.patch') install=$pkgname.install sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f' - '2c205952a447ee0a6a7fc99bddeea1bfaf1b8034' + 'ab888d59b98b673709d2d89554c668e2bea0cb86' 'e7607a9ac14dd839f3716ac68d46e19ab26ef112') build() { @@ -30,7 +30,7 @@ build() { for i in "$srcdir"/*.patch; do patch -p1 -i "$i" done - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/community/conntrack-tools/conntrackd.service b/community/conntrack-tools/conntrackd.service index 25a113785..250c558cc 100644 --- a/community/conntrack-tools/conntrackd.service +++ b/community/conntrack-tools/conntrackd.service @@ -2,7 +2,7 @@ Description=Conntrack Daemon [Service] -ExecStart=/usr/sbin/conntrackd +ExecStart=/usr/bin/conntrackd [Install] WantedBy=multi-user.target diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 8f93e8784..95aa5020c 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,31 +1,29 @@ -# $Id: PKGBUILD 88676 2013-04-21 22:16:43Z heftig $ +# $Id: PKGBUILD 90750 2013-05-13 15:02:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" license=('APACHE') -depends=('icu' 'erlang' 'js' 'openssl' 'curl') +depends=('icu' 'erlang' 'js185' 'openssl' 'curl') install=couchdb.install options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} +source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" - "couchdb.rc" "build-fix.patch") md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203' - '1346a657d7552188f6cc9e0cdc231b05' + 'SKIP' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' - 'a75ee9b310a950eea13b07274b7a0669' '71afe48505dfc07ba2091786b4650fa2') build() { @@ -44,8 +42,6 @@ package() { install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb - install -Dm755 $srcdir/couchdb.rc $pkgdir/etc/rc.d/couchdb - rm -rf $pkgdir/etc/default/ $pkgdir/var/run install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/community/couchdb/couchdb.rc b/community/couchdb/couchdb.rc deleted file mode 100644 index af41c6460..000000000 --- a/community/couchdb/couchdb.rc +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions - -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -### BEGIN INIT INFO -# Provides: couchdb -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Apache CouchDB init script -# Description: Apache CouchDB init script for the database server. -### END INIT INFO - -SCRIPT_OK=0 -SCRIPT_ERROR=1 - -DESCRIPTION="database server" -NAME=couchdb -SCRIPT_NAME=`basename $0` -COUCHDB=/usr/bin/couchdb -CONFIGURATION_FILE=/etc/conf.d/couchdb -RUN_DIR=/var/run/couchdb -LSB_LIBRARY=/lib/lsb/init-functions - -if test ! -x $COUCHDB; then - exit $SCRIPT_ERROR -fi - -if test -r $CONFIGURATION_FILE; then - . $CONFIGURATION_FILE -fi - -log_daemon_msg () { - stat_busy $@ -} - -log_end_msg () { - if test "$1" != "0"; then - stat_fail - else - stat_done - fi - return $1 -} - -if test -r $LSB_LIBRARY; then - . $LSB_LIBRARY -fi - -run_command () { - command="$1" - if test -n "$COUCHDB_OPTIONS"; then - command="$command $COUCHDB_OPTIONS" - fi - if test -n "$COUCHDB_USER"; then - if su $COUCHDB_USER -s /bin/bash -c "$command"; then - return $SCRIPT_OK - else - return $SCRIPT_ERROR - fi - else - if $command; then - return $SCRIPT_OK - else - return $SCRIPT_ERROR - fi - fi -} - -start_couchdb () { - # Start Apache CouchDB as a background process. - - mkdir -p "$RUN_DIR" - chown -R $COUCHDB_USER "$RUN_DIR" - command="$COUCHDB -b" - if test -n "$COUCHDB_STDOUT_FILE"; then - command="$command -o $COUCHDB_STDOUT_FILE" - fi - if test -n "$COUCHDB_STDERR_FILE"; then - command="$command -e $COUCHDB_STDERR_FILE" - fi - if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then - command="$command -r $COUCHDB_RESPAWN_TIMEOUT" - fi - run_command "$command" > /dev/null -} - -stop_couchdb () { - # Stop the running Apache CouchDB process. - - run_command "$COUCHDB -d" > /dev/null -} - -display_status () { - # Display the status of the running Apache CouchDB process. - - run_command "$COUCHDB -s" -} - -parse_script_option_list () { - # Parse arguments passed to the script and take appropriate action. - - case "$1" in - start) - log_daemon_msg "Starting $DESCRIPTION" $NAME - if start_couchdb; then - log_end_msg $SCRIPT_OK - else - log_end_msg $SCRIPT_ERROR - fi - ;; - stop) - log_daemon_msg "Stopping $DESCRIPTION" $NAME - if stop_couchdb; then - log_end_msg $SCRIPT_OK - else - log_end_msg $SCRIPT_ERROR - fi - ;; - restart) - log_daemon_msg "Restarting $DESCRIPTION" $NAME - if stop_couchdb; then - if start_couchdb; then - log_end_msg $SCRIPT_OK - else - log_end_msg $SCRIPT_ERROR - fi - else - log_end_msg $SCRIPT_ERROR - fi - ;; - status) - display_status - ;; - *) - cat << EOF >&2 -Usage: $SCRIPT_NAME {start|stop|restart|status} -EOF - exit $SCRIPT_ERROR - ;; - esac -} - -parse_script_option_list $@ diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index ab4ef1bfd..1c1df987d 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88776 2013-04-22 10:14:05Z spupykin $ +# $Id: PKGBUILD 91947 2013-05-30 09:41:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.19 +pkgver=0.19.1 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ url="http://www.cython.org" license=('APACHE') makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('76989337dee4cf7afdcb5cde514423f8') +md5sums=('df4cfb2b8e3345272e3fc451b76bd630') build() { true diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 0bc260b77..648c4df12 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79500 2012-11-06 11:18:47Z spupykin $ +# $Id: PKGBUILD 91850 2013-05-28 17:25:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.2 -pkgrel=3 +pkgrel=5 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64 'mips64el') @@ -14,15 +14,14 @@ backup=('etc/socks.conf' 'etc/sockd.conf') options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz - sockd.rc sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' - '5110dfd78a2b38fff27a886ee88b58a6' - 'ceb86b5bd97f7e3ceff28c6e6172a25b') + '9bb18a0165764092bd01da0ff6303fbf') build() { cd ${srcdir}/${pkgname}-${pkgver} [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ --disable-libwrap make } @@ -30,13 +29,9 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # Config files mkdir -p ${pkgdir}/etc/conf.d cp example/{socks,sockd}.conf ${pkgdir}/etc - # License install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - # rc-script - install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service } diff --git a/community/dante/sockd.rc b/community/dante/sockd.rc deleted file mode 100644 index 00ea5a7d4..000000000 --- a/community/dante/sockd.rc +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -daemon_name=sockd - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sockd.conf - -get_pid() { - cat /var/run/sockd.pid 2>/dev/null -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name $SOCKD_OPTS 1>/dev/null 2>/dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community/dante/sockd.service b/community/dante/sockd.service index a2a964304..68201577a 100644 --- a/community/dante/sockd.service +++ b/community/dante/sockd.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking EnvironmentFile=/etc/conf.d/sockd.conf -PIDFile=/var/run/sockd.pid -ExecStart=/usr/sbin/sockd $SOCKD_OPTS +PIDFile=/run/sockd.pid +ExecStart=/usr/bin/sockd $SOCKD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD index a1aba40ca..247f77f7e 100644 --- a/community/darkhttpd/PKGBUILD +++ b/community/darkhttpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89410 2013-04-29 10:56:40Z spupykin $ +# $Id: PKGBUILD 91852 2013-05-28 17:25:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=darkhttpd pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A small, static webserver" arch=('i686' 'x86_64' 'mips64el') url="http://dmr.ath.cx/net/darkhttpd/" @@ -20,7 +20,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/sbin/darkhttpd + install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/bin/darkhttpd mkdir -p $pkgdir/usr/share/licenses/$pkgname head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license } diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index 1f504ae9e..43663d797 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86508 2013-03-18 12:20:58Z spupykin $ +# $Id: PKGBUILD 91854 2013-05-28 17:26:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat pkgver=3.0.715 -pkgrel=8 +pkgrel=10 pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") @@ -11,28 +11,23 @@ arch=(i686 x86_64 'mips64el') depends=('libpcap' 'zlib' 'gcc-libs') backup=('etc/conf.d/darkstat.conf') source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 - darkstat darkstat.service darkstat.conf) install=darkstat.install md5sums=('5b7abc7538dcd8e30667dac150e81d77' - '1021f95fabe16cfab4c95f6264d535e5' '91dd1cf9d01c2b37896f01b4570b5521' 'aa9a9effd1e8f08860afcd6439fc94c5') options=(!makeflags !distcc) build() { cd $srcdir/darkstat-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { cd $srcdir/darkstat-$pkgver make DESTDIR=$pkgdir install - - # darkstat script - install -D -m755 "$srcdir"/darkstat "$pkgdir"/etc/rc.d/darkstat install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/darkstat/darkstat b/community/darkstat/darkstat deleted file mode 100755 index 26df1761a..000000000 --- a/community/darkstat/darkstat +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/sbin/darkstat" -daemon_name=$(basename $daemon_bin) -daemon_chroot=/var/$daemon_name -daemon_database="$daemon_name.dat" -daemon_output="$daemon_chroot/$daemon_name.out" -PIDF="$daemon_chroot/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --user "$daemon_name" --chroot "$daemon_chroot" \ - --import "$daemon_database" \ - --export "$daemon_database" \ - --pidfile "$(basename $PIDF)" \ - -i "$DARKSTAT_IFACE" \ - $DARKSTAT_ARGS \ - 2>&1 | tee "$daemon_output" - ret=$? - grep -q error "$daemon_output" 2>/dev/null - error_output=$? - rm -f "$daemon_output" - # - if [ $ret -gt 0 -o $error_output -eq 0 ] ; then - stat_fail - rm -f "$PIDF" - exit 1 - else - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index a4f646cad..207228bfa 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90013 2013-05-06 19:36:35Z foutrelis $ +# $Id: PKGBUILD 91822 2013-05-28 13:42:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.2 +pkgver=1.2.1 _pkgver=1.2 -pkgrel=4 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('31bfd13d4786aac4f99d5155a811602b') +md5sums=('f970573777752b1b4447997d1f1f65fa') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 6b388b23b..ab4fadc71 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84536 2013-02-19 15:03:09Z spupykin $ +# $Id: PKGBUILD 91488 2013-05-23 10:12:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=9 +pkgrel=11 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -15,14 +15,11 @@ optdepends=('libldap: for LDAP authentication' url="http://www.dbmail.org" license=('GPL') options=('!libtool' 'zipman') -backup=(etc/conf.d/dbmail - etc/xinetd.d/dbmail-imapd +backup=(etc/xinetd.d/dbmail-imapd etc/xinetd.d/dbmail-pop3d etc/xinetd.d/dbmail-lmtpd etc/xinetd.d/dbmail-timsieved) source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz - dbmail.conf.d - dbmail.rc.d dbmail.tmpfiles dbmail-imapd.service dbmail-lmtpd.service @@ -33,22 +30,20 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail-pop3d.xinetd dbmail-timsieved.xinetd) md5sums=('eb32235abffdf967253ee9d004e0e4a9' - 'e7f72bc360decdb2475266391ad12329' - '30774513fb016b9da08e9cf6f2a0b8e7' 'c4b5793c5422b62a675d4c66ff7e9300' - '84efa46eaac66057c4eb131d9bc27fa8' - '19560277f6a56d1f3f2fdb02315dcf0f' - '89a0f793737eaf36291409f8c840891e' - 'dd1b5b2c542f55d9d934a58a36d0513d' - '8fa791f2e4d107ba461453c054359477' - '069cd4285c4b2ec95dfdcebc2cfee387' - '44f87ce81e786fcee501daa17e55412a' - 'a66927cb94d4f26428211e3ad2d540c8') + '5a6297cb03c8d0b424f978ea1d7402de' + '070db88538af9833f003f4cb516d337b' + '422f0399f97a780b7cab84443e8f429a' + '15c7d367d4242aebac5f87649a2250aa' + '890de13361afbdf4fed12d6d7eb53e66' + '961593658cd596297d03d25eb9c9e98f' + '4cb764894abd3914802e90602bf90a0c' + 'e78dc86355f9aaf24590bc7c6611162f') build() { cd $srcdir/dbmail-${pkgver/_/-}/ - - [ -f Makefile ] || ./configure --prefix=/usr --with-ldap --with-sieve + [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \ + --with-ldap --with-sieve make } @@ -59,8 +54,6 @@ package() { mkdir $pkgdir/etc install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample - install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail - install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ cp dbmail.schema $pkgdir/usr/share/dbmail/ diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service index e67e0c4e8..bc3319fd0 100644 --- a/community/dbmail/dbmail-imapd.service +++ b/community/dbmail/dbmail-imapd.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-imapd.pid -ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid +PIDFile=/run/dbmail/dbmail-imapd.pid +ExecStart=/usr/bin/dbmail-imapd -p /run/dbmail/dbmail-imapd.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-imapd.xinetd b/community/dbmail/dbmail-imapd.xinetd index eee3635df..20f7d607d 100644 --- a/community/dbmail/dbmail-imapd.xinetd +++ b/community/dbmail/dbmail-imapd.xinetd @@ -3,9 +3,11 @@ service imap socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-imapd + server = /usr/bin/dbmail-imapd protocol = tcp server_args = -n log_on_failure += USERID disable = yes +# env = EVENT_NOEPOLL=yes +# instances = 200 } diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service index 2a059a15c..570ba1ec7 100644 --- a/community/dbmail/dbmail-lmtpd.service +++ b/community/dbmail/dbmail-lmtpd.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-lmtpd.pid -ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid +PIDFile=/run/dbmail/dbmail-lmtpd.pid +ExecStart=/usr/bin/dbmail-lmtpd -p /run/dbmail/dbmail-lmtpd.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-lmtpd.xinetd b/community/dbmail/dbmail-lmtpd.xinetd index 63365fee4..0a0e05620 100644 --- a/community/dbmail/dbmail-lmtpd.xinetd +++ b/community/dbmail/dbmail-lmtpd.xinetd @@ -5,7 +5,7 @@ service lmtp socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-lmtpd + server = /usr/bin/dbmail-lmtpd protocol = tcp server_args = -n log_on_failure += USERID diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service index 907f43b2b..edfa2570a 100644 --- a/community/dbmail/dbmail-pop3d.service +++ b/community/dbmail/dbmail-pop3d.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-pop3d.pid -ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid +PIDFile=/run/dbmail/dbmail-pop3d.pid +ExecStart=/usr/bin/dbmail-pop3d -p /run/dbmail/dbmail-pop3d.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-pop3d.xinetd b/community/dbmail/dbmail-pop3d.xinetd index 6c5b06735..f073aca8b 100644 --- a/community/dbmail/dbmail-pop3d.xinetd +++ b/community/dbmail/dbmail-pop3d.xinetd @@ -3,9 +3,11 @@ service pop3 socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-pop3d + server = /usr/bin/dbmail-pop3d protocol = tcp server_args = -n log_on_failure += USERID disable = yes +# env = EVENT_NOEPOLL=yes +# instances = 200 } diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service index 7f34bacec..32623e038 100644 --- a/community/dbmail/dbmail-timsieved.service +++ b/community/dbmail/dbmail-timsieved.service @@ -4,8 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service [Service] Type=forking -PIDFile=/var/run/dbmail/dbmail-timsieved.pid -ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid +PIDFile=/run/dbmail/dbmail-timsieved.pid +ExecStart=/usr/bin/dbmail-timsieved -p /run/dbmail/dbmail-timsieved.pid [Install] WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-timsieved.xinetd b/community/dbmail/dbmail-timsieved.xinetd index 77ed27c31..69f6dd66b 100644 --- a/community/dbmail/dbmail-timsieved.xinetd +++ b/community/dbmail/dbmail-timsieved.xinetd @@ -1,11 +1,15 @@ service sieve { +# port = 2000 +# type = UNLISTED socket_type = stream wait = no user = nobody - server = /usr/sbin/dbmail-timsieved + server = /usr/bin/dbmail-timsieved protocol = tcp server_args = -n log_on_failure += USERID disable = yes +# env = EVENT_NOEPOLL=yes +# instances = 200 } diff --git a/community/dbmail/dbmail.conf.d b/community/dbmail/dbmail.conf.d deleted file mode 100644 index 73309a4a2..000000000 --- a/community/dbmail/dbmail.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Parameters to be passed to dbmail -# -# -# Select the service you want started with dbmail -# -# Available options : -# dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved -# -DBMAIL_DAEMONS="dbmail-imapd" diff --git a/community/dbmail/dbmail.rc.d b/community/dbmail/dbmail.rc.d deleted file mode 100644 index f849b1679..000000000 --- a/community/dbmail/dbmail.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/dbmail ] && . /etc/conf.d/dbmail - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - mkdir -p /var/run/dbmail - chown -R nobody:nobody /var/run/dbmail - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Starting DbMail ${daemon}" - /usr/sbin/${daemon} -p /var/run/dbmail/${daemon}.pid - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - add_daemon dbmail - ;; - stop) - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/dbmail/${daemon}.pid 2>/dev/null) - kill $pid 2>/dev/null - while kill -0 "$pid" 2>/dev/null; do - sleep 0.2 - done - stat_done - done - rm_daemon dbmail - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac - -exit 0 diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD index 40a9833c3..ef8cb910c 100644 --- a/community/delegate/PKGBUILD +++ b/community/delegate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65112 2012-02-20 04:49:31Z spupykin $ +# $Id: PKGBUILD 91876 2013-05-28 17:59:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=delegate pkgver=9.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="Caching and converting multyprotocol proxy. For example, you may use it as NNTP web interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.delegate.org/" @@ -18,13 +18,17 @@ md5sums=('86c833e95cd16a54d54fa3c7e4ab7929') build() { cd $srcdir/$pkgname$pkgver make ADMIN="root@localhost" +} + +package() { + cd $srcdir/$pkgname$pkgver install -D -m0755 src/delegated $pkgdir/usr/bin/delegated - install -D -m0755 subin/dgbind $pkgdir/usr/sbin/dgbind - install -D -m0755 subin/dgchroot $pkgdir/usr/sbin/dgchroot - install -D -m0755 subin/dgcpnod $pkgdir/usr/sbin/dgcpnod - install -D -m0755 subin/dgpam $pkgdir/usr/sbin/dgpam + install -D -m0755 subin/dgbind $pkgdir/usr/bin/dgbind + install -D -m0755 subin/dgchroot $pkgdir/usr/bin/dgchroot + install -D -m0755 subin/dgcpnod $pkgdir/usr/bin/dgcpnod + install -D -m0755 subin/dgpam $pkgdir/usr/bin/dgpam install -D -m0644 doc/Manual.htm $pkgdir/usr/share/delegate/manual.htm install -D -m0644 doc/tutor-en.htm $pkgdir/usr/share/delegate/tutor-en.htm diff --git a/community/delegate/delegate.install b/community/delegate/delegate.install index f7c7096b4..39883a261 100644 --- a/community/delegate/delegate.install +++ b/community/delegate/delegate.install @@ -1,11 +1,6 @@ -pre_install() { - /bin/true -} - post_install() { echo "--" echo "-- Delegate supports too many protocols, so I did not write any rc-script" echo "-- Please read documentation in /usr/share/delegate/" echo "--" - /bin/true } diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 793d663e8..6b68492d5 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79187 2012-10-31 09:43:20Z spupykin $ +# $Id: PKGBUILD 91830 2013-05-28 17:03:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=dictd pkgver=1.12.1 -pkgrel=1 +pkgrel=3 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" license=('GPL') @@ -20,7 +20,6 @@ backup=(etc/dict/dictd.conf etc/dict/colorit.conf) options=('!emptydirs') source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" - dictd dict.conf dictd.conf dictd.confd @@ -29,25 +28,23 @@ source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" dictd.xinetd colorit.conf) md5sums=('62696491174c22079f664830d07c0623' - '6542df4fc585773fc03f1a088730126b' 'fb72f7d8c55f84b1b37bbc8d33a8e55a' '64cd6ffdb40fb3367224f91ac44926ac' '838887fee38ae4cebd652d399b1f2266' - '574e316d1f08885882d7b3075e1ea522' + 'd94fa6c43514c158c80e85f856c65365' 'b8cabf913876e544d919c7f20ff8db9e' - 'b7dbc9529df13ff895dae2b4abd080d6' + 'bd3fd3f68625bad0c23754686ae2e99c' '978c9c079a0fc8d7d42a4cd4000190e7') build() { cd $srcdir/$pkgname-$pkgver - ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict + ./configure --enable-dictorg --prefix=/usr --sysconfdir=/etc/dict --sbindir=/usr/bin make } package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m 0755 $srcdir/dictd $pkgdir/etc/rc.d/dictd install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd install -D -m 0644 $srcdir/dictd.conf $pkgdir/etc/dict/dictd.conf install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf diff --git a/community/dictd/dictd b/community/dictd/dictd deleted file mode 100644 index 4f435d6f0..000000000 --- a/community/dictd/dictd +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/dictd -. /etc/rc.conf - -. /etc/rc.d/functions - -preconfiguration() { - stat_busy "Check dictd configuration" - if [ ! -e ${DICTD_CONF} ]; then - echo "No configuration" - stat_fail - exit 1 - fi - stat_done - - # The new way of doing this is to scan /usr/lib/dict and tweek the conf - stat_busy "Scanning for dictionaries..." - if [ ! -d "${DICTD_DICTDIR}" ]; then - echo "No dictionaries found" - stat_fail - exit 1 - fi - stat_done - pushd ${DICTD_DICTDIR} >/dev/null - INDEXFILES=`ls *.index` - if [ -z "$INDEXFILES" ]; then - echo "No dictionaries found" - stat_fail - exit 1 - fi - - cat $DICTD_CONF | sed -e '/^#LASTLINE/,$d' > $DICTD_TMPCONF - echo "#LASTLINE" >> $DICTD_TMPCONF - - CNT=0 - for i in $INDEXFILES - do - DNAME=`echo $i | awk -F . '{print $1;}'` - #two possible names for a matching dictionary, check which is there. - if [ -f ${DNAME}.dict.dz ]; then - DICT=${DNAME}.dict.dz - elif [ -f ${DNAME}.dict ];then - DICT=${DNAME}.dict - else - echo "Index $i has no matching dictionaray..." - fi - - #ok, go an index, and a dixtionary, append. - echo "database $DNAME { data \"${DICTD_DICTDIR}/${DICT}\"" >> $DICTD_TMPCONF - echo " index \"${DICTD_DICTDIR}/$i\" }" >> $DICTD_TMPCONF - - CNT=`expr $CNT + 1` - done - popd >/dev/null - mv ${DICTD_TMPCONF} ${DICTD_CONF} - echo "$CNT dictionary indexes found." -} - -PID=`pidof -o %PPID /usr/sbin/dictd` - -case "$1" in - start) - preconfiguration || exit 1 - stat_busy "Start dictd daemon" - /usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dictd - stat_done - fi - ;; - - stop) - stat_busy "Stop dictd daemon" - kill $PID 2>/dev/null 1>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dictd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/dictd/dictd.service b/community/dictd/dictd.service index fa219f72a..f62bf275f 100644 --- a/community/dictd/dictd.service +++ b/community/dictd/dictd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking EnvironmentFile=-/etc/conf.d/dictd -ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS +ExecStart=/usr/bin/dictd $DICTD_ARGS -- $DICTD_EARGS [Install] WantedBy=multi-user.target diff --git a/community/dictd/dictd.xinetd b/community/dictd/dictd.xinetd index a3e3773dc..0ae5cb411 100644 --- a/community/dictd/dictd.xinetd +++ b/community/dictd/dictd.xinetd @@ -7,6 +7,6 @@ service dict protocol = tcp wait = no user = daemon - server = /usr/sbin/dictd + server = /usr/bin/dictd server_args = -c /etc/dict/dictd.conf -i --locale en_US.UTF-8 } diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 741d4beef..765446bbe 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81575 2012-12-24 15:00:09Z spupykin $ +# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=distcc pkgver=3.1 -pkgrel=10 +pkgrel=11 pkgdesc="A distributed C, C++, Obj C compiler" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/distcc/" @@ -17,11 +17,9 @@ optdepends=('gtk2: for distccmon-gnome' backup=('etc/conf.d/distccd' 'etc/distcc/hosts') source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 - distccd distccd.conf.d distccd.service) md5sums=('a1a9d3853df7133669fffec2a9aab9f3' - '1c918474372c09304772c20c4de484fa' '239aae53250e3e35288cba566bc0bbf1' '09f0688da9c1840e518d2593bd5c3830') @@ -46,7 +44,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd - install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd install -d ${pkgdir}/usr/lib/${pkgname}/bin ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cc diff --git a/community/distcc/distccd b/community/distcc/distccd deleted file mode 100644 index 4702d6820..000000000 --- a/community/distcc/distccd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/distccd` -case "$1" in - start) - stat_busy "Starting distcc Daemon" - [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon distccd - stat_done - fi - ;; - stop) - stat_busy "Stopping distcc Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon distccd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index 9c3a09793..bb150a493 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86842 2013-03-22 19:15:09Z seblu $ +# $Id: PKGBUILD 90502 2013-05-12 23:31:07Z seblu $ # Maintainer: Sébastien Luttringer pkgname=drbd pkgver=8.4.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Userland tools for Distributed Replicated Block Device' url='http://www.drbd.org' @@ -13,16 +13,20 @@ source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz" "$pkgname.service") backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') md5sums=('b081f1046adda1d51ba351c40a8b1107' - 'afbb345094db49b0a474c0b4e51c0acd') + '7dc909b5895c0b5289d3ee0581d7d333') + +prepare() { + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules +} build() { cd $pkgname-$pkgver - # fix hardcoded path in udev rules - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules ./configure \ --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-distro=generic \ --with-utils \ --with-bashcompletion \ @@ -41,7 +45,7 @@ package() { make DESTDIR="$pkgdir" install # move forced /sbin binaries cd "$pkgdir" - mv sbin/* usr/sbin + mv sbin/* usr/bin rmdir sbin # move udev files mv etc/udev usr/lib diff --git a/community/drbd/drbd.service b/community/drbd/drbd.service index ddd6c62b7..a8053fb05 100644 --- a/community/drbd/drbd.service +++ b/community/drbd/drbd.service @@ -7,13 +7,13 @@ Type=oneshot RemainAfterExit=yes # load config -ExecStart=/usr/sbin/drbdadm adjust all +ExecStart=/usr/bin/drbdadm adjust all # user interruptible version of wait-connect all -ExecStart=/usr/sbin/drbdadm wait-con-int +ExecStart=/usr/bin/drbdadm wait-con-int # become primary if configured -ExecStart=/usr/sbin/drbdadm sh-b-pri all +ExecStart=/usr/bin/drbdadm sh-b-pri all # disconnect and detach all resources -ExecStop=/usr/sbin/drbdadm down all +ExecStop=/usr/bin/drbdadm down all [Install] WantedBy=multi-user.target diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD index d7bcb0f4a..e0a357243 100644 --- a/community/dsniff/PKGBUILD +++ b/community/dsniff/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61947 2012-01-11 15:21:36Z stephane $ +# $Id: PKGBUILD 91568 2013-05-24 09:42:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ViNS <gladiator@fastwebnet.it> pkgname=dsniff pkgver=2.4b1 -pkgrel=21 +pkgrel=22 pkgdesc="Collection of tools for network auditing and penetration testing" url="http://www.monkey.org/~dugsong/dsniff/" arch=('i686' 'x86_64' 'mips64el') @@ -15,22 +15,26 @@ source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz" md5sums=('2f761fa3475682a7512b0b43568ee7d6' 'fbc9f62f9ab2f98f24f53ad497c1ce5d') -build() { +prepare() { cd $srcdir/$pkgname-2.4 patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff for i in *.dpatch; do patch -N < "$i" done + sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure +} - LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr - make +build() { + cd $srcdir/$pkgname-2.4 + LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure \ + --prefix=/usr --sbindir=/usr/bin + make -j1 } package() { cd "$srcdir"/$pkgname-2.4 - make prefix="$pkgdir"/usr install + make install_prefix="$pkgdir" install install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE - install -d "$pkgdir"/usr/share mv "$pkgdir"/usr/man "$pkgdir"/usr/share/ } diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index 58ef6d167..004e16c46 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86999 2013-03-25 19:16:37Z bpiotrowski $ +# $Id: PKGBUILD 90661 2013-05-13 14:22:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=4 +pkgrel=5 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64' 'mips64el') url="http://dspam.nuclearelephant.com/" @@ -24,13 +24,11 @@ options=('zipman' 'docs' '!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz dspam.logrotated - dspam dspam.service dspam.tmpfiles dspam_maintenance.cron) md5sums=('0e0e405d3284485b2a43f47eaf6b09bb' 'cec7e3df4cbc6feca387fb516a5b3490' - 'bb2300eff5b2a6eb987750c71a2c2169' '1581a94598cec370b66f37b118970676' '933643f2204ccbd7e451a439f83db1ea' 'ebfb0fec16a56f6e1a3a61ced2d5015d') @@ -58,10 +56,8 @@ package() { find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \; install -d $pkgdir/etc/logrotate.d \ - $pkgdir/etc/rc.d \ $pkgdir/usr/share/dspam/{mysql,pgsql} install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam - install -m755 ../dspam $pkgdir/etc/rc.d sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf diff --git a/community/dspam/dspam b/community/dspam/dspam deleted file mode 100644 index be533ba5f..000000000 --- a/community/dspam/dspam +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/dspam` -case "$1" in - start) - stat_busy "Starting DSPAM Daemon" - [ -d /var/run/dspam ] || mkdir -p /var/run/dspam - [ -z "$PID" ] && /usr/bin/dspam --daemon &> /dev/null & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dspam - stat_done - fi - ;; - stop) - stat_busy "Stopping DSPAM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dspam - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/dvdrtools/PKGBUILD b/community/dvdrtools/PKGBUILD index 3ce4f7354..6371ae6fc 100644 --- a/community/dvdrtools/PKGBUILD +++ b/community/dvdrtools/PKGBUILD @@ -5,7 +5,7 @@ pkgname=dvdrtools pkgver=0.3.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/dvdrtools/" diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 812a0255c..961e9d00e 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87844 2013-04-08 09:22:21Z spupykin $ +# $Id: PKGBUILD 91490 2013-05-23 10:12:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.12 -pkgrel=1 +pkgrel=4 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" @@ -17,11 +17,9 @@ backup=('etc/ejabberd/ejabberd.cfg' install=$pkgname.install source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" "$pkgname.logrotate" - "$pkgname" "ejabberd.service") md5sums=('7d49242cf04282f3c4cebfafa2cc2f46' 'f97c8a96160f30e0aecc9526c12e6606' - '2338a6230ce5f9f60be6dddcfa39bc7e' 'df32aa17e40a7bc5d9946d3ba6fe5e16') build() { @@ -34,12 +32,13 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver/src" make DESTDIR="$pkgdir" install - install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" install -d "$pkgdir/var/lib/$pkgname" install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* - chmod a+rx "$pkgdir/usr/sbin/ejabberdctl" - rm -rf "$pkgdir/var/lock" + mkdir -p $pkgdir/usr/bin + mv $pkgdir/usr/sbin/ejabberdctl $pkgdir/usr/bin/ejabberdctl + chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh" + rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin" install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service } diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd deleted file mode 100644 index c73be811c..000000000 --- a/community/ejabberd/ejabberd +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -cd /var/log/ejabberd/ - -get_pid() { - pidof epmd >/dev/null || { echo '' ; return 0; } - # get port from 'epmd -names', then get pid from 'ss -tlnp' - PORT=`epmd -names | grep ejabberd | cut -f5 -d\ ` - [ -z "$PORT" ] && { echo '' ; return 0; } - PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1` - [ -z "$PID" ] && { echo '' ; return 0; } - echo ${PID%/} -} - -case "$1" in - start) - stat_busy "Starting ejabber daemon" - - [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl - [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid - PID=`get_pid` - if [ -z "$PID" ]; then - su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"' - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/ejabberd.pid - add_daemon ejabberd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping ejabber daemon" - PID=`get_pid` - [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ejabberd.pid &> /dev/null - rm_daemon ejabberd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index 0e4cbcba9..236515763 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72899 2012-06-24 16:20:06Z bpiotrowski $ +# $Id: PKGBUILD 91649 2013-05-26 09:24:30Z bluewind $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=ekg2 pkgver=0.3.1 -pkgrel=5.1 +pkgrel=6 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" arch=('i686' 'x86_64' 'mips64el') url="http://ekg2.org/" diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD deleted file mode 100644 index a664796a1..000000000 --- a/community/emerald/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 63540 2012-02-05 11:54:48Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=emerald -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Emerald window decorator" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \ - 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'pkg-config' 'gettext') -groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk') -options=(!libtool) -conflicts=('emerald-git') -install=emerald.install -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - LIBS+="-lm -ldl" ./configure --prefix=/usr - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/emerald/deprecated_symbols.patch b/community/emerald/deprecated_symbols.patch deleted file mode 100644 index b32ce154a..000000000 --- a/community/emerald/deprecated_symbols.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001 -From: ShadowKyogre <shadowkyogre@aim.com> -Date: Fri, 05 Nov 2010 01:53:24 +0000 -Subject: Fix deprecated symbols and incorrect decoration property setting - ---- -diff --git a/src/main.c b/src/main.c -index 5f0ec35..150da99 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -27,8 +27,8 @@ - #include <emerald.h> - #include <engine.h> - --#define BASE_PROP_SIZE 12 --#define QUAD_PROP_SIZE 9 -+//#define BASE_PROP_SIZE 12 -+//#define QUAD_PROP_SIZE 9 - - #ifndef DECOR_INTERFACE_VERSION - #define DECOR_INTERFACE_VERSION 0 -@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val) - gdk_error_trap_push(); - - type = None; -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, - atom, - 0, G_MAXLONG, -@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data) - WnckWindow *win = data; - - gdk_error_trap_push(); -- XSetTransientForHint(gdk_display, -+ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - GDK_WINDOW_XID(dialog->window), - wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow) - int format, result; - char *retval; - -- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE); -+ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE); - - gdk_error_trap_push(); - -- result = XGetWindowProperty(gdk_display, -+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - xwindow, atom, - 0, G_MAXLONG, - FALSE, XA_STRING, &type, &format, &nitems, -@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win) - } - - gdk_error_trap_push(); -- XKillClient(gdk_display, wnck_window_get_xid(win)); -- XSync(gdk_display, FALSE); -+ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win)); -+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); - gdk_error_trap_pop(); - } - -@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius, - - static int update_shadow(frame_settings * fs) - { -- Display *xdisplay = gdk_display; -+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - XRenderPictFormat *format; - GdkPixmap *pixmap; - Picture src, dst, tmp; --- -cgit v0.8.3.1-30-gff3a - ---- a/src/main.c.old 2010-12-07 19:56:08.633333370 +0100 -+++ a/src/main.c 2010-12-07 19:56:39.273333379 +0100 -@@ -3757,7 +3757,7 @@ - - static void hide_tooltip(void) - { -- if (GTK_WIDGET_VISIBLE(tip_window)) -+ if (gtk_widget_get_visible (tip_window)) - g_get_current_time(&tooltip_last_popdown); - - gtk_widget_hide(tip_window); - ---- emerald-0.8.4/libengine/themer.c 2009-10-13 20:56:23.000000000 -0400 -+++ emerald-0.8.4.new/libengine/themer.c 2010-03-10 -01:20:03.046827674 -0500 -@@ -461,7 +461,7 @@ - } - gdouble get_float(SettingItem * item) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - return gtk_spin_button_get_value((GtkSpinButton *)item->widget); - } - else { -@@ -647,7 +647,7 @@ - } - void set_float(SettingItem * item, gdouble f) - { -- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { -+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) { - gtk_spin_button_set_value((GtkSpinButton *)item->widget, f); - } - else { - diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD index a0901da0d..ee8c6f4c3 100644 --- a/community/etherape/PKGBUILD +++ b/community/etherape/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 64163 2012-02-09 16:45:19Z ttopper $ +# $Id: PKGBUILD 90898 2013-05-15 12:17:39Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: kevin <kevin@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=etherape -pkgver=0.9.12 -pkgrel=2 -pkgdesc="A graphical network monitor for various OSI layers and protocols" +pkgver=0.9.13 +pkgrel=1 +pkgdesc='A graphical network monitor for various OSI layers and protocols' arch=('i686' 'x86_64' 'mips64el') url="http://etherape.sourceforge.net/" license=('GPL2') depends=('libgnomeui' 'libpcap') makedepends=('rarian' 'gnome-doc-utils') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('8e9cc85e73e44eccb236f488111e02f418ab095d') +sha1sums=('87c387b0929071581bcb6515b15ab849ea8c77fb') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD index 6577de78a..08b259e8d 100644 --- a/community/etl/PKGBUILD +++ b/community/etl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69579 2012-04-19 07:26:16Z spupykin $ +# $Id: PKGBUILD 90600 2013-05-13 10:14:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=etl -pkgver=0.04.15 +pkgver=0.04.16 pkgrel=1 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ conflicts=('synfig-etl') replaces=('synfig-etl') #source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz) source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz) -md5sums=('aac5038cdb4067100e57fb52337b0cfd') +md5sums=('e330d2045e980d424beb054423c73797') build() { cd $srcdir/ETL-$pkgver diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index 17ec70929..cf7f2798d 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90378 2013-05-12 06:05:15Z bpiotrowski $ +# $Id: PKGBUILD 90949 2013-05-16 06:57:01Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=exim pkgver=4.80.1 -pkgrel=2 +pkgrel=3 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686' 'mips64el') url='http://www.exim.org/' @@ -13,8 +13,8 @@ license=('GPL') backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim) install=exim.install depends=('db' 'pcre' 'pam' 'openssl' 'libldap') -provides=('smtp-server') -conflicts=('smtp-server') +provides=('smtp-server' 'smtp-forwarder') +conflicts=('smtp-server' 'smtp-forwarder') options=('!makeflags') source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2" aliases @@ -65,10 +65,13 @@ package() { cp "$srcdir/aliases" "$pkgdir/etc/mail" + install -d "$pkgdir/usr/sbin" cd "$pkgdir/usr/bin" for i in mailq rmail rsmtp runq sendmail; do ln -s exim "$i" + ln -s ../bin/exim ../sbin/"$i" done + # fhs compliancy ln -s ../bin/exim ../lib/sendmail diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index 81efb41eb..c156a0e4b 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 76580 2012-09-23 20:37:13Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90509 2013-05-12 23:37:59Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=ext4magic pkgver=0.3.1 -pkgrel=1 -pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' +pkgrel=2 +pkgdesc='Recover deleted or overwritten files on ext3 and ext4 filesystems' arch=('i686' 'x86_64' 'mips64el') url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') depends=('bzip2' 'file' 'util-linux' 'e2fsprogs') -source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") +source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('59c194b71e33aa6bd098b91f802e67d5') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --build=$CHOST + ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST make } @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/f2fs-tools/PKGBUILD b/community/f2fs-tools/PKGBUILD deleted file mode 100644 index a089b0e35..000000000 --- a/community/f2fs-tools/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Christian Hesse <mail@eworm.de> - -pkgname=f2fs-tools -pkgver=1.1.0 -pkgrel=2 -pkgdesc="Tools for Flash-Friendly File System (F2FS)" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/f2fs-tools/" -depends=('util-linux') -license=('GPL') -source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') -sha256sums=('c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867') - -build() { - cd "${pkgname}-${pkgver}" - - autoreconf -fi - ./configure --prefix=/usr - make -} - -package() { - cd "${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}/" install -} - diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD index 8501ab67f..b202cd172 100644 --- a/community/fbgetty/PKGBUILD +++ b/community/fbgetty/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65233 2012-02-20 12:23:20Z spupykin $ +# $Id: PKGBUILD 91856 2013-05-28 17:26:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=fbgetty pkgver=0.1.698 -pkgrel=4 +pkgrel=5 license=("GPL") pkgdesc="fbgetty is a console getty like mingetty, which supports framebuffers" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST + ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --build=$CHOST patch src/options.c <<EOF 33a34 @@ -23,6 +23,10 @@ build() EOF make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ } diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD index dd461bd70..0e862671f 100644 --- a/community/fcgiwrap/PKGBUILD +++ b/community/fcgiwrap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84283 2013-02-15 14:33:33Z lfleischer $ +# $Id: PKGBUILD 92086 2013-05-31 10:35:32Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com> # Contributor: Ron Huang <ronhuang+aur at gmail dot com> pkgname=fcgiwrap pkgver=1.1.0 -pkgrel=1 +pkgrel=3 pkgdesc='A simple server for running CGI applications over FastCGI.' arch=('i686' 'x86_64' 'mips64el') url='http://nginx.localdomain.pl/wiki/FcgiWrap' @@ -20,7 +20,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" autoreconf --install - ./configure --prefix=/usr --mandir=/share/man + # Here --sbindir is implicitly prefixed by /usr + ./configure --prefix=/usr --mandir=/share/man --sbindir=/bin make } diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 0bb255058..cf512694c 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,91 +1,80 @@ -# $Id: PKGBUILD 83238 2013-01-28 15:29:15Z ttoepper $ +# $Id: PKGBUILD 91897 2013-05-29 00:39:11Z seblu $ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler +# Contributor: Sébastien Luttringer # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=fcron -pkgver=3.1.1 -pkgrel=1 +pkgver=3.1.2 +pkgrel=7 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64 mips64el) -url="http://fcron.free.fr" +url='http://fcron.free.fr' license=('GPL') -depends=('pam') -makedepends=('smtp-server') -optdepends=('smtp-server: to receive mails from cron jobs') +depends=('pam' 'run-parts') +makedepends=('smtp-forwarder' 'vi') +optdepends=('smtp-forwarder: to send mails from cron jobs' + 'vi: default editor for fcrontab') provides=('cron') conflicts=('dcron') -backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \ - var/spool/fcron/systab var/spool/fcron/systab.orig) +backup=('etc/fcron/fcron.conf' + 'etc/fcron/fcron.allow' + 'etc/fcron/fcron.deny') options=('emptydirs' '!makeflags') -source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \ - systab systab.orig run-cron fcron.service) -md5sums=('230b91f308e6012957a3a71a94f03838' - 'e0c3f0bdc3c98fbbe46eff19001c18f2' - '938722c6654ef7b07f4aa10001905ba1' - 'bfb7daa22ebe22b9917e455c1ca4a382' - '5ff0cdcb9ec99778938ac6ef26800327' - '973e440ba6d9ea5aa00b45377140fae4') +install=$pkgname.install +source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz" + 'systab.orig') +md5sums=('36bf213e15f3a480f2274f8e46cced0a' + 'afecbfd98caa49e8e4aa239fa1b19255') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/fcron \ --with-answer-all=no \ --with-boot-install=no \ --with-username=root \ --with-groupname=root \ --datarootdir=/usr/share \ - --datadir=/usr/share \ + --datadir=/usr/share \ --with-docdir=/usr/share/doc \ --localstatedir=/var \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-piddir=/run \ - --with-editor=/usr/bin/vi \ + --with-editor=/usr/bin/vi \ --with-sendmail=/usr/sbin/sendmail make - - # Temporary bugfix make install expects the file in the files directory. - cp script/fcron.init.systemd files } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install - install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron" install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" - + install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" - # Install default fcrontab so that fcron can completely replace dcron - - install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" - # In order to preserve the systab crontab in any case it is better to have - # it in non-binary form too - install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" + + # Install a default fcrontab so that fcron can completely replace dcron + # We doesn't use binary format which is incompatible between arch and may cause crash + # We regenerate the binary format at each update + install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" # Add cron.* directories install -d -m755 "$pkgdir/etc/cron.daily" install -d -m755 "$pkgdir/etc/cron.hourly" install -d -m755 "$pkgdir/etc/cron.monthly" install -d -m755 "$pkgdir/etc/cron.weekly" - - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron" - - # Install systemd service - #install -D -m644 "$srcdir/fcron.service" \ - # "$pkgdir/usr/lib/systemd/system/fcron.service" # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" + rmdir "$pkgdir"/{var/,}run # avoid conflict with libbsd - #31259 rm "$pkgdir/usr/share/man/man3/bitstring.3" \ "$pkgdir/usr/share/man/fr/man3/bitstring.3" rmdir --ignore-fail-on-non-empty "$pkgdir/usr/share/man/man3" \ - "$pkgdir/usr/share/man/fr/man3" || true + "$pkgdir/usr/share/man/fr/man3" } # vim:set ts=2 sw=2 et: diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install new file mode 100644 index 000000000..f7b0abddf --- /dev/null +++ b/community/fcron/fcron.install @@ -0,0 +1,13 @@ +# arg 1: the new package version +post_install() { + # Generate binary format which is incompatible between arch + fcrontab -z -u systab &>/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fcron/fcron.rc b/community/fcron/fcron.rc deleted file mode 100644 index 880439a1d..000000000 --- a/community/fcron/fcron.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/fcron` -case "$1" in - start) - stat_busy "Starting Fcron Daemon" - [ -z "$PID" ] && /usr/sbin/fcron -b - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon fcron - stat_done - fi - ;; - stop) - stat_busy "Stopping Fcron Daemon" - [ -n "$PID" ] && kill $PID >/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fcron - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/fcron/fcron.service b/community/fcron/fcron.service deleted file mode 100644 index c54e8d9e9..000000000 --- a/community/fcron/fcron.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Cron Daemon - -[Service] -ExecStart=/usr/sbin/fcron --foreground --nosyslog -KillMode=process - -[Install] -WantedBy=multi-user.target diff --git a/community/fcron/run-cron b/community/fcron/run-cron deleted file mode 100644 index 51007a15a..000000000 --- a/community/fcron/run-cron +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - - -if [ -z $1 ]; then - echo "Usage: $0 crondir" - exit 1 -fi - -for cron in $1/* ; do - if [ -x $cron ]; then - $cron - fi -done -unset cron diff --git a/community/fcron/systab b/community/fcron/systab Binary files differdeleted file mode 100644 index 11c7e2fd0..000000000 --- a/community/fcron/systab +++ /dev/null diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig new file mode 100644 index 000000000..00af327bc --- /dev/null +++ b/community/fcron/systab.orig @@ -0,0 +1,4 @@ +&bootrun 01 * * * * /usr/bin/run-parts /etc/cron.hourly +&bootrun 02 00 * * * /usr/bin/run-parts /etc/cron.daily +&bootrun 22 00 * * 0 /usr/bin/run-parts /etc/cron.weekly +&bootrun 42 00 1 * * /usr/bin/run-parts /etc/cron.monthly diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 54f9011b7..ddc99181f 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90268 2013-05-10 20:25:25Z bluewind $ +# $Id: PKGBUILD 91731 2013-05-26 17:21:25Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.0.1 +pkgver=3.7.0.2 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('cb07cf02ee4cc767e10e8a022ad0ce0d') +md5sums=('04a6a6aea31a01feda78e509246ae10a') diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD index bca39bdd2..94b9c58b4 100644 --- a/community/fish/PKGBUILD +++ b/community/fish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84315 2013-02-16 11:41:49Z bpiotrowski $ +# $Id: PKGBUILD 92181 2013-06-02 13:25:12Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> @@ -6,20 +6,21 @@ # Contributor: Jan Fader <jan.fader@web.de> pkgname=fish -pkgver=2.0b2 -pkgrel=4 +pkgver=2.0.0 +pkgrel=2 pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64' 'mips64el') -url='http://ridiculousfish.com/shell/' +url='http://fishshell.com/' license=('GPL2') -depends=('python2') +depends=('python2' 'inetutils') makedepends=('doxygen' 'python') install=fish.install -source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz) -md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1') +source=(fish-$pkgver.tar.gz::http://fishshell.com/files/$pkgver/fish.tar.gz) +md5sums=('fe5907e6af61607d4128ce891a1f6501') build() { - cd "$srcdir"/fishfish + set -x + cd fish autoconf ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -28,7 +29,7 @@ build() { } package() { - cd "$srcdir"/fishfish + cd fish make DESTDIR="$pkgdir" install # use python2 diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD index 4e7399c63..57b4a7e96 100644 --- a/community/flashrom/PKGBUILD +++ b/community/flashrom/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74911 2012-08-09 12:06:08Z giovanni $ +# $Id: PKGBUILD 91099 2013-05-19 13:18:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Cilyan Olowen <gaknar@gmail.com> # Contributor: fill <mailbox@fillo.ru> @@ -6,7 +6,7 @@ pkgname=flashrom pkgver=0.9.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips" url="http://www.flashrom.org/" arch=('i686' 'x86_64' 'mips64el') @@ -19,6 +19,7 @@ md5sums=('407e836c0a2b17ec76583cb6809f65e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s:sbin:bin:g" Makefile make } diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index 069ad5eab..b51e173d9 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74096 2012-07-20 19:52:13Z spupykin $ +# $Id: PKGBUILD 91878 2013-05-28 18:07:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion pkgver=0.10.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A streaming media server" url="http://www.flumotion.net" @@ -29,10 +29,14 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin - install -d "$pkgdir/etc/$pkgname" make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir/etc/$pkgname" make DESTDIR="$pkgdir" install cp -R conf/workers "$pkgdir/etc/$pkgname" cp -R conf/managers "$pkgdir/etc/$pkgname" diff --git a/community/fortune-mod/PKGBUILD b/community/fortune-mod/PKGBUILD index cf1c5310d..5d3cbc654 100644 --- a/community/fortune-mod/PKGBUILD +++ b/community/fortune-mod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75721 2012-08-29 11:10:03Z bisson $ +# $Id: PKGBUILD 92041 2013-05-31 00:16:32Z seblu $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Dale Blount <archlinux@dale.us> pkgname=fortune-mod pkgver=1.99.1 -pkgrel=5.2 +pkgrel=6 pkgdesc="The Fortune Cookie Program from BSD games" arch=('i686' 'x86_64' 'mips64el') url="http://www.redellipse.net/code/fortune" @@ -27,7 +27,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make FORTDIR="$pkgdir"/usr/bin \ COOKIEDIR="$pkgdir"/usr/share/fortune \ - BINDIR="$pkgdir"/usr/sbin \ + BINDIR="$pkgdir"/usr/bin \ BINMANDIR="$pkgdir"/usr/share/man/man1 \ FORTMANDIR="$pkgdir"/usr/share/man/man6 install rm "$pkgdir"/usr/share/fortune/*.u8 diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD index 2452bc9ed..ecac54b00 100644 --- a/community/freeradius-client/PKGBUILD +++ b/community/freeradius-client/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65200 2012-02-20 10:12:30Z spupykin $ +# $Id: PKGBUILD 91904 2013-05-29 10:03:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kalidarn pkgname=freeradius-client pkgver=1.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="FreeRADIUS Client Software" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.freeradius.org/Radiusclient" @@ -16,8 +16,12 @@ md5sums=('2e46564e450ae13aedb70dc133b158ac') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install install -D -m0644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/license mv $pkgdir/etc/radiusclient $pkgdir/etc/radiusclient.default diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index d4ac8dcc1..164d97d3b 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87000 2013-03-25 19:16:38Z bpiotrowski $ +# $Id: PKGBUILD 91902 2013-05-29 10:03:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=5 +pkgrel=8 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" @@ -15,15 +15,13 @@ optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' '!makeflags') install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} - radiusd freeradius.tmpfiles freeradius.service krb5-build-fix.patch) md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' - '5dd57af81ba075102581fec45316ba7b' - 'f1a6530b1b69d2fa793aa45b2de379bb' + 'SKIP' 'f959e89812bedfc9f8308076f78cd74e' - '39eba6d34f8249781e9e917646465632' + 'e3f18e3a25df3b692e59f60605354708' 'c6a61de7576933f59154a53bfc12a2d2') build() { @@ -35,6 +33,7 @@ build() { --prefix=/usr --enable-heimdal-krb5 \ --localstatedir=/var \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libdir=/usr/lib/freeradius \ --with-udpfromto make @@ -43,7 +42,6 @@ build() { package() { cd $srcdir/freeradius-server-$pkgver make install R=$pkgdir - install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd chmod o+r $pkgdir/etc/raddb/* mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default rm -rf $pkgdir/var/run diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service index 635b6d6f8..220d352af 100644 --- a/community/freeradius/freeradius.service +++ b/community/freeradius/freeradius.service @@ -4,11 +4,11 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/radiusd/radiusd.pid -ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd -ExecStartPre=/usr/sbin/radiusd -C -ExecStart=/usr/sbin/radiusd -d /etc/raddb -ExecReload=/usr/sbin/radiusd -C +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-/bin/chown -R radiusd.radiusd /run/radiusd +ExecStartPre=/usr/bin/radiusd -C +ExecStart=/usr/bin/radiusd -d /etc/raddb +ExecReload=/usr/bin/radiusd -C ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/freeradius/radiusd b/community/freeradius/radiusd deleted file mode 100644 index bf872b6f2..000000000 --- a/community/freeradius/radiusd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/radiusd` -case "$1" in - start) - stat_busy "Starting radiusd Server" - - [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd - [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid - chown -R radiusd.radiusd /var/run/radiusd - - [ -z "$PID" ] && /usr/sbin/radiusd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/radiusd.pid - add_daemon radiusd - stat_done - fi - ;; - stop) - stat_busy "Stopping radiusd Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/radiusd.pid - rm_daemon radiusd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD index 22c2c43e3..537141a1c 100644 --- a/community/fssos-nsvs/PKGBUILD +++ b/community/fssos-nsvs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87001 2013-03-25 19:16:40Z bpiotrowski $ +# $Id: PKGBUILD 90505 2013-05-12 23:35:37Z eric $ # Maintainer: Dale Blount <dale@archlinux.org> pkgname=fssos-nsvs pkgver=0.5 -pkgrel=10 +pkgrel=11 pkgdesc="NSVS for FSSOS" arch=('i686' 'x86_64' 'mips64el') url="http://fssos.sourceforge.net/" @@ -13,21 +13,18 @@ backup=('etc/nsvsd.conf') options=('!libtool' '!makeflags') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz" - 'nsvsd' - 'nsvsd.service') + 'nsvsd.service') +md5sums=('3f17c2f6339f1a322b712b467023d825' + '9c791d2086e13f774548d9d6ba2cf9d5') build() { - cd $srcdir/nsvs-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + cd nsvs-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make CFLAGS="${CFLAGS} -D_GNU_SOURCE" } package() { - cd $srcdir/nsvs-$pkgver - make DESTDIR=$pkgdir install - install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd" + cd nsvs-$pkgver + make DESTDIR="$pkgdir" install install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service" } -md5sums=('3f17c2f6339f1a322b712b467023d825' - '4dfd9dc0d69b375587e39ab2621d9ea9' - '61e970d0704875b1da83cb4e9fc0eef5') diff --git a/community/fssos-nsvs/nsvsd b/community/fssos-nsvs/nsvsd deleted file mode 100755 index f9b4845ab..000000000 --- a/community/fssos-nsvs/nsvsd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting nsvsd" - /usr/sbin/nsvsd -f /etc/nsvsd.conf - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nsvsd - stat_done - fi - ;; - stop) - stat_busy "Stopping nsvsd" - kill `cat /var/run/nsvsd.pid` &>/dev/null - rm -f /var/run/nsvsd.pid - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nsvsd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/fssos-nsvs/nsvsd.service b/community/fssos-nsvs/nsvsd.service index 0df5444ab..8c3d12b67 100644 --- a/community/fssos-nsvs/nsvsd.service +++ b/community/fssos-nsvs/nsvsd.service @@ -2,7 +2,7 @@ Description=Name Service Via Sockets Daemon [Service] -ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf +ExecStart=/usr/bin/nsvsd -f /etc/nsvsd.conf [Install] WantedBy=multi-user.target diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 9aa8036d7..b216c0877 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90031 2013-05-06 19:37:10Z foutrelis $ +# $Id: PKGBUILD 91592 2013-05-25 02:56:17Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -16,7 +16,7 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index 32bf2ed50..015ddde27 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90032 2013-05-06 19:37:11Z foutrelis $ +# $Id: PKGBUILD 91067 2013-05-18 16:29:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal -pkgver=1.9.2 -pkgrel=2 +pkgver=1.10.0 +pkgrel=1 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gdal.org/" @@ -18,15 +18,15 @@ optdepends=('postgresql: postgresql database support' 'swig: perl binding support') options=('!libtool') changelog=$pkgname.changelog -source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz gdal-1.5.1-python-install.patch) -md5sums=('3f39db89f4710269b3a8bf94178e07aa' - '81afc1c26d29cee84aadb6924fe33861') +sha256sums=('1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487' + '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6') build() { export CFLAGS="$CFLAGS -fno-strict-aliasing" - # bug 23654 +# bug 23654 export LDFLAGS="$LDFLAGS -Wl,--as-needed" cd "${srcdir}/$pkgname-$pkgver" @@ -60,7 +60,7 @@ package () { #FS15477 clean up junks rm -f "${pkgdir}"/usr/bin/*.dox - # Remove RPATH +# Remove RPATH chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 9ad14990e..adeb1a88e 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90241 2013-05-09 23:30:17Z arodseth $ +# $Id: PKGBUILD 91272 2013-05-20 19:14:00Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,12 +6,12 @@ pkgname=geany-plugins pkgver=1.23 -pkgrel=2 +pkgrel=3 pkgdesc='Plugins for Geany' arch=('x86_64' 'i686' 'mips64el') url='http://plugins.geany.org/' license=('GPL') -depends=("geany=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' +depends=("geany>=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache' 'lua51') makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index 516ee77b2..302f92ba2 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86000 2013-03-10 22:54:45Z arodseth $ +# $Id: PKGBUILD 91268 2013-05-20 18:58:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> @@ -6,7 +6,7 @@ # Contributor: Allan McRae <mcrae_allan@hotmail.com> pkgname=geany -pkgver=1.23 +pkgver=1.23.1 pkgrel=1 pkgdesc='Fast and lightweight IDE' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,17 @@ optdepends=('vte: for terminal support' install="$pkgname.install" options=('!libtool') source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2") -sha256sums=('cdd4a772694803c837ae59e56f7bdc2faba174509317211f522e7d25dfcbe8b0') +sha256sums=('8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Python2 fix + sed -i '0,/on/s//on2/' data/templates/files/main.py + + # Syntax highlighting for PKGBUILD files + sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,14 +38,8 @@ build() { ./configure --prefix=/usr make - # Python2 fix - sed -i '0,/on/s//on2/' data/templates/files/main.py - # Fix for FS#10318 setconf geany.desktop MimeType '' - - # Syntax highlighting for PKGBUILD files - sed -i 's/Sh=/Sh=PKGBUILD;/' data/filetype_extensions.conf } package() { diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD index b9b769daa..7b8b90f54 100755 --- a/community/geary/PKGBUILD +++ b/community/geary/PKGBUILD @@ -7,7 +7,7 @@ pkgname=geary pkgver=0.3.1 pkgrel=4 pkgdesc="A lightweight email client for the GNOME desktop" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.yorba.org/projects/geary/" license=('GPL3') depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee06' 'libgnome-keyring' 'libnotify' 'libunique3' 'webkitgtk3') diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 6da1e9d1a..f80ecebe9 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 79363 2012-11-03 16:29:50Z lfleischer $ +# $Id: PKGBUILD 92203 2013-06-02 18:37:52Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gecko-mediaplayer -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/gecko-mediaplayer/' license=('GPL') -depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk') +depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk' 'curl') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('d35e3307126f874afba93bd896d605dc') +md5sums=('d13303664fcbb7f3b1273be4b1aa1b1e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index ab057abec..65595c3d0 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88687 2013-04-21 22:17:03Z heftig $ +# $Id: PKGBUILD 91737 2013-05-26 21:49:55Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Plugins for gedit" arch=('x86_64' 'i686' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('gucharmap: for charmap plugin' options=('!libtool' '!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141') +sha256sums=('ee6efad1222b0f74208b5280dbad84d16400f3fc39c227b12c8695999aa2b502') build() { cd $pkgname-$pkgver diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD index 2361b6076..ecf2a1f56 100644 --- a/community/gemrb/PKGBUILD +++ b/community/gemrb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 90034 2013-05-06 19:37:17Z foutrelis $ +# $Id: PKGBUILD 91754 2013-05-27 08:10:59Z bpiotrowski $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=gemrb -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.0.1 +pkgrel=1 pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate" arch=('i686' 'x86_64' 'mips64el') url="http://www.gemrb.org/" @@ -13,7 +13,7 @@ makedepends=('cmake') install=gemrb.install options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz") -md5sums=('dc0306d4d301726ac449225313285ea1') +md5sums=('fdb97cc031cf969938952ce2c79b25fc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD index d0379a3ef..e6796db56 100644 --- a/community/gen2shp/PKGBUILD +++ b/community/gen2shp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86465 2013-03-17 20:20:40Z cinelli $ +# $Id: PKGBUILD 91621 2013-05-25 12:05:10Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gen2shp pkgver=0.3.1 -pkgrel=7 +pkgrel=8 pkgdesc='Converts ArcInfo generate format to shapefile format' arch=('i686' 'x86_64' 'mips64el') url='http://www.intevation.de/~jan/gen2shp/' diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index cbea9fbae..52fe0bf3f 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,21 +1,18 @@ -# $Id: PKGBUILD 86359 2013-03-15 17:39:45Z arodseth $ +# $Id: PKGBUILD 90958 2013-05-16 14:50:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Thanks to Moonprincessluna at DeviantArt for the default icon: -# http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a - pkgname=gendesk -pkgver=0.4.4 +pkgver=0.5.2 pkgrel=1 -pkgdesc="Utility to generate .desktop files and download icons" +pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') -url="http://roboticoverlords.org/gendesk/" +url='http://roboticoverlords.org/gendesk/' license=('MIT') -depends=('glibc') makedepends=('go') +depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" - "http://roboticoverlords.org/images/default.png") -sha256sums=('23ca20823dc225ebc35baf53fa07558a1ddf314fe3f9cb9d2c5fc6523ca62334' + 'http://roboticoverlords.org/images/default.png') +sha256sums=('33a989aa7603d2cb15711137f653a8985143297a2ab7532dfad1c15aa649fe17' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD index b924e7489..dcb5e73de 100644 --- a/community/girara/PKGBUILD +++ b/community/girara/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82561 2013-01-20 23:41:34Z dwallace $ +# $Id: PKGBUILD 90573 2013-05-13 09:52:42Z spupykin $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mlq <mlq@pwmt.org> pkgbase=girara pkgname=(girara-common girara-gtk2 girara-gtk3) -pkgver=0.1.5 +pkgver=0.1.6 pkgrel=1 pkgdesc="user interface library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://pwmt.org/projects/girara" license=('custom') makedepends=('gtk3' 'gtk2') source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) -md5sums=('fe725fd935c85657008c18bb07c671d4') +md5sums=('1f213274fc710a5f9693d0d61f9ea66d') build() { true diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD index f1293632c..1a3a9ec5f 100644 --- a/community/gkrellm/PKGBUILD +++ b/community/gkrellm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79153 2012-10-31 05:24:09Z ebelanger $ +# $Id: PKGBUILD 92097 2013-05-31 14:27:10Z foutrelis $ # Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Matt Smith (Majik) <darkknight@helpdesk.zaz.net> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=gkrellm pkgver=2.3.5 -pkgrel=3 +pkgrel=4 pkgdesc="System monitor package for GTK2" arch=('i686' 'x86_64' 'mips64el') url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" @@ -15,9 +15,8 @@ depends=('gtk2' 'libsm' 'lm_sensors') makedepends=('gettext') backup=('etc/gkrellmd.conf') source=("http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2" - "gkrellmd" "gkrellm.service") + "gkrellm.service") sha256sums=('702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b' - 'c6d532dd7a706891aed92d750bceda74d4618e86ad82feadc0503214de904360' '2829931127632d0391f6749024809594b78c138fe4f03c98cd65fdbd47cea376') build() { @@ -31,7 +30,6 @@ package() { make DESTDIR="$pkgdir" PREFIX=/usr install install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf" - install -Dm755 "../gkrellmd" "$pkgdir/etc/rc.d/gkrellmd" install -Dm644 "../gkrellm.service" "$pkgdir/usr/lib/systemd/system/gkrellm.service" install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/gkrellm/gkrellmd b/community/gkrellm/gkrellmd deleted file mode 100644 index 1f255e755..000000000 --- a/community/gkrellm/gkrellmd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GKRELLMD_ARGS='-d' - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/gkrellmd) -case "$1" in - start) - stat_busy "Starting GKrellM Daemon" - [ -z "$PID" ] && /usr/bin/gkrellmd ${GKRELLMD_ARGS} - PID=$(pidof -o %PPID /usr/bin/gkrellmd) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gkrellmd - stat_done - fi - ;; - stop) - stat_busy "Stopping GKrellM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gkrellmd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 29bdf76b6..9aac29fc0 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 87414 2013-03-31 19:18:18Z stephane $ +# $Id: PKGBUILD 91057 2013-05-18 15:35:53Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.22.0 -pkgrel=5 +pkgver=1.24.0 +pkgrel=1 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" @@ -15,8 +15,8 @@ depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.24/$pkgname-$pkgver.tar.xz) +sha256sums=('83ff79610ffdede48536c0d07d5288ad84ec26c86aa2aa1db98b46abdebbdcc2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gloobus-preview/PKGBUILD b/community/gloobus-preview/PKGBUILD new file mode 100644 index 000000000..175945c38 --- /dev/null +++ b/community/gloobus-preview/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gloobus-preview +pkgver=0.4.5.290 +_pkgver=0.4.5-ubuntu11~ppa290 +pkgrel=1 +pkgdesc="Gnome application designed to enable a full screen preview of any kind of file" +arch=('i686' 'x86_64' 'mips64el') +url="http://gloobus.net/" +license=('GPL') +depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils') +makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') +optdepends=('djvulibre: Preview DjVu documents' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-good-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'gstreamer0.10-ugly-plugins: Extra media codecs' + 'libspectre: Preview PostScript documents' + 'p7zip: View content of 7z archives' + 'unoconv: Preview LibreOffice compatible documents' + 'unrar: View content of RAR archives' + 'unzip: View content of .ZIP archives') +options=('!libtool') +install=$pkgname.install +source=(https://launchpad.net/~gloobus-dev/+archive/$pkgname/+files/${pkgname}_$_pkgver.orig.tar.xz + gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi + fix-gtksource-include.patch + fix-unoconv.patch + use-xdg-open.patch) +md5sums=('27b3db2043ecaf47fa928940bbb4f32a' + 'SKIP' + 'ca15a3e31cec01d3d4fc5a4e1720f692' + '03379c173e67ad1b6804bc609336451d' + 'd6d9e2b3e001f0ea8440cccdf90480af') + +prepare() { + cd "$srcdir/$pkgname-$_pkgver" + + # Python2 fix + sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration + + # Fix build + patch -Np1 -i "$srcdir/fix-gtksource-include.patch" + sed -i 's/-Werror//' configure.ac src/Makefile.am + + # Fix unoconv support + patch -Np1 -i "$srcdir/fix-unoconv.patch" + + # Use xdg-open + patch -Np1 -i "$srcdir/use-xdg-open.patch" + + ### Prepare gloobus-sushi + cd "$srcdir/gloobus-sushi" + + # Python2 fix + sed -i 's/python /python2 /' src/gloobus-sushi.in +} + + +build() { + cd "$srcdir/$pkgname-$_pkgver" + + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make + + ### Build gloobus-sushi + cd "$srcdir/gloobus-sushi" + + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + make DESTDIR="$pkgdir" install + + ### Install gloobus-sushi + cd "$srcdir/gloobus-sushi" + make DESTDIR="$pkgdir" install + + # Rename service file to avoid conflict with sushi + mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service} +} diff --git a/community/gloobus-preview/fix-gtksource-include.patch b/community/gloobus-preview/fix-gtksource-include.patch new file mode 100644 index 000000000..053169a43 --- /dev/null +++ b/community/gloobus-preview/fix-gtksource-include.patch @@ -0,0 +1,39 @@ +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h 2012-04-06 15:07:29.000000000 +0200 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h 2013-05-17 06:27:37.833360264 +0200 +@@ -1,8 +1,7 @@ + #ifndef _ITEXT_ + #define _ITEXT_ + +-#include <gtksourceview/gtksourceview.h> +-#include <gtksourceview/gtksourcelanguagemanager.h> ++#include <gtksourceview/gtksource.h> + //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview + + #include "gloobus-preview-interface-main.h" +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp 2012-04-06 15:07:29.000000000 +0200 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp 2013-05-17 06:28:19.300984059 +0200 +@@ -1,6 +1,6 @@ + #include "gloobus-preview-plugin-manager.h" + #include <dlfcn.h> +-#include <gtksourceview/gtksourcelanguagemanager.h> ++#include <gtksourceview/gtksource.h> + + vector<gp_plugin_container*> PluginManager::plugins; + map<string, int> PluginManager::filetypes; +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h 2012-04-06 15:07:29.000000000 +0200 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h 2013-05-17 06:26:26.788384315 +0200 +@@ -3,10 +3,7 @@ + + #ifndef PLUGIN_LOADER + +-#include <gtksourceview/gtksourceview.h> +-#include <gtksourceview/gtksourcelanguagemanager.h> +-#include <gtksourceview/gtksourcestylescheme.h> +-#include <gtksourceview/gtksourcestyleschememanager.h> ++#include <gtksourceview/gtksource.h> + #include <gio/gio.h> + + #include "../gloobus-preview-config.h" diff --git a/community/gloobus-preview/fix-unoconv.patch b/community/gloobus-preview/fix-unoconv.patch new file mode 100644 index 000000000..f918f3019 --- /dev/null +++ b/community/gloobus-preview/fix-unoconv.patch @@ -0,0 +1,46 @@ +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp 2012-04-06 15:07:29.000000000 +0200 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp 2013-05-18 10:24:33.558221788 +0200 +@@ -87,7 +87,7 @@ + + if( NULL == uri && Utils::isProgramAvailable("unoconv") ) { + gchar *path = g_file_get_path(file); +- gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp); ++ gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path); + + if( system(cmd) == 0) { + uri = pathToUri(tmp); +@@ -123,4 +123,4 @@ + { + path = "file://" + path; + return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false); +-} +\ No newline at end of file ++} +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h 2012-04-06 15:07:29.000000000 +0200 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h 2013-05-18 10:33:02.352806550 +0200 +@@ -6,15 +6,21 @@ + PluginManager::register_plugin("office"); + + PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1); ++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1); + PluginManager::register_filetype("application/msword", 1); + PluginManager::register_filetype("application/rtf", 1); + PluginManager::register_filetype("application/vnd.ms-excel", 1); + PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1); ++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1); + PluginManager::register_filetype("application/vnd.ms-powerpoint", 1); ++PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1); ++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1); + PluginManager::register_filetype("application/vnd.sun.xml.calc", 1); ++PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1); ++ + + // TODO: add more filetypes supported by abiword and/or OpenOffice + + #endif + +-#endif /* OFFICE_PLUGIN_H */ +\ No newline at end of file ++#endif /* OFFICE_PLUGIN_H */ diff --git a/community/gloobus-preview/gloobus-preview.install b/community/gloobus-preview/gloobus-preview.install new file mode 100644 index 000000000..16ad7278f --- /dev/null +++ b/community/gloobus-preview/gloobus-preview.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate + gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/gloobus-preview/use-xdg-open.patch b/community/gloobus-preview/use-xdg-open.patch new file mode 100644 index 000000000..68e219e6a --- /dev/null +++ b/community/gloobus-preview/use-xdg-open.patch @@ -0,0 +1,20 @@ +diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp +--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp 2012-04-06 15:07:29.000000000 +0200 ++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp 2013-05-18 09:49:24.833574800 +0200 +@@ -560,12 +560,12 @@ + string label(gtk_menu_item_get_label(item)); + if(label == _("Settings")) + cmd = "gloobus-preview-configuration"; +- else if(label == _("Report a Bug")) +- cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\""; ++ else if(label == _("Report a Problem")) ++ cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\""; + else if(label == _("Blog")) +- cmd = "gnome-open \"http://gloobus.wordpress.com\"" ; ++ cmd = "xdg-open \"http://gloobus.wordpress.com\"" ; + else if(label == _("Donate")) +- cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0¤cy_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ; ++ cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0¤cy_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ; + else if(label == _("About")) + ui->create_about(); + else if(label == _("Quit")) diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index f2dc1ea9d..e20d459d2 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 80469 2012-11-22 12:21:36Z spupykin $ +# $Id: PKGBUILD 92113 2013-05-31 16:29:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be # henning mueller <henning@orgizm.net> pkgname=glusterfs -_basever=3.3 -pkgver=$_basever.1 -pkgrel=1 +pkgver=3.3.1 +_basever=`echo $pkgver | cut -f1-2 -d.` +pkgrel=4 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64 mips64el) url='http://www.gluster.org/' @@ -16,20 +16,18 @@ depends=(fuse python2 libxml2) makedepends=(flex bison) options=(!libtool) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz - glusterd.rc glusterd.service) sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') + '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b') build() { cd $srcdir/$pkgname-$pkgver ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/share/man \ @@ -56,10 +54,6 @@ package() { $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ $pkgdir/usr/share/doc/glusterfs/ - install -D -m 755 \ - $srcdir/glusterd.rc \ - $pkgdir/etc/rc.d/glusterd - install -D -m 644 \ $srcdir/glusterd.service \ $pkgdir/usr/lib/systemd/system/glusterd.service diff --git a/community/glusterfs/glusterd.rc b/community/glusterfs/glusterd.rc deleted file mode 100644 index 61cc26476..000000000 --- a/community/glusterfs/glusterd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Thanks to igor - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="/var/run/glusterd.pid" - -case "$1" in - start) - stat_busy "Starting glusterd" - /usr/sbin/glusterd -p $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon glusterd - stat_done - fi - ;; - stop) - stat_busy "Stopping glusterd" - kill -QUIT `cat "$PID"` &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - rm_daemon glusterd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 diff --git a/community/glusterfs/glusterd.service b/community/glusterfs/glusterd.service index c44024317..b1dd5c18d 100644 --- a/community/glusterfs/glusterd.service +++ b/community/glusterfs/glusterd.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/glusterd +ExecStart=/usr/bin/glusterd [Install] WantedBy=multi-user.target diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 2793070d7..2342b1ded 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90038 2013-05-06 19:37:29Z foutrelis $ +# $Id: PKGBUILD 91613 2013-05-25 11:46:26Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=gmerlin pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD index 1a826e993..ecb19458b 100644 --- a/community/gmtk/PKGBUILD +++ b/community/gmtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79359 2012-11-03 16:28:22Z lfleischer $ +# $Id: PKGBUILD 92205 2013-06-02 18:41:20Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=gmtk -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 -pkgdesc='Common functions for gnome-mplayer and gecko-mediaplay.' +pkgdesc='Common functions for gnome-mplayer and gecko-mediaplayer.' arch=('i686' 'x86_64' 'mips64el') url='http://gmtk.googlecode.com/' license=('GPL') @@ -12,7 +12,7 @@ depends=('glib2' 'gtk3' 'dconf') makedepends=('intltool' 'pkg-config') options=(!libtool) source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('919ea155b755a33ab052dacbbc6e7f03') +md5sums=('ee8ab99f3ac2e0071c99a35e4847bba5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnokii/PKGBUILD b/community/gnokii/PKGBUILD index e79e980f7..83d8d9f4e 100644 --- a/extra/gnokii/PKGBUILD +++ b/community/gnokii/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180682 2013-03-25 19:15:33Z bpiotrowski $ +# $Id: PKGBUILD 90848 2013-05-14 21:40:33Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gnokii pkgver=0.6.31 -pkgrel=3 +pkgrel=4 pkgdesc="Tools and user space driver for use with mobile phones" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnokii.org/" @@ -24,7 +24,7 @@ md5sums=('d9627f4a1152d3ea7806df4532850d5f' 'fd1c448114c2e0de8e05981030f0e69f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} # FS#13249 sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in @@ -33,13 +33,14 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --enable-security \ --disable-unix98test make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc" diff --git a/extra/gnokii/gnokii.patch b/community/gnokii/gnokii.patch index db593cdf4..db593cdf4 100644 --- a/extra/gnokii/gnokii.patch +++ b/community/gnokii/gnokii.patch diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 2dad1ed2c..d6522c2db 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80171 2012-11-17 12:43:41Z lfleischer $ +# $Id: PKGBUILD 92201 2013-06-02 18:25:47Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64' 'mips64el') url='http://gnome-mplayer.googlecode.com/' @@ -14,7 +14,7 @@ depends=('mplayer' 'dbus-glib' 'libnotify' 'gnome-icon-theme' 'hicolor-icon-them makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('d0cdabdf1b3eaa25d5c007b5cbd2d9ce') +md5sums=('9225dc0645d050ee31dd877559d7c16b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 9e8fa4811..dd666071e 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88703 2013-04-21 22:24:13Z heftig $ +# $Id: PKGBUILD 91084 2013-05-19 01:47:07Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions' options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('fe0a6368ee5a67419c9332a3b0031ecf1e3e92aa2fe0eb30aa4273f6224d070a') +sha256sums=('f13481d477a47295fa204b73ae7590f61d5576a8c889e5644cee0bc1f5cf530c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index 616751ca6..46b671006 100644 --- a/community/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88932 2013-04-24 22:25:52Z bgyorgy $ +# $Id: PKGBUILD 90851 2013-05-14 21:40:37Z andrea $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-panel pkgname=('gnome-panel' 'gnome-flashback-session') pkgver=3.6.2 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('GPL') pkgdesc="Legacy GNOME panel" diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index ed35c77b5..8d528344a 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88701 2013-04-21 22:24:09Z heftig $ +# $Id: PKGBUILD 91086 2013-05-19 01:51:02Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -15,14 +15,14 @@ install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" 'arch.patch') -sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee' +sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be' '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') build() { cd "$srcdir/$_pkgname-$pkgver" patch -Np1 -i "$srcdir/arch.patch" - + autoreconf ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index bbd4c1c58..365205720 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84387 2013-02-17 20:28:03Z spupykin $ +# $Id: PKGBUILD 90671 2013-05-13 14:25:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet pkgver=0.9.5_a -pkgrel=1 +pkgrel=2 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" @@ -16,14 +16,10 @@ backup=(etc/gnunetd.conf) options=('!libtool' '!makeflags') install=gnunet.install source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz - gnunet.rc gnunet.service - gnunet.conf.d defaults.conf) md5sums=('b0e204cf9711f9799baaeb477992e66a' - '5baf691913b007fb33e365239e3f7217' '54cce3d2415d95b2e5bd1bd88db3a0ea' - 'f161b46915736e4017e77ad735521453' '0fe23b2ca5b3fc47a0b5645e04406da0') build() { @@ -36,8 +32,6 @@ build() { package() { cd $srcdir/gnunet-${pkgver/_/} make DESTDIR=$pkgdir install - install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd - install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd install -D -m0644 $srcdir/defaults.conf $pkgdir/etc/gnunetd.conf rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/community/gnunet/gnunet.conf.d b/community/gnunet/gnunet.conf.d deleted file mode 100644 index f10a322ce..000000000 --- a/community/gnunet/gnunet.conf.d +++ /dev/null @@ -1 +0,0 @@ -GNUNETD_USER=nobody diff --git a/community/gnunet/gnunet.rc b/community/gnunet/gnunet.rc deleted file mode 100644 index 30ac4d2ad..000000000 --- a/community/gnunet/gnunet.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -GNUNETD_USER=nobody - -. /etc/conf.d/gnunetd -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/gnunet-arm) -case "$1" in - start) - stat_busy "Starting gnunet services" - [ -z "$PID" ] && su -c '/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf' - $GNUNETD_USER 1>/dev/null 2>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon gnunetd - stat_done - fi - ;; - stop) - stat_busy "Stopping gnunet services" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gnunetd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD index c8b5c5d40..4afbd0cc9 100644 --- a/community/gnustep-make/PKGBUILD +++ b/community/gnustep-make/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-make -pkgver=2.6.2 -pkgrel=2.1 +pkgver=2.6.4 +pkgrel=1.1 pkgdesc="The GNUstep make package" arch=('mips64el') url="http://www.gnustep.org/" @@ -13,7 +13,7 @@ depends=() conflicts=('gnustep-make-svn') groups=('gnustep-core') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('b926d142debc9f38d75b11019c31889f') +md5sums=('c5617da024add87ce9b09726bb9328a6') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 45d62ed28..7f0ade8e5 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90230 2013-05-09 17:13:58Z arodseth $ +# $Id: PKGBUILD 92197 2013-06-02 17:23:53Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -8,13 +8,13 @@ # Contributor: Mike Rosset <mike.rosset@gmail.com> # Contributor: Daniel YC Lin <dlin.tw@gmail.com> -# TODO: Create split packages for the crosscompilation versions as well +# TODO: Create split packages for the crosscompilation versions? (maybe) pkgname=go -pkgver=1.1rc3 -pkgrel=1 +pkgver=1.1 +pkgrel=4 epoch=2 -pkgdesc='Google Go compiler and tools' +pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') url='http://golang.org/' license=('custom') @@ -23,17 +23,18 @@ makedepends=('inetutils') options=('!strip') install="$pkgname.install" backup=('usr/lib/go/bin') -#if [ "$CARCH" == 'x86_64' ]; then -# source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" -# "$pkgname.sh") -# sha256sums=('ed631dd172418488ee24f79b1aa64474b8eb959f8035c5f2ee77e6d2e467e61a' -# 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') -#else + +if [ "$CARCH" == 'x86_64' ]; then + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" + "$pkgname.sh") + sha256sums=('2ed0548bc9f9071c24d253f945dd8354bdaa8a9925e48ad5eef586afbf6cfe8a' + 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') +else source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" "$pkgname.sh") - sha256sums=('c81fd6503ab49ad92a270a740581ad744062c195bec4df94ae9973a9f4001da9' + sha256sums=('fd6c951cbd5329f192430fe579dbe594d380c80651bf660c1b3d4e9a86370383' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') -#fi +fi build() { cd "$srcdir/$pkgname/src" @@ -76,65 +77,68 @@ package() { cd "$srcdir/$pkgname" install -Dm644 LICENSE \ - $pkgdir/usr/share/licenses/go/LICENSE + "$pkgdir/usr/share/licenses/go/LICENSE" install -Dm644 misc/bash/go \ - $pkgdir/usr/share/bash-completion/completions/go + "$pkgdir/usr/share/bash-completion/completions/go" install -Dm644 misc/emacs/go-mode-load.el \ - $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el + "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el" install -Dm644 misc/emacs/go-mode.el \ - $pkgdir/usr/share/emacs/site-lisp/go-mode.el + "$pkgdir/usr/share/emacs/site-lisp/go-mode.el" install -Dm644 misc/zsh/go \ - $pkgdir/usr/share/zsh/site-functions/_go + "$pkgdir/usr/share/zsh/site-functions/_go" for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \ ftplugin/go/fmt.vim ftplugin/go/import.vim syntax/go.vim syntax/godoc.vim \ plugin/godoc.vim; do - install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f + install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f" done - mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site}} + mkdir -p \ + "$pkgdir/"{etc/profile.d,usr/{share/go,lib/go,lib/go/src,lib/go/site/src}} - cp -r doc misc -t $pkgdir/usr/share/go - ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc - cp -a bin $pkgdir/usr - cp -a pkg $pkgdir/usr/lib/go - cp -a $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ - cp -a $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd - cp -a $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ - cp -a $GOROOT/lib $pkgdir/usr/lib/go/ - cp -a $GOROOT/include $pkgdir/usr/lib/go/ + cp -r doc misc -t "$pkgdir/usr/share/go" + ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc" + cp -a bin "$pkgdir/usr" + cp -a pkg "$pkgdir/usr/lib/go" + cp -a "$GOROOT/src/pkg" "$pkgdir/usr/lib/go/src/" + cp -a "$GOROOT/src/cmd" "$pkgdir/usr/lib/go/src/cmd" + cp -a "$GOROOT/src/lib9" "$pkgdir/usr/lib/go/src/" + cp -a "$GOROOT/lib" "$pkgdir/usr/lib/go/" + cp -a "$GOROOT/include" "$pkgdir/usr/lib/go/" - install -Dm644 src/Make.* $pkgdir/usr/lib/go/src + install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src" # Remove object files from target src dir - find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + find "$pkgdir/usr/lib/go/src/" -type f -name '*.[ao]' -delete # Fix for FS#32813 - find $pkgdir -type f -name sql.go -exec chmod -x {} \; + find "$pkgdir" -type f -name sql.go -exec chmod -x {} \; # Remove all executable source files - find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete + find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete # Headers for C modules install -Dm644 src/pkg/runtime/runtime.h \ - $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h + "$pkgdir/usr/lib/go/src/pkg/runtime/runtime.h" install -Dm644 src/pkg/runtime/cgocall.h \ - $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h + "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h" # For packages that source /etc/profile.d/go.sh - install -Dm755 $srcdir/$pkgname.sh $pkgdir/etc/profile.d/$pkgname.sh + install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" # This is to make go get code.google.com/p/go-tour/gotour and # then running the gotour executable work out of the box. - ln -sf /usr/bin $pkgdir/usr/lib/go/bin + ln -sf /usr/bin "$pkgdir/usr/lib/go/bin" # For godoc - install -Dm644 favicon.ico $pkgdir/usr/lib/go/favicon.ico + install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico" + + rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin" - rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin + install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION" - install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION + find "$pkgdir/usr/"{lib/go/pkg,bin} -type f -exec touch '{}' + } # vim:set ts=2 sw=2 et: diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 6b896a69d..f3d84a587 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,11 +1,11 @@ -#$Id: PKGBUILD 90350 2013-05-11 18:38:52Z arodseth $ +#$Id: PKGBUILD 91294 2013-05-20 20:42:41Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide pkgver=18.1 -pkgrel=1 +pkgrel=3 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') @@ -13,25 +13,19 @@ url='https://github.com/visualfc/liteide' depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit') makedepends=('gendesk') options=('!strip') -source=("$pkgname.tgz::https://github.com/visualfc/liteide/archive/x$pkgver.zip" +source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'golangide.png' 'golangide.sh') -sha256sums=('4ca6438099314789f4cd8fd3acc8016d8e32594634a6d0f130f5666dcb0a3d6c' +sha256sums=('60ab324bffb5ec4e7b1b3f9cae9729c7c6c499df3bb994861de65e473f2d64fe' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04') -_name=('Golang IDE') prepare() { cd "$srcdir" - gendesk -n - - cd "$srcdir/liteide-x$pkgver/build" - head -n-3 build_linux.sh > build_linux_fixed.sh - mv build_linux_fixed.sh build_linux.sh - head -n-4 webkit_linux.sh > webkit_linux_fixed.sh - mv webkit_linux_fixed.sh webkit_linux.sh - chmod +x build_linux.sh webkit_linux.sh + gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc" + cd "liteide-x$pkgver/build" + chmod +x build_linux.sh } build() { @@ -39,7 +33,6 @@ build() { msg2 'Compiling...' QTDIR=/usr ./build_linux.sh - QTDIR=/usr ./webkit_linux.sh # Fixing insecure RPATH, need to test if this is still needed msg2 'Fixing...' @@ -50,9 +43,10 @@ build() { package() { msg2 'Creating directories...' - mkdir -p "$pkgdir/usr/lib/liteide" - mkdir -p "$pkgdir/usr/share/liteide" - mkdir -p "$pkgdir/usr/share/doc/$pkgname" + mkdir -p \ + "$pkgdir/usr/lib/liteide" \ + "$pkgdir/usr/share/liteide" \ + "$pkgdir/usr/share/doc/$pkgname" cd "$srcdir/liteide-x$pkgver/build/liteide" @@ -65,8 +59,7 @@ package() { cd "$srcdir/liteide-x$pkgver/liteidex" msg2 'Packaging resources...' - cp -r deploy/* "$pkgdir/usr/share/liteide" - cp -r os_deploy/* "$pkgdir/usr/share/liteide" + cp -r deploy/* os_deploy/* "$pkgdir/usr/share/liteide" msg2 'Packaging libraries and plugins...' cp -r liteide/lib/liteide/* "$pkgdir/usr/lib/liteide" diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD index aa8f02b51..8cc59a4ab 100644 --- a/community/goobox/PKGBUILD +++ b/community/goobox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87383 2013-03-30 13:01:13Z bgyorgy $ +# $Id: PKGBUILD 90865 2013-05-15 04:00:47Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=goobox -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="CD player and ripper for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool') optdepends=('gst-plugins-good: rip CDs into flac and wav formats') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0bd5c31d53635588f46ad4d254866ff74356caee5edb45c1a3bce9c754cc6cb6') +sha256sums=('c2dba51881902cad3593fc3b3dafd3c12038173a27c623350f1771a1bfbf09a7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD index 5fd36fbb9..5b71fd746 100644 --- a/community/goocanvasmm/PKGBUILD +++ b/community/goocanvasmm/PKGBUILD @@ -1,9 +1,11 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 91035 2013-05-18 13:20:54Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Laurent Meunier <laurent@deltalima.net> pkgname=goocanvasmm -pkgver=1.90.8 +pkgver=1.90.9 pkgrel=1 pkgdesc='C++ wrappers for goocanvas' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +14,7 @@ license=('GPL') depends=('goocanvas' 'gtkmm3') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/1.90/goocanvasmm-${pkgver}.tar.xz) -sha256sums=('721649be4f8bbbb4589800c0b973522d2104a95172f9eefd7b93e3bf59ae8721') +sha256sums=('a2f52fbff4f753602bb55ac8588201efd5f193c890df6dfc72004eaaf5daae92') build() { cd ${pkgname}-${pkgver} diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD index 942b55e23..404255f32 100644 --- a/community/gputils/PKGBUILD +++ b/community/gputils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88505 2013-04-19 06:14:12Z cinelli $ +# $Id: PKGBUILD 91611 2013-05-25 11:39:42Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Johannes Martin <honzor@gmx.net> # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> @@ -6,7 +6,7 @@ pkgname=gputils pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="PIC Programming Utilities" arch=('i686' 'x86_64' 'mips64el') url="http://gputils.sourceforge.net/" diff --git a/community/haskell-pandoc/PKGBUILD b/community/haskell-pandoc/PKGBUILD index 6f8310913..a31f95cb8 100644 --- a/community/haskell-pandoc/PKGBUILD +++ b/community/haskell-pandoc/PKGBUILD @@ -5,7 +5,7 @@ _hkgname=pandoc pkgname=haskell-pandoc pkgver=1.11.1 -pkgrel=5 +pkgrel=6 pkgdesc="Conversion between markup formats" url="http://hackage.haskell.org/package/${_hkgname}" license=('GPL') @@ -15,6 +15,9 @@ depends=('haskell-base64-bytestring' 'haskell-blaze-html' 'haskell-blaze-markup' source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install md5sums=('e895b22745affba37c0ba5e6e6d0f17c') +provides=(pandoc) +conflicts=(pandoc) +replaces=(pandoc) build() { cd $_hkgname-$pkgver @@ -22,7 +25,7 @@ build() { --prefix=/usr --docdir=/usr/share/doc/$pkgname --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock - runhaskell Setup register --gen-script + runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD index 7d8b4922f..5fcb53a3d 100644 --- a/community/hdapsd/PKGBUILD +++ b/community/hdapsd/PKGBUILD @@ -4,28 +4,21 @@ pkgname=hdapsd pkgver=20090401 -pkgrel=5 +pkgrel=7 pkgdesc='HDAPS userspace hard drive protection daemon' arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.net/projects/hdaps/' license=('GPL') -depends=('glibc') -backup=('etc/conf.d/hdapsd') +depends=('glibc' 'bash') source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz" - 'hdapsd.conf.d' - 'hdapsd.rc.d' - 'hdapsd.systemd' - 'hdapsd.wrapper') + 'hdapsd.systemd') md5sums=('897cee8b0192febd127470f3e9506aeb' - '07fc036c8717bf5a38bbc269ed38ad19' - '9ab70348da9751810a2bbac51e18ac75' - '4b1378d43dc9431982f6605265c24f3b' - '11270661f3a543268786a68bbe74a6bb') + '61ac40d4d77e57863da68d9fd94c58e7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make ${MAKEFLAGS} } @@ -34,9 +27,5 @@ package() { make DESTDIR="${pkgdir}/" install - # install rc script and its configuration file - install -Dm0644 "${srcdir}/hdapsd.conf.d" "${pkgdir}/etc/conf.d/hdapsd" - install -Dm0755 "${srcdir}/hdapsd.rc.d" "${pkgdir}/etc/rc.d/hdapsd" install -Dm0644 "${srcdir}/hdapsd.systemd" "${pkgdir}/usr/lib/systemd/system/hdapsd.service" - install -Dm0755 "${srcdir}/hdapsd.wrapper" "${pkgdir}/usr/sbin/hdapsd-wrapper" } diff --git a/community/hdapsd/hdapsd.conf.d b/community/hdapsd/hdapsd.conf.d deleted file mode 100644 index eb99fdc2c..000000000 --- a/community/hdapsd/hdapsd.conf.d +++ /dev/null @@ -1,22 +0,0 @@ -# DEVICE specifies the device to monitor, defaults to "sda". -#DEVICE='sda' - -# If an ultrabay hard drive is inserted, the following can be used: -#DEVICE=('sda' 'sdb') - -# SENSITIVITY is self explanatory, defaults to "15". -#SENSITIVITY='15' - -# Set ADAPTIVE to "yes" to enable adaptive threshold (automatically increase -# when the built-in keyboard/mouse is used). -#ADAPTIVE='yes' - -# Set SYSLOG to "yes" to have the daemon report errors to syslog (instead of -# stderr/stdout). -SYSLOG='yes' - -# Set FORCE to "yes" to force the kernel to use the unload heads feature on -# some old hard drives for which support cannot be autodetected (don't use this -# unless you're absolutely sure your hard drive really supports unloading -# heads). -#FORCE='yes' diff --git a/community/hdapsd/hdapsd.rc.d b/community/hdapsd/hdapsd.rc.d deleted file mode 100644 index f4e8a6b99..000000000 --- a/community/hdapsd/hdapsd.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/hdapsd ] && . /etc/conf.d/hdapsd - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE=/var/run/hdapsd.pid -PID=`cat ${PIDFILE} 2> /dev/null` - -case "$1" in - start) - stat_busy "Starting hdapsd" - - ## The daemon will try to autoload the kernel module - #if [ ! -d /sys/devices/platform/hdaps ]; then - # stat_fail - # echo "You need to load the hdaps kernel module." - # exit 1 - #fi - - ## Set up options to the hdapsd daemon - HDAPSD_OPTS="-bp" - if [ -z "${DEVICE}" ]; then - HDAPSD_OPTS="${HDAPSD_OPTS} -d sda" - else - for i in ${DEVICE[@]}; do - HDAPSD_OPTS="${HDAPSD_OPTS} -d ${i}" - done - fi - [ ! -z "${SENSITIVITY}" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -s ${SENSITIVITY}" - [ "${ADAPTIVE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -a" - [ "${SYSLOG}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -l" - [ "${FORCE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -f" - [ -z "${PID}" ] && /usr/sbin/hdapsd ${HDAPSD_OPTS} - if [ ${?} -gt 0 ]; then - stat_fail - else - add_daemon hdapsd - stat_done - fi - ;; - stop) - stat_busy "Stopping hdapsd" - [ ! -z "${PID}" ] && kill $PID &> /dev/null - if [ ${?} -gt 0 ]; then - stat_fail - else - rm_daemon hdapsd - stat_done - fi - ;; - restart) - ${0} stop - sleep 1 - ${0} start - ;; - *) - echo "usage: ${0} {start|stop|restart}" -esac diff --git a/community/hdapsd/hdapsd.systemd b/community/hdapsd/hdapsd.systemd index 328699bc7..d3927d61e 100644 --- a/community/hdapsd/hdapsd.systemd +++ b/community/hdapsd/hdapsd.systemd @@ -5,7 +5,7 @@ After=syslog.target [Service] Type=forking PIDFile=/var/run/hdapsd.pid -ExecStart=/usr/sbin/hdapsd-wrapper +ExecStart=/usr/bin/hdapsd-wrapper ExecReload=/bin/kill -HUP ${MAINPID} [Install] diff --git a/community/hdapsd/hdapsd.wrapper b/community/hdapsd/hdapsd.wrapper deleted file mode 100644 index d74fd272d..000000000 --- a/community/hdapsd/hdapsd.wrapper +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/hdapsd ] && source /etc/conf.d/hdapsd - -OPTS="-bp" - -if [ -z "${DEVICE}" ]; then - OPTS="${OPTS} -d sda" -else - for i in ${DEVICE[@]}; do - OPTS="${OPTS} -d ${i}" - done -fi - -[ ! -z "${SENSITIVITY}" ] && OPTS="${OPTS} -s ${SENSITIVITY}" -[ "${ADAPTIVE}" == "yes" ] && OPTS="${OPTS} -a" -[ "${SYSLOG}" == "yes" ] && OPTS="${OPTS} -l" -[ "${FORCE}" == "yes" ] && OPTS="${OPTS} -f" - -/usr/sbin/hdapsd ${OPTS} diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index 5c00b8aac..a85b6d751 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85915 2013-03-08 23:40:40Z foutrelis $ +# $Id: PKGBUILD 90673 2013-05-13 14:26:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd pkgver=2.0 -pkgrel=3 +pkgrel=6 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64' 'mips64el') url="http://w1.fi/hostapd/" @@ -23,13 +23,9 @@ backup=('etc/hostapd/hostapd.conf' install=hostapd.install source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz config - hostapd - hostapd.conf.d hostapd.service) md5sums=('ba22e639bc57aa4035d2ea8ffa9bbbee' '5d7ee10b04e33f22c37be56a4c33dddb' - 'd570327c385f34a4af24d3a0d61cea19' - 'f169534b0f59b341f6df1a21e0344511' 'a0a16879eed5e4e41ae6b225a4809955') build() { @@ -41,10 +37,6 @@ build() { } package() { - # RC script - install -D hostapd "$pkgdir/etc/rc.d/hostapd" - install -Dm644 hostapd.conf.d "$pkgdir/etc/conf.d/hostapd" - # Systemd unit install -Dm644 hostapd.service "$pkgdir/usr/lib/systemd/system/hostapd.service" diff --git a/community/hostapd/hostapd b/community/hostapd/hostapd deleted file mode 100644 index b4709d7bf..000000000 --- a/community/hostapd/hostapd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/hostapd - -case "$1" in - start) - stat_busy "Starting hostapd" - /usr/bin/hostapd -B -P ${HOSTAPD_PID} ${HOSTAPD_CONF} &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon hostapd - fi - ;; - stop) - stat_busy "Stopping hostapd" - [ -f ${HOSTAPD_PID} ] && kill `cat ${HOSTAPD_PID}` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - rm_daemon hostapd - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/hostapd/hostapd.conf.d b/community/hostapd/hostapd.conf.d deleted file mode 100644 index 7a7bbc806..000000000 --- a/community/hostapd/hostapd.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -HOSTAPD_PID="/var/run/hostapd.pid" -HOSTAPD_CONF="/etc/hostapd/hostapd.conf" diff --git a/community/hping/Makefile.patch b/community/hping/Makefile.patch index dd53dd0a6..d1d4221f4 100644 --- a/community/hping/Makefile.patch +++ b/community/hping/Makefile.patch @@ -12,11 +12,11 @@ diff -Naur hping3-20051105/Makefile hping3-20051105-new/Makefile - @if [ -d ${INSTALL_MANPATH}/man8 ]; then \ - cp ./docs/hping3.8 ${INSTALL_MANPATH}/man8; \ - chmod 644 ${INSTALL_MANPATH}/man8/hping3.8; \ -+ @[ ! -d ${DESTDIR}/usr/sbin ] && install -d ${DESTDIR}/usr/sbin -+ cp -f hping3 ${DESTDIR}/usr/sbin/ -+ chmod 755 ${DESTDIR}/usr/sbin/hping3 -+ ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping -+ ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping2 ++ @[ ! -d ${DESTDIR}/usr/bin ] && install -d ${DESTDIR}/usr/bin ++ cp -f hping3 ${DESTDIR}/usr/bin/ ++ chmod 755 ${DESTDIR}/usr/bin/hping3 ++ ln -s hping3 ${DESTDIR}/usr/bin/hping ++ ln -s hping3 ${DESTDIR}/usr/bin/hping2 + @[ ! -d ${DESTDIR}${INSTALL_MANPATH}/man8 ] && install -d ${DESTDIR}${INSTALL_MANPATH}/man8 + @if [ -d ${DESTDIR}${INSTALL_MANPATH}/man8 ]; then \ + cp ./docs/hping3.8 ${DESTDIR}${INSTALL_MANPATH}/man8; \ diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD index f312479fb..d75938dec 100644 --- a/community/hping/PKGBUILD +++ b/community/hping/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57877 2011-11-04 07:45:07Z lfleischer $ +# $Id: PKGBUILD 92024 2013-05-30 23:36:53Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=hping pkgver=3.0.0 -pkgrel=2.2 +pkgrel=3 pkgdesc='A command-line oriented TCP/IP packet assembler/analyzer.' arch=('i686' 'x86_64' 'mips64el') url='http://www.hping.org' @@ -14,7 +14,7 @@ source=("http://www.hping.org/hping3-20051105.tar.gz" 'Makefile.patch' 'bytesex.h.patch') md5sums=('ca4ea4e34bcc2162aedf25df8b2d1747' - '3c6f920201fc980d377408917a28df93' + '339a38f86169d1b9344287a85201afbe' '8af8e336819df1447b0c1b879a704be9') build() { diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 42cb74bb0..07c280b4b 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89408 2013-04-29 10:54:52Z arodseth $ +# $Id: PKGBUILD 90497 2013-05-12 23:11:39Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> @@ -10,7 +10,7 @@ pkgname=hwinfo pkgver=20.1 _subver=3.10 -pkgrel=1 +pkgrel=2 pkgdesc='Hardware detection tool from openSUSE' arch=('i686' 'x86_64' 'mips64el') url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' @@ -41,6 +41,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make LIBDIR=/usr/lib DESTDIR="$pkgdir" install + mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" rmdir "$pkgdir/sbin" } diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD index 58e4491d7..858749946 100644 --- a/community/i2c-tools/PKGBUILD +++ b/community/i2c-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73640 2012-07-12 13:05:49Z tredaelli $ +# $Id: PKGBUILD 92028 2013-05-30 23:36:57Z seblu $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=i2c-tools pkgver=3.1.0 -pkgrel=3 +pkgrel=5 pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/wiki/I2CTools" @@ -15,7 +15,7 @@ source=(http://dl.lm-sensors.org/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz md5sums=('f15019e559e378c6e9d5d6299a00df21') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" make make -C eepromer CFLAGS="$CFLAGS -I../include" cd py-smbus @@ -24,8 +24,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install - install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/sbin" + make prefix="${pkgdir}/usr" sbindir="$pkgdir/usr/bin" install + install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/bin" cd py-smbus python2 setup.py install --prefix "${pkgdir}/usr" rm -rf "${pkgdir}/usr/include" diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index d8eb2f017..58f13bcc5 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87689 2013-04-05 09:27:30Z lcarlier $ +# $Id: PKGBUILD 91015 2013-05-17 22:04:55Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl -pkgver=20130328 +pkgver=20130517 pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64' 'mips64el') @@ -41,3 +41,5 @@ package() { install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('7846a62551352d7dae6f93f8255e9d99' + '8615526144f69ea4e870d9bc37df9b29') diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index e77b1f51d..4521e4873 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90320 2013-05-11 14:52:54Z fyan $ +# $Id: PKGBUILD 90641 2013-05-13 13:18:31Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.5.1 +pkgver=1.5.3 pkgrel=1 pkgdesc='Japanese input method Anthy IMEngine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('ibus' 'anthy' 'python2' 'pygtk' 'gtk-update-icon-cache') makedepends=('swig' 'intltool') options=('!libtool') install=$pkgname.install -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") build() { cd $srcdir/$pkgname-$pkgver @@ -34,4 +34,4 @@ package() { make DESTDIR=$pkgdir/ install } -sha512sums=('ba5456d4b16c168ff90945c948109bd3bb9d64c145ae746a471789ef74a1e657a9f891e198ecf64b733c03880f81a28cc9cd2c1fa82ad006eb0ac6e7e5c2c3a5') +sha512sums=('490a89ef78e31ad9e0f61aadd1d93b7a670852a765cc784cbfa307a208aab4344e851dceee316dd04bdf004e901a1b23bf40ff505e55fa18ab9dafdf097263d3') diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD index 39466d76c..f4a06dff8 100644 --- a/community/icecast/PKGBUILD +++ b/community/icecast/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84031 2013-02-08 17:31:49Z lfleischer $ +# $Id: PKGBUILD 90559 2013-05-13 07:47:15Z lfleischer $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=icecast pkgver=2.3.3 -pkgrel=3 +pkgrel=4 pkgdesc='Streaming audio over the Internet' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,12 +15,10 @@ depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora') backup=('etc/icecast.xml' 'etc/logrotate.d/icecast') source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'icecastd' 'icecast.logrotate' 'start-by-nobody.patch' 'icecast.service') md5sums=('2b5d1b40778922e5f6431b7758c359ad' - 'e823c1fdb080aae3d0c54ef8be95f7cb' '59c6552bcb1dd9fb542af8670dfabd3c' 'd8e929d2214123a1954da4383bf16583' '1468e59f76de194579b615889e20198f') @@ -43,8 +41,7 @@ package() { sed -i -e 's/icecast2/icecast/g' debian/icecast2.1 install -Dm644 debian/icecast2.1 "${pkgdir}/usr/share/man/man1/icecast.1" - # install rc.d script and logrotate config (taken from Fedora) - install -Dm755 "${srcdir}/icecastd" "${pkgdir}/etc/rc.d/icecast" + # install logrotate config (taken from Fedora) install -Dm644 "${srcdir}/icecast.logrotate" "${pkgdir}/etc/logrotate.d/icecast" # create log directory diff --git a/community/icecast/icecastd b/community/icecast/icecastd deleted file mode 100644 index e6c91b08c..000000000 --- a/community/icecast/icecastd +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -timeo=30 - -getPID() { - pgrep -u nobody icecast 2>/dev/null -} - -case $1 in - start) - stat_busy "Starting Icecast Server" - if getPID >/dev/null; then - # already running - stat_fail - exit 1 - else - /usr/bin/icecast -b -c /etc/icecast.xml &>/dev/null - while (( timeo > 0 )); do - if getPID >/dev/null; then - add_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Icecast Server" - if ! getPID >/dev/null; then - # not running - stat_done - exit 1 - fi - if ! kill $(getPID) &> /dev/null; then - stat_fail - exit 1 - fi - while (( timeo > 0 )); do - if getPID >/dev/null; then - rm_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/idesk/PKGBUILD b/community/idesk/PKGBUILD index b84f8768b..abbb694e7 100644 --- a/community/idesk/PKGBUILD +++ b/community/idesk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65602 2012-02-21 09:26:32Z spupykin $ +# $Id: PKGBUILD 90753 2013-05-13 15:08:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Claudio Sabattoli <gasherbrum3@alice.it> @@ -16,14 +16,18 @@ md5sums=('beb48c97815c7b085e3b3d601297fbb8') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - - sed -i '1,1i#include <unistd.h>' src/DesktopConfig.cpp - sed -i '1,1i#include <sys/stat.h>' src/DesktopConfig.cpp - sed -i '1,1i#include <sys/types.h>' src/DesktopConfig.cpp + sed -i \ + -e '1,1i#include <unistd.h>' \ + -e '1,1i#include <sys/stat.h>' \ + -e '1,1i#include <sys/types.h>' \ + src/DesktopConfig.cpp + sed -i 's#usr/local#usr#' examples/default.lnk + ./configure --prefix=/usr make - make DESTDIR=$pkgdir install +} - sed -i 's#usr/local#usr#' $pkgdir/usr/share/idesk/default.lnk +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD index 8ed1225fb..508beb19d 100644 --- a/community/iftop/PKGBUILD +++ b/community/iftop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67935 2012-03-16 10:23:32Z giovanni $ +# $Id: PKGBUILD 92025 2013-05-30 23:36:54Z seblu $ # Maintainer: Daenyth <Daenyth+Arch at gmail dot com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> @@ -6,22 +6,20 @@ pkgname=iftop pkgver=0.17 -pkgrel=10 +pkgrel=11 pkgdesc="iftop does for network usage what top(1) does for CPU usage" arch=('i686' 'x86_64' 'mips64el') url="http://www.ex-parrot.com/~pdw/iftop/" license=('GPL') depends=('libpcap' 'ncurses') options=('!makeflags') -source=(http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz) +source=("http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz") md5sums=('062bc8fb3856580319857326e0b8752d') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --build=$CHOST + ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --build=$CHOST make } diff --git a/community/igmpproxy/PKGBUILD b/community/igmpproxy/PKGBUILD index 6bebc58ed..00e4855c3 100644 --- a/community/igmpproxy/PKGBUILD +++ b/community/igmpproxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80944 2012-12-07 13:00:49Z spupykin $ +# $Id: PKGBUILD 91494 2013-05-23 10:13:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: sda <sda00@himki.net> pkgname=igmpproxy pkgver=0.1 -pkgrel=1 +pkgrel=3 pkgdesc="a simple multicast router for Linux only using the IGMP protocol" arch=(i686 x86_64 mips64el) url="http://sourceforge.net/projects/igmpproxy" @@ -13,21 +13,18 @@ license=('GPL') depends=() backup=("etc/igmpproxy.conf") source=("http://downloads.sourceforge.net/sourceforge/igmpproxy/igmpproxy-$pkgver.tar.gz" - "igmpproxy.rc.d" "igmpproxy.service") md5sums=('c56f41ec195bc1fe016369bf74efc5a1' - '642054dd586e5b0e7f660863e8131f57' - '2ff8500f8a59cdfaf910e48cd54ab659') + '2a4387442ce00297d97371f729f8b21e') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -Dm755 $srcdir/$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/igmpproxy/igmpproxy.rc.d b/community/igmpproxy/igmpproxy.rc.d deleted file mode 100644 index 5b88e94f1..000000000 --- a/community/igmpproxy/igmpproxy.rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/igmpproxy` -case "$1" in - start) - stat_busy "Starting igmpproxy routing daemon" - if [ -z "$PID" ]; then - /usr/sbin/igmpproxy /etc/igmpproxy.conf & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - disown - add_daemon igmpproxy - stat_done - fi - ;; - stop) - stat_busy "Stopping igmpproxy routing daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon igmpproxy - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/igmpproxy/igmpproxy.service b/community/igmpproxy/igmpproxy.service index c10ec63b1..734d600ab 100644 --- a/community/igmpproxy/igmpproxy.service +++ b/community/igmpproxy/igmpproxy.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf +ExecStart=/usr/bin/igmpproxy /etc/igmpproxy.conf [Install] WantedBy=multi-user.target diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 6f526c274..a24c78732 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74646 2012-08-01 06:33:04Z spupykin $ +# $Id: PKGBUILD 91949 2013-05-30 09:42:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> pkgname=incron pkgver=0.5.10 -pkgrel=3 +pkgrel=6 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64' 'mips64el') url="http://incron.aiken.cz/" @@ -14,17 +14,20 @@ depends=('gcc-libs' 'bash') install=incron.install options=('emptydirs') source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" - 'incron.init' 'incrond.service') md5sums=('67f8b671db8169edccc8ef11c7d2c8be' - '648e1ca1a4b1e624401d9d71aa3756b3' - '859a90af9e4efe40db381ea07167a66a') + '4be206ba6ecacd9d2006cdc72b4604db') -build() { +prepare() { cd "${srcdir}"/$pkgname-$pkgver sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp + sed -i 's|$(DESTDIR)$(PREFIX)/sbin/|$(DESTDIR)$(PREFIX)/bin/|g' Makefile +} + +build() { + cd "${srcdir}"/$pkgname-$pkgver make } @@ -39,6 +42,6 @@ package() { CFGDIR="${pkgdir}"/etc \ SYSDATADIR="${pkgdir}"/etc/incron.d install - install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service" + rmdir $pkgdir/usr/sbin } diff --git a/community/incron/incron.init b/community/incron/incron.init deleted file mode 100644 index 337c0fa0b..000000000 --- a/community/incron/incron.init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Incrond" - /usr/sbin/incrond - add_daemon incrond - stat_done - ;; - stop) - stat_busy "Stopping Incrond" - PID=`pidof -o %PPID /usr/sbin/incrond` - [ -z "$PID" ] || kill $PID - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon incrond - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/incron/incron.install b/community/incron/incron.install index fa42d9cdc..9cb53bbe6 100644 --- a/community/incron/incron.install +++ b/community/incron/incron.install @@ -8,7 +8,6 @@ post_install () { pre_remove() { [ -h /var/service/incron ] && rm /var/service/incron - /etc/rc.d/incron stop - usr/sbin/userdel incron >& /dev/null - usr/sbin/groupdel incron >& /dev/null + userdel incron >& /dev/null + groupdel incron >& /dev/null } diff --git a/community/incron/incrond.service b/community/incron/incrond.service index 54fcfa9d2..d46814bf3 100644 --- a/community/incron/incrond.service +++ b/community/incron/incrond.service @@ -4,7 +4,7 @@ Description=Inotify System Scheduler [Service] Type=forking PIDFile=/run/incrond.pid -ExecStart=/usr/sbin/incrond +ExecStart=/usr/bin/incrond [Install] WantedBy=multi-user.target diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 9ec3784ca..7ce438422 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82923 2013-01-25 21:39:24Z spupykin $ +# $Id: PKGBUILD 91652 2013-05-26 09:24:36Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Edward Tjörnhammar <xhemi@cube2.se> # Contributor: Edward Tjörnhammar <xhemi@cube2.se> pkgname=inn pkgver=2.5.3 -pkgrel=2 +pkgrel=6 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64' 'mips64el') @@ -47,18 +47,10 @@ backup=(etc/inn/newsfeeds var/db/inn/history.index var/db/inn/newsgroups) source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz - innd.rc - nnrpd.rc - innd.conf - nnrpd.conf innd.service inn.tmpfiles site.make.patch) md5sums=('353fe95232828ddbc80debff86c240bc' - 'a243d9498568f1beee20da5684b5fbfc' - 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' - 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' - 'bb4bbe86ae52fbbf08b0f6f370dea052' '9da925a486fcf0cd67fdf462cbb9c0b4' '050b7bffff3361c673a118739e42349e' '960c800026ed6e03901cf0bafdfd53d8') @@ -96,7 +88,6 @@ build() { EOF sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH make } @@ -107,13 +98,6 @@ package() { make DESTDIR=$pkgdir install - mkdir -p $pkgdir/etc/{conf,rc}.d - install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd - install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd - - install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd - install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd - cd $pkgdir/usr/lib for i in lib*.a; do gcc -shared -o ${i%%.a}.so.2.0.0 $i diff --git a/community/inn/innd.conf b/community/inn/innd.conf deleted file mode 100644 index 48f96ba5e..000000000 --- a/community/inn/innd.conf +++ /dev/null @@ -1,2 +0,0 @@ -NEWS_USER=news -NEWS_GROUP=news diff --git a/community/inn/innd.rc b/community/inn/innd.rc deleted file mode 100644 index 5e36aec0d..000000000 --- a/community/inn/innd.rc +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd -[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1; -[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1; - -case "$1" in - start) - stat_busy "Starting InterNetNews" - [ -d /var/run/inn ] || { - mkdir -p /var/run/inn - chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn - } - su $NEWS_USER -c /usr/bin/rc.news 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - echo $! > /var/run/innd.pid - add_daemon innd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews" - ctlinnd throttle "shutting down" 2>&- >&- - su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&- - rm /var/run/innd.pid - rm_daemon innd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/inn/nnrpd.conf b/community/inn/nnrpd.conf deleted file mode 100644 index 689a289ce..000000000 --- a/community/inn/nnrpd.conf +++ /dev/null @@ -1,3 +0,0 @@ -USE_SSL=1 -LISTEN_PORT=563 -NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf" diff --git a/community/inn/nnrpd.rc b/community/inn/nnrpd.rc deleted file mode 100644 index d7c902832..000000000 --- a/community/inn/nnrpd.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd -[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1; - -PID=`pidof -o %PPID nnrpd` -case "$1" in - start) - stat_busy "Starting InterNetNews Readers Daemon" - if [ ! -f /var/run/nnrpd.pid ]; then - stat_append ":: InterNetNews (innd) is not running" - stat_fail - exit 1 - fi - - [ -d /var/run/inn ] || mkdir -p /var/run/inn - [ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID nnrpd` - echo $PID > /var/run/nnrpd.pid - add_daemon nnrpd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews Readers Daemon" - [ ! -z "$PID" ] && kill $PID >&- - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/nnrpd.pid - rm_daemon nnrpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD index e084af3bc..1e66de54b 100644 --- a/community/inputattach/PKGBUILD +++ b/community/inputattach/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77899 2012-10-15 16:07:24Z spupykin $ +# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=inputattach pkgver=1.24 -pkgrel=6 +pkgrel=10 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system" arch=('i686' 'x86_64' 'mips64el') url="http://linuxconsole.sourceforge.net/" @@ -12,13 +12,9 @@ license=('GPL') depends=('bash') makedepends=('gcc') backup=(etc/conf.d/inputattach) -install=inputattach.install -#source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c' -# 'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h' source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' 'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h' 'inputattach.conf.d' - 'inputattach.rc.d' 'inputattach.service' 'inputattachctl' '0001-Add-w8001-flag.patch' @@ -26,9 +22,8 @@ source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a' '7ca903e54829764c8241233af5069216' - 'aa2e404fc113abdd2ab14e2a6352c331' 'c19b9ed38b243191cf5378b87a42a4cc' - '84c6463660c10bd34c0390102da087d5' + '7dd0690a9d2fe5e1052900650906e273' 'f1b3ddae308351357f557cbd5c6cda81' '8f76908449cae24a95adbf0bc0a17721') @@ -48,9 +43,8 @@ build() { package() { cd "$srcdir/src" - install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach" - install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" - install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach" + install -Dm755 inputattach "$pkgdir/usr/bin/inputattach" install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl + install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service } diff --git a/community/inputattach/inputattach.install b/community/inputattach/inputattach.install deleted file mode 100644 index d705bceaf..000000000 --- a/community/inputattach/inputattach.install +++ /dev/null @@ -1,16 +0,0 @@ -## arg 1: the new package version - -post_upgrade() { - (( $(vercmp 1.24-3 $2) > 0 )) && cat <<EOF -ATTENTION: - /etc/conf.d/inputattach.conf has been replaced by /etc/conf.d/inputattach - Make sure you adjust the new config file, which has a new format. -EOF -} - -post_install() { - cat << EOF -The correct device mode and /dev device file will need to be set in -/etc/conf.d/inputattach before starting /etc/rc.d/inputattach -EOF -} diff --git a/community/inputattach/inputattach.rc.d b/community/inputattach/inputattach.rc.d deleted file mode 100644 index eb626e199..000000000 --- a/community/inputattach/inputattach.rc.d +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/inputattach - -case "$1" in - start) - stat_busy "Starting inputattach" - for param in "${IAPARAMS[@]}"; do - if ! /usr/sbin/inputattach --daemon $param; then - stat_fail - exit 1 - fi - done - - add_daemon inputattach - stat_done - ;; - stop) - stat_busy "Stopping inputattach" - PID=`pidof -o %PPID /usr/sbin/inputattach` - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon inputattach - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl index 291c531ae..05dfa4af5 100755 --- a/community/inputattach/inputattachctl +++ b/community/inputattach/inputattachctl @@ -5,7 +5,7 @@ case "$1" in start) for i in "${IAPARAMS[@]}"; do - /usr/sbin/inputattach --daemon $i || exit 1 + /usr/bin/inputattach --daemon $i || exit 1 done ;; stop) diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 126f175f5..9a9e81baa 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89105 2013-04-26 19:07:54Z stativ $ +# $Id: PKGBUILD 90936 2013-05-15 15:48:29Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.1.2 -_pkgver=129.354 +pkgver=12.1.3 +_pkgver=129.451 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('ad9f4bbd7c8c7a86a4708d3f4bb093ed') +md5sums=('03aea501b9e1dc87a63a8c30399c4304') package() { cd "$srcdir" diff --git a/community/ipguard/PKGBUILD b/community/ipguard/PKGBUILD index d7c799816..b9bc5b333 100644 --- a/community/ipguard/PKGBUILD +++ b/community/ipguard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65572 2012-02-21 09:01:48Z spupykin $ +# $Id: PKGBUILD 91832 2013-05-28 17:04:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ipguard pkgver=1.04 -pkgrel=2 +pkgrel=3 pkgdesc="ipguard - arp<->ip relation checking tool" arch=(i686 x86_64 'mips64el') url="http://ipguard.deep.perm.ru/" @@ -15,14 +15,20 @@ source=(http://ipguard.deep.perm.ru/files/$pkgname-$pkgver.tar.gz md5sums=('7f44f7c31876f0d68792f02047e25409' 'b27cfc9e8ad4ef9459d7274a2e624831') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver - patch -Np1 <../build-fix-le.patch + sed -i 's|$(PREFIX)/sbin|$(PREFIX)/bin|g' Makefile +} +build() { + cd $srcdir/$pkgname-$pkgver CFLAGS="-DLIBNET_LIL_ENDIAN" make - make PREFIX=$pkgdir/usr install +} +package() { + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr install mkdir -p $pkgdir/usr/share mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index 9e89943fe..e953aaebc 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86151 2013-03-12 12:49:56Z spupykin $ +# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.1 -pkgrel=1 +pkgrel=4 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" @@ -13,16 +13,12 @@ makedepends=('linux-headers') license=('GPL') options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 - racoon.rc - ipsec.rc racoon.service ipsec.service ipsec-tools-linux-3.7-compat.patch) md5sums=('d38b39f291ba2962387c3232e7335dd8' - '416b8e362d86987b8c55f7153cdafbeb' - '90d0810267cbd847383ae3101699b192' - '1632fce55ba5592dea1f8bf661106e7d' - '5bf7478590c751b465617681a31619fe' + '3a64a9e3b498c6da90450ffb0b758aea' + '387a0b0c4f10e42b2bb62282885cdc9c' 'ae1dd20c83dcfce3dedb46ee73e83613') build() { @@ -32,17 +28,16 @@ build() { sed -i 's#-Werror##' configure.ac ./bootstrap - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ - --enable-adminport --enable-gssapi + --enable-adminport --enable-gssapi \ + --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include make } package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon - install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service } diff --git a/community/ipsec-tools/ipsec.rc b/community/ipsec-tools/ipsec.rc deleted file mode 100644 index cff472c59..000000000 --- a/community/ipsec-tools/ipsec.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Loading IPSec Security Policy Database..." - /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ipsec - stat_done - fi - ;; - stop) - stat_busy "Unloading IPSec Security Policy Database..." - /usr/sbin/setkey -F -P - /usr/sbin/setkey -F - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ipsec - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service index 3a6dea38b..483a5b58d 100644 --- a/community/ipsec-tools/ipsec.service +++ b/community/ipsec-tools/ipsec.service @@ -5,8 +5,8 @@ After=syslog.target network.target [Service] Type=oneshot RemainAfterExit=true -ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf -ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F +ExecStart=/usr/bin/setkey -f /etc/ipsec.conf +ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F [Install] WantedBy=multi-user.target diff --git a/community/ipsec-tools/racoon.rc b/community/ipsec-tools/racoon.rc deleted file mode 100644 index 1a67dcac5..000000000 --- a/community/ipsec-tools/racoon.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/racoon` -case "$1" in - start) - stat_busy "Starting Racoon IPSec daemon" - [ -z "$PID" ] && /usr/sbin/racoon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon racoon - stat_done - fi - ;; - stop) - stat_busy "Stopping Racoon IPSec daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon racoon - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service index 792cfd395..95324bd5d 100644 --- a/community/ipsec-tools/racoon.service +++ b/community/ipsec-tools/racoon.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -ExecStart=/usr/sbin/racoon +ExecStart=/usr/bin/racoon [Install] WantedBy=multi-user.target diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 148ec1a7d..75d272a46 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90287 2013-05-10 23:18:07Z seblu $ +# $Id: PKGBUILD 90514 2013-05-12 23:45:55Z seblu $ # Maintainer: Sébastien Luttringer pkgname=ipset pkgver=6.19 -pkgrel=1 +pkgrel=2 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64' 'mips64el') url='http://ipset.netfilter.org' @@ -14,11 +14,11 @@ options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.service") md5sums=('cabba1bd63a93f6e1c3db3fb22412b64' - 'f74642f7bb88056103c63a62a91c782c') + '6be6a2b34c1f38fc8ad60828403e2077') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --with-kmod=no + ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no make } diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service index 1af453668..39183c7d7 100644 --- a/community/ipset/ipset.service +++ b/community/ipset/ipset.service @@ -5,8 +5,8 @@ Before=iptables.service [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/ipset -f /etc/ipset.conf restore -ExecStop=/usr/sbin/ipset destroy +ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore +ExecStop=/usr/bin/ipset destroy [Install] WantedBy=multi-user.target diff --git a/community/iptstate/PKGBUILD b/community/iptstate/PKGBUILD index 4b4450916..117243f2c 100644 --- a/community/iptstate/PKGBUILD +++ b/community/iptstate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71896 2012-06-03 00:25:44Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90516 2013-05-12 23:47:26Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=iptstate pkgver=2.2.5 -pkgrel=1 +pkgrel=2 pkgdesc='top-like interface to netfilter connection-tracking table' arch=('i686' 'x86_64' 'mips64el') url='http://www.phildev.net/iptstate/' @@ -20,8 +20,8 @@ build() { package() { cd $pkgname-$pkgver - install -D -m755 $pkgname "$pkgdir/usr/sbin/$pkgname" + install -D -m755 $pkgname "$pkgdir/usr/bin/$pkgname" install -D -m644 $pkgname.8 "$pkgdir/usr/share/man/man8/$pkgname.8" install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD index 7e78d5906..7a3279978 100644 --- a/community/ipvsadm/PKGBUILD +++ b/community/ipvsadm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83590 2013-02-03 14:26:41Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 90518 2013-05-12 23:51:34Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ipvsadm pkgver=1.26 -pkgrel=7 +pkgrel=8 pkgdesc='The IP Virtual Server administration utility' arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxvirtualserver.org/software/ipvs.html' @@ -22,9 +22,12 @@ md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' 'dc87684064f85b64c1e79c1eac336303' 'e9fb77d2fbe2d3f41d60257316338543') +prepare() { + patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.patch +} + build() { cd $pkgname-$pkgver - patch -p1 -i ../01-fix-not-showing-all-server.patch make } @@ -33,7 +36,7 @@ package() { make \ BUILD_ROOT="$pkgdir" \ MANDIR=usr/share/man \ - SBIN="$pkgdir/usr/sbin" \ + SBIN="$pkgdir/usr/bin" \ INIT="$pkgdir/etc/rc.d" \ install popd diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index f03152b49..4bd49a92a 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84828 2013-02-25 06:15:43Z schiv $ +# $Id: PKGBUILD 92144 2013-06-01 12:22:16Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,12 +9,12 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.9.5 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) license=('GPL') -makedepends=('python2' 'celt' 'libsamplerate') +makedepends=('python2' 'celt' 'opus' 'libsamplerate') [ "$CARCH" != "mips64el" ] && makedepends+=('libffado') source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2" '99-audio.conf' @@ -23,6 +23,10 @@ md5sums=('6c9de6b89db9d7076fa2ce222816cf4c' 'ae65b7c9ebe0fff6c918ba9d97ae342d' '471aad533ff56c5d3cbbf65ce32cadef') +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + _pyfix() { sed -i 's:bin/env python:bin/env python2:' \ "$pkgdir/usr/bin/jack_control" @@ -42,24 +46,24 @@ _wafconf() { # see https://github.com/jackaudio/jack2/issues/22 } -_isbuild() { - printf "%s\n" ${pkgname[@]} | grep -qx $1 -} - -build() { +prepare() { cd "$srcdir" # Some optimisation bug exists for current GCC # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 - export CFLAGS="${CFLAGS/-O[0-9]/-O0}" - export CXXFLAGS="$CFLAGS" + #export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + #export CXXFLAGS="$CFLAGS" # fix doxygen building - # TODO: report upstream, but redundant until gihub issue 22 resolves + # TODO: report upstream, but redundant until github issue 22 resolves #sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript # we may do 2 different builds cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver +} + +build() { + cd "$srcdir" # mixed dbus/classic build if _isbuild jack2; then @@ -84,7 +88,7 @@ package_jack2() { ! _isbuild jack2 && return 0 pkgdesc="The next-generation JACK with SMP support" - depends=('libsamplerate' 'celt') + depends=('libsamplerate' 'celt' 'opus') optdepends=('python2: jack_control') [ "$CARCH" != "mips64el" ] && depends+=('libffado') conflicts=('jack') @@ -110,7 +114,7 @@ package_jack2-dbus() { ! _isbuild jack2-dbus && return 0 pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" - depends=('libsamplerate' 'celt') + depends=('libsamplerate' 'celt' 'opus') [ "$CARCH" != "mips64el" ] && depends+=('libffado') optdepends=('python2: jack_control') conflicts=('jack' 'jack2') diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 880e6aaf6..54c750779 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83710 2013-02-04 14:57:08Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 90520 2013-05-12 23:55:17Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived pkgver=1.2.7 -pkgrel=2 +pkgrel=3 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64' 'mips64el') url='http://www.keepalived.org/' @@ -14,11 +14,11 @@ depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.service') md5sums=('8551a34ee048895dbe5350a031ff29c1' - 'edbeda8c8777cf36110c1623e49bc5c9') + '0a5171f4298528315e8a8004b55befb7') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } @@ -31,10 +31,8 @@ package() { install -d -m 755 "$pkgdir/usr/share/$pkgname" mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples" # systemd - cd "$srcdir" - install -D -m 644 $pkgname.service \ + install -D -m 644 "$srcdir/$pkgname.service" \ "$pkgdir/usr/lib/systemd/system/$pkgname.service" - } # vim:set ts=2 sw=2 et: diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service index b96a8f474..a1bbeabb3 100644 --- a/community/keepalived/keepalived.service +++ b/community/keepalived/keepalived.service @@ -3,7 +3,7 @@ Description=Keepalive Daemon After=network.target [Service] -ExecStart=/usr/sbin/keepalived --dont-fork +ExecStart=/usr/bin/keepalived --dont-fork [Install] WantedBy=multi-user.target diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD index 7574d167c..7405e80dc 100644 --- a/community/kmess/PKGBUILD +++ b/community/kmess/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 67104 2012-03-04 10:22:10Z andrea $ +# $Id: PKGBUILD 91296 2013-05-20 21:10:18Z foutrelis $ # Maintainer: # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com> pkgname=kmess pkgver=2.0.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64' 'mips64el') url='http://kmess.sourceforge.net/' license=('GPL') depends=('kdebase-lib') -makedepends=('automoc4' 'cmake') +makedepends=('automoc4' 'cmake' 'optipng') optdepends=('cabextract: provides winks support') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") md5sums=('a2e57911713308bef81b9347135cc5dd') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix invalid PNG images to work with libpng 1.6 + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}" mkdir build diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD index ae0c29e01..c452c7218 100644 --- a/community/kmymoney/PKGBUILD +++ b/community/kmymoney/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76043 2012-09-09 20:57:42Z jlichtblau $ +# $Id: PKGBUILD 90852 2013-05-14 21:40:38Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vamp898 <vamp898@web.de> @@ -8,7 +8,7 @@ pkgname=kmymoney pkgver=4.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('i686' 'x86_64' 'mips64el') url="http://kmymoney2.sourceforge.net/" @@ -19,8 +19,16 @@ replaces=('kmymoney2') install=$pkgname.install changelog=$pkgname.changelog options=('!makeflags') -source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e') +source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2 + git-fixes.diff) +sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e' + 'e618cc5531f00c14171c5cae837d8b5fb58bccaac363a5b09eed863355c242d3') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ../git-fixes.diff +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/kmymoney/git-fixes.diff b/community/kmymoney/git-fixes.diff new file mode 100644 index 000000000..21b0e2330 --- /dev/null +++ b/community/kmymoney/git-fixes.diff @@ -0,0 +1,43 @@ +commit 77209f84a85360e98d2e805d412956a8f2a77db3 +Author: Alex Merry <kde@randomguy3.me.uk> +Date: Fri Feb 1 15:31:54 2013 +0000 + + Fix build with GMP 5.1.0 + + GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class + or mpf_class. So we have to have an explicit conversion. + + BUG: 312481 + +diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp +index aeed135..5de7fa9 100644 +--- a/kmymoney/mymoney/mymoneymoney.cpp ++++ b/kmymoney/mymoney/mymoneymoney.cpp +@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool + // be much better than using KGlobal::locale()->formatMoney. + bool bNegative = false; + mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den(); +- mpz_class right = (valueRef() - mpq_class(left)) * denom; ++ mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom); + + if (right < 0) { + right = -right; +commit 9b6f96a38b8c84cb87bb07165b503acbe5ea81ff +Author: Christoph Feck <christoph@maxiom.de> +Date: Fri Mar 23 23:05:19 2012 +0100 + + Fix includes + +diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp +index ff217e3..d31bb02 100644 +--- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp ++++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp +@@ -16,6 +16,7 @@ + + #include "mymoneydatabasemgrtest.h" + #include <pwd.h> ++#include <unistd.h> + #include <iostream> + + #include <QtTest/QtTest> + diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index d5b2fd11f..5cfdaa45a 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85367 2013-03-01 10:34:38Z andrea $ +# $Id: PKGBUILD 91653 2013-05-26 09:24:37Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" depends=('python2' 'libxss' 'qtwebkit') diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD index 382994257..8f65fc769 100644 --- a/community/kvpnc/PKGBUILD +++ b/community/kvpnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89963 2013-05-06 10:41:26Z spupykin $ +# $Id: PKGBUILD 91108 2013-05-19 18:46:49Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Danial Olsen <do@meyl.fo> pkgname=kvpnc pkgver=0.9.6a -pkgrel=3 +pkgrel=4 pkgdesc="A KDE Desktop Environment frontend for various vpn clients" arch=(i686 x86_64 'mips64el') url="http://home.gna.org/kvpnc/" @@ -13,15 +13,20 @@ depends=('kdelibs' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4' 'optipng') install=kvpnc.install source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2 - kvpnc-0.9.6a-scriptsec.patch - kvpnc-0.9.6a-gcc47.patch) + "vpnc-paths.patch") md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7' - 'a0ee8caabf56732b8481a426e02f881b' - '9725f5a005dca1e3d1cba86a8e52360a') + '4bf6a10c7be84656723183b876cbaf9d') + +prepare() { + cd "$srcdir/$pkgname-$pkgver-kde4" + + patch -Np0 <"$srcdir/vpnc-paths.patch" + + sed -i '1,1i#include <unistd.h>' src/kvpnc.cpp +} build() { cd $srcdir - sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp export LDFLAGS=-lX11 mkdir build diff --git a/community/kvpnc/vpnc-paths.patch b/community/kvpnc/vpnc-paths.patch new file mode 100644 index 000000000..5dc66638d --- /dev/null +++ b/community/kvpnc/vpnc-paths.patch @@ -0,0 +1,20 @@ +--- src/kvpncconfig.cpp.orig 2013-05-19 14:37:11.867517045 -0400 ++++ src/kvpncconfig.cpp 2013-05-19 14:37:31.702107829 -0400 +@@ -865,7 +865,7 @@ + enableDebugXl2tpdtunnel = QVariant(configgroup.readEntry("EnableDebugXl2tpdtunnel", false)).toBool(); + + +- pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/sbin/vpnc"); ++ pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/bin/vpnc"); + pathToCiscoVpnc = configgroup.readEntry("Path to vpnclient", "/usr/local/bin/vpnclient"); + pathToSetkey = configgroup.readEntry("Path to setkey", "/usr/sbin/setkey"); + pathToRacoon = configgroup.readEntry("Path to racoon", "/usr/sbin/racoon"); +@@ -1489,7 +1489,7 @@ + void KVpncConfig::checkStandardPathValues() + { + if (pathToVpnc.isEmpty()) +- pathToVpnc = "/usr/sbin/vpnc"; ++ pathToVpnc = "/usr/bin/vpnc"; + + if (pathToCiscoVpnc.isEmpty()) + pathToCiscoVpnc = "/usr/local/bin/vpnclient"; diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD index 6e2ce806d..58a1a1858 100644 --- a/community/leafnode/PKGBUILD +++ b/community/leafnode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64337 2012-02-11 23:22:13Z allan $ +# $Id: PKGBUILD 91512 2013-05-23 11:13:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=leafnode pkgver=1.11.8 -pkgrel=5.1 +pkgrel=6 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://leafnode.sourceforge.net/" @@ -15,11 +15,11 @@ backup=('etc/xinetd.d/leafnode') source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 leafnode.xinetd) md5sums=('a3edafeb854efaa3fbb0f7951d02160f' - 'db3c6ad1ff9fc03442949456d1d21304') + '08cd0a81d6efe0803b5d0747ab31903f') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \ + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode --sbindir=/usr/bin \ --with-user=9 \ --with-group=13 sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h diff --git a/community/leafnode/leafnode.install b/community/leafnode/leafnode.install index 5f8a74c04..8c5f10484 100644 --- a/community/leafnode/leafnode.install +++ b/community/leafnode/leafnode.install @@ -1,7 +1,7 @@ post_install() { echo "-- Adding user 'news' and group 'news', chowning /var/spool/news" - grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- - grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- + grep -e "^news:" etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- + grep -e "^news:" etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- chown -R root:news etc/leafnode # create dir if necessary if [ ! -d var/spool/news ]; then diff --git a/community/leafnode/leafnode.xinetd b/community/leafnode/leafnode.xinetd index 94c7c6ca7..98b5c24e0 100644 --- a/community/leafnode/leafnode.xinetd +++ b/community/leafnode/leafnode.xinetd @@ -7,7 +7,7 @@ service nntp socket_type = stream wait = no user = news - server = /usr/sbin/leafnode + server = /usr/bin/leafnode log_type = SYSLOG news log_on_success += USERID log_on_failure += USERID diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD index 1e372f88d..ebdf1db17 100644 --- a/community/libaccounts-qt/PKGBUILD +++ b/community/libaccounts-qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85369 2013-03-01 10:34:56Z andrea $ +# $Id: PKGBUILD 90880 2013-05-15 06:57:50Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=libaccounts-qt _pkgbase=accounts-qt pkgname=('libaccounts-qt' 'libaccounts-qt-doc') -pkgver=1.6 -pkgrel=2 +pkgver=1.7 +pkgrel=1 pkgdesc="Qt-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/accounts-sso/" @@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') options=('!emptydirs') source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) -sha1sums=('bd2c02b747384d53b75767c18b1e026bcf2211c5') +sha1sums=('628c278f42289247f0669dc65ffd2af8a329a27d') build() { cd "$srcdir/$_pkgbase-$pkgver" @@ -22,7 +22,7 @@ build() { # Do not install tests echo 'INSTALLS =' >>tests/accountstest.pro - qmake PREFIX=/usr LIBDIR=/usr/lib + qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/libcompizconfig/PKGBUILD b/community/libcompizconfig/PKGBUILD deleted file mode 100644 index be6488340..000000000 --- a/community/libcompizconfig/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 68306 2012-03-21 10:40:24Z pschmitz $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: nesl247 <nesl247@gmail.com> - -pkgname=libcompizconfig -pkgver=0.8.8 -pkgrel=2 -pkgdesc="Compiz configuration system library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.compiz.org" -license=('GPL') -depends=('compiz-core' 'libxml2' 'libxcomposite' 'libxinerama' 'startup-notification' - 'libxml++') -makedepends=('intltool' 'pkgconfig') -conflicts=('libcompizconfig-git') -source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -options=('!emptydirs' '!libtool') -sha1sums=('8ea1f15fd9e1e2eb37a9814646659a31a8018fd8') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - CPPFLAGS="$CPPFLAGS -I/usr/include/compiz -I/usr/include/startup-notification-1.0 \ - -I/usr/include/libxml2" ./configure --prefix=/usr --sysconfdir=/etc - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index 2ba06e4b6..2b2493659 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $ +# $Id: PKGBUILD 91834 2013-05-28 17:04:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: James Fryman <jfryman@gmail.com> pkgname=libdnet pkgver=1.12 -pkgrel=6.1 +pkgrel=7 pkgdesc="A simplified, portable interface to several low-level networking routines" arch=(i686 x86_64 'mips64el') makedepends=(python2) @@ -19,7 +19,7 @@ build() { cd $srcdir/$pkgname-$pkgver sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in autoreconf -I config --force --install - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD index 133b11128..a46834697 100644 --- a/community/libee/PKGBUILD +++ b/community/libee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80464 2012-11-22 10:27:21Z spupykin $ +# $Id: PKGBUILD 91836 2013-05-28 17:04:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Brian Knox <taotetek@gmail.com> pkgname=libee pkgver=0.4.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="event expression library inspired by CEE" url="http://www.libee.org/" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ md5sums=('7bbf4160876c12db6193c06e2badedb2') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make -j1 } diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD index 8c8a70e8f..36de8c0e7 100644 --- a/community/libgdamm/PKGBUILD +++ b/community/libgdamm/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 87026 2013-03-25 19:19:10Z bpiotrowski $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 91044 2013-05-18 13:45:43Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan de Groot <jan@jgc.homeip.net> pkgbase=libgdamm pkgname=(libgdamm libgdamm-docs) -pkgver=4.99.6 -pkgrel=2 +pkgver=4.99.7 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs') url="http://www.gtkmm.org/" license=('LGPL') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d1b7e5101c192695e1fad96f6371d4c2362adb3e8f452f2cb2c89e4380d4f492') +sha256sums=('5b864ddc7d5555c6c2d7fb5c6a3856c690911d12837148511a7b9f85100ca06c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/community/libident/PKGBUILD b/community/libident/PKGBUILD index 8567024bb..0729a7e0f 100644 --- a/community/libident/PKGBUILD +++ b/community/libident/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 67228 2012-03-05 13:41:53Z arodseth $ +# $Id: PKGBUILD 90500 2013-05-12 23:26:42Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> -# -# TODO: Write a pkg-conf file pkgname=libident pkgver=0.32 -pkgrel=3 -pkgdesc="New libident C library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.remlab.net/libident/" +pkgrel=5 +pkgdesc='Library for querying IDENT servers' +arch=('x86_64' 'i686' 'mips64el') +url='http://www.remlab.net/libident/' license=('custom') -options=('!libtool') -source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz") -sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b') +depends=('glibc') +options=('!emptydirs' '!libtool') +source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz" + 'libident.pc') +sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b' + '81907cda4fe9c925e78bf58bc9c61d1af439784e4f01da4bd6fc7e4d87750f5c') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man make @@ -29,6 +31,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm755 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 "$srcdir/libident.pc" "$pkgdir/usr/lib/pkgconfig/libident.pc" } # vim:set ts=2 sw=2 et: diff --git a/community/libident/libident.pc b/community/libident/libident.pc new file mode 100644 index 000000000..835504e9a --- /dev/null +++ b/community/libident/libident.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: libident +Description: IDENT query library +Version: 0.32 +Libs: -L${libdir} -lident +Cflags: -I${includedir} diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index 81d516f9f..61ddcef5d 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84838 2013-02-25 10:38:34Z spupykin $ +# $Id: PKGBUILD 90920 2013-05-15 13:45:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('df890b982250711055f5cb6d948251bb' +md5sums=('7a50881744a29dac6f93a8f6cbaebc0c' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index f50a9ff4c..f25d774f7 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83452 2013-02-01 11:36:01Z foutrelis $ +# $Id: PKGBUILD 90890 2013-05-15 08:03:49Z bpiotrowski $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached pkgver=1.0.16 -pkgrel=1 +pkgrel=2 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64' 'mips64el') url="http://libmemcached.org/" diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD index 7c2a9b61f..c8dd1ff0b 100644 --- a/community/libpaper/PKGBUILD +++ b/community/libpaper/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83644 2013-02-04 09:47:51Z arodseth $ +# $Id: PKGBUILD 90780 2013-05-13 21:25:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: royrocks <royrocks13@gmail.com> pkgname=libpaper pkgver=1.1.24 -pkgrel=4 +pkgrel=5 pkgdesc='Library for handling paper characteristics' arch=('x86_64' 'i686' 'mips64el') url='http://packages.debian.org/unstable/source/libpaper' @@ -17,13 +17,18 @@ sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96') build() { cd "$srcdir/$pkgname-$pkgver+nmu2" - ./configure --prefix=/usr --sysconfdir=/etc + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin make } package() { cd "$srcdir/$pkgname-$pkgver+nmu2" - make prefix="$pkgdir/usr" install + + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/libtorrent/PKGBUILD b/community/libtorrent/PKGBUILD index 69383dcda..6684a6e83 100644 --- a/community/libtorrent/PKGBUILD +++ b/community/libtorrent/PKGBUILD @@ -1,19 +1,21 @@ +# $Id: PKGBUILD 90569 2013-05-13 09:41:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: sh__ pkgname=libtorrent -pkgver=0.13.2 +pkgver=0.13.3 pkgrel=2 pkgdesc='BitTorrent library with a focus on high performance and good code' url='http://libtorrent.rakshasa.no/' -license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('libsigc++2.0' 'openssl') -options=('!libtool') +license=('GPL') +depends=('openssl') source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz") -sha1sums=('4f34a744fbe10c54aaf53d34681fabc1a49d7257') +sha1sums=('e65a20b9e6d5c04b4e0849543d58befb60d948b7') + +options=('!libtool') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libtxc_dxtn/PKGBUILD b/community/libtxc_dxtn/PKGBUILD index 0419da5e8..375d6aa79 100644 --- a/community/libtxc_dxtn/PKGBUILD +++ b/community/libtxc_dxtn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81456 2012-12-21 10:04:07Z lcarlier $ +# $Id: PKGBUILD 91927 2013-05-29 16:38:35Z lcarlier $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=libtxc_dxtn pkgver=1.0.1 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64 mips64el) -pkgdesc="Texture compression library for Mesa" +pkgdesc="S3 Texture Compression (S3TC) library for Mesa" url="http://dri.freedesktop.org/wiki/S3TC" license=(custom:BSD) depends=(mesa) diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD index ff1143354..03f8fe40b 100644 --- a/community/libuser/PKGBUILD +++ b/community/libuser/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88522 2013-04-19 10:31:27Z spupykin $ +# $Id: PKGBUILD 91838 2013-05-28 17:05:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Dziedzic < gostrc at gmail > pkgname=libuser pkgver=0.59 -pkgrel=1 +pkgrel=2 pkgdesc='A standardized interface for manipulating and administering user and group accounts.' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -21,6 +21,7 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --disable-gtk-doc-html \ --disable-rpath sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 1619b5b1e..b44eabbc9 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89909 2013-05-05 14:49:00Z spupykin $ +# $Id: PKGBUILD 92095 2013-05-31 13:59:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.5 -pkgrel=1 +pkgrel=7 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -31,15 +31,11 @@ backup=('etc/conf.d/libvirtd' 'etc/sasl2/libvirt.conf') install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" - libvirtd.rc.d libvirtd.conf.d - libvirtd-guests.rc.d libvirtd-guests.conf.d libvirt.tmpfiles.d) md5sums=('91c4145f49bcf92e89470fa3fb28fff6' - 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') @@ -54,21 +50,18 @@ build() { done export LDFLAGS=-lX11 - export RADVD=/usr/sbin/radvd - [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ + export RADVD=/usr/bin/radvd + [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \ --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd --with-audit \ --with-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface + --without-netcf --with-interface \ + --with-dnsmasq-path=/usr/bin/dnsmasq \ + --with-iptables-path=/usr/bin/iptables make - sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service - sed -i \ - -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \ - -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \ - -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \ - tools/libvirt-guests.service - sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service + sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service + sed -i 's|@sbindir@|/usr/bin|g' src/virtlockd.service sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf } @@ -77,17 +70,13 @@ package() { make DESTDIR="$pkgdir" install - install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd - - install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests # systemd stuff install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ - rm -rf \ "$pkgdir"/var/run \ "$pkgdir"/etc/sysconfig \ diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d deleted file mode 100644 index 3100b34fb..000000000 --- a/community/libvirt/libvirtd-guests.rc.d +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/bash - -source /etc/conf.d/libvirtd-guests -[ -f /etc/rc.conf ] && source /etc/rc.conf - -if [ -f /etc/rc.d/functions ]; then - . /etc/rc.d/functions -else - stat_busy() { - echo "$*" - } - - stat_fail() { - echo "FAIL" - } - - stat_done() { - echo "DONE" - } - - add_daemon() { - true - } - - rm_daemon() { - true - } -fi - - -LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" - -# get guest state by name -libvirt_get_guest_state() -{ - virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}' -} - -# list IDs of running guests -libvirt_list() -{ - - list=$(virsh $LIBVIRTD_URI list) - - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - uuids= - for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do - uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') - if [ -z "$uuid" ]; then - RETVAL=1 - return 1 - fi - uuids="$uuids $uuid" - done - - echo $uuids - -} - -libvirt_domname() -{ - uuid=$1 - name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') - - echo $name -} - -# suspend guest by name -libvirt_suspend() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# shutdown guest by name -libvirt_shutdown() -{ - virsh $LIBVIRTD_URI shutdown "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# start guest by name -libvirt_start() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null -} - -# stop all guests -libvirt_stop_all() -{ - mkdir -p `dirname $LIBVIRTD_LISTFILE` - echo -n >$LIBVIRTD_LISTFILE - - for i in `libvirt_list`; do - name=`libvirt_domname $i` - if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then - stat_busy "Suspending libvirtd/$name guest" - libvirt_suspend "$i" - else - stat_busy "Shutting libvirtd/$i guest down" - libvirt_shutdown "$i" - fi - [ $? -eq 0 ] && stat_done || stat_fail - echo $i >>$LIBVIRTD_LISTFILE - done -} - -# start all guests -libvirt_start_all() -{ - if [ -f $LIBVIRTD_LISTFILE ]; then - for i in `cat $LIBVIRTD_LISTFILE`; do - name=`libvirt_domname $i` - stat_busy "Starting/resuming libvirtd/$name guest" - libvirt_start "$i" - [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail - done - fi - rm -f $LIBVIRTD_LISTFILE -} - -# main -LC_ALL=C -LANG=C -case "$1" in - start) - libvirt_start_all - add_daemon libvirtd-guests - ;; - stop) - libvirt_stop_all - rm_daemon libvirtd-guests - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo $"Usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/libvirt/libvirtd.rc.d b/community/libvirt/libvirtd.rc.d deleted file mode 100644 index 193bffa9c..000000000 --- a/community/libvirt/libvirtd.rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/libvirtd -. /etc/rc.d/functions - -LIBVIRTD_CONFIG_ARGS= -if [ -n "$LIBVIRTD_CONFIG" ] -then - LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" -fi - -PID=`pidof -o %PPID /usr/sbin/libvirtd` -case "$1" in - start) - stat_busy "Starting libvirtd" - export RADVD=/usr/sbin/radvd - for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do - [ -d $i ] || mkdir -p $i - done - [ -z "$PID" ] && ( - mkdir -p /var/{cache,run}/libvirt - rm -rf /var/cache/libvirt/* - KRB5_KTNAME=$KRB5_KTNAME \ - /usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS - ) - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon libvirtd - stat_done - fi - ;; - stop) - stat_busy "Stopping libvirtd" - [ ! -z "$PID" ] && ( - kill $PID &> /dev/null - rm -rf /var/cache/libvirt/* - rm -f /var/run/libvirtd.pid - ) - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon libvirtd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading libvirtd configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 322ca3466..4290c6d99 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74891 2012-08-09 07:50:09Z spupykin $ +# $Id: PKGBUILD 90922 2013-05-15 13:46:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.28 +pkgver=0.4.29 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f09e519b71e61a7226ffefe55d00eadf') +md5sums=('a103218d3438c63fe246cda71ad0ca88') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD index 9830537de..e678e2998 100755 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 90483 2013-05-12 21:57:46Z alucryd $ +# $Id: PKGBUILD 91482 2013-05-23 08:41:25Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk2-greeter -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=2 epoch=1 pkgdesc="GTK+ greeter for LightDM" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/lightdm-gtk-greeter" license=('GPL3' 'LGPL3') depends=('gtk2' 'lightdm') makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/2/}") +conflicts=("${pkgname/2/3}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") -sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621') +sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') build() { cd "${srcdir}"/${pkgname/2/}-${pkgver} diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index caf7451c8..deab1db66 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90482 2013-05-12 21:57:34Z alucryd $ +# $Id: PKGBUILD 91480 2013-05-23 08:39:59Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=2 epoch=1 pkgdesc="GTK+ greeter for LightDM" @@ -13,9 +13,10 @@ license=('GPL3' 'LGPL3') depends=('gtk3' 'lightdm') makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/3/}") +conflicts=("${pkgname/3/2}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") -sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621') +sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') build() { cd "${srcdir}"/${pkgname/3/}-${pkgver} diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD index 1d511ce1b..fd8973a58 100644 --- a/community/lshw/PKGBUILD +++ b/community/lshw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87848 2013-04-08 09:23:17Z spupykin $ +# $Id: PKGBUILD 91516 2013-05-23 11:14:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> # Contributor: Chuck Yang <Chuck.Yang@gmail.com> pkgname=lshw pkgver=B.02.16 -pkgrel=4 +pkgrel=5 pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine." url="http://ezix.org/project/wiki/HardwareLiSter" license=('GPL') @@ -19,14 +19,14 @@ md5sums=('67479167add605e8f001097c30e96d0d') build() { cd $srcdir/$pkgname-$pkgver sed -i 's|/usr/bin/gtk-lshw|/usr/sbin/gtk-lshw|' src/gui/integration/gtk-lshw.desktop - make - make gui + make SBINDIR=/usr/bin + make SBINDIR=/usr/bin gui } package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir/ install - make DESTDIR=$pkgdir/ install-gui + make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install + make DESTDIR=$pkgdir/ SBINDIR=/usr/bin install-gui install -Dm0644 src/gui/integration/gtk-lshw.desktop $pkgdir/usr/share/applications/gtk-lshw.desktop install -Dm0644 src/gui/integration/gtk-lshw.pam $pkgdir/usr/share/doc/$pkgname/gtk-lshw.pam install -Dm0644 src/gui/integration/console.apps $pkgdir/usr/share/doc/$pkgname/console.apps diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index d480fae5f..4dc3c6229 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90274 2013-05-10 21:44:25Z thestinger $ +# $Id: PKGBUILD 91966 2013-05-30 13:14:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> @@ -8,25 +8,32 @@ pkgname=lxc pkgver=0.9.0 epoch=1 -pkgrel=2 +pkgrel=3 pkgdesc="Linux Containers" arch=('i686' 'x86_64' 'mips64el') url="http://lxc.sourceforge.net/" depends=('bash' 'perl' 'libseccomp') +makedepends=('docbook2x') +optdepends=('arch-install-scripts: for archlinux template') license=('LGPL') source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz") md5sums=('8552a4479090616f4bc04d8473765fc9') +prepare() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + sed -i "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" configure.ac +} + build() { cd "$srcdir/$pkgname-${pkgver/_/-}" + ./autogen.sh ./configure \ - --prefix=/usr \ - --localstatedir=/var \ - --libexecdir=/usr/bin \ - --sysconfdir=/etc \ - --disable-apparmor \ - --disable-doc \ - --enable-seccomp + --prefix=/usr \ + --localstatedir=/var \ + --libexecdir=/usr/bin \ + --sysconfdir=/etc \ + --disable-apparmor \ + --enable-seccomp make } diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index da8dd8dc9..e79668599 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90434 2013-05-12 10:57:52Z dwallace $ +# $Id: PKGBUILD 91463 2013-05-23 00:34:07Z dwallace $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=21 +pkgrel=22 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" @@ -13,6 +13,7 @@ license=('GPL') groups=('lxde') depends=('gtk2' 'xorg-server') makedepends=('intltool') +optdepends=('librsvg: display the default background') install=${pkgname}.install backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' @@ -25,13 +26,27 @@ source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz lxdm-0.4.1-industrial-greeter-ui.patch lxdm-0.4.1-modern-systems.patch lxdm-0.4.1-nolang-show-sessions.patch - lxdm-0.4.1-pam-env-vars.patch) + lxdm-0.4.1-pam-env-vars.patch + lxdm-0.4.1-kill_user_processes.patch + ) +md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' + '9cc734228696a3c6f06d91bba61b03c1' + 'b86317143ae44d7ed38c150fe4f25502' + 'd2e4a4a22ee2aa1a986be154c647b6c6' + 'c50dd01b715b0a236407d48066191601' + 'a1e3c46a8bef691bc544028f5b6cfe22' + '2c4afdbe3532be4f90d8f6240d352766' + 'baed9055e8825a5511712bc095197519' + '28475239d0c8b4fd778ec49f5ec72962' + '4c1d43e81e9a256e8d1ea7686c24b3d3' + '3ac63085f9df9296dfa645fa623af0e2') prepare(){ cd $srcdir/$pkgname-$pkgver patch -Np1 -i $srcdir/lxdm-0.4.1-event-check-bug.patch patch -Np1 -i $srcdir/lxdm-0.4.1-nolang-show-sessions.patch patch -Np1 -i $srcdir/lxdm-0.4.1-pam-env-vars.patch + patch -Np1 -i $srcdir/lxdm-0.4.1-kill_user_processes.patch } build() { @@ -65,14 +80,3 @@ package() { # avoid conflict with filesystem>=2012.06 rm -r $pkgdir/var/run } - -md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - '9cc734228696a3c6f06d91bba61b03c1' - 'b86317143ae44d7ed38c150fe4f25502' - 'd2e4a4a22ee2aa1a986be154c647b6c6' - 'c50dd01b715b0a236407d48066191601' - 'a1e3c46a8bef691bc544028f5b6cfe22' - '2c4afdbe3532be4f90d8f6240d352766' - 'baed9055e8825a5511712bc095197519' - '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3') diff --git a/community/lxdm/lxdm-0.4.1-kill_user_processes.patch b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch new file mode 100644 index 000000000..f267b105a --- /dev/null +++ b/community/lxdm/lxdm-0.4.1-kill_user_processes.patch @@ -0,0 +1,35 @@ +diff -aur lxdm/src/xconn.c lxdm.modified/src/xconn.c +--- lxdm/src/xconn.c 2012-12-23 19:27:04.512531088 -0800 ++++ lxdm/src/xconn.c 2012-12-23 19:28:31.659227448 -0800 +@@ -172,7 +172,7 @@ + free(c); + } + +-#if 0 ++//#if 0 + static xcb_window_t xconn_get_root(xconn_t c) + { + const xcb_setup_t *setup; +@@ -181,11 +181,11 @@ + xcb_screen_t *screen = iter.data; + return screen->root; + } +-#endif ++//#endif + + void xconn_clean(xconn_t c) + { +-#if 0 ++//#if 0 + xcb_query_tree_cookie_t wintree; + xcb_query_tree_reply_t *rep; + xcb_window_t *children; +@@ -202,7 +202,7 @@ + xcb_kill_client(c->c,children[i]); + free(rep); + xcb_flush(c->c); +-#endif ++//#endif + } + + #endif diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index 4d1285dc5..875dc59e3 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -1,18 +1,21 @@ post_install() { - if ! getent group lxdm > /dev/null ; then - groupadd --system lxdm - chgrp -R lxdm /var/lib/lxdm - chgrp lxdm /etc/lxdm/lxdm.conf - chmod +r /etc/lxdm/lxdm.conf - fi + getent group lxdm >/dev/null && groupmod -g 121 lxdm || groupadd -g 121 lxdm + getent passwd lxdm >/dev/null && usermod -u 121 -g 121 lxdm || useradd -r -d /var/lib/lxdm -u 121 -g 121 lxdm + chown -R 121:121 /var/lib/lxdm + chgrp 121 /etc/lxdm/lxdm.conf + chmod +r /etc/lxdm/lxdm.conf } post_upgrade() { - post_install $1 + post_install $1 + if [[ $(vercmp $2 0.4.1-22) < 0 ]]; then + groupmod -g 121 lxdm + usermod -g 121 -u 121 lxdm + fi } post_remove() { - if ! getent group lxdm > /dev/null ; then - groupdel lxdm - fi + userdel -f lxdm + groupdel lxdm + true } diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index 30889c09c..ef87348b4 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,38 +1,34 @@ -# $Id: PKGBUILD 59712 2011-11-29 13:35:07Z stephane $ +# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=mailutils pkgver=2.2 -pkgrel=4 +pkgrel=5 pkgdesc="MUA command line tool (mailx)" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/mailutils/" license=('GPL') depends=('libldap' 'pam' 'gnutls' 'guile') -makedepends=('python2' 'emacs') -optdepends=('python2') +makedepends=('emacs') conflicts=('libsieve') install=mailutils.install options=(zipman !emptydirs) -source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) -md5sums=('834d2f616b922856127ecfe6c2de7d1a') +source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2 + build-fix.patch) +md5sums=('834d2f616b922856127ecfe6c2de7d1a' + 'e83709ffdcdb257dfab443ef77c89574') -build() { +prepare() { cd "$srcdir/mailutils-$pkgver" + patch -p1 <$srcdir/build-fix.patch +} - py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` - py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` - - export PYTHON=/usr/bin/python2 - export PYTHON_CONFIG=/usr/bin/python2-config - export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" - export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" - +build() { + cd "$srcdir/mailutils-$pkgver" [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ --libexecdir=/usr/lib/$pkgname --without-fribidi \ - --without-tcp-wrappers -# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; + --without-tcp-wrappers --sbindir=/usr/bin make -j1 } diff --git a/community/mailutils/build-fix.patch b/community/mailutils/build-fix.patch new file mode 100644 index 000000000..ec4afd5e3 --- /dev/null +++ b/community/mailutils/build-fix.patch @@ -0,0 +1,13 @@ +diff -wbBur mailutils-2.2/lib/Makefile.in mailutils-2.2.q/lib/Makefile.in +--- mailutils-2.2/lib/Makefile.in 2010-09-08 13:58:58.000000000 +0400 ++++ mailutils-2.2.q/lib/Makefile.in 2013-05-29 14:51:14.064888989 +0400 +@@ -1861,7 +1861,8 @@ + -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ ++ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ ++ -e 's|_GL_WARN_ON_USE (gets.*||'; \ + } > $@-t && \ + mv $@-t $@ + diff --git a/community/makedev/PKGBUILD b/community/makedev/PKGBUILD index d6cf65b99..03d6bff3d 100644 --- a/community/makedev/PKGBUILD +++ b/community/makedev/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 90528 2013-05-13 00:22:02Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Jonathan Liu <net147@gmail.com> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=makedev pkgver=3.23_1 -pkgrel=1.1 +pkgrel=2 pkgdesc='The ubiquitous script to create static device nodes' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -21,7 +21,9 @@ build() { package() { cd ${pkgname^^*}-${pkgver/_*} - make DESTDIR="${pkgdir}" devdir=/usr/sbin makedevdir=/usr/sbin install + # We make devdir == makedevdir to avoid install script to symlink into /dev + # As previous make doesn't have a bad devdir, everything goes well + make DESTDIR="$pkgdir" devdir=/usr/bin makedevdir=/usr/bin sbindir=/usr/bin install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 9e0adc01d..4e959e0fa 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88089 2013-04-11 09:34:40Z spupykin $ +# $Id: PKGBUILD 91951 2013-05-30 09:42:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog -pkgver=20130411 +pkgver=20130530 pkgrel=1 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" @@ -14,11 +14,14 @@ makedepends=('git') options=('docs') backup=('etc/mcelog/mcelog.conf') source=("git://github.com/andikleen/mcelog.git" - "${pkgname}.rc" "mcelog.service") md5sums=('SKIP' - 'f039a77d7bde3518d3d695b144816e8a' - 'b71eb82e532aed3918ebf6b30e158e7f') + 'afd7fc2b7a2f92a75e040b23d6b15958') + +prepare() { + cd "${srcdir}/mcelog" + sed -i 's|sbin|bin|g' Makefile mcelog.cron +} build() { cd "${srcdir}/mcelog" @@ -29,8 +32,7 @@ package() { cd "${srcdir}/mcelog" mkdir -p $pkgdir/usr/share/doc/mcelog make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog - install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" - install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog" + install -Dm0755 mcelog.cron "${pkgdir}/usr/bin/mcelog.cron" install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate" install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README" install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/community/mcelog/mcelog.rc b/community/mcelog/mcelog.rc deleted file mode 100644 index fb73743c7..000000000 --- a/community/mcelog/mcelog.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/mcelog` -case "$1" in - start) - stat_busy "Starting mcelog" - if [ -z "$PID" ]; then - /usr/sbin/mcelog --daemon --pidfile /var/run/mcelog.pid - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon mcelog - stat_done - fi - ;; - stop) - stat_busy "Stopping mcelog" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mcelog - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service index 35c18bc6f..9d6c84f40 100644 --- a/community/mcelog/mcelog.service +++ b/community/mcelog/mcelog.service @@ -4,7 +4,7 @@ After=syslog.target [Service] PIDFile=/run/mcelog.pid -ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid +ExecStart=/usr/bin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid StandardOutput=syslog [Install] diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 2d3c2de1e..d32b982d7 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84844 2013-02-25 10:39:41Z spupykin $ +# $Id: PKGBUILD 90926 2013-05-15 13:47:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') +md5sums=('bd794e4066b6bb197af23cb7b8ba832b') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index fd9740384..bcb786f3e 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84842 2013-02-25 10:39:20Z spupykin $ +# $Id: PKGBUILD 90924 2013-05-15 13:46:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.62 +pkgver=0.7.63 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('a9a8bc398cc5d2ca8723fae024f6e891') +md5sums=('bd794e4066b6bb197af23cb7b8ba832b') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index 4b7cb8f4f..773e3890c 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80024 2012-11-15 14:41:33Z spupykin $ +# $Id: PKGBUILD 90685 2013-05-13 14:28:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy pkgver=2.5.2 -pkgrel=4 +pkgrel=5 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64' 'mips64el') @@ -13,24 +13,24 @@ depends=('python2' 'libnetfilter_conntrack' 'iptables' 'python2-application' 'python2-cjson' 'python2-gnutls') #backup=('opt/mediaproxy/config.ini') source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" - "mediaproxy.init" "mediaproxy-dispatcher.service" "mediaproxy-relay.service" "mediaproxy.tmpfiles") md5sums=('840de8f52e656991be728c15ec30bb5e' - '66f4417f40dda0dfa31569ee4ccc32c7' '4a1fa0b6ce0a8bd44bf0f1d9d36a6154' '23c1a584835de00a958ef963cdd40040' '60a25f2cb6429a0a7d62d45d0c75a0ea') build() { cd $srcdir/mediaproxy-$pkgver - sed -i "s|libraries = get_link_libraries(),|libraries = ['netfilter_conntrack', 'ip4tc'],|g" setup.py +} + +package() { + cd $srcdir/mediaproxy-$pkgver python2 setup.py install --root=$pkgdir - install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf diff --git a/community/mediaproxy/mediaproxy.init b/community/mediaproxy/mediaproxy.init deleted file mode 100644 index ba9fe90b2..000000000 --- a/community/mediaproxy/mediaproxy.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# mediaproxy starts and stops the SER MediaProxy server - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting mediaproxy" - media-dispatcher && media-relay - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - stop) - stat_busy "Stopping mediaproxy" - kill `cat /var/run/mediaproxy/relay.pid` - kill `cat /var/run/mediaproxy/dispatcher.pid` - stat_done - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 2f4cc6259..6c81af3a3 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90243 2013-05-09 23:40:12Z arodseth $ +# $Id: PKGBUILD 91092 2013-05-19 10:48:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -7,8 +7,8 @@ # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> pkgname=midori -pkgver=0.5.0 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686' 'mips64el') url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' @@ -20,7 +20,7 @@ optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' 'aria2: download utility') options=('!emptydirs') source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") -sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0') +sha256sums=('a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index b96561236..f4a55802b 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75192 2012-08-15 19:32:50Z lfleischer $ +# $Id: PKGBUILD 90561 2013-05-13 08:02:43Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif pkgver=1.0.5 -pkgrel=2.1 +pkgrel=3 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64' 'mips64el') url='http://minbif.im/' @@ -17,12 +17,10 @@ backup=('etc/minbif/minbif.conf' install='minbif.install' source=("http://minbif.im/attachments/download/148/${pkgname}-${pkgver}.tar.gz" 'minbif-gcc-4.7.patch' - 'minbif' 'minbif.service' 'minbif.tmpfiles.conf') md5sums=('00c5c1abbe2b8a9d900961832c7909a8' '2235c45d5bdb01e9ef4b11d2a41d49bb' - '307a6fab42bcaeed11a55b5fb4589778' 'b34876e339a37dfb1dc6cd0b9d8edf9d' '3360f5d1bf9bc69fd9b7c9326f321dc3') @@ -42,7 +40,6 @@ package() { install -dm0755 "${pkgdir}/var/lib" install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif" install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users" - install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif" make DESTDIR="${pkgdir}" install diff --git a/community/minbif/minbif b/community/minbif/minbif deleted file mode 100644 index 47888d169..000000000 --- a/community/minbif/minbif +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/minbif` -case "$1" in - start) - stat_busy "Starting minbif daemon" - if [ -z "$PID" ]; then - if [ ! -d /var/run/minbif ]; then - mkdir -p /var/run/minbif && chown minbif:minbif /var/run/minbif - fi - [ -f /var/run/minbif/minbif.pid ] && rm -f /var/run/minbif/minbif.pid - CMD='/usr/bin/minbif --pidfile /var/run/minbif/minbif.pid \ - /etc/minbif/minbif.conf' - su -s /bin/sh -c "$CMD" minbif - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon minbif - stat_done - fi - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping minbif daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/minbif/minbif.pid - rm_daemon minbif - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD new file mode 100644 index 000000000..2fb9f0c74 --- /dev/null +++ b/community/minetest/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 92174 2013-06-02 12:00:30Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Konsta Kokkinen <kray@tsundere.fi> + +pkgname=minetest +pkgver=0.4.6 +pkgrel=1 +pkgdesc='An Infiniminer/Minecraft inspired game' +arch=('i686' 'x86_64') +url='http://minetest.net/' +license=('GPL') +depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'hicolor-icon-theme') +makedepends=('cmake' 'irrlicht' 'mesa' 'libpng' 'zlib') +install=minetest.install +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver} + ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver} + ${pkgname}_common-${pkgver}.tar.gz::https://github.com/minetest/common/tarball/${pkgver}) +md5sums=('a8cacba57659c397fb8098881eb0c5f9' + '1023ac25a83d1431c861d7947e962675' + '54a805066c509478f6983b359f2e91fc') + +build() { + cd "$srcdir"/minetest-minetest-* + + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir"/minetest-minetest-* + + make DESTDIR="$pkgdir" install + + mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest + mv -v "$srcdir"/minetest-common-* "$pkgdir"/usr/share/minetest/games/common + + # small cleanup + rm "$pkgdir"/usr/share/minetest/games/{minetest,common}/.gitignore +} diff --git a/community/minetest/minetest.install b/community/minetest/minetest.install new file mode 100644 index 000000000..85b22a1c5 --- /dev/null +++ b/community/minetest/minetest.install @@ -0,0 +1,17 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + update-desktop-database > /dev/null 2>&1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} diff --git a/community/mingetty/PKGBUILD b/community/mingetty/PKGBUILD deleted file mode 100644 index 494728ee0..000000000 --- a/community/mingetty/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> -# Contributor: Daniel Micay <danielmicay@gmail.com> -# Contributor: stonecrest <stonecrestATgmailDOTcom> - -pkgname=mingetty -pkgver=1.08 -pkgrel=3 -pkgdesc="A minimal getty which allows automatic logins." -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/mingetty" -license=('GPL') -depends=('glibc') -md5sums=('2a75ad6487ff271424ffc00a64420990' - 'b1bcb0668c34d4981e3acddc3990dfdb') -source=(http://downloads.sourceforge.net/sourceforge/mingetty/$pkgname-$pkgver.tar.gz - $pkgname-utf8.patch) - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch $pkgname.c ../$pkgname-utf8.patch - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - install -Dm755 $pkgname "$pkgdir/sbin/$pkgname" - install -Dm644 $pkgname.8 "$pkgdir/usr/share/man/man8/$pkgname.8" -} diff --git a/community/mingetty/mingetty-utf8.patch b/community/mingetty/mingetty-utf8.patch deleted file mode 100644 index c269039ac..000000000 --- a/community/mingetty/mingetty-utf8.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff -Nru mingetty-1.07.orig/mingetty.c mingetty-1.07/mingetty.c ---- mingetty-1.07.orig/mingetty.c 2004-01-03 15:15:56.000000000 +0200 -+++ mingetty-1.07/mingetty.c 2006-11-22 22:13:26.967910100 +0200 -@@ -16,10 +16,15 @@ - * - autologin only at first login - * - /etc/mingetty.conf that can be used instead of /etc/inittab for - * command line options -- * - Can UTF-8 setup be done within mingetty? -+ * - Can UTF-8 setup be done within mingetty? Let's try now :-) (VinzC) - * - Also add /bin/login-type functionality in here? - */ - -+/* Additional comments: Vincent Cadet <vcadet@hotmail.com> (2006-11-21) -+ * - Attempt to make mingetty support UTF-8. Modifications were imported -+ * from Suse migetty.c 0.9.6s. -+ */ -+ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -@@ -39,6 +44,19 @@ - #include <syslog.h> - #include <sys/utsname.h> - #include <time.h> -+#include <locale.h> -+#include <iconv.h> -+#include <wctype.h> -+#include <sys/kd.h> -+#include <sys/ttydefaults.h> -+ -+#ifndef IUTF8 -+# ifndef ASM_IUTF8 -+# error ASM_IUTF8 input flag not defined - Cannot define IUTF8 -+# else -+# define IUTF8 ASM_IUTF8 -+# endif -+#endif - - /* name of this program (argv[0]) */ - static char *progname; -@@ -74,6 +92,8 @@ - static char *autologin = NULL; - /* try to read a char before dropping to login prompt */ - static int loginpause = 0; -+/* terminal mode */ -+static int mode = K_RAW; - - /* error() - output error messages */ - static void error (const char *fmt, ...) -@@ -187,10 +207,21 @@ - if (fd > 2) - close (fd); - -+ /* Detect mode of current keyboard setup, e.g. for UTF-8 */ -+ if (ioctl(0, KDGKBMODE, &mode) < 0) -+ mode = K_RAW; -+ - /* Write a reset string to the terminal. This is very linux-specific - and should be checked for other systems. */ - if (noclear == 0) -- write (0, "\033c", 2); -+ /* don't write a full reset (ESC c) because this leaves the -+ unicode mode again if the terminal was in unicode mode -+ and also undos the ESC sequences in CONSOLE_MAGIC which -+ are needed for some languages/console-fonts. -+ Just put the cursor to the home position (ESC [ H), -+ erase everything below the cursor (ESC [ J), and set the -+ scrolling region to the full window (ESC [ r) */ -+ write (0, "\033[r\033[H\033[J", 9); - - sigaction (SIGHUP, &sa_old, NULL); - } -@@ -292,32 +323,75 @@ - - static char *get_logname (void) - { -- static char logname[40]; -+ static char logname[4*UT_NAMESIZE]; - char *bp; - unsigned char c; -+ int ascii; -+ iconv_t ic; - - tcflush (0, TCIFLUSH); /* flush pending input */ -+ -+ /* Check for UTF-8 mode */ -+ switch(mode) { -+ case K_UNICODE: -+ ascii = 0; -+ setlocale(LC_CTYPE, "en_US.UTF-8"); -+ break; -+ case K_RAW: -+ case K_MEDIUMRAW: -+ case K_XLATE: -+ default: -+ ascii = 1; -+ setlocale(LC_CTYPE, "POSIX"); -+ break; -+ } -+ - for (*logname = 0; *logname == 0;) { - do_prompt (1); - for (bp = logname;;) { - if (read (0, &c, 1) < 1) { -- if (errno == EINTR || errno == EIO -- || errno == ENOENT) -+ if (errno == EINTR || errno == EAGAIN) { -+ usleep(1000); -+ continue; -+ } -+ if (errno == EIO || errno == ENOENT) - exit (EXIT_SUCCESS); - error ("%s: read: %s", tty, strerror (errno)); - } - if (c == '\n' || c == '\r') { - *bp = 0; - break; -- } else if (!isprint (c)) -- error ("%s: invalid character 0x%x in login" -- " name", tty, c); -+ } -+ -+ if (ascii && !isprint (c)) -+ error ("%s: invalid character 0x%x in login name", tty, c); - else if ((size_t)(bp - logname) >= sizeof (logname) - 1) - error ("%s: too long login name", tty); -- else -- *bp++ = c; -+ -+ *bp++ = c; - } - } -+ -+ if (!ascii && (ic = iconv_open("WCHAR_T", "UTF-8"))) { -+ char tmpbuf[4*sizeof(logname)], *op, *lp; -+ size_t len = bp - logname; -+ size_t out = sizeof(tmpbuf) - 1; -+ size_t wcl; -+ wint_t *wcp; -+ -+ op = tmpbuf; -+ lp = logname; -+ if ((wcl = iconv(ic , &lp, &len, &op, &out)) == (size_t)-1) -+ error ("%s: invalid character conversion for login name", tty); -+ iconv_close(ic); -+ -+ wcp = (wint_t*)tmpbuf; -+ wcp[wcl] = (wint_t)0; -+ while (*wcp) { -+ if (!iswprint(*wcp++)) -+ error ("%s: invalid character for login name found", tty); -+ } -+ } - return logname; - } - - - diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD index 7db59a6c3..2e29dbaa5 100644 --- a/community/mingw32-binutils/PKGBUILD +++ b/community/mingw32-binutils/PKGBUILD @@ -15,7 +15,7 @@ license=(GPL) source=("https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma" "260cd952.patch::http://sourceware.org/git/?p=binutils.git;a=patch;h=260cd95271cdf002ed8e419898fd29c42e257841") md5sums=('5d76604f545b151230d1c86e1b8cfab3' - '9226501a8258a12c81956252ba3b4ba1') + 'ad86b2b889424fd1a3b07e7c54ecf646') build() { [ $NOEXTRACT -eq 1 ] || tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 67fb86bd4..2643d6ed4 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84354 2013-02-16 22:50:32Z ioni $ +# $Id: PKGBUILD 91520 2013-05-23 11:15:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Kamil Kaminski <kyle@kkaminsk.com> pkgname=minidlna -pkgver=1.0.25 -pkgrel=5 +pkgver=1.1.0 +pkgrel=2 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" @@ -17,19 +17,16 @@ backup=('etc/minidlna.conf' 'etc/conf.d/minidlna') install=minidlna.install changelog=changelog -source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz - minidlna.rc +source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz minidlna.service minidlna.tmpfiles) -md5sums=('d966256baf2f9b068b9de871ab5dade5' - '1b92f88905abe8f719585d48f4b25a49' - '1903ed9ceee43b8bb86146b9ad8eb50c' +md5sums=('26484a84af3fceafdee26595aae097f7' + '7e3890ee50aa4dfa4d1754261e6cc965' '26de27b12d6a37c47d9714107d07aac9') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh - find -type f -name '*.c' -exec sed -i '1,1i#include </usr/include/time.h>' {} \; + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -37,13 +34,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" DESTDIR=$pkgdir make install install -Dm644 minidlna.conf ${pkgdir}/etc/minidlna.conf - - install -Dm755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna - mkdir -p $pkgdir/etc/conf.d - echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna - echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna - - # systemd files install -Dm0644 $srcdir/minidlna.tmpfiles $pkgdir/usr/lib/tmpfiles.d/minidlna.conf install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service } diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc deleted file mode 100644 index dd5910544..000000000 --- a/community/minidlna/minidlna.rc +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/minidlna -. /etc/minidlna.conf - -daemon_name=minidlna - -get_pid() { - pidof -o %PPID /usr/sbin/minidlna -} - -case "$1" in - start) - stat_busy "Starting minidlna" - PID=$(get_pid) - if [[ -z "$PID" ]]; then - rm -f /var/run/$daemon_name.pid - touch /var/run/$daemon_name.pid && chown $MINIDLNA_USER:$MINIDLNA_USER /var/run/$daemon_name.pid - mkdir -p /var/cache/minidlna - chown -R $MINIDLNA_USER /var/cache/minidlna - su -s /bin/sh -l -c "/usr/sbin/minidlna ${MINIDLNA_OPTS} $2" - $MINIDLNA_USER - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping minidlna" - PID=$(get_pid) - [[ -n $PID ]] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon minidlna - stat_done - fi - ;; - - clean) - $0 stop - sleep 1 - stat_busy "Cleaning minidlna cache" - [ -z $db_dir ] || rm -r $db_dir/* - stat_done - sleep 1 - $0 start - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - rescan) - $0 stop - sleep 1 - $0 start -R - ;; - - *) - echo "usage: $0 {start|stop|restart|clean}" -esac -exit 0 diff --git a/community/minidlna/minidlna.service b/community/minidlna/minidlna.service index 6c9a40152..bc79e96ef 100644 --- a/community/minidlna/minidlna.service +++ b/community/minidlna/minidlna.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking User=nobody -ExecStart=/usr/sbin/minidlna -P /var/run/minidlna/minidlna.pid -PIDFile=/var/run/minidlna/minidlna.pid +ExecStart=/usr/bin/minidlnad -P /run/minidlna/minidlna.pid +PIDFile=/run/minidlna/minidlna.pid [Install] WantedBy=multi-user.target diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index f346ed2ac..38cddc0e5 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79082 2012-10-30 09:54:22Z spupykin $ +# $Id: PKGBUILD 91953 2013-05-30 09:43:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo -pkgver=1.2.5 -pkgrel=3 +pkgver=1.2.6 +pkgrel=1 pkgdesc="Teredo client and server." arch=('i686' 'x86_64' 'mips64el') url="http://www.remlab.net/miredo/" @@ -13,17 +13,11 @@ backup=('etc/miredo/miredo.conf' 'etc/miredo/client-hook') options=('!libtool') source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz - isatapd.rc.d miredo.install - miredo.rc.d - miredo-server.rc.d miredo.service) -md5sums=('5114debbf9fcab5d292176e4548f8cd1' - '51ab6d091192605ee9206944869cb2ab' +md5sums=('5bcdbaced54f40b6cb1e9c9a8dbac411' 'd1b655d7a851cdb46c91c3418ed1962f' - 'c5a9be5c3175fecec387f1710bfd2788' - '319aba1ae06349b76cb25fda0dba60a9' - 'abd7d8831cab7f3ea6d0d4e51b8f8f6a') + 'fd6d5b355b2356426eeefd6047f6bb7c') build() { cd "$srcdir/$pkgname-$pkgver" @@ -33,13 +27,16 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ --with-Judy make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo - install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server - install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook # avoid conflict with filesystem>=2012.06 diff --git a/community/miredo/isatapd.rc.d b/community/miredo/isatapd.rc.d deleted file mode 100644 index fa7bbd708..000000000 --- a/community/miredo/isatapd.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/isatapd` -case "$1" in - start) - stat_busy "Starting userspace ISATAP client" - if [ -z "$PID" ]; then - /usr/sbin/isatapd - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon isatapd - stat_done - fi - ;; - stop) - stat_busy "Stopping userspace ISATAP client" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon isatapd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/miredo/miredo-server.rc.d b/community/miredo/miredo-server.rc.d deleted file mode 100644 index d05513b23..000000000 --- a/community/miredo/miredo-server.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/miredo-server` -case "$1" in - start) - stat_busy "Starting teredo protocol server" - if [ -z "$PID" ]; then - /usr/sbin/miredo-server - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon miredo-server - stat_done - fi - ;; - stop) - stat_busy "Stopping teredo protocol server" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon miredo-server - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/miredo/miredo.rc.d b/community/miredo/miredo.rc.d deleted file mode 100644 index 500374b12..000000000 --- a/community/miredo/miredo.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/miredo` -case "$1" in - start) - stat_busy "Starting teredo protocol client" - if [ -z "$PID" ]; then - /usr/sbin/miredo - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon miredo - stat_done - fi - ;; - stop) - stat_busy "Stopping teredo protocol client" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon miredo - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/miredo/miredo.service b/community/miredo/miredo.service index d28803efd..e824f99e1 100644 --- a/community/miredo/miredo.service +++ b/community/miredo/miredo.service @@ -3,7 +3,7 @@ Description=Teredo IPv6 Tunneling Daemon After=network.target [Service] -ExecStart=/usr/sbin/miredo -f +ExecStart=/usr/bin/miredo -f ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/misdnuser/misdncapid.rc b/community/misdnuser/misdncapid.rc deleted file mode 100755 index 5c47ca0a9..000000000 --- a/community/misdnuser/misdncapid.rc +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$(pidof -o %PPID /usr/sbin/mISDNcapid)" -case "$1" in - start) - stat_busy "Starting misdncapid" - if [ ! -x /var/run/mISDNcapid ] ; then - install -m755 -d /var/run/mISDNcapid - fi - - [ -z "$PID" ] && /usr/sbin/mISDNcapid >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/sbin/mISDNcapid) - echo $PID > /var/run/misdncapid.pid - add_daemon misdncapid - stat_done - fi - ;; - stop) - stat_busy "Stopping misdncapid" - [ -f /var/run/misdncapid.pid ] && kill `cat /var/run/misdncapid.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/misdncapid.pid - rm_daemon misdncapid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index c10219857..318e5e1b9 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79004 2012-10-28 18:41:19Z jlichtblau $ +# $Id: PKGBUILD 92063 2013-05-31 02:32:07Z seblu $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit pkgver=5.5 -pkgrel=2 +pkgrel=3 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64' 'mips64el') url="http://mmonit.com/monit/" @@ -14,9 +14,8 @@ depends=('openssl') backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ - monitd monit.service) + monit.service) sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53' - 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496' 'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4') build() { @@ -32,8 +31,7 @@ package() { make DESTDIR=${pkgdir} install - install -D -m755 ${srcdir}/monitd ${pkgdir}/etc/rc.d/monitd install -D -m700 monitrc ${pkgdir}/etc/monitrc - + install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service } diff --git a/community/monit/monitd b/community/monit/monitd deleted file mode 100644 index 61a359702..000000000 --- a/community/monit/monitd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -start() { - stat_busy "Starting Monit" - /usr/bin/monit &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon monitd - stat_done - fi -} - -stop() { - stat_busy "Stopping Monit" - /usr/bin/monit quit &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon monitd - stat_done - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index 77ec7bf24..4387558e4 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77069 2012-10-04 09:18:24Z spupykin $ +# $Id: PKGBUILD 90575 2013-05-13 09:53:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils -pkgver=0.47 -pkgrel=2 +pkgver=0.48 +pkgrel=1 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64' 'mips64el') url="http://joeyh.name/code/moreutils/" @@ -14,11 +14,16 @@ depends=('perl' 'perl-ipc-run' 'perl-timedate' 'perl-time-duration') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) -md5sums=('4cd3b41a90d07166632942e173ac5ce2') +md5sums=('c6f1eb13132a88ce053be709aa2625d2') build() { - cd $srcdir/moreutils + cd $srcdir/$pkgname + sed -i 's|schema/dtd/4.4|xml-dtd-4.5|g' *.docbook make DOCBOOK2XMAN=docbook2man +} + +package() { + cd $srcdir/$pkgname make PREFIX=$pkgdir/usr install chmod 0644 $pkgdir/usr/share/man/man1/* diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index e5778de03..4bcbe2eb6 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84356 2013-02-16 22:50:34Z ioni $ +# $Id: PKGBUILD 90689 2013-05-13 14:29:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=8 +pkgrel=9 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,14 +12,12 @@ depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat') backup=('etc/motion/motion.conf') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - rc.motion motion.service motion.tmpfiles ffmpeg-0.8.patch linux-headers.patch ffmpeg-compat.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' - '2e8c53c4980edddd420f08fdd572c9be' 'b5b589f8f39939b7a1802cbd9dbe2e1a' 'f863f8c025f7f025b2178def8418decd' 'd36687710837d69fbce4608b1345fa34' @@ -45,7 +43,6 @@ package(){ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" - install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" install -Dm644 "${srcdir}/motion.service" "${pkgdir}/usr/lib/systemd/system/motion.service" install -Dm644 "${srcdir}/motion.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/motion.conf" } diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index d16cb9972..8d71d1522 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90125 2013-05-06 21:32:15Z faidoc $ +# $Id: PKGBUILD 91466 2013-05-23 00:58:44Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64' 'mips64el') @@ -16,11 +16,9 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" - "switch-applications.patch" - "fix-dnd.patch") -sha256sums=('4b3f872c0a0325d88d2d6ece4b67202b7b91b89634fb3c8ff93ebd5c6acfbd67' - '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' - '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') + "switch-applications.patch") +sha256sums=('903c6ab5e228c8a1b8e05f460ba34c111e8a92ce9382ebd0b014416af4dd7049' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96') build() { cd ${pkgname}-${pkgver} @@ -28,8 +26,6 @@ build() { # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch - # Fix unresponsive panel on DND - patch -RNp1 -i ../fix-dnd.patch PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch deleted file mode 100644 index f30e22521..000000000 --- a/community/muffin/fix-dnd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 -From: luyikei <luyikei.qmltu@gmail.com> -Date: Wed, 16 Jan 2013 14:09:39 +0900 -Subject: [PATCH] Put the rest of redirect window types into the top window - group - ---- - src/compositor/meta-window-actor.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c -index 4113e72..66ba3c4 100644 ---- a/src/compositor/meta-window-actor.c -+++ b/src/compositor/meta-window-actor.c -@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) - - if (window->type == META_WINDOW_DROPDOWN_MENU || - window->type == META_WINDOW_POPUP_MENU || -- window->type == META_WINDOW_COMBO){ -+ window->type == META_WINDOW_COMBO || -+ window->type == META_WINDOW_NOTIFICATION || -+ window->type == META_WINDOW_DND || -+ window->type == META_WINDOW_OVERRIDE_OTHER){ - clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), - CLUTTER_ACTOR (self)); - } --- -1.8.1.6 - diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD index 5247c9d2c..2ffe5b53d 100644 --- a/community/mumble/PKGBUILD +++ b/community/mumble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85446 2013-03-01 18:21:21Z svenstaro $ +# $Id: PKGBUILD 92166 2013-06-02 06:17:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lauri Niskanen <ape@ape3000.com> # Contributor: Sebastian.Salich@gmx.de @@ -8,8 +8,8 @@ # to the depends and delete "no-g15" in the configure line below pkgname=mumble -pkgver=1.2.3 -pkgrel=7 +pkgver=1.2.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A voice chat application similar to TeamSpeak" license=('BSD') @@ -20,13 +20,13 @@ options=('!libtool') install=mumble.install url="http://mumble.sourceforge.net/" source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz") -md5sums=('55804e3dfe98b16eeb40abca6c254625') +md5sums=('49bc6abea78f9c54298934c2c28a7c7c') build() { cd $srcdir/$pkgname-$pkgver # Building mumble - qmake main.pro \ + qmake-qt4 main.pro \ CONFIG+="bundled-celt no-bundled-speex no-speechd no-g15 no-xevie no-server \ no-embed-qt-translations no-update packaged" \ DEFINES+="PLUGIN_PATH=/usr/lib/mumble" diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index 367f52bbc..c6a901b1c 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87551 2013-04-02 23:01:31Z svenstaro $ +# $Id: PKGBUILD 92168 2013-06-02 06:18:50Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur -pkgver=1.2.3 -pkgrel=13 +pkgver=1.2.4 +pkgrel=1 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64' 'mips64el') url="http://mumble.sourceforge.net" @@ -17,9 +17,9 @@ install="murmur.install" source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" "murmur.dbus.conf" "murmur.service") -md5sums=('55804e3dfe98b16eeb40abca6c254625' +md5sums=('49bc6abea78f9c54298934c2c28a7c7c' 'eddea4cdbd0bde4b960a67e16b5d5478' - '4ce52d399ba2d95705e997146e0e2544') + 'd27a9adcd7561859e7b033046729bc0e') build() { cd ${srcdir}/mumble-$pkgver @@ -38,7 +38,7 @@ package() { -i scripts/murmur.ini install -dm755 ${pkgdir}/var/lib/murmur - install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd + install -Dm755 release/murmurd ${pkgdir}/usr/bin/murmurd install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini install -Dm644 ${srcdir}/murmur.dbus.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service index 9d58077ab..685b84d13 100644 --- a/community/murmur/murmur.service +++ b/community/murmur/murmur.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini -fg +ExecStart=/usr/bin/murmurd -ini /etc/murmur.ini -fg Restart=always [Install] diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index ed01dd9fa..bf8a4471c 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88083 2013-04-11 08:51:54Z svenstaro $ +# $Id: PKGBUILD 90984 2013-05-16 23:49:59Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,25 +6,24 @@ pkgname=nbd pkgver=3.3 -pkgrel=1 +pkgrel=3 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64' 'mips64el') url="http://nbd.sourceforge.net" license=('GPL') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - config nbd nbd.service) + config nbd.service) backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install md5sums=('cde8fe6e870b8a7459f12e5dcf572d86' '2d05d426b8c2708d5f8a0d028fcbae05' - 'e7b13a8b3369e11927d9917664557efa' '5d1acc143018117174f79eff15afa038') build(){ cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog + ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog --sbindir=/usr/bin make } @@ -35,7 +34,6 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config - install -D -m755 "${srcdir}"/nbd "${pkgdir}"/etc/rc.d/nbd install -D -m644 "${srcdir}"/nbd.service "${pkgdir}"/usr/lib/systemd/system/nbd.service install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README diff --git a/community/nbd/nbd b/community/nbd/nbd deleted file mode 100644 index 76d16c779..000000000 --- a/community/nbd/nbd +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE="/var/run/nbd-server.pid" -PID=`cat $PIDFILE 2>/dev/null` -case "$1" in - start) - stat_busy "Starting Network Block Device Server" - if [ "$PID" = "" ]; then - /usr/bin/nbd-server - fi - if [ "$PID" != "" -o $? -gt 0 ]; then - stat_fail - else - add_daemon nbd - stat_done - fi - ;; - stop) - stat_busy "Stopping Network Block Device Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - rm -f $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nbd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD index f7f2b94d5..74420d0a1 100644 --- a/community/ndisc6/PKGBUILD +++ b/community/ndisc6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86933 2013-03-25 01:19:53Z seblu $ +# $Id: PKGBUILD 90526 2013-05-13 00:18:50Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=ndisc6 pkgver=1.0.2 -pkgrel=6 +pkgrel=7 pkgdesc='Collection of IPv6 networking utilities' arch=('i686' 'x86_64' 'mips64el') url='http://www.remlab.net/ndisc6/' @@ -13,17 +13,25 @@ license=('GPL') depends=('glibc' 'perl') makedepends=('glibc' 'gcc') options=(!emptydirs) -install=ndisc6.install +install=$pkgname.install source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2" 'rdnssd.service') md5sums=('50cb4c19606cf6ff2b7388e71832f579' - 'beeb4f033e9eb951e2de962f609c7c2a') + '88a290cbcf51ac5e10ed5f995a8ba4b9') + +prepare() { + # patch invalid path + sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \ + $pkgname-$pkgver/rdnssd/merge-hook.in +} build() { cd $pkgname-$pkgver - # patch invalid path - sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' rdnssd/merge-hook.in - ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --sysconfdir=/etc make } diff --git a/community/ndisc6/rdnssd.service b/community/ndisc6/rdnssd.service index dcaf73331..6fdf91f2d 100644 --- a/community/ndisc6/rdnssd.service +++ b/community/ndisc6/rdnssd.service @@ -6,7 +6,7 @@ Requires=network.target [Service] Type=forking PIDFile=/run/rdnssd.pid -ExecStart=/usr/sbin/rdnssd -H /etc/rdnssd/merge-hook +ExecStart=/usr/bin/rdnssd -H /etc/rdnssd/merge-hook [Install] WantedBy=multi-user.target diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index f839ec21d..4771c0852 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90132 2013-05-06 22:22:04Z faidoc $ +# $Id: PKGBUILD 92161 2013-06-01 22:17:04Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo -pkgver=1.8.0 +pkgver=1.8.3 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -sha256sums=('4812381bd2e926fa3cd4efcddc79585bab3ff1c226d1db69e7ce3802c783d18a' +sha256sums=('1d3404dc66d3f8ec686dfc1b02523331e66d3e942e2a57d6b29e9f2ae998945a' '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index 4bc67a275..aebdc4f3d 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88327 2013-04-16 13:30:25Z spupykin $ +# $Id: PKGBUILD 90691 2013-05-13 14:30:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf pkgver=0.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -30,5 +30,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install - rm -rf $pkgdir/etc/rc.d/init.d + rm -rf $pkgdir/etc/rc.d } diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD index bcf2cc63e..e6e58955d 100644 --- a/community/nfacct/PKGBUILD +++ b/community/nfacct/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85684 2013-03-04 23:04:09Z seblu $ +# $Id: PKGBUILD 90530 2013-05-13 00:24:07Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> pkgname=nfacct pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='Command line tool to create/retrieve/delete accounting objects' arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/nfacct/' @@ -16,7 +16,7 @@ md5sums=('992e863409d144350dbc8f0554a0f478') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index db780e77d..dda512b6a 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90389 2013-05-12 06:32:22Z bpiotrowski $ +# $Id: PKGBUILD 90996 2013-05-17 06:59:15Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl' 'geoip') diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD index 36a37689f..28db8b57e 100644 --- a/community/ngircd/PKGBUILD +++ b/community/ngircd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84301 2013-02-15 22:17:20Z kkeen $ +# $Id: PKGBUILD 92045 2013-05-31 00:26:55Z seblu $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ngircd pkgver=20.2 -pkgrel=1 +pkgrel=2 pkgdesc="Next Generation IRC Daemon" arch=('i686' 'x86_64' 'mips64el') backup=(etc/ngircd.conf) @@ -13,17 +13,16 @@ url="http://ngircd.barton.de/" license=('GPL') depends=('openssl' 'libident') source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz" - ngircd.sh ngircd.service) sha256sums=('306c0ef0d2ceac0836a84ecf871a6bc4dd16c25683aa87c0f172b6e68b93357d' - 'f8c28546090af8ce67471b9b4d577f6926007615356dd11afd2bc16f61d698d5' - '13ffad9647ef42d1a9c8f01f6208bef9dfe9e0f86dce9a01f72711d813d720a0') + 'f02e30f6864ba1130bcc85bedc44ad782687f572c06f10e0501b0ddcf532b404') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --with-ident \ --with-openssl \ @@ -35,7 +34,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm 755 ../ngircd.sh "$pkgdir/etc/rc.d/ngircd" install -Dm 755 ../ngircd.service "$pkgdir/usr/lib/systemd/system/ngircd.service" } diff --git a/community/ngircd/ngircd.service b/community/ngircd/ngircd.service index b5bab060b..b75382ea9 100644 --- a/community/ngircd/ngircd.service +++ b/community/ngircd/ngircd.service @@ -4,7 +4,7 @@ After=network.target [Service] # don't daemonize to simplify stuff -ExecStart=/usr/sbin/ngircd -n +ExecStart=/usr/bin/ngircd -n ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/ngircd/ngircd.sh b/community/ngircd/ngircd.sh deleted file mode 100644 index 3947f527e..000000000 --- a/community/ngircd/ngircd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ngircd IRC daemon" - /usr/sbin/ngircd - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon ngircd - fi - ;; - stop) - stat_busy "Stopping ngircd IRC daemon" - PID=`pidof -o %PPID /usr/sbin/ngircd` - kill $PID > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ngircd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 25c23becd..230ec8f05 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88884 2013-04-24 15:09:27Z bpiotrowski $ +# $Id: PKGBUILD 92185 2013-06-02 15:29:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,20 +8,21 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.5 -pkgrel=1 +pkgver=0.10.9 +pkgrel=2 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') url='http://nodejs.org/' license=('MIT') -depends=('openssl' 'python2') +depends=('openssl') +makedepends=('python2') checkdepends=('curl') options=('!emptydirs') -source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd') +source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) +sha256sums=('25fb276ac6765ebb19f44d3e3775ed1c0275f874c896755d0d619226caee9c30') -build() { - cd node-v${pkgver} +prepare() { + cd node-v$pkgver msg 'Fixing for python2 name' find -type f -exec sed \ @@ -30,8 +31,12 @@ build() { -e 's_^#!/usr/bin/python$_&2_' \ -e "s_'python'_'python2'_" -i {} \; find test/ -type f -exec sed 's_python _python2 _' -i {} \; - export PYTHON=python2 +} +build() { + cd node-v$pkgver + + export PYTHON=python2 ./configure \ --prefix=/usr \ --shared-openssl @@ -40,18 +45,18 @@ build() { } check() { - cd node-v${pkgver} + cd node-v$pkgver make test || true } package() { - cd node-v${pkgver} + cd node-v$pkgver make DESTDIR="$pkgdir" install # install docs as per user request install -d "$pkgdir"/usr/share/doc/nodejs - cp -r doc/api/*.html \ + cp -r doc/api/{*.html,assets} \ "$pkgdir"/usr/share/doc/nodejs install -D -m644 LICENSE \ diff --git a/community/noip/PKGBUILD b/community/noip/PKGBUILD index 66a10d0c0..75c40a7eb 100644 --- a/community/noip/PKGBUILD +++ b/community/noip/PKGBUILD @@ -1,40 +1,42 @@ -# $Id: PKGBUILD 79265 2012-11-02 00:34:36Z arodseth $ +# $Id: PKGBUILD 90507 2013-05-12 23:35:57Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daenyth # Contributor: Lyle Putnam <lcputnam@amerytel.net> pkgname=noip pkgver=2.1.9 -pkgrel=4 +pkgrel=5 pkgdesc='Dynamic DNS Client Updater for no-ip.com services' arch=('x86_64' 'i686' 'mips64el') url='http://www.no-ip.com/downloads.php?page=linux' license=('GPL') -depends=('bash') -#backup=('etc/no-ip2.conf') -install=noip.install +install="$pkgname.install" +depends=('glibc') source=('http://www.no-ip.com/client/linux/noip-duc-linux.tar.gz' - 'noip-rc.d' - 'noip2.service') + 'noip.service') sha256sums=('82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593' - '95bbebf584e0bc33186fb95f76a85bbd103fcea8ca073c7e4d36a811c3ac5d5d' '624553d92d69bb76cb457a056a7722dc051b5bbd17ea0e622b5cc08909019ea5') -build() { - cd $srcdir/$pkgname-$pkgver-1 - # Their Makefile is fucking horrid, do it by hand instead +prepare() { + cd "$srcdir/$pkgname-$pkgver-1" + sed -i '/^#define CONFIG_FILEPATH/s/PREFIX//' noip2.c sed -i '/^#define CONFIG_FILENAME/s/PREFIX//' noip2.c - cc -Wall $CFLAGS $LDFLAGS -g -Dlinux -DPREFIX=/usr noip2.c -o noip2 +} + +build() { + cd "$srcdir/$pkgname-$pkgver-1" + + cc -Wall $CLFAGS $LDFLAGS -g -Dlinux -DPREFIX=/usr noip2.c -o noip2 -Wno-unused-but-set-variable } package() { - cd $srcdir/$pkgname-$pkgver-1 + cd "$srcdir/$pkgname-$pkgver-1" - install -Dm755 noip2 $pkgdir/usr/bin/noip2 - install -Dm755 ../noip-rc.d $pkgdir/etc/rc.d/noip - install -Dm644 ../noip2.service $pkgdir/usr/lib/systemd/system/noip2.service + install -Dm755 noip2 "$pkgdir/usr/bin/noip2" + install -Dm644 "$srcdir/$pkgname.service" \ + "$pkgdir/usr/lib/systemd/system/noip2.service" } # vim:set ts=2 sw=2 et: diff --git a/community/noip/noip-rc.d b/community/noip/noip-rc.d deleted file mode 100644 index c40b9d12a..000000000 --- a/community/noip/noip-rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -_DAEMON=noip - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/${_DAEMON}2` -case "$1" in - start) - stat_busy "Starting $_DAEMON" - [ -z "$PID" ] && /usr/bin/${_DAEMON}2 - if [ $? -gt 0 ]; then - stat_fail - else - echo `pidof -o %PPID /usr/bin/${_DAEMON}2` > /var/run/$_DAEMON.pid - add_daemon $_DAEMON - stat_done - fi - ;; - stop) - stat_busy "Stopping $_DAEMON" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/$_DAEMON.pid - rm_daemon $_DAEMON - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/noip/noip2.service b/community/noip/noip.service index 2ad0ba867..2ad0ba867 100644 --- a/community/noip/noip2.service +++ b/community/noip/noip.service diff --git a/community/normalize/PKGBUILD b/community/normalize/PKGBUILD index 17af4046b..4a0018ba8 100644 --- a/community/normalize/PKGBUILD +++ b/community/normalize/PKGBUILD @@ -6,7 +6,7 @@ pkgname=normalize pkgver=0.7.7 pkgrel=6.1 pkgdesc="A tool for adjusting the volume of WAV files to a standard level" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://normalize.nongnu.org" license=('GPL') depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123') diff --git a/community/notification-daemon/PKGBUILD b/community/notification-daemon/PKGBUILD index ae78b32cc..7c2530761 100644 --- a/community/notification-daemon/PKGBUILD +++ b/community/notification-daemon/PKGBUILD @@ -4,7 +4,7 @@ pkgname=notification-daemon pkgver=0.7.6 -pkgrel=2 +pkgrel=2.1 pkgdesc="Notification daemon for the desktop notifications framework" arch=(i686 x86_64 'mips64el') license=(GPL) diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD index 23a5ba397..b41bcf521 100644 --- a/community/notmuch/PKGBUILD +++ b/community/notmuch/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 90380 2013-05-12 06:14:15Z dwallace $ +# $Id: PKGBUILD 92216 2013-06-02 21:17:12Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: fauno <fauno at kiwwwi.com.ar> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> # Contributor: Richard Murri <admin@richardmurri.com> pkgbase=notmuch -pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime') +pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime') pkgver=0.15.2 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://notmuchmail.org/" license=('GPL3') @@ -16,47 +16,55 @@ options=(!distcc !makeflags) source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") md5sums=('e86968dfcd7ffaf162b7b87de56b7f18') +prepare(){ + #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver" + cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2} + + find "$srcdir/${pkgname}-${pkgver}/bindings/python" -name '*.py' -exec sed -i -e '1s,python$,python3,' {} + + find "$srcdir/${pkgname}-${pkgver}/bindings/python2" -name '*.py' -exec sed -i -e '1s,python$,python2,' {} + +} build() { cd "$srcdir/${pkgname}-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --includedir=/usr/include - make - (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt" - make ${pkgname}-mutt.1) + --includedir=/usr/include \ + --without-zsh-completion - cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver" + make + ( pushd "contrib/$pkgbase-deliver" + export CPPFLAGS="-I ../../lib" + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc \ + --includedir=/usr/include \ + LDFLAGS="-L$srcdir/$pkgname-$pkgver/lib" \ + CPPFLAGS="-I$srcdir/$pkgname-$pkgver/lib" + make) + make -C "contrib/${pkgbase}-mutt" "${pkgname}-mutt.1" cd bindings/ruby ruby extconf.rb - cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2} - - cd "$srcdir/${pkgname}-${pkgver}/bindings/python" - #env LD_LIBRARY_PATH="." python setup.py build - find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} + + cd "$srcdir/${pkgname}-${pkgver}/bindings/python" python setup.py build - cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" - find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} + - #env LD_LIBRARY_PATH="." python2 setup.py build + cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" python2 setup.py build } package_notmuch-runtime(){ pkgdesc="Runtime for notmuch and notmuch-mutt" depends=('xapian-core' 'gmime' 'talloc') - cd "$srcdir/${pkgname}-$pkgver" + cd "$srcdir/${pkgbase}-$pkgver" make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install + install -Dm755 notmuch $pkgdir/usr/bin/notmuch +} - install -Dm644 notmuch "$pkgdir/usr/bin/notmuch" +package_notmuch-vim(){ + pkgdesc="Vim plugins for notmuch" + depends=('notmuch-runtime') mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax} - - make -C vim prefix="$pkgdir/usr/share/vim/vimfiles" install - - # Remove conflicting zsh completion - rm -r ${pkgdir}/usr/share/zsh + make -C "$srcdir/$pkgbase-$pkgver/vim" prefix="$pkgdir/usr/share/vim/vimfiles" install } @@ -70,30 +78,28 @@ package_notmuch(){ 'gnupg: for email encryption') cd "$srcdir/${pkgname}-$pkgver" + # Install ruby bindings + sed -i -e 's,/site_ruby,,g' bindings/ruby/Makefile + make -C bindings/ruby exec_prefix=$pkgdir/usr prefix=/usr install + + # Install notmuch-deliver + make -C "contrib/${pkgbase}-deliver" DESTDIR="$pkgdir" install # Install python bindings cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" - #env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root="$pkgdir" python2 setup.py install --prefix=/usr --root="$pkgdir" cd "$srcdir/${pkgname}-${pkgver}/bindings/python" - #env LD_LIBRARY_PATH="." python setup.py install --prefix=/usr --root="$pkgdir" python setup.py install --prefix=/usr --root="$pkgdir" - - # Install ruby bindings - cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby" - sed -i -e 's,/site_ruby,,g' Makefile - make exec_prefix=$pkgdir/usr prefix=/usr install - } package_notmuch-mutt(){ pkgdesc="The mail indexer" depends=('notmuch-runtime' 'perl-mailtools' 'perl-mail-box' 'perl-term-readline-gnu' 'perl-string-shellquote' 'perl-file-which') - cd "$srcdir/$pkgbase-runtime-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz" + install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1" } #vim: set filetype=PKGBUILD sw=4 ts=4 et diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index e6e18a19c..b8d257e9d 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83750 2013-02-04 22:23:27Z bisson $ +# $Id: PKGBUILD 91246 2013-05-20 14:50:30Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd pkgver=3.2.15 -pkgrel=1 +pkgrel=2 pkgdesc='Authoritative only, high performance and simple DNS server' url='http://www.nlnetlabs.nl/nsd/' license=('BSD') @@ -15,32 +15,25 @@ arch=('i686' 'x86_64' 'mips64el') source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'service') sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664' - '1cfa2d7254139be50f11753d4e07281ed2af36eb') + 'f35ecb887e86ae0a54ac70aef5a7577fc8761877') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/ \ - --exec-prefix=/usr \ + --sbindir=/usr/bin \ --datarootdir=/usr/share \ --with-pidfile=/run/nsd.pid \ - --enable-ratelimit \ - + --enable-ratelimit make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}"/etc/rc.d - ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service - rm doc/differences.pdf install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}" diff --git a/community/nsd/service b/community/nsd/service index 28bb1c5b7..ca423c29c 100644 --- a/community/nsd/service +++ b/community/nsd/service @@ -5,9 +5,9 @@ After=network.target [Service] Type=forking PIDFile=/run/nsd.pid -ExecStart=/usr/sbin/nsdc start -ExecReload=/usr/sbin/nsdc reload -ExecStop=/usr/sbin/nsdc stop +ExecStart=/usr/bin/nsdc start +ExecReload=/usr/bin/nsdc reload +ExecStop=/usr/bin/nsdc stop [Install] WantedBy=multi-user.target diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD index 19cacfa2f..f4cec348c 100644 --- a/community/nss-pam-ldapd/PKGBUILD +++ b/community/nss-pam-ldapd/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=nss-pam-ldapd -pkgver=0.8.12 -pkgrel=3 +pkgver=0.8.13 +pkgrel=2 pkgdesc='LDAP module for NSS and PAM' arch=('i686' 'x86_64' 'mips64el') url="http://arthurdejong.org/$pkgname/" @@ -16,17 +16,18 @@ install=nss-pam-ldapd.install backup=('etc/nslcd.conf') source=("http://arthurdejong.org/$pkgname/$pkgname-$pkgver.tar.gz" "nslcd.service") -sha1sums=('9c320172df0cdd4eca6cd97ad4c2438e6552ffe0' - '40afa421f05c2128a5219504fea45b2e76830973') - +sha1sums=('0567cfea104defabeacd88a3a3200b311b8071ec' + 'b564fa5738963a67a9240bf4ce63b2fa494cafb7') + build() { cd "$srcdir/$pkgname-$pkgver" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --with-pam-seclib-dir=/usr/lib/security; - + make } diff --git a/community/nss-pam-ldapd/nslcd.service b/community/nss-pam-ldapd/nslcd.service index 41fcb8966..73a9b5272 100644 --- a/community/nss-pam-ldapd/nslcd.service +++ b/community/nss-pam-ldapd/nslcd.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/nslcd/nslcd.pid -ExecStart=/usr/sbin/nslcd +ExecStart=/usr/bin/nslcd [Install] WantedBy=multi-user.target diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index cd2b88464..c30bc8a73 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81126 2012-12-12 00:49:38Z eric $ +# $Id: PKGBUILD 92109 2013-05-31 15:39:41Z foutrelis $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=ntop pkgver=5.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64' 'mips64el') url='http://www.ntop.org/' @@ -14,12 +14,8 @@ makedepends=('subversion' 'wget' 'ca-certificates') options=('!libtool' '!makeflags') install='ntop.install' source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz" - 'ntop' - 'ntop.conf.d' 'ntop.service') md5sums=('01710b6925a8a5ffe1a41b8b512ebd69' - '7b0d7bb57432e768ff387e9f7236f87c' - '6a9371de1dcf31d8ef13a4cf349c02b3' '0e149d20f881600e8387d850ac268483') build() { @@ -37,9 +33,6 @@ package() { install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop" install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd" - install -Dm0755 "${srcdir}/ntop" "${pkgdir}/etc/rc.d/ntop" - install -Dm0644 "${srcdir}/ntop.conf.d" "${pkgdir}/etc/conf.d/ntop" - for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do _plug="$(basename ${_f})" ln -sf "../../lib${_plug}" "${_f}" diff --git a/community/ntop/ntop b/community/ntop/ntop deleted file mode 100644 index 2f0dbcbdd..000000000 --- a/community/ntop/ntop +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/ntop ] && . /etc/conf.d/ntop - -case "$1" in - start) - stat_busy "Starting ntop daemon" - /usr/bin/ntop -d ${NTOP_ARGS} 2>&1 >> ${NTOP_LOG} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ntop - stat_done - fi - ;; - stop) - stat_busy "Stopping ntop daemon" - killall /usr/bin/ntop &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ntop - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ntop/ntop.conf.d b/community/ntop/ntop.conf.d deleted file mode 100644 index 28e2a3166..000000000 --- a/community/ntop/ntop.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Parameters to be passed to ntop. -NTOP_ARGS="-i eth0 -w 3000" - -# Location of the log file. -NTOP_LOG="/var/log/ntop.log" diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index e1df72a0e..5030c8173 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88583 2013-04-20 15:33:34Z jlichtblau $ +# $Id: PKGBUILD 92051 2013-05-31 00:48:23Z seblu $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget pkgver=10.2 -pkgrel=1 +pkgrel=2 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686' 'mips64el') url="http://nzbget.sourceforge.net/" @@ -18,7 +18,7 @@ sha256sums=('c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --enable-parcheck + ./configure --prefix=/usr --sbindir=/usr/bin --enable-parcheck make CXXFLAGS="-lsigc-2.0" } diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD index 5c3872a0f..65670d32b 100644 --- a/community/oidentd/PKGBUILD +++ b/community/oidentd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75286 2012-08-17 22:22:42Z heftig $ +# $Id: PKGBUILD 90524 2013-05-13 00:06:48Z eric $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: simo <simo@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> @@ -6,33 +6,30 @@ pkgname=oidentd pkgver=2.0.8 -pkgrel=7 +pkgrel=8 pkgdesc='An RFC1413 compliant ident daemon' arch=('i686' 'x86_64' 'mips64el') url="http://dev.ojnk.net/" license=('GPL') depends=('glibc' 'bash') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz - rc.d conf.d service socket) +source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz{,.asc} + service socket) md5sums=('c3d9a56255819ef8904b867284386911' - '93cbf742cdd0b053f67482273d715f25' - '603307525771724b0f55a2c34fbc3f3e' - 'b215bee5764cdecb0939f44d5d2dccbe' + 'SKIP' + 'f54c5ed2a532a559c837af18735a28f1' '4442fb9fc10754914568e6ffc3d5fc42') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + cd $pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man make } package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -D -m644 $srcdir/conf.d $pkgdir/etc/conf.d/oidentd - install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/oidentd - install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/oidentd@.service - install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket + install -D -m644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/oidentd@.service" + install -D -m644 "$srcdir/socket" "$pkgdir/usr/lib/systemd/system/oidentd.socket" } diff --git a/community/oidentd/conf.d b/community/oidentd/conf.d deleted file mode 100644 index 5eefa80e2..000000000 --- a/community/oidentd/conf.d +++ /dev/null @@ -1,5 +0,0 @@ -USER=nobody -GROUP=nobody -OPTS="" -# You will need this, when you want oidentd listen both on IPv4 and IPv6 -# OPTS="-a ::" diff --git a/community/oidentd/rc.d b/community/oidentd/rc.d deleted file mode 100644 index 8b3c04c45..000000000 --- a/community/oidentd/rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/oidentd - -# no daemon check needed for oidentd, and no pid nesecary. -case "$1" in - start) - stat_busy "Starting oidentd Daemon..." - # oidentd is smart enough to only run one copy of - # itsself, no check nesecary, and no pidfile - /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon oidentd - stat_done - fi - ;; - stop) - stat_busy "Stopping oidentd Daemon..." - # kill the process by it's full name, or the init script - # will terminate as well, wreaking havok. - killall /usr/sbin/oidentd - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon oidentd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/oidentd/service b/community/oidentd/service index 3688298c1..72ca7c244 100644 --- a/community/oidentd/service +++ b/community/oidentd/service @@ -2,7 +2,7 @@ Description=Ident (RFC 1413) per-connection server [Service] -ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody +ExecStart=/usr/bin/oidentd -I -u nobody -g nobody ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket StandardError=syslog diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index a6ddb975d..d88c3a5f1 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87200 2013-03-28 14:27:14Z spupykin $ +# $Id: PKGBUILD 91498 2013-05-23 10:14:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.8.2 -pkgrel=1 +pkgver=2.8.3 +pkgrel=3 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" @@ -16,16 +16,14 @@ backup=(etc/conf.d/opendkim) install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf - opendkim.rc opendkim.service) -md5sums=('62d7b22f3b15049e3692caa28bcc801e' +md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc' '3e2bb1058ac0662f01e675aa6ac7ee8f' - '093f5c098a45cc68753f97e45a5b374c' - 'bc1b73856bc1941faaa4842e00437cb5') + '85010750a21954e2d3cf5d57fe210d3f') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-db + ./configure --prefix=/usr --sbindir=/usr/bin --with-db make } @@ -44,10 +42,7 @@ package() { mv "$pkgdir/usr/share/doc/opendkim/opendkim.conf.sample" "$pkgdir/etc/opendkim/opendkim.conf.sample" chmod 0700 "$pkgdir/etc/opendkim" chmod 0600 "$pkgdir/etc/opendkim/opendkim.conf.sample" - - # Init script install -Dm644 "$srcdir/opendkim.conf" "$pkgdir/etc/conf.d/opendkim" - install -Dm755 "$srcdir/opendkim.rc" "$pkgdir/etc/rc.d/opendkim" # License mkdir -p "$pkgdir/usr/share/licenses/opendkim" diff --git a/community/opendkim/opendkim.rc b/community/opendkim/opendkim.rc deleted file mode 100644 index f87bfcfc9..000000000 --- a/community/opendkim/opendkim.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/opendkim - -PID=`pidof -o %PPID /usr/sbin/opendkim` -case "$1" in - start) - stat_busy "Starting OpenDKIM filter" - if [ -z "$PID" ]; then - /usr/sbin/opendkim $OPENDKIM_FILTER > /dev/null & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon dkim - stat_done - fi - ;; - stop) - stat_busy "Stopping OpenDKIM filter" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dkim - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/opendkim/opendkim.service b/community/opendkim/opendkim.service index d34c62960..7d2eb79aa 100644 --- a/community/opendkim/opendkim.service +++ b/community/opendkim/opendkim.service @@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking EnvironmentFile=/etc/conf.d/opendkim -ExecStart=/usr/sbin/opendkim $OPENDKIM_FILTER +ExecStart=/usr/bin/opendkim $OPENDKIM_FILTER [Install] WantedBy=multi-user.target diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index 0f701c4a7..cd0412116 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80248 2012-11-18 11:40:59Z jelle $ +# $Id: PKGBUILD 91455 2013-05-22 23:28:35Z seblu $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch) @@ -6,32 +6,35 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=21 -pkgdesc="Free, easy to use implementation of the Network Time Protocol." -url="http://www.openntpd.org/" +pkgrel=22 +pkgdesc='Free, easy to use implementation of the Network Time Protocol.' +url='http://www.openntpd.org/' arch=('x86_64' 'i686' 'mips64el') license=('BSD') depends=('openssl') conflicts=('ntp') -backup=('etc/ntpd.conf' 'etc/conf.d/openntpd') +backup=('etc/ntpd.conf') install=$pkgname.install -source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz - 'openntpd' 'openntpd.conf' 'linux-adjtimex.patch' 'openntpd.tmpfiles' 'openntpd.service') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz" + 'linux-adjtimex.patch' + 'openntpd.tmpfiles' + 'openntpd.service') sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49' - 'b486b7034b8d3d790b6bc1793dd8a44c68b82c8dc833b617c60674b0a7c9d98f' - '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96' '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2' 'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5' - '7ad4d3ce4af3a6ff47ba2e5428092139666ad821101dafe1599b209d53f6943f') + '3239fc6f69d661cd9233233da9e68bebdf7b12888febbc2f2d794742db2d8ed1') -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + patch -Np1 -d $pkgname-$pkgver < linux-adjtimex.patch +} - patch -Np1 -i ../linux-adjtimex.patch +build() { + cd $pkgname-$pkgver autoreconf -fi ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-privsep-user=ntp \ --with-privsep-path=/run/openntpd/ \ --with-adjtimex @@ -42,8 +45,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -Dm644 "$srcdir/$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname" install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/LICENCE" sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf diff --git a/community/openntpd/openntpd b/community/openntpd/openntpd deleted file mode 100644 index 59fa8107d..000000000 --- a/community/openntpd/openntpd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -CONF=/etc/conf.d/openntpd - -. /etc/rc.conf -. /etc/rc.d/functions -[[ -f $CONF ]] && . "$CONF" - -PID=$(pidof -o %PPID /usr/sbin/ntpd) -case $1 in - start) - stat_busy "Starting OpenNTPD" - [[ -d /run/openntpd ]] || mkdir /run/openntpd - if [[ $PID ]] || ! /usr/sbin/ntpd $PARAMS; then - stat_fail - else - pidof -o %PPID /usr/sbin/ntpd >/run/openntpd.pid - add_daemon openntpd - stat_done - fi - ;; - stop) - stat_busy "Stopping OpenNTPD" - if [[ -z $PID ]] || ! kill $PID &>/dev/null; then - stat_fail - else - rm_daemon openntpd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/openntpd/openntpd.conf b/community/openntpd/openntpd.conf deleted file mode 100644 index a2af277f7..000000000 --- a/community/openntpd/openntpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -s Set the time immediately at startup if the local clock is off by more than# 180 seconds. -PARAMS="-s" - - diff --git a/community/openntpd/openntpd.service b/community/openntpd/openntpd.service index e419204d4..ebaf10540 100644 --- a/community/openntpd/openntpd.service +++ b/community/openntpd/openntpd.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/ntpd -s +ExecStart=/usr/bin/ntpd -s [Install] WantedBy=multi-user.target diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index adcd0fd97..1fc2bfdd9 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88548 2013-04-19 16:08:52Z spupykin $ +# $Id: PKGBUILD 91536 2013-05-23 11:21:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips -pkgver=1.9.0 -pkgrel=1 +pkgver=1.9.1 +pkgrel=2 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') @@ -24,14 +24,11 @@ license=('GPL') install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz - opensips.init opensips.service) -md5sums=('2d989e49c9f5f6bd6d0910937fd49802' - '685fbe00826df1285b410d4610dcbb0c' - '7b786d758fe3174af34e2ced44b549e7') +md5sums=('0b7b93f4df29a96daedf12e490e7ec86' + '35cdcb3692f6925236fd5fe7e9484c58') -build() -{ +prepare() { cd $srcdir/$pkgname-$pkgver-tls/ # python2 fix @@ -40,6 +37,13 @@ build() sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + sed -i 's|sbin|bin|g' Makefile + sed -i 's|bin-dir = sbin/|bin-dir = bin/|' Makefile.defs +} + +build() { + cd $srcdir/$pkgname-$pkgver-tls/ + make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ TLS=1 LIBDIR=lib @@ -57,11 +61,6 @@ package() { mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/ sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg - # Install starting script - mkdir -p $pkgdir/etc/rc.d/ - cp ../opensips.init $pkgdir/etc/rc.d/opensips - chmod 755 $pkgdir/etc/rc.d/opensips - # fix bad paths cd $pkgdir/usr/share find -type f -exec sed -i "s#$pkgdir##" {} \; @@ -69,7 +68,7 @@ package() { cd $pkgdir/usr/lib/opensips/opensipsctl find -type f -exec sed -i "s#$pkgdir##" {} \; - cd $pkgdir/usr/sbin + cd $pkgdir/usr/bin sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole cd $pkgdir/etc diff --git a/community/opensips/opensips.init b/community/opensips/opensips.init deleted file mode 100644 index 1c883c4c2..000000000 --- a/community/opensips/opensips.init +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -BINNAME=opensips -OSRDIR=/usr/sbin -OPENSIPS=$OSRDIR/$BINNAME - -TMPDIR=/var/tmp -CORE=$TMPDIR/core - -ETC=/etc/opensips/opensips.cfg -PIDFILE=/var/run/opensips.pid - -case "$1" in - start) - stat_busy "Starting OpenSIPS server" - cd $TMPDIR - $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon opensips - stat_done - fi - ;; - stop) - stat_busy "Stopping OpenSIPS server" - if [ -r $PIDFILE ] - then - cat $PIDFILE | xargs kill - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon opensips - stat_done - fi - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/opensips/opensips.install b/community/opensips/opensips.install index 9e8f2a47b..40973a77a 100644 --- a/community/opensips/opensips.install +++ b/community/opensips/opensips.install @@ -1,5 +1,3 @@ -post_install() -{ - echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'" - /bin/true +post_install() { + echo "To use MySQL, you should install mysql package and run '/usr/bin/openser_mysql.sh create'" } diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service index 81f6fd93e..220a5d419 100644 --- a/community/opensips/opensips.service +++ b/community/opensips/opensips.service @@ -4,8 +4,8 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking -PIDFile=/var/run/opensips.pid -ExecStart=/usr/sbin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid +PIDFile=/run/opensips.pid +ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /run/opensips.pid [Install] WantedBy=multi-user.target diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD index 50d75be6e..a16cf7bbf 100644 --- a/community/opensmtpd/PKGBUILD +++ b/community/opensmtpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88532 2013-04-19 11:57:55Z seblu $ +# $Id: PKGBUILD 91076 2013-05-18 18:46:51Z bpiotrowski $ # Maintainer: Sébastien Luttringer pkgname=opensmtpd -pkgver=5.3.1p1 -pkgrel=2 +pkgver=5.3.2p1 +pkgrel=1 pkgdesc='Free implementation of the server-side SMTP protocol' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.opensmtpd.org/' license=('custom') depends=('libevent') @@ -16,7 +16,7 @@ install=opensmtpd.install source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz" 'smtpd.service' 'smtpd.socket') -md5sums=('0ee036a473f19fe27012cda0068cd287' +md5sums=('8fc513dd632461f70e433103d75dbf50' 'a278f272d97a9fe5a8aac784a7c98d67' 'c2c01e9ca78df3f65efe40a7c0e17ee0') diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index 952a2ba78..c2ab306fd 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90074 2013-05-06 19:38:57Z foutrelis $ +# $Id: PKGBUILD 92128 2013-06-01 08:22:38Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') url='http://www.openttd.org' @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -sha256sums=('1a3525186f4486de8193992426690a1fd8c7e4d376a328056b0464a1a5d32080') +sha256sums=('f6cb90e0773dc7bdf01161ded03e48661a65c3f1412b192ae954215aaf26eca2') package() { cd ${pkgname}-${pkgver} diff --git a/community/ophcrack/PKGBUILD b/community/ophcrack/PKGBUILD index f89079136..d94e0a2b6 100644 --- a/community/ophcrack/PKGBUILD +++ b/community/ophcrack/PKGBUILD @@ -8,7 +8,7 @@ pkgname=ophcrack pkgver=3.5.0 pkgrel=1 pkgdesc="A free Windows password cracker based on rainbow tables" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://ophcrack.sourceforge.net" license=('GPL') depends=('qt4') diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index 2c27c4d2e..6345b3475 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78366 2012-10-17 15:27:49Z spupykin $ +# $Id: PKGBUILD 91866 2013-05-28 17:38:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris pkgver=4.2.3 -pkgrel=5 +pkgrel=7 pkgdesc="A file integrity management system" arch=('i686' 'x86_64' 'mips64el') url="http://osiris.shmoo.com/" @@ -13,35 +13,36 @@ depends=('openssl' 'readline') install=$pkgname.install #source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz - osirismd.init - osirisd.init osirismd.service osirisd.service) md5sums=('1951c7dc0fe729af9ffaf58910340d12' - '96c1ba5433bd0ed7d9520583a07b9bdd' - 'b6dde0a539ca798fa81489f717507f25' - '48644676b88b231803785b8e2da956e5' - 'c0355b453770f6bbc6a58f5cd80766b4') + '8398d60bcbf0c90034473365abc3ece6' + '758d029a1ff53be11756330de595e77f') build() { cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/share/licenses/$pkgname/ - install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt - mkdir -p $pkgdir/etc/rc.d - ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname --build=$CHOST + sed -i "s|/sbin|/bin|g" src/install/install.sh.in + + ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST \ + --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname make all # Arch-ify install locations sed -i "s|^INSTALL_OSIRISM=0|INSTALL_OSIRISM=1|" src/install/install.sh sed -i "s|^INSTALL_OSIRISD=0|INSTALL_OSIRISD=1|" src/install/install.sh sed -i "s|^ROOT_GROUP=wheel|ROOT_GROUP=root|" src/install/install.sh +} + +package() { + cd $srcdir/$pkgname-$pkgver + + mkdir -p $pkgdir/usr/share/licenses/$pkgname/ + install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt make DESTDIR=$pkgdir install - install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd - install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd - rm -rf $pkgdir/usr/osiris + rm -rf $pkgdir/usr/osiris $pkgdir/etc/init.d install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service diff --git a/community/osiris/osirisd.init b/community/osiris/osirisd.init deleted file mode 100644 index 8262d902e..000000000 --- a/community/osiris/osirisd.init +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -LOCKFILE=/var/run/osirisd.lock - -case "$1" in - start) - stat_busy "Starting Osiris Scanning Daemon" - [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && /usr/sbin/osirisd && touch $LOCKFILE - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - stop) - stat_busy "Stopping Osiris Scanning Daemon" - [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirisd - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service index 199737c9f..3b162160f 100644 --- a/community/osiris/osirisd.service +++ b/community/osiris/osirisd.service @@ -4,7 +4,7 @@ Description=A file integrity management system [Service] User=osiris Type=forking -ExecStart=/usr/sbin/osirisd +ExecStart=/usr/bin/osirisd [Install] WantedBy=multi-user.target diff --git a/community/osiris/osirismd.init b/community/osiris/osirismd.init deleted file mode 100644 index 0bdae5e10..000000000 --- a/community/osiris/osirismd.init +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -LOCKFILE=/var/run/osirismd.lock - -case "$1" in - start) - stat_busy "Starting Osiris Management Daemon" - [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && touch $LOCKFILE && /usr/sbin/osirismd - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - stop) - stat_busy "Stopping Osiris Management Daemon" - [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirismd - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service index d51cef22c..ec4c40702 100644 --- a/community/osiris/osirismd.service +++ b/community/osiris/osirismd.service @@ -4,7 +4,7 @@ Description=A file integrity management system [Service] User=osiris Type=forking -ExecStart=/usr/sbin/osirismd +ExecStart=/usr/bin/osirismd [Install] WantedBy=multi-user.target diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD index cf5854876..ba1f32ae5 100644 --- a/community/osmo/PKGBUILD +++ b/community/osmo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68669 2012-03-31 08:29:38Z stativ $ +# $Id: PKGBUILD 90853 2013-05-14 21:40:39Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Benzo <mb_benzo@yahoo.es> pkgname=osmo pkgver=0.2.10 -pkgrel=7 +pkgrel=8 pkgdesc="A handy personal organizer" arch=('i686' 'x86_64' 'mips64el') url="http://clayo.org/osmo/" diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD index e4225e508..cd38e3956 100644 --- a/community/ozerocdoff/PKGBUILD +++ b/community/ozerocdoff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69167 2012-04-09 22:11:35Z spupykin $ +# $Id: PKGBUILD 91884 2013-05-28 18:09:59Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> pkgname=ozerocdoff pkgver=2 -pkgrel=7 +pkgrel=8 pkgdesc="Userspace driver for Option High Speed Mobile Devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.pharscape.org/ozerocdoff.html" @@ -15,10 +15,15 @@ source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;t md5sums=('88a78f9380d9591f8d20a657b72e3e5c' '28ed1afd16fdec92de3baf66b32b0b12') +prepare() { + cd "${srcdir}/udev" + patch -p1 <$srcdir/remove-old-rules.patch + sed -i 's|usr/sbin|usr/bin|g' Makefile +} + build() { cd "${srcdir}/udev" make clean - patch -p1 <$srcdir/remove-old-rules.patch make } diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index 8791c00f4..4900ee892 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78346 2012-10-17 14:53:26Z spupykin $ +# $Id: PKGBUILD 91863 2013-05-28 17:37:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: v01d <phreakuencies@gmail.com> pkgname=p3scan pkgver=2.3.2 -pkgrel=7 +pkgrel=9 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection" arch=('i686' 'x86_64' 'mips64el') url="http://p3scan.sourceforge.net/" @@ -12,12 +12,10 @@ depends=('pcre' 'openssl') license=('GPL') install=p3scan.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "rc.p3scan" "p3scan.service" "p3scan.tmpfiles") md5sums=('9f8decc7d4701228788e3c8717096ca0' - '482a783e699b6532cbc478977f429eb5' - 'dc724b50963d80be7924fc4d9d4856f0' + '74a3a5e52e6714ac5001985061248a34' '265a730e20e3d8aaf0cd7816dc98ca71') build() { @@ -27,7 +25,7 @@ build() { unset CFLAGS sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile - sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile + sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/bin/|' Makefile make } @@ -35,14 +33,13 @@ package() { cd $srcdir/$pkgname-$pkgver # Create base dirs, the Makefile assumes they're there - install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8 + install -d $pkgdir/usr/bin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d # install with root set on $pkgdir make DESTDIR=$pkgdir install # delete init script provided and use an arch compatible one - rm -f $pkgdir/etc/rc.d/rc.p3scan - install -D -m755 -g root -o root $srcdir/rc.p3scan $pkgdir/etc/rc.d/p3scan + rm -rf $pkgdir/etc/rc.d # BUG?: make absolute link a relative one ( diff --git a/community/p3scan/p3scan.service b/community/p3scan/p3scan.service index 0bab3e7ec..bdd34b75c 100644 --- a/community/p3scan/p3scan.service +++ b/community/p3scan/p3scan.service @@ -3,8 +3,8 @@ Description=p3scan proxy [Service] Type=forking -PIDFile=/var/run/p3scan/p3scan.pid -ExecStart=/usr/sbin/p3scan +PIDFile=/run/p3scan/p3scan.pid +ExecStart=/usr/bin/p3scan [Install] WantedBy=multi-user.target diff --git a/community/p3scan/rc.p3scan b/community/p3scan/rc.p3scan deleted file mode 100644 index fc8b79b22..000000000 --- a/community/p3scan/rc.p3scan +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting p3scan" - [ -d /var/run/p3scan ] || mkdir -p /var/run/p3scan - if [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi - - # Start p3scan - /usr/sbin/p3scan - if ! [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi - add_daemon p3scan - stat_done - ;; - stop) - stat_busy "Stopping p3scan" - - # Stop p3scan - if [ -a /var/run/p3scan/p3scan.pid ]; then - kill `cat /var/run/p3scan/p3scan.pid` &>/dev/null || stat_die - rm -f /var/run/p3scan/p3scan.pid - rm_daemon p3scan - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 { start | stop | restart }" -esac -exit 0 diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index 39bafce1c..a7f65a030 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87881 2013-04-08 12:41:31Z jconder $ +# $Id: PKGBUILD 90942 2013-05-16 02:47:08Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit') pkgver=0.7.6 -pkgrel=9 +pkgrel=10 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64' 'mips64el') url="http://www.packagekit.org" @@ -18,7 +18,7 @@ source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" 'libarchive.patch') sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d' 'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8' - 'd27c77d3c0e2932fff2916fedcae011bd283904ef7c329dd0dc05163b58d7415' + 'c7f6da04f5b8f09e6d884ae4f480c064eae10de1d2528bf14d2f55b34e472c23' '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2') build() { @@ -31,6 +31,7 @@ build() { patch -Np1 -i "$srcdir/adopt.patch" patch -Np1 -i "$srcdir/alpm.patch" patch -Np1 -i "$srcdir/libarchive.patch" + sed -i 's@sbin_PROGRAMS@bin_PROGRAMS@' 'contrib/device-rebind/Makefile.am' export PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr \ @@ -52,7 +53,7 @@ build() { --disable-dummy \ --enable-alpm \ --with-default-backend=alpm - make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs' + make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-suggest-attribute=format' } package_packagekit() { diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch index 8b972b291..a15fafeb2 100644 --- a/community/packagekit/alpm.patch +++ b/community/packagekit/alpm.patch @@ -1080,7 +1080,7 @@ index d2f363b..80d5ae0 100644 out: diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c -index 76402f0..5e32151 100644 +index 76402f0..554f06d 100644 --- a/backends/alpm/pk-backend-transaction.c +++ b/backends/alpm/pk-backend-transaction.c @@ -63,7 +63,7 @@ alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename) @@ -1130,7 +1130,15 @@ index 76402f0..5e32151 100644 if (percent == recent) { break; } -@@ -388,6 +393,17 @@ pk_backend_output (PkBackend *self, const gchar *output) +@@ -316,7 +321,6 @@ pk_backend_transaction_conv_cb (alpm_question_t question, gpointer data1, + case ALPM_QUESTION_REPLACE_PKG: + case ALPM_QUESTION_CONFLICT_PKG: + case ALPM_QUESTION_CORRUPTED_PKG: +- case ALPM_QUESTION_LOCAL_NEWER: + /* these actions are mostly harmless */ + g_debug ("safe question %d", question); + *result = 1; +@@ -388,6 +392,17 @@ pk_backend_output (PkBackend *self, const gchar *output) } static void @@ -1148,7 +1156,7 @@ index 76402f0..5e32151 100644 pk_backend_transaction_dep_resolve (PkBackend *self) { g_return_if_fail (self != NULL); -@@ -427,7 +443,8 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) +@@ -427,7 +442,8 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) name = alpm_pkg_get_name (pkg); version = alpm_pkg_get_version (pkg); @@ -1158,7 +1166,7 @@ index 76402f0..5e32151 100644 pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); optdepends = alpm_pkg_get_optdepends (pkg); -@@ -435,8 +452,10 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) +@@ -435,8 +451,10 @@ pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) pk_backend_output (self, "Optional dependencies:\n"); for (i = optdepends; i != NULL; i = i->next) { @@ -1170,7 +1178,7 @@ index 76402f0..5e32151 100644 pk_backend_output (self, output); g_free (output); } -@@ -467,7 +486,8 @@ pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg) +@@ -467,7 +485,8 @@ pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg) name = alpm_pkg_get_name (pkg); version = alpm_pkg_get_version (pkg); @@ -1180,7 +1188,7 @@ index 76402f0..5e32151 100644 pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); pk_backend_output_end (self); } -@@ -498,45 +518,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg, +@@ -498,45 +517,106 @@ pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg, pk_backend_output_start (self, pkg); } @@ -1307,7 +1315,7 @@ index 76402f0..5e32151 100644 pk_backend_transaction_setup (PkBackend *self) { g_return_if_fail (self != NULL); -@@ -545,12 +626,46 @@ pk_backend_transaction_setup (PkBackend *self) +@@ -545,12 +625,46 @@ pk_backend_transaction_setup (PkBackend *self) } static void @@ -1355,7 +1363,7 @@ index 76402f0..5e32151 100644 switch (event) { case ALPM_EVENT_CHECKDEPS_START: case ALPM_EVENT_RESOLVEDEPS_START: -@@ -559,7 +674,6 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, +@@ -559,7 +673,6 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, case ALPM_EVENT_FILECONFLICTS_START: case ALPM_EVENT_INTERCONFLICTS_START: @@ -1363,7 +1371,7 @@ index 76402f0..5e32151 100644 case ALPM_EVENT_DELTA_INTEGRITY_START: case ALPM_EVENT_DISKSPACE_START: pk_backend_transaction_test_commit (backend); -@@ -582,23 +696,73 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, +@@ -582,23 +695,73 @@ pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, break; case ALPM_EVENT_UPGRADE_START: @@ -1438,7 +1446,7 @@ index 76402f0..5e32151 100644 default: g_debug ("unhandled event %d", event); break; -@@ -623,7 +787,7 @@ pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags, +@@ -623,7 +786,7 @@ pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags, g_return_val_if_fail (cancellable != NULL, FALSE); if (alpm_trans_init (alpm, flags) < 0) { @@ -1447,7 +1455,7 @@ index 76402f0..5e32151 100644 g_set_error_literal (error, ALPM_ERROR, errno, alpm_strerror (errno)); return FALSE; -@@ -692,6 +856,7 @@ alpm_depend_free (alpm_depend_t *depend) +@@ -692,6 +855,7 @@ alpm_depend_free (alpm_depend_t *depend) { free (depend->name); free (depend->version); @@ -1455,7 +1463,7 @@ index 76402f0..5e32151 100644 free (depend); } -@@ -731,7 +896,7 @@ alpm_conflict_build_list (const alpm_list_t *i) +@@ -731,7 +895,7 @@ alpm_conflict_build_list (const alpm_list_t *i) g_string_append_printf (list, "%s <-> %s (%s), ", conflict->package1, conflict->package2, reason); @@ -1464,7 +1472,7 @@ index 76402f0..5e32151 100644 } } -@@ -837,12 +1002,12 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) +@@ -837,12 +1001,12 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) } if (prefix != NULL) { @@ -1479,7 +1487,7 @@ index 76402f0..5e32151 100644 g_set_error_literal (error, ALPM_ERROR, errno, alpm_strerror (errno)); } -@@ -959,12 +1124,12 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) +@@ -959,12 +1123,12 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) } if (prefix != NULL) { @@ -1494,7 +1502,7 @@ index 76402f0..5e32151 100644 g_set_error_literal (error, ALPM_ERROR, errno, alpm_strerror (errno)); } -@@ -993,7 +1158,7 @@ pk_backend_transaction_end (PkBackend *self, GError **error) +@@ -993,7 +1157,7 @@ pk_backend_transaction_end (PkBackend *self, GError **error) } if (alpm_trans_release (alpm) < 0) { @@ -1597,7 +1605,7 @@ index 37ade1e..ff83b5e 100644 alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs); diff --git a/configure.ac b/configure.ac -index 37e8a64..2e85f6f 100644 +index 37e8a64..4a33dbd 100644 --- a/configure.ac +++ b/configure.ac @@ -707,9 +707,7 @@ if test x$enable_opkg = xyes; then @@ -1607,7 +1615,7 @@ index 37e8a64..2e85f6f 100644 - AC_CHECK_HEADER([alpm.h], - [], - [AC_MSG_ERROR([No ALPM headers found])]) -+ PKG_CHECK_MODULES(ALPM, libalpm >= 4.1.0) ++ PKG_CHECK_MODULES(ALPM, libalpm >= 8.0.1) fi if test x$enable_poldek = xyes; then diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD index dc77371c8..bf243f18b 100644 --- a/community/pam_mount/PKGBUILD +++ b/community/pam_mount/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77500 2012-10-11 11:40:42Z spupykin $ +# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: Sirius Bakke <sirius\at/nonline.org> pkgname=pam_mount pkgver=2.13 -pkgrel=4 +pkgrel=5 pkgdesc="A PAM module that can mount volumes for a user session" arch=('i686' 'x86_64' 'mips64el') url="http://pam-mount.sourceforge.net/" @@ -22,12 +22,13 @@ build() { cd -- "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/$pkgname-git.patch aclocal - automake --add-missing libtoolize + automake --add-missing autoreconf ./configure \ --prefix=/usr \ - --with-ssbindir=/usr/sbin \ + --with-ssbindir=/usr/bin \ + --sbindir=/usr/bin \ --with-slibdir=/usr/lib \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD index 4ae03a936..deee1070c 100644 --- a/community/pam_pwcheck/PKGBUILD +++ b/community/pam_pwcheck/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 70355 2012-05-04 23:55:13Z allan $ +# $Id: PKGBUILD 90578 2013-05-13 09:54:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pam_pwcheck -pkgver=3.9 -pkgrel=4 +pkgver=3.12.1 +pkgrel=1 pkgdesc="A password strength checking module for PAM-aware password changing programs" arch=(i686 x86_64 'mips64el') url="http://www.thkukuk.de/pam/pam_pwcheck/" depends=('pam') license=('GPL') -source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2 - pam_pwcheck-3.9-pthread.patch) -md5sums=('27be63338af88d14610d182b6a161cd1' - '0978c56f1321febb5b4fa584f1054773') +source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2) +md5sums=('85cd0d48500c160abcb0b9902e5594ce') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ${srcdir}/pam_pwcheck-3.9-pthread.patch ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch b/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch deleted file mode 100644 index ef007b469..000000000 --- a/community/pam_pwcheck/pam_pwcheck-3.9-pthread.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- pam_pwcheck-3.9.orig/src/read-files.c 2005-10-10 13:38:30.000000000 -0500 -+++ pam_pwcheck-3.9/src/read-files.c 2012-12-25 05:23:41.175269985 -0500 -@@ -30,8 +30,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <nss.h> --#include <bits/libc-lock.h> --#define __libc_lock_t pthread_mutex_t -+#include <pthread.h> - - #include "read-files.h" - -@@ -341,11 +340,11 @@ - char *buffer, size_t buflen, int *errnop) - { - /* Locks the static variables in this file. */ -- __libc_lock_define_initialized (static, lock); -+ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; - enum nss_status status; - FILE *stream = NULL; - -- __libc_lock_lock (lock); -+ pthread_mutex_lock (&lock); - - status = internal_setent (&stream, "/shadow"); - if (status == NSS_STATUS_SUCCESS) -@@ -361,7 +360,7 @@ - internal_endent (&stream); - } - -- __libc_lock_unlock (lock); -+ pthread_mutex_unlock (&lock); - - return status; - } -@@ -371,11 +370,11 @@ - char *buffer, size_t buflen, int *errnop) - { - /* Locks the static variables in this file. */ -- __libc_lock_define_initialized (static, lock); -+ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; - enum nss_status status; - FILE *stream = NULL; - -- __libc_lock_lock (lock); -+ pthread_mutex_lock (&lock); - - status = internal_setent (&stream, "/passwd"); - if (status == NSS_STATUS_SUCCESS) -@@ -391,7 +390,7 @@ - internal_endent (&stream); - } - -- __libc_lock_unlock (lock); -+ pthread_mutex_unlock (&lock); - - return status; - } diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index 13653dcd4..c61e08f6a 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 77048 2012-10-03 23:34:04Z bisson $ +# $Id: PKGBUILD 90928 2013-05-15 13:56:58Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=pari -pkgver=2.5.3 +pkgver=2.5.4 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -11,12 +11,16 @@ arch=('i686' 'x86_64' 'mips64el') depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') -source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz") -sha1sums=('de79eee7ae017a495dc0c648b6f7d5a4f6c7a522') +source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc}) +sha1sums=('471226fd86fea0ad1f236249a49bdaee16aa34bf' 'SKIP') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/\$addlib64//g' -i config/get_libpth +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/\$addlib64/ /' -i config/get_libpth ./Configure --prefix=/usr --with-gmp --with-readline make all } @@ -29,8 +33,5 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - # symlink pointing to a symlink that is going to be moved by zipman - rm "${pkgdir}"/usr/share/man/man1/pari.1 - ln -s gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1.gz + ln -sf gp.1.gz "${pkgdir}"/usr/share/man/man1/pari.1 } diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index a3caad52b..94a3bda89 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88524 2013-04-19 10:31:48Z spupykin $ +# $Id: PKGBUILD 92115 2013-05-31 16:30:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=5.3.0 +pkgver=5.4.0 #_rel=stable _rel=devel pkgrel=1 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('4f9fd4994bffd7664901dcace9ab6c16') +md5sums=('5f4603d4c4ee8d60826e56f9012d2e99') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD index 7cc655b41..679a5bebe 100644 --- a/community/partimage/PKGBUILD +++ b/community/partimage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77310 2012-10-08 15:54:38Z lfleischer $ +# $Id: PKGBUILD 92035 2013-05-31 00:06:34Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Sven Kauber <celeon@gmail.com> @@ -7,7 +7,7 @@ pkgname=partimage pkgver=0.6.9 -pkgrel=3 +pkgrel=4 pkgdesc='Partition Image saves partitions in many formats to an image file.' arch=('i686' 'x86_64' 'mips64el') url='http://www.partimage.org/' @@ -17,21 +17,19 @@ backup=('etc/partimaged/partimagedusers') install='partimage.install' source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'partimage-0.6.9-zlib-1.2.6.patch' - 'partimaged' 'partimaged-gencrt' 'partimaged.service') md5sums=('1bc046fd915c5debbafc85729464e513' '202c4334766041d98c5f67c9d62c3063' - 'f3b517a62de5540f3b1a8b7edf65b7ec' '2316b116227b07efb48266e660ca1ba1' - '4102983fdf6e7af7cac73fdf9d37a6f6') + '5f8dae511cdfbf097409a45e9642a372') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../partimage-0.6.9-zlib-1.2.6.patch - ./configure --prefix=/usr --sysconfdir=/etc --enable-pam + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-pam make make pamfile } @@ -42,7 +40,6 @@ package() { make DESTDIR="${pkgdir}" install install -Dm0644 partimaged.pam "${pkgdir}/etc/pam.d/partimaged" - install -Dm0755 "${srcdir}/partimaged" "${pkgdir}/etc/rc.d/partimaged" install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt" chmod 644 "${pkgdir}/etc/partimaged/partimagedusers" diff --git a/community/partimage/partimaged b/community/partimage/partimaged deleted file mode 100644 index da810cbb1..000000000 --- a/community/partimage/partimaged +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# This file belongs in /etc/rc.d -# -############################################################################### - -#inserting certain functions (like stat_busy) -. /etc/rc.conf -. /etc/rc.d/functions - -PARTIMAGE=/usr/sbin/ - -# Check the file is there and is executable. -[ -x $PARTIMAGE/partimaged ] || exit 0 - -PID=`pidof -o %PPID /usr/sbin/partimaged` - -# See how we were called. -case "$1" in - start) - stat_busy "Starting Partimage Daemon " - if [ -z "$PID" ]; then - /usr/sbin/partimaged -D &>/dev/null - RETVAL=$? #storing the status of the last command to RETVAL - if [ $? -gt 0 ]; then #if the status was other than 0, the command failed - stat_fail - exit 1 - else - add_daemon partimaged - stat_done - fi - else - stat_fail - echo ":: Daemon already started as pid $PID" - exit 1 - fi - ;; - stop) - stat_busy "Stopping Partimage Daemon " - if [ "$PID" != "" ]; then #if PID exists - kill -KILL $PID &>/dev/null - stat_done - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - RETVAL=$? - rm_daemon partimaged - fi - else - stat_fail - echo ":: Daemon already stopped" - exit 1 - fi - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - *) - echo "Usage: partimaged {start|stop|restart|reload}" - exit 1 -esac -exit $RETVAL diff --git a/community/partimage/partimaged.service b/community/partimage/partimaged.service index 34eb87fd7..baa682981 100644 --- a/community/partimage/partimaged.service +++ b/community/partimage/partimaged.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -ExecStart=/usr/sbin/partimaged --daemon +ExecStart=/usr/bin/partimaged --daemon [Install] WantedBy=multi-user.target diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 3c4679f2e..1fc3d2ad7 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88487 2013-04-18 14:09:48Z spupykin $ +# $Id: PKGBUILD 90992 2013-05-17 06:49:35Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=4.0.0.rc6 -pkgrel=2 +pkgver=4.0.2 +pkgrel=1 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" @@ -14,7 +14,7 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz) -md5sums=('2cc01a611431f4f980b65b87dbbd9e5a') +md5sums=('0b261a5a9a23858c3fe2999aecdbc552') build(){ cd $srcdir/passenger-release-$pkgver diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD index f3562ada8..28de1def2 100644 --- a/community/pcsc-perl/PKGBUILD +++ b/community/pcsc-perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87531 2013-04-02 15:53:32Z giovanni $ +# $Id: PKGBUILD 91655 2013-05-26 09:24:45Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> # Contributor: marc0s <marc0s@fsfe.org> pkgname=pcsc-perl pkgver=1.4.13 -pkgrel=1 +pkgrel=2 pkgdesc="A Perl Module for PC/SC SmartCard access" arch=('i686' 'x86_64' 'mips64el') url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/" diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 403257fa6..d21b66fae 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83602 2013-02-03 16:05:49Z giovanni $ +# $Id: PKGBUILD 91101 2013-05-19 13:42:04Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite pkgver=1.8.8 -pkgrel=2 +pkgrel=3 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') url="https://alioth.debian.org/projects/pcsclite/" @@ -21,6 +21,7 @@ build() { sed -i -e "s:python:python2:g" src/spy/pcsc-spy ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-libudev \ --sysconfdir=/etc \ --enable-ipcdir=/run/pcscd \ diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD index 142d55d81..f73b84a4b 100644 --- a/community/pd/PKGBUILD +++ b/community/pd/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 74762 2012-08-03 14:09:42Z speps $ +# $Id: PKGBUILD 92207 2013-06-02 18:54:01Z bpiotrowski $ # Maintainer : speps <speps at aur dot archlinux dot org> -# Contributor: TDY <tdy@gmx.com> +# Contributor: TDY <tdy@gmx.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> -# Contributor: Andrea Scarpino <bash.lnx@gmail.com> pkgname=pd -pkgver=0.43.4 +pkgver=0.44.3 _ver=${pkgver%.*}-${pkgver##*.} pkgrel=1 pkgdesc="The Pure Data real-time music and multimedia environment" @@ -15,10 +14,11 @@ license=('custom:BSD') depends=('jack' 'fftw' 'tk') provides=('puredata') source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz") -md5sums=('9f174836ad5715ff3f65fd9b9f9a18ce') +md5sums=('a3e8ca0eab039dc472a6533ef9344582') build() { - cd "$srcdir/pd-$_ver/src" + cd "$srcdir/pd-$_ver" + ./autogen.sh ./configure --prefix=/usr \ --enable-alsa \ --enable-jack \ @@ -27,10 +27,10 @@ build() { } package() { - cd "$srcdir/pd-$_ver/src" + cd "$srcdir/pd-$_ver" make DESTDIR="$pkgdir" install # license - install -Dm644 ../LICENSE.txt \ + install -Dm644 LICENSE.txt \ "$pkgdir/usr/share/licenses/pd/LICENSE" } diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 26f1ff262..38a311ed0 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88656 2013-04-21 08:48:16Z jelle $ +# $Id: PKGBUILD 91593 2013-05-25 02:56:18Z foutrelis $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.16 -pkgrel=4 +pkgrel=6 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" @@ -12,22 +12,26 @@ license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') makedepends=('pstreams' 'python2-nose' 'ttf-liberation') source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") +md5sums=('6ba1e576212e129111518a8c4afd1092') build() { cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i 's/nosetests/nosetests2/' tests/Makefile + make test +} + package() { cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 } -check() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's/nosetests/nosetests2/' tests/Makefile - make test -} -md5sums=('6ba1e576212e129111518a8c4afd1092') diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD index f5a42a386..63479e96d 100644 --- a/community/pdns-recursor/PKGBUILD +++ b/community/pdns-recursor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89549 2013-04-29 23:06:17Z arodseth $ +# $Id: PKGBUILD 90965 2013-05-16 18:09:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Jan Steffens <heftig@archlinux.org> pkgname=pdns-recursor -pkgver=3.5 +pkgver=3.5.1 pkgrel=1 pkgdesc='PowerDNS recursor' url='https://www.powerdns.com/' @@ -15,8 +15,8 @@ makedepends=('boost') backup=('etc/powerdns/recursor.conf') source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2" 'pdns-recursor.service') -sha256sums=('02ea398aa0e95ef4c9caf478eb3836598eabcd5c99ccb7e2e7c265d716089549' - 'c5849127cb42b578ff4c38ee6ad39e109bb749ce8b0147ac3619af90803b6875') +sha256sums=('30655996d1963e259d4fc8648184031bf9cb83f64510d0b00539d3ce698b2824' + '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,8 +29,9 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf" + make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install + mv "$pkgdir/etc/powerdns/recursor.conf-dist" \ + "$pkgdir/etc/powerdns/recursor.conf" rm -r "$pkgdir/etc/init.d" install -Dm644 "$srcdir/pdns-recursor.service" \ "$pkgdir/usr/lib/systemd/system/pdns-recursor.service" diff --git a/community/pdns-recursor/pdns-recursor.service b/community/pdns-recursor/pdns-recursor.service index 8f4404e1d..e8d23ccd0 100644 --- a/community/pdns-recursor/pdns-recursor.service +++ b/community/pdns-recursor/pdns-recursor.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/pdns_recursor --daemon +ExecStart=/usr/bin/pdns_recursor --daemon [Install] WantedBy=multi-user.target diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD index 8387ffd6f..9e679b81b 100644 --- a/community/pdns/PKGBUILD +++ b/community/pdns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90235 2013-05-09 18:41:57Z arodseth $ +# $Id: PKGBUILD 90788 2013-05-13 22:34:43Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> pkgname=pdns pkgver=3.2 -pkgrel=6 +pkgrel=7 pkgdesc='Modern, advanced and high performance authoritative-only nameserver' arch=('x86_64' 'i686' 'mips64el') url='http://www.powerdns.com/' @@ -22,7 +22,7 @@ source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz" 'pdns.service' 'pdns.conf') sha256sums=('d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572' - '2a60c4407bcfe19026ae77d3e3b7b477d5a0c6323c0bc78892e9d907003b442a' + 'b2358a5951ac944feee15ac03d42ffe9c2a72fa6f57746f77ef8997d54a82040' 'a1afcccb0d2fb6a6f7a5960de95f8d38ce1ac75ac5e3dcecf09e49f0de10166e') prepare() { @@ -40,10 +40,12 @@ build() { --libexecdir=/usr/lib \ --libdir=/usr/lib/powerdns \ --mandir=/usr/share/man \ - --with-modules="" \ + --with-modules='' \ --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \ --disable-recursor \ - --disable-static + --disable-static \ + --sbindir=/usr/bin \ + --bindir=/usr/bin make } diff --git a/community/pdns/pdns.service b/community/pdns/pdns.service index 1005c9f64..b544ba73e 100644 --- a/community/pdns/pdns.service +++ b/community/pdns/pdns.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -ExecStart=/usr/sbin/pdns_server --daemon --guardian=yes +ExecStart=/usr/bin/pdns_server --daemon --guardian=yes ExecReload=/usr/bin/pdns_control cycle ExecStop=/usr/bin/pdns_control quit diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index 593894619..62579bfaf 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 75512 2012-08-26 18:24:09Z bpiotrowski $ +# $Id: PKGBUILD 91500 2013-05-23 10:14:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrik Nymann Jensen <h@henriknj.dk> pkgname=pdnsd pkgver=1.2.9.a _pkgver=${pkgver/.a/a} -pkgrel=1 +pkgrel=4 pkgdesc="Proxy DNS server with permanent caching" arch=(i686 x86_64 mips64el) url="http://members.home.nl/p.a.rombouts/pdnsd/" license=('GPL') depends=('glibc') source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz - rc.d - service) + service) md5sums=('2f3e705d59a0f9308ad9504b24400769' - '3670bd47c9303fbb655d9216715512de' - 'fad5e518d126b29fc947941d57a0a494') + '4f86bdbd8495b53341070d5720491996') build() { - cd $srcdir/$pkgname-$_pkgver - ./configure --prefix=/usr --sysconfdir=/etc + cd $srcdir/$pkgname-${_pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-ipv6 make } package() { - cd $srcdir/$pkgname-$_pkgver + cd $srcdir/$pkgname-${_pkgver} make DESTDIR=$pkgdir install - - install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/pdnsd install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service } diff --git a/community/pdnsd/rc.d b/community/pdnsd/rc.d deleted file mode 100644 index 34a541d18..000000000 --- a/community/pdnsd/rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/pdnsd` -case "$1" in - start) - stat_busy "Starting pdnsd Daemon" - if [ -z "$PID" ]; then - /usr/sbin/pdnsd -d - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon pdnsd - stat_done - fi - ;; - stop) - stat_busy "Stopping pdnsd Daemon" - [ ! -z "$PID" ] && kill -TERM $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pdnsd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/pdnsd/service b/community/pdnsd/service index 5821dbcb2..d284cd933 100644 --- a/community/pdnsd/service +++ b/community/pdnsd/service @@ -3,7 +3,7 @@ Description=proxy name server After=network.target [Service] -ExecStart=/usr/sbin/pdnsd +ExecStart=/usr/bin/pdnsd [Install] WantedBy=multi-user.target diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index cf4e7607d..1e0308158 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90217 2013-05-09 09:13:19Z foutrelis $ +# $Id: PKGBUILD 92159 2013-06-01 21:53:18Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Eddie Lozon <almostlucky@attbi.com> pkgname=pekwm -pkgver=0.1.16 -pkgrel=5 +pkgver=0.1.17 +pkgrel=1 pkgdesc='Small, fast, functional, and flexible window manager' arch=('x86_64' 'i686' 'mips64el') license=('GPL') @@ -29,13 +29,13 @@ backup=(etc/pekwm/autoproperties etc/pekwm/vars) source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2" "${pkgname}_kdm.desktop") -sha256sums=('899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96' +sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00' '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6') prepare() { cd "$srcdir" - gendesk + gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" } build() { diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 3c8fe9edd..584d016a3 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88094 2013-04-11 13:45:38Z mtorromeo $ +# $Id: PKGBUILD 91599 2013-05-25 10:17:47Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.30_rel30.2 +pkgver=5.5.31_rel30.3 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64' 'mips64el') @@ -97,7 +97,7 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('d30876033cd5590f8e1d68aff6a2eaad677dbe59168d4610c580c4e4e2e923a7' +sha256sums=('808fea7fa2a10e61a3767819f4f9275afc8e5a66a7567b7b6d9e3bde2b79fce3' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index a7032ac70..7dfa16a58 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90076 2013-05-06 19:39:02Z foutrelis $ +# $Id: PKGBUILD 91562 2013-05-23 19:50:14Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=6 +pkgrel=7 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" @@ -13,15 +13,25 @@ depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'li makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa') optdepends=('performous-freesongs: free songs for performous') source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/performous-$pkgver.tar.bz2 - performous-0.7.0-cmake.patch) + performous-0.7.0-cmake.patch + fix-noisy-sound-output.patch) md5sums=('60f3f72b51a630a4aa996484aedb9526' - '7da8aef3f4dd28e19f95957ae9ac2bb1') + '7da8aef3f4dd28e19f95957ae9ac2bb1' + '820dc6d1a91c23f0ef56e2cd1759afb6') -build() { +prepare() { cd performous-${pkgver} + # patch from gentoo patch -Np0 -i ../performous-0.7.0-cmake.patch + # fix FS#33948 (merged upstream) + patch -Np1 -i ../fix-noisy-sound-output.patch +} + +build() { + cd performous-${pkgver} + mkdir -p build cd build diff --git a/community/performous/fix-noisy-sound-output.patch b/community/performous/fix-noisy-sound-output.patch new file mode 100644 index 000000000..e4ba0c246 --- /dev/null +++ b/community/performous/fix-noisy-sound-output.patch @@ -0,0 +1,440 @@ +diff -ur performous-0.7.0/game/audio.cc performous-0.7.0b/game/audio.cc +--- performous-0.7.0/game/audio.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/audio.cc 2013-05-23 19:38:26.568498744 +0200 +@@ -140,7 +140,8 @@ + FFmpeg mpeg; + float fadeLevel; + float pitchFactor; +- Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} ++ //Track(std::string const& filename, unsigned int sr): mpeg(false, true, filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} ++ Track(std::string const& filename, unsigned int sr): mpeg(filename, sr), fadeLevel(1.0f), pitchFactor(0.0f) {} + }; + typedef boost::ptr_map<std::string, Track> Tracks; + Tracks tracks; ///< Audio decoders +@@ -241,7 +242,8 @@ + FFmpeg mpeg; + bool eof; + public: +- Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { } ++ //Sample(std::string const& filename, unsigned sr) : srate(sr), m_pos(), mpeg(false, true, filename, sr), eof(true) { } ++ Sample(std::string const& filename, unsigned sr) : m_pos(), mpeg(filename, sr), eof(true) { } + void operator()(float* begin, float* end) { + if(eof) { + // No more data to play in this sample +diff -ur performous-0.7.0/game/ffmpeg.cc performous-0.7.0b/game/ffmpeg.cc +--- performous-0.7.0/game/ffmpeg.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/ffmpeg.cc 2013-05-23 21:41:09.057986491 +0200 +@@ -3,6 +3,7 @@ + #include "config.hh" + #include "util.hh" + #include "xtime.hh" ++#include <boost/smart_ptr/shared_ptr.hpp> + #include <iostream> + #include <stdexcept> + +@@ -20,15 +21,20 @@ + + /*static*/ boost::mutex FFmpeg::s_avcodec_mutex; + +-FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate): +- width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(), +- m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(), +- m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(), ++//FFmpeg::FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& _filename, unsigned int rate): ++// width(), height(), m_filename(_filename), m_rate(rate), m_quit(), m_running(), m_eof(), ++// m_seekTarget(getNaN()), m_position(), m_streamId(-1), m_mediaType(), ++// m_formatContext(), m_codecContext(), m_codec(), m_resampleContext(), m_swsContext(), ++FFmpeg::FFmpeg(std::string const& _filename, unsigned int rate): ++ width(), height(), m_filename(_filename), m_rate(rate), m_quit(), ++ m_seekTarget(getNaN()), m_position(), m_duration(), m_streamId(-1), ++ m_mediaType(rate ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO), ++ m_formatContext(), m_codecContext(), m_resampleContext(), m_swsContext(), + m_thread(new boost::thread(boost::ref(*this))) + { +- if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO; +- else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO; +- else throw std::logic_error("Can only decode one track"); ++// if (decodeVideo) m_mediaType = AVMEDIA_TYPE_VIDEO; ++// else if (decodeAudio) m_mediaType = AVMEDIA_TYPE_AUDIO; ++// else throw std::logic_error("Can only decode one track"); + } + + FFmpeg::~FFmpeg() { +@@ -36,20 +42,20 @@ + videoQueue.reset(); + audioQueue.quit(); + m_thread->join(); +- // TODO: use RAII for freeing resources (to prevent memory leaks) +- boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe +- if (m_resampleContext) audio_resample_close(m_resampleContext); +- if (m_codecContext) avcodec_close(m_codecContext); +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) +- if (m_formatContext) avformat_close_input(&m_formatContext); +-#else +- if (m_formatContext) av_close_input_file(m_formatContext); +-#endif +-} +- +-double FFmpeg::duration() const { +- double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN(); +- return d >= 0.0 ? d : getInf(); ++// // TODO: use RAII for freeing resources (to prevent memory leaks) ++// boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe ++// if (m_resampleContext) audio_resample_close(m_resampleContext); ++// if (m_codecContext) avcodec_close(m_codecContext); ++// #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) ++// if (m_formatContext) avformat_close_input(&m_formatContext); ++// #else ++// if (m_formatContext) av_close_input_file(m_formatContext); ++// #endif ++// } ++// ++// double FFmpeg::duration() const { ++// double d = m_running ? m_formatContext->duration / double(AV_TIME_BASE) : getNaN(); ++// return d >= 0.0 ? d : getInf(); + } + + void FFmpeg::open() { +@@ -60,11 +66,14 @@ + if (avformat_find_stream_info(m_formatContext, NULL) < 0) throw std::runtime_error("Cannot find stream information"); + m_formatContext->flags |= AVFMT_FLAG_GENPTS; + // Find a track and open the codec +- m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0); ++// m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &m_codec, 0); ++ AVCodec* codec = NULL; ++ m_streamId = av_find_best_stream(m_formatContext, (AVMediaType)m_mediaType, -1, -1, &codec, 0); + if (m_streamId < 0) throw std::runtime_error("No suitable track found"); + + AVCodecContext* cc = m_formatContext->streams[m_streamId]->codec; +- if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec"); ++// if (avcodec_open2(cc, m_codec, NULL) < 0) throw std::runtime_error("Cannot open audio codec"); ++ if (avcodec_open2(cc, codec, NULL) < 0) throw std::runtime_error("Cannot open codec"); + cc->workaround_bugs = FF_BUG_AUTODETECT; + m_codecContext = cc; + +@@ -90,18 +99,20 @@ + + void FFmpeg::operator()() { + try { open(); } catch (std::exception const& e) { std::clog << "ffmpeg/error: Failed to open " << m_filename << ": " << e.what() << std::endl; m_quit = true; return; } +- m_running = true; +- audioQueue.setDuration(duration()); ++// m_running = true; ++// audioQueue.setDuration(duration()); ++ m_duration = m_formatContext->duration / double(AV_TIME_BASE); ++ audioQueue.setDuration(m_duration); + int errors = 0; + while (!m_quit) { + try { + if (audioQueue.wantSeek()) m_seekTarget = 0.0; + if (m_seekTarget == m_seekTarget) seek_internal(); + decodePacket(); +- m_eof = false; ++// m_eof = false; + errors = 0; + } catch (eof_error&) { +- m_eof = true; ++// m_eof = true; + videoQueue.push(new VideoFrame()); // EOF marker + boost::thread::sleep(now() + 0.1); + } catch (std::exception& e) { +@@ -109,10 +120,19 @@ + if (++errors > 2) { std::clog << "ffmpeg/error: FFMPEG terminating due to multiple errors" << std::endl; m_quit = true; } + } + } +- m_running = false; +- m_eof = true; ++// m_running = false; ++// m_eof = true; + audioQueue.setEof(); + videoQueue.push(new VideoFrame()); // EOF marker ++ // TODO: use RAII for freeing resources (to prevent memory leaks) ++ boost::mutex::scoped_lock l(s_avcodec_mutex); // avcodec_close is not thread-safe ++ if (m_resampleContext) audio_resample_close(m_resampleContext); ++ if (m_codecContext) avcodec_close(m_codecContext); ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0) ++ if (m_formatContext) avformat_close_input(&m_formatContext); ++#else ++ if (m_formatContext) av_close_input_file(m_formatContext); ++#endif + } + + void FFmpeg::seek(double time, bool wait) { +@@ -125,7 +145,8 @@ + videoQueue.reset(); + audioQueue.reset(); + int flags = 0; +- if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD; ++// if (m_seekTarget < position()) flags |= AVSEEK_FLAG_BACKWARD; ++ if (m_seekTarget < m_position) flags |= AVSEEK_FLAG_BACKWARD; + av_seek_frame(m_formatContext, -1, m_seekTarget * AV_TIME_BASE, flags); + m_seekTarget = getNaN(); // Signal that seeking is done + } +@@ -139,16 +160,16 @@ + ~ReadFramePacket() { av_free_packet(this); } + }; + +- struct AVFrameWrapper { +- AVFrame* m_frame; +- AVFrameWrapper(): m_frame(avcodec_alloc_frame()) { +- if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame"); +- } +- ~AVFrameWrapper() { av_free(m_frame); } +- operator AVFrame*() { return m_frame; } +- AVFrame* operator->() { return m_frame; } +- }; +- ++// struct AVFrameWrapper { ++// AVFrame* m_frame; ++// AVFrameWrapper(): m_frame(avcodec_alloc_frame()) { ++// if (!m_frame) throw std::runtime_error("Unable to allocate AVFrame"); ++// } ++// ~AVFrameWrapper() { av_free(m_frame); } ++// operator AVFrame*() { return m_frame; } ++// AVFrame* operator->() { return m_frame; } ++// }; ++// + // Read an AVPacket and decode it into AVFrames + ReadFramePacket packet(m_formatContext); + int packetSize = packet.size; +@@ -156,19 +177,27 @@ + if (packetSize < 0) throw std::logic_error("negative packet size?!"); + if (m_quit || m_seekTarget == m_seekTarget) return; + if (packet.stream_index != m_streamId) return; +- AVFrameWrapper frame; ++// AVFrameWrapper frame; ++ boost::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), &av_free); + int frameFinished = 0; + int decodeSize = (m_mediaType == AVMEDIA_TYPE_VIDEO ? +- avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) : +- avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet)); +- if (decodeSize < 0) throw std::runtime_error("cannot decode avframe"); ++// avcodec_decode_video2(m_codecContext, frame, &frameFinished, &packet) : ++// avcodec_decode_audio4(m_codecContext, frame, &frameFinished, &packet)); ++// if (decodeSize < 0) throw std::runtime_error("cannot decode avframe"); ++ avcodec_decode_video2(m_codecContext, frame.get(), &frameFinished, &packet) : ++ avcodec_decode_audio4(m_codecContext, frame.get(), &frameFinished, &packet)); ++ if (decodeSize < 0) return; // Packet didn't produce any output (could be waiting for B frames or something) + packetSize -= decodeSize; // Move forward within the packet + if (!frameFinished) continue; + // Update current position if timecode is available +- if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) { +- m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base); +- } +- if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame); ++// if (frame->pkt_pts != uint64_t(AV_NOPTS_VALUE)) { ++ if (int64_t(frame->pkt_pts) != int64_t(AV_NOPTS_VALUE)) { ++// m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base); ++ m_position = double(frame->pkt_pts) * av_q2d(m_formatContext->streams[m_streamId]->time_base) ++ - double(m_formatContext->start_time) / AV_TIME_BASE; ++ } ++// if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame); else processAudio(frame); ++ if (m_mediaType == AVMEDIA_TYPE_VIDEO) processVideo(frame.get()); else processAudio(frame.get()); + } + } + +@@ -189,9 +218,29 @@ + } + + void FFmpeg::processAudio(AVFrame* frame) { ++ void* data = frame->data[0]; ++ // New FFmpeg versions use non-interleaved audio decoding and samples may be in float format. ++ // Do a conversion here, allowing us to use the old (deprecated) avcodec audio_resample(). ++ std::vector<int16_t> input; ++ unsigned inFrames = frame->nb_samples; ++ if (frame->data[1]) { ++ unsigned channels = m_codecContext->channels; ++ input.reserve(channels * inFrames); ++ for (unsigned i = 0; i < inFrames; ++i) { ++ for (unsigned ch = 0; ch < channels; ++ch) { ++ data = frame->data[ch]; ++ input.push_back(m_codecContext->sample_fmt == AV_SAMPLE_FMT_FLTP ? ++ da::conv_to_s16(reinterpret_cast<float*>(data)[i]) : ++ reinterpret_cast<int16_t*>(data)[i] ++ ); ++ } ++ } ++ data = &input[0]; ++ } + // Resample to output sample rate, then push to audio queue and increment timecode + std::vector<int16_t> resampled(AVCODEC_MAX_AUDIO_FRAME_SIZE); +- int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples); ++// int frames = audio_resample(m_resampleContext, &resampled[0], (short*)frame->data[0], frame->nb_samples); ++ int frames = audio_resample(m_resampleContext, &resampled[0], reinterpret_cast<short*>(data), inFrames); + resampled.resize(frames * AUDIO_CHANNELS); + audioQueue.push(resampled, m_position); // May block + m_position += double(frames)/m_formatContext->streams[m_streamId]->codec->sample_rate; +diff -ur performous-0.7.0/game/ffmpeg.hh performous-0.7.0b/game/ffmpeg.hh +--- performous-0.7.0/game/ffmpeg.hh 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/ffmpeg.hh 2013-05-23 20:42:22.868566247 +0200 +@@ -3,7 +3,8 @@ + #include "util.hh" + #include "libda/sample.hpp" + #include <boost/circular_buffer.hpp> +-#include <boost/ptr_container/ptr_set.hpp> ++//#include <boost/ptr_container/ptr_set.hpp> ++#include <boost/ptr_container/ptr_deque.hpp> + #include <boost/scoped_ptr.hpp> + #include <boost/thread/condition.hpp> + #include <boost/thread/mutex.hpp> +@@ -47,25 +48,29 @@ + } + }; + +-static bool operator<(VideoFrame const& a, VideoFrame const& b) { +- return a.timestamp < b.timestamp; +-} ++// static bool operator<(VideoFrame const& a, VideoFrame const& b) { ++// return a.timestamp < b.timestamp; ++// } + + /// video queue: first in first out + class VideoFifo { + public: +- VideoFifo(): m_available(), m_timestamp(), m_eof() {} ++// VideoFifo(): m_available(), m_timestamp(), m_eof() {} ++ VideoFifo(): m_timestamp(), m_eof() {} + /// trys to pop a VideoFrame from queue + bool tryPop(VideoFrame& f) { + boost::mutex::scoped_lock l(m_mutex); +- if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; } +- statsUpdate(); +- if (m_available == 0) return false; // Nothing to deliver ++// if (!m_queue.empty() && m_queue.begin()->data.empty()) { m_eof = true; return false; } ++// statsUpdate(); ++// if (m_available == 0) return false; // Nothing to deliver ++ if (m_queue.empty()) return false; // Nothing to deliver ++ if (m_queue.begin()->data.empty()) { m_eof = true; return false; } + f.swap(*m_queue.begin()); +- m_queue.erase(m_queue.begin()); ++// m_queue.erase(m_queue.begin()); ++ m_queue.pop_front(); + m_cond.notify_all(); + m_timestamp = f.timestamp; +- statsUpdate(); ++// statsUpdate(); + return true; + } + /// pushes VideoFrames to queue +@@ -73,38 +78,41 @@ + boost::mutex::scoped_lock l(m_mutex); + while (m_queue.size() > m_max) m_cond.wait(l); + if (m_queue.empty()) m_timestamp = f->timestamp; +- m_queue.insert(f); +- statsUpdate(); +- } +- /// updates stats +- void statsUpdate() { +- m_available = std::max(0, int(m_queue.size()) - int(m_min)); +- if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1; ++// m_queue.insert(f); ++// statsUpdate(); ++// } ++// /// updates stats ++// void statsUpdate() { ++// m_available = std::max(0, int(m_queue.size()) - int(m_min)); ++// if (m_available == 0 && !m_queue.empty() && m_queue.rbegin()->data.empty()) m_available = m_queue.size() - 1; ++ m_queue.push_back(f); + } + /// resets video queue + void reset() { + boost::mutex::scoped_lock l(m_mutex); + m_queue.clear(); + m_cond.notify_all(); +- statsUpdate(); ++// statsUpdate(); + m_eof = false; + } + /// returns current position + double position() const { return m_timestamp; } +- /// returns m_available / m_max +- double percentage() const { return double(m_available) / m_max; } ++// /// returns m_available / m_max ++// double percentage() const { return double(m_available) / m_max; } + /// simple eof check + double eof() const { return m_eof; } + + private: +- boost::ptr_set<VideoFrame> m_queue; ++// boost::ptr_set<VideoFrame> m_queue; ++ boost::ptr_deque<VideoFrame> m_queue; + mutable boost::mutex m_mutex; + boost::condition m_cond; +- volatile unsigned m_available; ++// volatile unsigned m_available; + double m_timestamp; + bool m_eof; +- static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames +- static const unsigned m_max = 50; ++// static const unsigned m_min = 16; // H.264 may have 16 consecutive B frames ++// static const unsigned m_max = 50; ++ static const unsigned m_max = 20; + }; + + class AudioBuffer { +@@ -195,7 +203,7 @@ + + // ffmpeg forward declarations + extern "C" { +- struct AVCodec; ++// struct AVCodec; + struct AVCodecContext; + struct AVFormatContext; + struct AVFrame; +@@ -206,8 +214,10 @@ + /// ffmpeg class + class FFmpeg { + public: +- /// constructor +- FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000); ++// /// constructor ++// FFmpeg(bool decodeVideo, bool decodeAudio, std::string const& file, unsigned int rate = 48000); ++ /// Decode file; if no rate is specified, decode video, otherwise decode audio. ++ FFmpeg(std::string const& file, unsigned int rate = 0); + ~FFmpeg(); + void operator()(); ///< Thread runs here, don't call directly + unsigned width, ///< width of video +@@ -220,8 +230,8 @@ + void seek(double time, bool wait = true); + /// duration + double duration() const; +- /// return current position +- double position() { return videoQueue.position(); /* FIXME: remove */ } ++// /// return current position ++// double position() { return videoQueue.position(); /* FIXME: remove */ } + bool terminating() const { return m_quit; } + + class eof_error: public std::exception {}; +@@ -234,16 +244,17 @@ + std::string m_filename; + unsigned int m_rate; + volatile bool m_quit; +- volatile bool m_running; +- volatile bool m_eof; ++// volatile bool m_running; ++// volatile bool m_eof; + volatile double m_seekTarget; + double m_position; ++ double m_duration; + // libav-specific variables + int m_streamId; + int m_mediaType; // enum AVMediaType + AVFormatContext* m_formatContext; + AVCodecContext* m_codecContext; +- AVCodec* m_codec; ++// AVCodec* m_codec; + ReSampleContext* m_resampleContext; + SwsContext* m_swsContext; + // Make sure the thread starts only after initializing everything else +diff -ur performous-0.7.0/game/video.cc performous-0.7.0b/game/video.cc +--- performous-0.7.0/game/video.cc 2012-11-12 23:14:08.000000000 +0100 ++++ performous-0.7.0b/game/video.cc 2013-05-23 20:33:30.612096870 +0200 +@@ -3,7 +3,8 @@ + #include "util.hh" + #include <cmath> + +-Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {} ++// Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(true, false, _videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {} ++Video::Video(std::string const& _videoFile, double videoGap): m_mpeg(_videoFile), m_videoGap(videoGap), m_surfaceTime(), m_lastTime(), m_alpha(-0.5, 1.5) {} + + void Video::prepare(double time) { + time += m_videoGap; diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index 21f7f5f14..108c806d7 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73833 2012-07-16 05:37:51Z spupykin $ +# $Id: PKGBUILD 91656 2013-05-26 09:24:46Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-berkeleydb pkgver=0.51 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/BerkeleyDB/" diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD index c2c0b292c..0bcf76cb3 100644 --- a/community/perl-class-methodmaker/PKGBUILD +++ b/community/perl-class-methodmaker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71753 2012-06-02 10:29:34Z bluewind $ +# $Id: PKGBUILD 91657 2013-05-26 09:24:47Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-methodmaker pkgver=2.18 -pkgrel=6 +pkgrel=7 pkgdesc="Create generic class methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Class-MethodMaker" @@ -18,6 +18,10 @@ build() { cd $srcdir/Class-MethodMaker-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Class-MethodMaker-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index f07ed1629..4830160de 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-clone pkgver=0.34 -pkgrel=1 +pkgrel=2 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64' 'mips64el') url='http://search.cpan.org/~RDF/Clone' diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD index 0edfcab11..39d303e26 100644 --- a/community/perl-crypt-blowfish/PKGBUILD +++ b/community/perl-crypt-blowfish/PKGBUILD @@ -1,21 +1,32 @@ -# $Id: PKGBUILD 71757 2012-06-02 10:29:42Z bluewind $ +# $Id: PKGBUILD 91659 2013-05-26 09:24:50Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-crypt-blowfish pkgver=2.12 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Crypt-Blowfish" license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz") -md5sums=('a0eca17addc8bdaf38c044c365a8800c') +source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz" + "perl-5.18.patch") +md5sums=('a0eca17addc8bdaf38c044c365a8800c' + '700129e690f239f9c1a318fffd3504c7') + +prepare() { + cd $srcdir/Crypt-Blowfish-$pkgver + patch -p1 <$srcdir/perl-5.18.patch +} build() { cd $srcdir/Crypt-Blowfish-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Crypt-Blowfish-$pkgver make pure_install doc_install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-crypt-blowfish/perl-5.18.patch b/community/perl-crypt-blowfish/perl-5.18.patch new file mode 100644 index 000000000..291733cb9 --- /dev/null +++ b/community/perl-crypt-blowfish/perl-5.18.patch @@ -0,0 +1,13 @@ +diff -wbBur Crypt-Blowfish-2.12.org/Blowfish.xs Crypt-Blowfish-2.12/Blowfish.xs +--- Crypt-Blowfish-2.12.org/Blowfish.xs 2000-11-30 09:25:21.000000000 +0300 ++++ Crypt-Blowfish-2.12/Blowfish.xs 2013-05-20 15:31:52.481940353 +0400 +@@ -63,8 +63,7 @@ + output = sv_newmortal(); + output_len = 8; + +- if (!SvUPGRADE(output, SVt_PV)) +- croak("cannot use output argument as lvalue"); ++ SvUPGRADE(output, SVt_PV); + + /* blowfish_crypt_8bytes(input, SvGROW(output, 8), ks, dir); */ + /* HP-UX (HP cc) fix below, thanks Addi! */ diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD index 1a8097f1c..19b7ed1cb 100644 --- a/community/perl-crypt-des/PKGBUILD +++ b/community/perl-crypt-des/PKGBUILD @@ -1,20 +1,32 @@ -# $Id: PKGBUILD 71759 2012-06-02 10:29:46Z bluewind $ +# $Id: PKGBUILD 91660 2013-05-26 09:24:51Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> #Contributor: Pete Morris <pete dot morris at gmail dot com> pkgname=perl-crypt-des pkgver=2.05 -pkgrel=5 +pkgrel=6 pkgdesc="Perl DES encryption module" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~dparis/Crypt-DES" license=("GPL" "PerlArtistic") depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb') +source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz" + "perl-5.18.patch") +md5sums=('a8a0bea7064e11d2af434f3e468c17bb' + '836d1a954281257efe00503d98b42dc8') + +prepare() { + cd $srcdir/Crypt-DES-$pkgver + patch -p1 <$srcdir/perl-5.18.patch +} + build() { - cd Crypt-DES-$pkgver + cd $srcdir/Crypt-DES-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Crypt-DES-$pkgver make pure_install doc_install DESTDIR=${pkgdir} find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-crypt-des/perl-5.18.patch b/community/perl-crypt-des/perl-5.18.patch new file mode 100644 index 000000000..16e5aac85 --- /dev/null +++ b/community/perl-crypt-des/perl-5.18.patch @@ -0,0 +1,13 @@ +diff -wbBur Crypt-DES-2.05.org/DES.xs Crypt-DES-2.05/DES.xs +--- Crypt-DES-2.05.org/DES.xs 2005-12-08 18:52:50.000000000 +0300 ++++ Crypt-DES-2.05/DES.xs 2013-05-20 15:35:58.668612530 +0400 +@@ -64,8 +64,7 @@ + output = sv_newmortal(); + output_len = 8; + +- if (!SvUPGRADE(output, SVt_PV)) +- croak("cannot use output argument as lvalue"); ++ SvUPGRADE(output, SVt_PV); + + perl_des_crypt(input, SvGROW(output, output_len), (i32 *)ks, enc_flag); + diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD index cd14d69d7..aed65a17d 100644 --- a/community/perl-curses/PKGBUILD +++ b/community/perl-curses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71761 2012-06-02 10:29:50Z bluewind $ +# $Id: PKGBUILD 91661 2013-05-26 09:24:52Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-curses pkgver=1.28 -pkgrel=5 +pkgrel=6 pkgdesc="Character screen handling and windowing" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Curses" @@ -19,6 +19,10 @@ build() { cd $srcdir/Curses-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Curses-$pkgver make pure_install doc_install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-data-dumper/PKGBUILD b/community/perl-data-dumper/PKGBUILD new file mode 100644 index 000000000..2f96b2588 --- /dev/null +++ b/community/perl-data-dumper/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-data-dumper +pkgver=2.145 +pkgrel=2 +pkgdesc="stringified perl data structures, suitable for both printing and eval" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/Data-Dumper/" +depends=('perl') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/Data-Dumper-$pkgver.tar.gz) +md5sums=('b773c875afcca866faf8481adc3464b0') + +build() { + cd $srcdir/Data-Dumper-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/Data-Dumper-${pkgver} + make install DESTDIR=$pkgdir + find $pkgdir -name perllocal.pod -delete + find $pkgdir -name .packlist -delete +} diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD index 81cff6e8b..d34c8ab22 100644 --- a/community/perl-data-structure-util/PKGBUILD +++ b/community/perl-data-structure-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71763 2012-06-02 10:29:54Z bluewind $ +# $Id: PKGBUILD 91662 2013-05-26 09:24:54Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-data-structure-util pkgver=0.15 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module Data::Structure::Util" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Data-Structure-Util" @@ -16,6 +16,10 @@ build() { cd $srcdir/Data-Structure-Util-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Data-Structure-Util-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-datetime-format-builder/PKGBUILD b/community/perl-datetime-format-builder/PKGBUILD index c385d6c93..bea356279 100644 --- a/community/perl-datetime-format-builder/PKGBUILD +++ b/community/perl-datetime-format-builder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65778 2012-02-22 12:27:49Z spupykin $ +# $Id: PKGBUILD 90637 2013-05-13 12:43:31Z spupykin $ # Contributor: Caleb Cushing <xenoterracide@gmail.com> pkgname=perl-datetime-format-builder -pkgver=0.8000 -pkgrel=6 +pkgver=0.8100 +pkgrel=1 pkgdesc="Create DateTime parser classes and objects" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 7fa2c4cb8..9f6a4e829 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85696 2013-03-05 09:22:28Z spupykin $ +# $Id: PKGBUILD 91663 2013-05-26 09:24:55Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.78 -pkgrel=1 +pkgver=1.03 +pkgrel=2 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DateTime" @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('9d71a13933e3afc55c2c54202d40ae13') +md5sums=('ea0fc830410b9ce3baeef3525bc0acdd') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index 49097474e..186632e86 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88252 2013-04-15 10:48:00Z spupykin $ +# $Id: PKGBUILD 91664 2013-05-26 09:24:58Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-odbc pkgver=1.43 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-ODBC/" diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD index afdc17312..5bdb15d52 100644 --- a/community/perl-dbd-pg/PKGBUILD +++ b/community/perl-dbd-pg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82880 2013-01-25 09:55:54Z spupykin $ +# $Id: PKGBUILD 91665 2013-05-26 09:25:00Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-pg pkgver=2.19.3 -pkgrel=1 +pkgrel=2 pkgdesc="Postgres Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-Pg" diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD index 67ca8b084..5331e6fe4 100644 --- a/community/perl-dbd-sqlite2/PKGBUILD +++ b/community/perl-dbd-sqlite2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88254 2013-04-15 10:48:22Z spupykin $ +# $Id: PKGBUILD 91666 2013-05-26 09:25:02Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-dbd-sqlite2 pkgver=0.36 -pkgrel=1 +pkgrel=2 pkgdesc="Perl/CPAN Module DBD::SQLite2" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/DBD-SQLite2" diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index 5c5482b10..dca40f850 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88257 2013-04-15 10:48:59Z spupykin $ +# $Id: PKGBUILD 91667 2013-05-26 09:25:03Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-dbd-sybase pkgver=1.15 -pkgrel=1 +pkgrel=2 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DBD-Sybase/" diff --git a/community/perl-device-serialport/PKGBUILD b/community/perl-device-serialport/PKGBUILD index dadbb6fa4..ea915dfaf 100644 --- a/community/perl-device-serialport/PKGBUILD +++ b/community/perl-device-serialport/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71775 2012-06-02 10:30:18Z bluewind $ +# $Id: PKGBUILD 91668 2013-05-26 09:25:04Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> pkgname=perl-device-serialport pkgver=1.04 -pkgrel=4 +pkgrel=5 pkgdesc="POSIX clone of Win32::SerialPort" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Device-SerialPort" @@ -19,6 +19,10 @@ build() { eval `perl -V:archname` PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Device-SerialPort-$pkgver make DESTDIR=$pkgdir install find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-file-rsyncp/PKGBUILD b/community/perl-file-rsyncp/PKGBUILD index f963baba7..45f512a49 100644 --- a/community/perl-file-rsyncp/PKGBUILD +++ b/community/perl-file-rsyncp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71777 2012-06-02 10:30:22Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 91669 2013-05-26 09:25:06Z bluewind $ +# Maintainer: Sébastien Luttringer pkgname=perl-file-rsyncp pkgver=0.70 -pkgrel=2 +pkgrel=3 pkgdesc='Perl interface to rsync file list encoding and decoding' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir/" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index ff5b42f56..dccb0d40a 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71779 2012-06-02 10:30:26Z bluewind $ +# $Id: PKGBUILD 91670 2013-05-26 09:25:07Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-fuse pkgver=0.14 -pkgrel=2 +pkgrel=3 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Fuse" diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD index edb1da252..b51591150 100644 --- a/community/perl-gd/PKGBUILD +++ b/community/perl-gd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86698 2013-03-21 10:52:41Z spupykin $ +# $Id: PKGBUILD 91671 2013-05-26 09:25:08Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> pkgname=perl-gd pkgver=2.49 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to Gd Graphics Library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GD" diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD index 56b07a88d..beac8756e 100644 --- a/community/perl-gnome2-wnck/PKGBUILD +++ b/community/perl-gnome2-wnck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87815 2013-04-07 02:33:26Z bgyorgy $ +# $Id: PKGBUILD 91672 2013-05-26 09:25:09Z bluewind $ # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=perl-gnome2-wnck pkgver=0.16 -pkgrel=7 +pkgrel=8 pkgdesc="Perl interface to the Window Navigator Construction Kit" arch=('i686' 'x86_64' 'mips64el') license=("GPL" "PerlArtistic") diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD index 095078f27..0a50fbdb8 100644 --- a/community/perl-gssapi/PKGBUILD +++ b/community/perl-gssapi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71785 2012-06-02 10:30:38Z bluewind $ +# $Id: PKGBUILD 91673 2013-05-26 09:25:11Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-gssapi pkgver=0.28 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module GSSAPI" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/GSSAPI" diff --git a/community/perl-gstreamer-interfaces/PKGBUILD b/community/perl-gstreamer-interfaces/PKGBUILD index 119ef1882..01dd3220b 100644 --- a/community/perl-gstreamer-interfaces/PKGBUILD +++ b/community/perl-gstreamer-interfaces/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71789 2012-06-02 10:30:46Z bluewind $ +# $Id: PKGBUILD 91675 2013-05-26 09:25:18Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer-interfaces pkgver=0.06 -pkgrel=5 +pkgrel=6 pkgdesc="GStreamer::Interfaces" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GStreamer-Interfaces" diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD index d5baa978c..744cbac3e 100644 --- a/community/perl-gstreamer/PKGBUILD +++ b/community/perl-gstreamer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86700 2013-03-21 10:53:05Z spupykin $ +# $Id: PKGBUILD 91674 2013-05-26 09:25:14Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to the GStreamer library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/GStreamer" diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD index a9e2568d0..939abd262 100644 --- a/community/perl-gtk2-sexy/PKGBUILD +++ b/community/perl-gtk2-sexy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71791 2012-06-02 10:30:50Z bluewind $ +# $Id: PKGBUILD 91676 2013-05-26 09:25:19Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> # Creator: Florian Ragwitz <http://search.cpan.org/~/> pkgname=perl-gtk2-sexy pkgver=0.05 -pkgrel=7 +pkgrel=8 pkgdesc="Perl/CPAN Module Gtk2::Sexy" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Gtk2-Sexy" diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD index 30de9b127..6cac850f1 100644 --- a/community/perl-gtk2-trayicon/PKGBUILD +++ b/community/perl-gtk2-trayicon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71793 2012-06-02 10:30:54Z bluewind $ +# $Id: PKGBUILD 91677 2013-05-26 09:25:21Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-gtk2-trayicon pkgver=0.06 -pkgrel=9 +pkgrel=10 pkgdesc="Perl interface to the EggTrayIcon library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Gtk2-TrayIcon/" diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD index 68833be68..a1a9b800c 100644 --- a/community/perl-gtk2-webkit/PKGBUILD +++ b/community/perl-gtk2-webkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71795 2012-06-02 10:30:58Z bluewind $ +# $Id: PKGBUILD 91678 2013-05-26 09:25:22Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gtk2-webkit pkgver=0.09 -pkgrel=3 +pkgrel=4 pkgdesc="Gtk2::WebKit" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Gtk2-WebKit" diff --git a/community/perl-html-strip/PKGBUILD b/community/perl-html-strip/PKGBUILD index 820c36d81..66907cd50 100644 --- a/community/perl-html-strip/PKGBUILD +++ b/community/perl-html-strip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71797 2012-06-02 10:31:02Z bluewind $ +# $Id: PKGBUILD 91679 2013-05-26 09:25:24Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-html-strip pkgver=1.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module HTML::Strip" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~kilinrax/HTML-Strip/" diff --git a/community/perl-inline-java/PKGBUILD b/community/perl-inline-java/PKGBUILD index f6042cbf6..40d874ee6 100644 --- a/community/perl-inline-java/PKGBUILD +++ b/community/perl-inline-java/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71799 2012-06-02 10:31:06Z bluewind $ +# $Id: PKGBUILD 91680 2013-05-26 09:25:26Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgname=perl-inline-java pkgver=0.53 -pkgrel=4 +pkgrel=5 pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'perl-inline' 'java-runtime') diff --git a/community/perl-io-dirent/PKGBUILD b/community/perl-io-dirent/PKGBUILD index d27c607e0..5ebf46b34 100644 --- a/community/perl-io-dirent/PKGBUILD +++ b/community/perl-io-dirent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71801 2012-06-02 10:31:10Z bluewind $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 91681 2013-05-26 09:25:30Z bluewind $ +# Maintainer: Sébastien Luttringer pkgname=perl-io-dirent pkgver=0.05 -pkgrel=2 +pkgrel=3 pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir/" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD index 33593d4f0..3899cd93f 100644 --- a/community/perl-io-tty/PKGBUILD +++ b/community/perl-io-tty/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71803 2012-06-02 10:31:14Z bluewind $ +# $Id: PKGBUILD 91682 2013-05-26 09:25:34Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> pkgname=perl-io-tty pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc="Provide an interface to TTYs and PTYs" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/IO-Tty/" diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index 773cf0b9e..66b930adb 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82882 2013-01-25 09:56:15Z spupykin $ +# $Id: PKGBUILD 91683 2013-05-26 09:25:38Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> pkgname=perl-json-xs pkgver=2.33 -pkgrel=1 +pkgrel=2 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") diff --git a/community/perl-lchown/PKGBUILD b/community/perl-lchown/PKGBUILD index 1984b2eb9..c8ba16422 100644 --- a/community/perl-lchown/PKGBUILD +++ b/community/perl-lchown/PKGBUILD @@ -2,7 +2,7 @@ pkgname=perl-lchown pkgver=1.01 -pkgrel=1 +pkgrel=2 pkgdesc="use the lchown(2) system call from Perl" arch=(i686 x86_64 mips64el) license=(PerlArtistic GPL) @@ -12,7 +12,6 @@ url=https://metacpan.org/release/Lchown source=("http://search.cpan.org/CPAN/authors/id/N/NC/NCLEATON/Lchown-${pkgver}.tar.gz") md5sums=(e3db31be650437eb5d9bfc4da6252ee3) sha512sums=(f3b7bf7b3b71a7d92449d4ae8249d76b456869e48105db401a49f39f687ee5d97e079485fb2bbaae991a3a27d408959fc132b843c6f69487eeb2958c85f683a8) -_distdir="${srcdir}/Lchown-${pkgver}" build() ( @@ -22,7 +21,7 @@ build() PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" /usr/bin/perl Build.PL ./Build ) @@ -30,12 +29,12 @@ build() check() ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" ./Build test ) package() { - cd "$_distdir" + cd "${srcdir}/Lchown-${pkgver}" ./Build install find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD index 44c6e2894..17808ec64 100644 --- a/community/perl-linux-pid/PKGBUILD +++ b/community/perl-linux-pid/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 86747 2013-03-21 21:01:12Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 91685 2013-05-26 09:25:43Z bluewind $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Generator : CPANPLUS::Dist::Arch 1.12 pkgname='perl-linux-pid' pkgver='0.04' -pkgrel='2' +pkgrel='3' pkgdesc="Interface to Linux getpp?id functions" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl') url='http://search.cpan.org/dist/Linux-Pid' -source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz') +source=(http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz) md5sums=('130c4d299f827abf1f2285fddf03fccb') build() { diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD index 3cbc720ce..a4299f106 100644 --- a/community/perl-mail-box-parser-c/PKGBUILD +++ b/community/perl-mail-box-parser-c/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71811 2012-06-02 10:31:30Z bluewind $ +# $Id: PKGBUILD 91686 2013-05-26 09:25:45Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-box-parser-c pkgver=3.006 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Mail-Box-Parser-C" diff --git a/community/perl-mail-transport-dbx/PKGBUILD b/community/perl-mail-transport-dbx/PKGBUILD index 8742685cb..8cb763a47 100644 --- a/community/perl-mail-transport-dbx/PKGBUILD +++ b/community/perl-mail-transport-dbx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71813 2012-06-02 10:31:34Z bluewind $ +# $Id: PKGBUILD 91687 2013-05-26 09:25:47Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-transport-dbx pkgver=0.07 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Mail-Transport-Dbx" diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD index 8f90b6f76..1e2c3bbe7 100644 --- a/community/perl-net-dbus/PKGBUILD +++ b/community/perl-net-dbus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71815 2012-06-02 10:31:38Z bluewind $ +# $Id: PKGBUILD 91688 2013-05-26 09:25:48Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-net-dbus pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Binding for DBus messaging protocol" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Net-DBus" diff --git a/community/perl-net-libidn/PKGBUILD b/community/perl-net-libidn/PKGBUILD index 33c45f4b2..a35d9245f 100644 --- a/community/perl-net-libidn/PKGBUILD +++ b/community/perl-net-libidn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71817 2012-06-02 10:31:42Z bluewind $ +# $Id: PKGBUILD 91689 2013-05-26 09:25:49Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-net-libidn pkgver=0.12 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module Net::LibIDN" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Net-LibIDN/" diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD index 43c93b42c..805749e53 100644 --- a/community/perl-package-stash-xs/PKGBUILD +++ b/community/perl-package-stash-xs/PKGBUILD @@ -1,17 +1,18 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 86634 2013-03-20 19:09:56Z eric $ +# $Id: PKGBUILD 91690 2013-05-26 09:25:52Z bluewind $ +# Maintainer: Jonathan Steel <mail@jsteel.org> +# Contributor: Justin Davis <jrcd83@gmail.com> pkgname=perl-package-stash-xs pkgver=0.26 -pkgrel=1 +pkgrel=2 pkgdesc="Faster and more correct implementation of the Package::Stash API" arch=(i686 x86_64 mips64el) -license=(PerlArtistic GPL) -options=(!emptydirs) +url="http://search.cpan.org/dist/Package-Stash-XS" +license=('PerlArtistic' 'GPL') depends=('perl') makedepends=('perl-extutils-makemaker') checkdepends=('perl-test-fatal' 'perl-test-simple' 'perl-test-requires') -url="http://search.cpan.org/dist/Package-Stash-XS" +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz") md5sums=('33b07af6344d4a16ecd4e9ae3fa48984') diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD index 7518329af..b349b490c 100644 --- a/community/perl-params-classify/PKGBUILD +++ b/community/perl-params-classify/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71821 2012-06-02 10:31:50Z bluewind $ +# $Id: PKGBUILD 91691 2013-05-26 09:25:54Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-params-classify pkgver=0.013 -pkgrel=2 +pkgrel=3 pkgdesc="argument type classification" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') @@ -17,6 +17,10 @@ build() { cd $srcdir/Params-Classify-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd $srcdir/Params-Classify-$pkgver make install DESTDIR=${pkgdir} find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD index 229eec160..d7a3cab2d 100644 --- a/community/perl-params-util/PKGBUILD +++ b/community/perl-params-util/PKGBUILD @@ -1,23 +1,22 @@ -# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 72466 2012-06-15 00:05:46Z juster $ +# $Id: PKGBUILD 91692 2013-05-26 09:25:55Z bluewind $ +# Maintainer: Jonathan Steel <mail@jsteel.org> +# Contributor: Justin Davis (juster) <jrcd83@gmail.com> pkgname=perl-params-util pkgver=1.07 -pkgrel=1 +pkgrel=2 pkgdesc='Simple, compact and correct param-checking functions' arch=(i686 x86_64 mips64el) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=('perl>=5.5.30') -url=https://metacpan.org/release/Params-Util +url="https://metacpan.org/release/Params-Util" +license=('PerlArtistic' 'GPL') +depends=('perl') +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz") -md5sums=(02db120c0eef87aae1830cc62bdec37b) -sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56) -_dir="$srcdir/Params-Util-$pkgver" +sha256sums=('30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c') build() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT /usr/bin/perl Makefile.PL @@ -26,7 +25,7 @@ build() check() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test @@ -34,7 +33,7 @@ check() package() ( - cd "$_dir" + cd "$srcdir/Params-Util-$pkgver" make install INSTALLDIRS=vendor DESTDIR="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete ) diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index acd7959e3..c868ca892 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79319 2012-11-02 19:11:19Z spupykin $ +# $Id: PKGBUILD 91693 2013-05-26 09:25:57Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate pkgver=1.07 -pkgrel=1 +pkgrel=2 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD index 08bc5c316..45af750c0 100644 --- a/community/perl-string-crc32/PKGBUILD +++ b/community/perl-string-crc32/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71827 2012-06-02 10:32:02Z bluewind $ +# $Id: PKGBUILD 91694 2013-05-26 09:26:00Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-string-crc32 pkgver=1.4 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/String-CRC32" diff --git a/community/perl-term-readline-gnu/PKGBUILD b/community/perl-term-readline-gnu/PKGBUILD index ea03ba7f4..579c2929b 100644 --- a/community/perl-term-readline-gnu/PKGBUILD +++ b/community/perl-term-readline-gnu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83559 2013-02-03 00:44:54Z dwallace $ +# $Id: PKGBUILD 91695 2013-05-26 09:26:04Z bluewind $ # CPAN Name : Term-ReadLine-Gnu # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: jason ryan <jasonwryan@gmail.com> @@ -7,7 +7,7 @@ pkgname=perl-term-readline-gnu pkgver=1.20 -pkgrel=5 +pkgrel=6 pkgdesc="GNU Readline XS library wrapper" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') @@ -18,7 +18,6 @@ source=('http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1 'termcap-bad-ncurses-good.patch') md5sums=('fa33510193b89a2ada74fcef00816322' 'a000706b89792f822b5ec20baa370910') -_distdir="${srcdir}/Term-ReadLine-Gnu-1.20" build() { export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -27,21 +26,20 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" patch --forward -p1 < "${srcdir}/termcap-bad-ncurses-good.patch" /usr/bin/perl Makefile.PL make - } check() { - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test } package() { - cd "$_distdir" + cd "${srcdir}/Term-ReadLine-Gnu-1.20" make pure_install PERL_INSTALL_ROOT="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD index 1056ade3c..30e54d76c 100644 --- a/community/perl-text-charwidth/PKGBUILD +++ b/community/perl-text-charwidth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71829 2012-06-02 10:32:06Z bluewind $ +# $Id: PKGBUILD 91696 2013-05-26 09:26:06Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-text-charwidth pkgver=0.04 -pkgrel=8 +pkgrel=9 pkgdesc="Perl/CPAN Module Text::CharWidth" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Text-CharWidth" diff --git a/community/perl-text-kakasi/PKGBUILD b/community/perl-text-kakasi/PKGBUILD index 724ce4b8c..5f43e4479 100644 --- a/community/perl-text-kakasi/PKGBUILD +++ b/community/perl-text-kakasi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71831 2012-06-02 10:32:12Z bluewind $ +# $Id: PKGBUILD 91697 2013-05-26 09:26:08Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-text-kakasi pkgver=2.04 -pkgrel=9 +pkgrel=10 pkgdesc="Perl frontend to kakasi" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Text-Kakasi" diff --git a/community/perl-tie-hash-indexed/PKGBUILD b/community/perl-tie-hash-indexed/PKGBUILD index 02446da64..746ad3c50 100644 --- a/community/perl-tie-hash-indexed/PKGBUILD +++ b/community/perl-tie-hash-indexed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71833 2012-06-02 10:32:16Z bluewind $ +# $Id: PKGBUILD 91698 2013-05-26 09:26:10Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-tie-hash-indexed pkgver=0.05 -pkgrel=8 +pkgrel=9 pkgdesc="Ordered hashes for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Tie-Hash-Indexed" diff --git a/community/perl-tk-tablematrix/PKGBUILD b/community/perl-tk-tablematrix/PKGBUILD index a4add0047..509a84f54 100644 --- a/community/perl-tk-tablematrix/PKGBUILD +++ b/community/perl-tk-tablematrix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71835 2012-06-02 10:32:20Z bluewind $ +# $Id: PKGBUILD 91699 2013-05-26 09:26:12Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-tk-tablematrix pkgver=1.23 -pkgrel=9 +pkgrel=10 pkgdesc="Display data in TableSpreadsheet format" arch=("i686" "x86_64" 'mips64el') url="http://search.cpan.org/dist/Tk-TableMatrix" diff --git a/community/perl-www-curl/PKGBUILD b/community/perl-www-curl/PKGBUILD index 2ee3f68a1..d6d030cbd 100644 --- a/community/perl-www-curl/PKGBUILD +++ b/community/perl-www-curl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71837 2012-06-02 10:32:24Z bluewind $ +# $Id: PKGBUILD 91700 2013-05-26 09:26:14Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-www-curl pkgver=4.15 -pkgrel=3 +pkgrel=4 pkgdesc="Perl/CPAN Module WWW::Curl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/WWW-Curl/" diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD index e0f140e60..9388cb5b2 100644 --- a/community/perl-xml-fast/PKGBUILD +++ b/community/perl-xml-fast/PKGBUILD @@ -1,10 +1,10 @@ -$Id: PKGBUILD 76693 2012-09-27 04:18:50Z dwallace $ +# $Id: PKGBUILD 91701 2013-05-26 09:26:15Z bluewind $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: trizen .= x@gmail.com pkgname=perl-xml-fast pkgver=0.11 -pkgrel=3 +pkgrel=4 pkgdesc="Simple and very fast XML to hash conversion." arch=('x86_64' 'i686' 'mips64el') url="http://search.cpan.org/dist/XML-Fast/" diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index 040e569df..5ba9a9447 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89886 2013-05-04 19:42:51Z jsteel $ +# $Id: PKGBUILD 91702 2013-05-26 09:26:18Z bluewind $ # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> # Contributor: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-xml-libxml -pkgver=2.0016 +pkgver=2.0018 pkgrel=1 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common') options=('!emptydirs') install=perl-xml-libxml.install source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz) -md5sums=('d3bbc3437f6b39eca5825e9d0b0c187a') +md5sums=('c5db1c6ba5f588802a5e1a15b5b6d653') build() { cd XML-LibXML-$pkgver diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index 09a6ce057..2379f6f5d 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86669 2013-03-21 01:03:52Z eric $ +# $Id: PKGBUILD 91703 2013-05-26 09:26:22Z bluewind $ # Maintainer: Justin "juster" Davis <jrcd83@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-xml-libxslt pkgver=1.80 -pkgrel=1 +pkgrel=2 pkgdesc="Interface to the gnome libxslt library" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/XML-LibXSLT" diff --git a/community/perl-xmms/PKGBUILD b/community/perl-xmms/PKGBUILD index 2fbdc9113..1c2acdfd0 100644 --- a/community/perl-xmms/PKGBUILD +++ b/community/perl-xmms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71843 2012-06-02 10:32:38Z bluewind $ +# $Id: PKGBUILD 91704 2013-05-26 09:26:24Z bluewind $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=perl-xmms pkgver=0.12 -pkgrel=8 +pkgrel=9 pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~dougm/Xmms-Perl/" diff --git a/community/pidgin-encryption/PKGBUILD b/community/pidgin-encryption/PKGBUILD index 7969f2e8e..178d7d344 100644 --- a/community/pidgin-encryption/PKGBUILD +++ b/community/pidgin-encryption/PKGBUILD @@ -5,9 +5,9 @@ pkgname=pidgin-encryption pkgver=3.1 -pkgrel=2 +pkgrel=2.1 pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://pidgin-encrypt.sourceforge.net/" depends=('pidgin' 'nss') diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD index 8041fd6fe..884b9e373 100644 --- a/community/pidgin-libnotify/PKGBUILD +++ b/community/pidgin-libnotify/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pidgin-libnotify pkgver=0.14 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') pkgdesc="pidgin plugin that enables popups when someone logs in or messages you." url="http://gaim-libnotify.sourceforge.net/" @@ -14,22 +14,25 @@ makedepends=('intltool') optdepends=('notification-daemon') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch - pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch) + pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch pidgin-libnotify-getfocus.patch) +md5sums=('bfb5368b69c02d429b2b17c00a6673c0' + 'e9bdbb3c7faa61f062fc64277457b6c0' + '05538625f14d9f2c12adae5fa6a1fa26' + 'efe1e86aa1e0bc9f7d20efe7f34ad4a7' + 'e624998744d1c2fb8e2c6be94b04c38a') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/language_fixes.patch" patch -Np0 -i "$srcdir/pidgin-libnotify-0.14-libnotify-0.7.patch" patch -Np0 -i "$srcdir/pidgin-libnotify-showbutton.patch" + patch -Np0 -i "$srcdir/pidgin-libnotify-getfocus.patch" ./configure --prefix=/usr --disable-deprecated --disable-static make } + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('bfb5368b69c02d429b2b17c00a6673c0' - 'e9bdbb3c7faa61f062fc64277457b6c0' - '05538625f14d9f2c12adae5fa6a1fa26' - 'efe1e86aa1e0bc9f7d20efe7f34ad4a7') diff --git a/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch b/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch new file mode 100644 index 000000000..db45829d9 --- /dev/null +++ b/community/pidgin-libnotify/pidgin-libnotify-getfocus.patch @@ -0,0 +1,69 @@ +--- src/pidgin-libnotify.c 2013-05-07 17:38:31.397261982 +0200 ++++ src2/pidgin-libnotify.c 2013-05-07 17:43:43.787904584 +0200 +@@ -169,6 +169,49 @@ pixbuf_from_buddy_icon (PurpleBuddyIcon + return icon; + } + ++/* Taken from pidgin-hotkeys to get focus on conversation window */ ++static void ++hacky_active_window(GtkWidget *window) ++{ ++ GdkScreen *screen; ++ GdkWindow *root; ++ GdkDisplay *display; ++ Display *xdisplay; ++ Window xroot; ++ XEvent xev; ++ static Atom _net_active_window = None; ++ ++ screen = gtk_widget_get_screen(window); ++ root = gdk_screen_get_root_window(screen); ++ display = gdk_screen_get_display(screen); ++ ++ xdisplay = GDK_DISPLAY_XDISPLAY(display); ++ xroot = GDK_WINDOW_XWINDOW(root); ++ ++ if (_net_active_window == None) ++ _net_active_window = XInternAtom(xdisplay, ++ "_NET_ACTIVE_WINDOW", ++ False); ++ ++ xev.xclient.type = ClientMessage; ++ xev.xclient.serial = 0; ++ xev.xclient.send_event = True; ++ xev.xclient.window = GDK_WINDOW_XWINDOW(window->window); ++ xev.xclient.message_type = _net_active_window; ++ xev.xclient.format = 32; ++ xev.xclient.data.l[0] = 1; /* requestor type; we're an app, I guess */ ++ xev.xclient.data.l[1] = CurrentTime; ++ xev.xclient.data.l[2] = None; /* "currently active window", supposedly */ ++ xev.xclient.data.l[3] = 0; ++ xev.xclient.data.l[4] = 0; ++ ++ XSendEvent(xdisplay, ++ xroot, False, ++ SubstructureRedirectMask | SubstructureNotifyMask, ++ &xev); ++} ++ ++ + static void + action_cb (NotifyNotification *notification, + gchar *action, gpointer user_data) +@@ -194,6 +237,16 @@ action_cb (NotifyNotification *notificat + buddy->name); + } + conv->ui_ops->present (conv); ++ ++ /* get the focus on the new conversation window */ ++ { ++ GtkWindow *gtkwindow; ++ ++ gtkwindow = GTK_WINDOW(pidgin_conv_get_window(PIDGIN_CONVERSATION(conv))->window); ++ /*gtk_window_present(gtkwindow);*/ ++ hacky_active_window(GTK_WIDGET(gtkwindow)); ++ } ++ + + notify_notification_close (notification, NULL); + } diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 2df34ea5e..df79b2ffc 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90442 2013-05-12 11:52:36Z fyan $ +# $Id: PKGBUILD 90931 2013-05-15 14:52:30Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq pkgver=0.1e _pkgver=0.1e -pkgrel=1 +pkgrel=2 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/xiehuc/pidgin-lwqq" @@ -30,4 +30,4 @@ package() make DESTDIR="${pkgdir}" install } -sha512sums=('0e5c49dd5b0c9ba9f9eef90cb075c66839a6691aae93789da409a758a36916aef8fceea0d272ee9b67a5e6279bafea2907d2acba10c9d3858a94f4509f4b1f4b') +sha512sums=('5a04c716cabaf09b863ab9eedae4d851741fc6d3977d81ff371d41b109b09e8fb020c8910fcaa0b2df82058ffaf82caff596acef9c8b4b216b0215a1212a7f29') diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD index 0f2291598..87c643a98 100644 --- a/community/pork/PKGBUILD +++ b/community/pork/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71845 2012-06-02 10:32:42Z bluewind $ +# $Id: PKGBUILD 91705 2013-05-26 09:26:27Z bluewind $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=pork pkgver=0.99.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="Console-based AOL Instant Messenger & IRC client" arch=('i686' 'x86_64' 'mips64el') url="http://dev.ojnk.net/" diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index a73a0b4d7..717203c27 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78356 2012-10-17 15:19:00Z spupykin $ +# $Id: PKGBUILD 91955 2013-05-30 09:43:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=3.1 +pkgrel=6 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64' 'mips64el') url="http://www.apsis.ch/pound/index_html" @@ -13,19 +13,17 @@ license=('GPL') depends=('pcre' 'openssl') backup=(etc/pound/pound.cfg) source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz - pound.init pound.runit pound.service pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' - 'bd3bddb6dc17fdcab824815a4705b055' - '4bd5e2a8d8e707eb900ae88929e00d4c' - '23c70776fcd1cf71572f90a8809f7408' + '2a555ee5871a849cb1f6e6ba2ff054df' + 'c0d0726a96dfda0e83843362e401b3dc' '8937808acd22c6391ebe4340af8df854') build() { cd $srcdir/Pound-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/pound + ./configure --prefix=/usr --sysconfdir=/etc/pound --sbindir=/usr/bin make } @@ -34,11 +32,10 @@ package() { install -d $pkgdir/usr/sbin make DESTDIR=$pkgdir install chown root.root -R $pkgdir/usr - install -d $pkgdir/etc/rc.d - install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound install -d $pkgdir/etc/sv install -d $pkgdir/etc/sv/pound install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + rmdir $pkgdir/usr/sbin } diff --git a/community/pound/pound.init b/community/pound/pound.init deleted file mode 100644 index b8187c81f..000000000 --- a/community/pound/pound.init +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Pound" - /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pound - stat_done - fi - ;; - stop) - stat_busy "Stopping Pound" - [ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/pound.pid - rm_daemon pound - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/pound/pound.runit b/community/pound/pound.runit index ed59ea046..ae904583c 100644 --- a/community/pound/pound.runit +++ b/community/pound/pound.runit @@ -4,7 +4,7 @@ exec 2>&1 . /etc/rc.conf . /etc/rc.d/functions -BIN=/usr/sbin/pound +BIN=/usr/bin/pound OPTS="-f /etc/pound/pound.cfg -p /var/run/pound.pid" SVC=pound diff --git a/community/pound/pound.service b/community/pound/pound.service index 0a91f3424..5ec089c9a 100644 --- a/community/pound/pound.service +++ b/community/pound/pound.service @@ -3,8 +3,8 @@ Description=A reverse proxy, load balancer, and SSL wrapper [Service] Type=forking -PIDFile=/var/run/pound.pid -ExecStart=/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid +PIDFile=/run/pound.pid +ExecStart=/usr/bin/pound -f /etc/pound/pound.cfg -p /run/pound.pid [Install] WantedBy=multi-user.target diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index 9fbafcc11..5600762f0 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86900 2013-03-24 05:37:37Z foutrelis $ +# $Id: PKGBUILD 91995 2013-05-30 21:12:52Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Xilon <xilonmu@gmail.com> pkgname=powertop pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc='A tool to diagnose issues with power consumption and power management' arch=('i686' 'x86_64' 'mips64el') url='https://01.org/powertop/' @@ -18,7 +18,7 @@ sha256sums=('b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD index ab5e4d45c..db5d84eea 100644 --- a/community/pptpd/PKGBUILD +++ b/community/pptpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77852 2012-10-15 09:47:33Z spupykin $ +# $Id: PKGBUILD 91528 2013-05-23 11:16:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pptpd pkgver=1.3.4 -pkgrel=11 +pkgrel=13 pkgdesc="Poptop server" arch=(i686 x86_64 'mips64el') url="http://poptop.sourceforge.net/" @@ -11,12 +11,10 @@ license=('GPL') depends=(ppp glibc) backup=(etc/pptpd.conf) source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz - pptpd pptpd.service unrecognized-opt.patch) md5sums=('b38df9c431041922c997c1148bedf591' - 'e09f81beb5d59a0fdfba94e3a60d992b' - '144c17c7d5c1b95cfb3450eb73aa2e50' + 'f17df2a137282adbd04c75dd25784a9c' 'cfa02c86d0413eb94fac15599986f54c') build() { @@ -26,8 +24,14 @@ build() { cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/unrecognized-opt.patch + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.in autoreconf -i - ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --sbindir=/usr/bin \ + --exec-prefix=/usr \ + --mandir=/usr/share/man sed -i "s|#define VERSION.*|#define VERSION \"${_pppver}\"|" plugins/patchlevel.h make sed -i 's|install -o root|install|g' plugins/Makefile @@ -39,7 +43,6 @@ package() { make DESTDIR=$pkgdir install mkdir -p $pkgdir/etc/ echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\n# and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf - install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service mkdir -p $pkgdir/usr/share/doc/pptpd cp -a samples $pkgdir/usr/share/doc/pptpd/ diff --git a/community/pptpd/pptpd b/community/pptpd/pptpd deleted file mode 100644 index 08c4de496..000000000 --- a/community/pptpd/pptpd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting PPTP Daemon" - pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pptpd - stat_done - fi - ;; - stop) - stat_busy "Stopping PPTP Daemon" - kill `cat /var/run/pptpd.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pptpd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/pptpd/pptpd.service b/community/pptpd/pptpd.service index 739508b60..c907c0b9f 100644 --- a/community/pptpd/pptpd.service +++ b/community/pptpd/pptpd.service @@ -3,7 +3,7 @@ Description=PPTP Server After=network.target [Service] -ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f +ExecStart=/usr/bin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f StandardOutput=null [Install] diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 7ea9fb4c5..e4d8c4188 100644 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82336 2013-01-15 11:35:08Z allan $ +# $Id: PKGBUILD 92211 2013-06-02 19:15:02Z bpiotrowski $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') url="http://pragha.wikispaces.com/" @@ -15,12 +15,13 @@ depends=('libnotify' 'libcdio-paranoia' 'gstreamer0.10-base' 'dbus-glib' 'sqlite' 'desktop-file-utils' 'libclastfm') optdepends=('notification-daemon: OSD notification') +makedepends=('intltool') replaces=('dissonance') install=pragha.install -source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2" +source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2" cdio-includes.patch) -sha1sums=('a7b839df5799263f870ea65a7f272015e24637e9' - '05a2e007800dc5395a0bb7f026ec7e388cd9488c') +sha1sums=('3e6456275a216110bd6942b2dc19b1120f4d14e5' + '83b366be516b4c09dbccbb25b473f2de545bdbe8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pragha/cdio-includes.patch b/community/pragha/cdio-includes.patch index 9f93044d1..707734ad0 100644 --- a/community/pragha/cdio-includes.patch +++ b/community/pragha/cdio-includes.patch @@ -1,12 +1,11 @@ -diff -upr pragha-1.1.1.orig/src/cdda.h pragha-1.1.1/src/cdda.h ---- pragha-1.1.1.orig/src/cdda.h 2013-01-14 04:58:09.000000000 +0200 -+++ pragha-1.1.1/src/cdda.h 2013-01-14 04:58:52.000000000 +0200 -@@ -21,7 +21,7 @@ - - #include <glib.h> - --#include <cdio/cdda.h> -+#include <cdio/paranoia/cdda.h> - #include <cdio/cd_types.h> - #ifdef __CDIO_CONFIG_H__ - #include <cdio/cdio_unconfig.h> +--- a/src/cdda.h.orig 2013-02-16 23:13:47.000000000 +0100 ++++ b/src/cdda.h 2013-06-02 21:07:50.473864563 +0200 +@@ -24,7 +24,7 @@ + #ifdef HAVE_PARANOIA_NEW_INCLUDES + #include <cdio/paranoia/cdda.h> + #else +- #include <cdio/cdda.h> ++ #include <cdio/paranoia/cdda.h> + #ifdef __CDIO_CONFIG_H__ + #include <cdio/cdio_unconfig.h> + #endif diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD index fe4735011..a302459ee 100644 --- a/community/prelink/PKGBUILD +++ b/community/prelink/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 57791 2011-11-02 20:30:29Z lfleischer $ +# $Id: PKGBUILD 90944 2013-05-16 03:44:23Z eric $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Rouslan Solomakhin <rouslan@localnet.com> pkgname=prelink pkgver=20111012 -pkgrel=1 +pkgrel=2 pkgdesc='ELF prelinking utility to speed up dynamic linking.' arch=('i686' 'x86_64' 'mips64el') url='http://people.redhat.com/jakub/prelink/' license=('GPL') depends=('elfutils') backup=('etc/prelink.conf') -md5sums=('f5aaf347432d677c293e5e3399ba4fdf' - '0793ed49e9b31c125cba4d936c333cf6' - 'b347580536e078b34c547742d36a3e9d') source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2" 'prelink.conf' 'arch-x86_64-dynamic_linker.patch') +md5sums=('f5aaf347432d677c293e5e3399ba4fdf' + '0793ed49e9b31c125cba4d936c333cf6' + 'b347580536e078b34c547742d36a3e9d') -build() { - cd "${srcdir}/${pkgname}" - +prepare() { + cd ${pkgname} patch -Np0 -i ../arch-x86_64-dynamic_linker.patch +} - ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST +build() { + cd ${pkgname} + ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin --build=$CHOST make } package() { - cd "${srcdir}/${pkgname}" - + cd ${pkgname} make DESTDIR="${pkgdir}" install install -Dm0644 "${srcdir}/prelink.conf" "${pkgdir}/etc/prelink.conf" } diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD index 106b1f7b3..90b88459f 100644 --- a/community/preload/PKGBUILD +++ b/community/preload/PKGBUILD @@ -1,50 +1,44 @@ -# $Id: PKGBUILD 74711 2012-08-02 09:27:00Z bpiotrowski $ +# $Id: PKGBUILD 90536 2013-05-13 00:33:46Z eric $ # Maintainer: # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=preload pkgver=0.6.4 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Makes applications run faster by prefetching binaries and shared objects" url="http://sourceforge.net/projects/preload" license=('GPL2') depends=('glib2' 'bash') -makedepends=('help2man' 'pkgconfig') +makedepends=('help2man') backup=('etc/preload.conf') options=('!makeflags') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz" - rc.d service) + service) md5sums=('10786287b55afd3a2b433b4f898809f4' - 'bde0dd7867c77e7c4d10b481b5cddcd3' - 'db9350ab52fd643edbc88ebab2c8c1bb') + 'b4871a6ade86968322b3bdf3fce88e99') build() { - cd "${srcdir}"/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ + --sbindir=/usr/bin \ --localstatedir=/var make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" sysconfigdir=/etc/conf.d install - install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/preload install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/preload.service - rm -rf "${pkgdir}"/etc/rc.d/init.d - + rm -rf "${pkgdir}"/etc/rc.d rm -rf "${pkgdir}"/var/lib/preload/preload.state rm -rf "${pkgdir}"/var/log/preload.log - install -d "${pkgdir}"/etc/conf.d - mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d - rm -rf "${pkgdir}"/etc/sysconfig - sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf } diff --git a/community/preload/rc.d b/community/preload/rc.d deleted file mode 100644 index a3cb01ba0..000000000 --- a/community/preload/rc.d +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# -# /etc/rc.d/init.d/preload -# -# Starts the preload daemon -# -# Heavily modified for Arch Linux by Leslie P. Polzer <polzer@gnu.org>. - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/preload` - -if [ -f /etc/conf.d/preload ]; then - . /etc/conf.d/preload -fi - -MIN_MEMORY=${MIN_MEMORY:-256} -# Check for > MIN_MEMORY MB -free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0 - -RETVAL=0 - -# -# See how we were called. -# - -start() { - if [ -z "$PID" ]; then - stat_busy "Starting preload daemon: " - /usr/sbin/preload $PRELOAD_OPTS - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - if [ -n $IONICE_OPTS ]; then - /usr/bin/ionice $IONICE_OPTS -p "`pidof -o %PPID /usr/sbin/preload`" - fi - add_daemon preload - stat_done - else - stat_fail - fi - fi - return $RETVAL -} - -stop() { - stat_busy "Stopping preload daemon: " - kill $PID &>/dev/null - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - rm_daemon preload - stat_done - PID="" - else - stat_fail - fi - return $RETVAL -} - - -restart() { - $0 stop - sleep 1 - $0 start -} - -reload() { - trap "" SIGHUP - kill -HUP $PID -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - reload) - reload - ;; - restart) - restart - ;; - condrestart) - if [ ! -z $PID ]; then - restart - else - stat_fail - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|reload}" - exit 1 -esac - -exit $RETVAL diff --git a/community/preload/service b/community/preload/service index e4202751f..a26e2d01b 100644 --- a/community/preload/service +++ b/community/preload/service @@ -5,7 +5,7 @@ Description=Adaptive readahead daemon Type=simple IOSchedulingClass=3 EnvironmentFile=/etc/conf.d/preload -ExecStart=/usr/sbin/preload --foreground $PRELOAD_OPTS +ExecStart=/usr/bin/preload --foreground $PRELOAD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index ff82d567b..da2bb0532 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,32 +1,27 @@ -# $Id: PKGBUILD 80122 2012-11-16 17:01:01Z lfleischer $ +# $Id: PKGBUILD 92055 2013-05-31 01:13:33Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy -pkgver=3.0.19 -pkgrel=7 +pkgver=3.0.21 +pkgrel=1 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64' 'mips64el') url='http://www.privoxy.org' license=('GPL') depends=('pcre' 'zlib') makedepends=('autoconf') -backup=('etc/conf.d/privoxy' - 'etc/privoxy/'{config,trust,default.action,user.filter,default.filter} +backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter} 'etc/privoxy/'{match-all,user}.action 'etc/logrotate.d/privoxy') install='privoxy.install' source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" - 'privoxy' 'privoxy.logrotate.d' - 'privoxy.conf.d' 'privoxy.service') -md5sums=('57acc79059565cc42eda67982842785d' - '1b4ed8c4e7e5b04b10ef41b597dc3f3b' +md5sums=('79558f2545cfcf9731f7de611646d837' 'fc3046377137003726a151ee27b142a2' - '27830ef79418e277b90c1c1fa933f876' - '4c154a126ec17b02c623e3d451e062d9') + '358e614190247fc1671bbcadddf500db') build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" @@ -41,15 +36,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \ + make prefix="${pkgdir}/usr" SBIN_DEST="${pkgdir}/usr/bin" \ + MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \ CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install # Don't overwrite existing log files! rm "${pkgdir}/var/log/privoxy/"* - install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy" install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy" - install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy" # Fix config paths. sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \ diff --git a/community/privoxy/privoxy b/community/privoxy/privoxy deleted file mode 100644 index 754453de5..000000000 --- a/community/privoxy/privoxy +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy - -# read logdir and logfile from privoxy config -prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2` -[ -n "$prld" ] || prld=/var/log/privoxy -prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2` -[ -n "$prlf" ] || prlf=logfile - -PID=`pidof -o %PPID /usr/sbin/privoxy` - -case "$1" in - start) - stat_busy "Starting Privoxy" - # create missing logdir and logfile - [ -d "$prld" ] || mkdir -p "$prld" - if [ ! -f "$prlf" ]; then - touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \ - chmod 0660 "$prld/$prlf" - fi - [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \ - ${PRIVOXY_ARGS} ${PRIVOXY_CONF} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon privoxy - stat_done - fi - ;; - stop) - stat_busy "Stopping Privoxy" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon privoxy - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/privoxy/privoxy.conf.d b/community/privoxy/privoxy.conf.d deleted file mode 100644 index 9aa11cd67..000000000 --- a/community/privoxy/privoxy.conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# Location of the config file. -PRIVOXY_CONF='/etc/privoxy/config' - -# User and group that privoxy will be run as. -PRIVOXY_USER='privoxy' -PRIVOXY_GROUP='privoxy' - -# Additional arguments. -PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid" - diff --git a/community/privoxy/privoxy.service b/community/privoxy/privoxy.service index 59a8884f9..e8b04447b 100644 --- a/community/privoxy/privoxy.service +++ b/community/privoxy/privoxy.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/run/privoxy.pid -ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config +ExecStart=/usr/bin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config SuccessExitStatus=15 [Install] diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index e4a8509ca..63ef3cdaa 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85228 2013-02-27 19:59:51Z andrea $ +# $Id: PKGBUILD 91372 2013-05-21 10:01:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.0b8 +pkgver=2.0b9 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming language and environment for creating images, animations and interactions' @@ -15,19 +15,19 @@ options=(!strip) if [ "$CARCH" == "x86_64" ]; then source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('5eab47cd67f3160a71ff694b45e74f8a17f0b0ca31cd3ae545104fb70babb58e' + sha256sums=('df6ab1042a09e72dec6eee8ae3bf21ed2fb47fc1eb63668960bea31a6cd62108' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('ba113199c5ca3c0d9a274088a62eacd6c3872dea9151e34ed1f312d78bad6f17' + sha256sums=('9a1cc4b41c3eee3835347bc198252a2b30fea1c811abda18a42e295b5544048b' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi -build() { +prepare() { cd "$srcdir" - gendesk + gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc" } package() { diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD index 35a4f35a7..846b045f8 100644 --- a/community/procstatd/PKGBUILD +++ b/community/procstatd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66164 2012-02-23 02:23:03Z spupykin $ +# $Id: PKGBUILD 91870 2013-05-28 17:44:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jason Chu <jason@archlinux.org> pkgname=procstatd pkgver=1.4.2 -pkgrel=6.1 +pkgrel=8 pkgdesc="A daemon that can be run either from userspace or inetd that can be queried via a simple API to parse various files in /proc" arch=('i686 x86_64' 'mips64el') license=('GPL') @@ -17,8 +17,12 @@ md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') build() { cd $srcdir/$pkgname # Get rid of the funky make install forever bug - sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile + sed -i 's/make install/echo/;s/cd watchman/echo/;s@$(INSTDIR)/sbin@$(INSTDIR)/bin@' Makefile make +} + +package() { + cd $srcdir/$pkgname make INSTDIR=$pkgdir/usr install mkdir ${pkgdir}/usr/share mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man diff --git a/community/proftpd/PKGBUILD b/community/proftpd/PKGBUILD deleted file mode 100644 index 1b86c9638..000000000 --- a/community/proftpd/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 87017 2013-03-25 19:16:59Z bpiotrowski $ -# Maintainer: -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4c -pkgrel=2 -epoch=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.proftpd.org/" -license=('GPL') -depends=('libmariadbclient' 'postgresql-libs') -backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -install=${pkgname}.install -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service' - 'proftpd.tmpfiles') -md5sums=('65f61e953bea249f8377e681594143a5' - '7f00fb7bf757b4bd795afdf0a3f5e556' - 'c439a0a1dbc21b604d8382da87aa021b' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736' - '5709f27ebcbe906e52963ea75e4fde64' - '907b149a120b046f05647c73502e23c9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ - --sysconfdir=/etc \ - --localstatedir=/run/proftpd \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls \ - --with-systemd - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - - install -d "${pkgdir}/usr/lib/systemd/system/" - install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" - install -Dm644 "${srcdir}"/proftpd.tmpfiles \ - "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf - - # /run is tmpfs - rmdir "${pkgdir}"/run/{proftpd,} -} diff --git a/community/proftpd/proftpd b/community/proftpd/proftpd deleted file mode 100755 index 9ea1d47fc..000000000 --- a/community/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /run/proftpd/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/community/proftpd/proftpd.conf.d b/community/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/community/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/community/proftpd/proftpd.install b/community/proftpd/proftpd.install deleted file mode 100644 index 6d9888496..000000000 --- a/community/proftpd/proftpd.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - systemd-tmpfiles --create proftpd.conf -} diff --git a/community/proftpd/proftpd.logrotate b/community/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/community/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/community/proftpd/proftpd.service b/community/proftpd/proftpd.service deleted file mode 100644 index a07d17f46..000000000 --- a/community/proftpd/proftpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=ProFTPD FTP Server -After=network.target - -[Service] -Type=forking -PIDFile=/run/proftpd/proftpd.pid -ExecStart=/usr/sbin/proftpd -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy = multi-user.target diff --git a/community/proftpd/proftpd.tmpfiles b/community/proftpd/proftpd.tmpfiles deleted file mode 100644 index 241dc7cb1..000000000 --- a/community/proftpd/proftpd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/proftpd 0755 root root diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 61262e558..b968b4424 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81207 2012-12-13 02:54:35Z seblu $ +# $Id: PKGBUILD 90613 2013-05-13 10:55:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgname=prosody pkgver=0.8.2 -pkgrel=8 +pkgrel=9 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64' 'mips64el') url="http://prosody.im/" @@ -16,15 +16,13 @@ install=prosody.install backup=('etc/logrotate.d/prosody' 'etc/prosody/prosody.cfg.lua') source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz" - 'prosody.rcd' 'prosody.logrotated' 'fix-config.patch' 'prosody.tmpfile.d' 'prosody.service') md5sums=('6e907bf0d0acf24f1011083020ba6ffb' - 'd2b5f9c8e42bb31819e715eb1756ee53' - '26466fdbea87963a3ca6f48f76fe4a29' - '59a1bf2dfd0bd386cef6fa646e2a3752' + '5b44aee99f1fa9e7f055e067688cafbd' + 'a4a5b968b5809037f83465c571eb9afe' 'e2f5a1df410b05696a30dcb058841084' 'e74045f27cb60908d535969906781f75') @@ -46,19 +44,16 @@ package() { rm $pkgdir/etc/prosody/certs/* - install -d "$pkgdir/etc/rc.d" install -d "$pkgdir/etc/logrotate.d" install -d "$pkgdir/var/log/prosody" for i in tools/*.lua; do install -Dm0644 $i $pkgdir/usr/share/prosody/$i done - install -o root -g root -m 755 "$srcdir/prosody.rcd" \ - "$pkgdir/etc/rc.d/prosody" install -o root -g root -m 644 "$srcdir/prosody.logrotated" \ "$pkgdir/etc/logrotate.d/prosody" install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf + install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir/usr/lib/tmpfiles.d/prosody.conf install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service } diff --git a/community/prosody/fix-config.patch b/community/prosody/fix-config.patch index 8856bfb92..3d01fd88a 100644 --- a/community/prosody/fix-config.patch +++ b/community/prosody/fix-config.patch @@ -6,7 +6,7 @@ diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua. -- Example: admins = { "user1@example.com", "user2@example.net" } admins = { } +daemonize = true -+pidfile = "/var/run/prosody/prosody.pid" ++pidfile = "/run/prosody/prosody.pid" -- Enable use of libevent for better performance under high load -- For more information see: http://prosody.im/doc/libevent diff --git a/community/prosody/prosody.install b/community/prosody/prosody.install index f935e3d63..792681038 100644 --- a/community/prosody/prosody.install +++ b/community/prosody/prosody.install @@ -10,6 +10,8 @@ post_install() { chown prosody:prosody var/log/prosody echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" + + systemd-tmpfiles --create prosody.conf } post_upgrade() { diff --git a/community/prosody/prosody.logrotated b/community/prosody/prosody.logrotated index 5659ba01f..13876230f 100644 --- a/community/prosody/prosody.logrotated +++ b/community/prosody/prosody.logrotated @@ -4,6 +4,6 @@ sharedscripts missingok postrotate - /bin/kill -HUP `cat /var/run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true endscript } diff --git a/community/prosody/prosody.rcd b/community/prosody/prosody.rcd deleted file mode 100644 index afaf77903..000000000 --- a/community/prosody/prosody.rcd +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -daemon_name=prosody -pid_file=/var/run/$daemon_name/$daemon_name.pid - -source /etc/rc.conf -source /etc/rc.d/functions - -get_pid() { - if [ -f $pid_file ]; then - /bin/kill -0 $(cat $pid_file) - if [ $? == 0 ]; then - cat $pid_file - fi - fi -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - [ -d /var/run/$daemon_name ] || { mkdir -p /var/run/$daemon_name ; chown prosody:prosody /var/run/prosody; } - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $pid_file ] && rm -f $pid_file - mkdir -p `dirname $pid_file` - prosodyctl start 1>/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - else - stat_fail - printhl "$daemon_name is already running" - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - if [ ! -z "$PID" ]; then - prosodyctl stop 1>/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $pid_file &> /dev/null - rm_daemon $daemon_name - stat_done - fi - else - stat_fail - printhl "$daemon_name is not running" - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - stat_busy "Reloading $daemon_name" - PID=$(get_pid) - if [ ! -z "$PID" ]; then - /bin/kill -HUP $PID 2> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - stat_done - fi - else - stat_fail - printhl "$daemon_name is not running" - fi - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|reload|status}" - esac - -exit 0 diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index cd822c75c..527e56025 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9838 +pkgver=9840 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/pwgen/PKGBUILD b/community/pwgen/PKGBUILD index 06f091e56..4587955d6 100644 --- a/community/pwgen/PKGBUILD +++ b/community/pwgen/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 67140 2012-03-04 23:54:53Z pschmitz $ -# Maintainer: damir <damir@archlinux.org> -# Contributor : Tobias Powalowski <t.powa@gmx.de> +# $Id: PKGBUILD 92192 2013-06-02 15:55:52Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: damir <damir@archlinux.org> +# Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pwgen pkgver=2.06 -pkgrel=3 -pkgdesc="Pwgen is a small password generator which creates passwords which can be easily memorized by a human" -arch=("i686" "x86_64" "mips64el") -url="http://sourceforge.net/projects/pwgen/" +pkgrel=4 +pkgdesc='Password generator for creating easily memorable passwords' +arch=('x86_64' 'i686' 'mips64el') +url='http://sourceforge.net/projects/pwgen/' license=('GPL') depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/pwgen/${pkgname}-${pkgver}.tar.gz") -md5sums=('935aebcbe610fbc9de8125e7b7d71297') +source=("http://downloads.sourceforge.net/sourceforge/pwgen/$pkgname-$pkgver.tar.gz") +sha256sums=('61598c9e3a0f7eb2e7367d4ecc71522c4f16a7d41ed31db29e3afee8d9843454') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + + autoconf ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/pymad/PKGBUILD b/community/pymad/PKGBUILD index ace77f357..9ab61d3f2 100644 --- a/community/pymad/PKGBUILD +++ b/community/pymad/PKGBUILD @@ -6,7 +6,7 @@ pkgname=pymad pkgver=0.6 pkgrel=4 pkgdesc="Python interface to libmad." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.spacepants.org/src/pymad/" license=('LGPL') depends=('libmad' 'python2') diff --git a/community/python-cchardet/PKGBUILD b/community/python-cchardet/PKGBUILD index 0b6bb965c..37d6b426a 100644 --- a/community/python-cchardet/PKGBUILD +++ b/community/python-cchardet/PKGBUILD @@ -1,27 +1,51 @@ -# $Id: PKGBUILD 80436 2012-11-21 15:45:04Z mtorromeo $ +# $Id: PKGBUILD 90632 2013-05-13 12:37:47Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=python-cchardet -pkgver=0.3.2 +pkgname=(python-cchardet python2-cchardet) +pkgver=0.3.3 pkgrel=1 -_libname=${pkgname/python-/} pkgdesc="Universal encoding detector faster than chardet." url="http://pypi.python.org/pypi/cchardet/" -depends=('python') -makedepends=('cython' 'python-distribute') +makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute') license=('MIT') arch=('i686' 'x86_64' 'mips64el') -source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) +source=(http://pypi.python.org/packages/source/c/cchardet/cchardet-$pkgver.tar.gz) build() { - cd "$srcdir/$_libname-$pkgver" - python setup.py build + cd "$srcdir/cchardet-$pkgver" + + rm -rf ../buildpy3; mkdir ../buildpy3 + python setup.py build -b ../buildpy3 + + rm -rf ../buildpy2; mkdir ../buildpy2 + python2 setup.py build -b ../buildpy2 + find ../buildpy2 -name \*.py -exec sed -r 's|^#!(.*)python$|#!\1python2|' -i {} + } package() { - cd "$srcdir/$_libname-$pkgver" + cd "$srcdir/cchardet-$pkgver" python setup.py install --root="$pkgdir" install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" } -sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23') +package_python-cchardet() { + depends=(python) + + + cd "$srcdir/cchardet-$pkgver" + rm -rf build; ln -s ../buildpy3 build + python setup.py install --skip-build -O1 --root="$pkgdir" + install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" +} + +package_python2-cchardet() { + depends=(python2) + + cd "$srcdir/cchardet-$pkgver" + rm -rf build; ln -s ../buildpy2 build + python2 setup.py install --skip-build -O1 --root="$pkgdir" + install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" +} + +sha256sums=('f326245fa9dc1541a3251cbae66ce2fa8d94969a6f6dfb2800e3beb3636cd2b8') diff --git a/community/python-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD index ac6d8d3fa..c45780544 100644 --- a/community/python-numexpr/PKGBUILD +++ b/community/python-numexpr/PKGBUILD @@ -8,7 +8,7 @@ pkgver=2.1 pkgrel=1 pkgdesc="A JIT compiler for Python expressions" url="http://code.google.com/p/numexpr/" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('MIT') makedepends=('python2-distribute' 'python-distribute' 'python-numpy' 'python2-numpy') source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 3f56285fe..f984d3f2d 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86969 2013-03-25 14:30:39Z arodseth $ +# $Id: PKGBUILD 92176 2013-06-02 12:35:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jelle van der Waa <jelle@vdwaa.nl> pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.5 +pkgver=2.5.2 pkgrel=1 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686' 'mips64el') @@ -13,7 +13,7 @@ license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('79aff1c77ec6be6158a4d1a11002400ee0eb8f74dc6f4f67527f59bfac78c222') +sha256sums=('84ac1da67d0dabc711fa8259324d4e94b26a85411bcf0c12dc80a427d9f93ecc') build() { cd "$srcdir" diff --git a/community/python-pyxattr/PKGBUILD b/community/python-pyxattr/PKGBUILD index 7a211c735..2ca0d6529 100644 --- a/community/python-pyxattr/PKGBUILD +++ b/community/python-pyxattr/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 78604 2012-10-21 22:13:35Z lfleischer $ +# $Id: PKGBUILD 92209 2013-06-02 18:57:49Z bpiotrowski $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jon Bergli Heier <snakebite@jvnv.net> pkgname=('python2-pyxattr' 'python-pyxattr') pkgbase=python-pyxattr _pkgname=pyxattr -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc='A python extension module that allows you to manipulate the extended attributes.' arch=('i686' 'x86_64' 'mips64el') url='http://pyxattr.k1024.org/' license=('GPL') makedepends=('python2' 'python' 'python2-distribute' 'python-distribute') -source=("https://github.com/downloads/iustin/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") -md5sums=('bb9560510b17625015aa45f2fbc3b520') +source=("http://pyxattr.k1024.org/downloads/pyxattr-$pkgver.tar.gz") +md5sums=('9ff2e4218badc201b689b6d254290001') package_python2-pyxattr() { depends=('python2') diff --git a/community/python2-cchardet/PKGBUILD b/community/python2-cchardet/PKGBUILD deleted file mode 100644 index f24cbc0ac..000000000 --- a/community/python2-cchardet/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 80426 2012-11-21 14:15:53Z mtorromeo $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> - -pkgname=python2-cchardet -pkgver=0.3.2 -pkgrel=1 -_libname=${pkgname/python2-/} -pkgdesc="Universal encoding detector faster than chardet." -url="http://pypi.python.org/pypi/cchardet/" -depends=('python2') -makedepends=('cython2' 'python2-distribute') -license=('MIT') -arch=('i686' 'x86_64' 'mips64el') -source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) - -build() { - cd "$srcdir/$_libname-$pkgver" - find -type f -exec sed -i '1 s|python\s*$|python2|' {} + - python2 setup.py build -} - -package() { - cd "$srcdir/$_libname-$pkgver" - python2 setup.py install --root="$pkgdir" - install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" -} - -sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23') diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 8fae12b29..2bee7ef10 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,57 +1,68 @@ -# $Id: PKGBUILD 90083 2013-05-06 19:39:17Z foutrelis $ +# $Id: PKGBUILD 91963 2013-05-30 10:15:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=2.0.5.0 -pkgrel=12 +pkgver=3.0.14.0 +pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.ribbonsoft.com/qcad.html" license=('GPL2') -depends=('qt3') +depends=('qtwebkit') makedepends=('glu') options=(libtool) -source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz - qcad.xpm - QCad.desktop - qcad-intptr.patch - qcad.patch) -md5sums=('96b6a56027782aec953c9c4e64c5998c' - 'da32fec0d2fb85d96126bf28bb0ab9ff' - 'b4d1eb6724b4b41f191f1ab6fd859c39' - '92f900fe1fd3a8f841232b587b49c7da' - '7e6779b1e3b10da1eb4daf36d93f8479') -# http://ghost1227.com/files/misc/qm.tar.gz) +source=($pkgname-$pkgver.zip::https://github.com/qcad/qcad/archive/v${pkgver}.zip + QCad.desktop) +md5sums=('2c460838235a95a4d969e508a75b8206' + '8c4288986b78b14a813b005e81b6ba53') + +prepare() { + cd ${srcdir}/qcad-$pkgver + + sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp + sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp +} build() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src - - [ "$CARCH" = "x86_64" ] && { - patch -p1 < ../qcad-intptr.patch; - sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp; - } - patch -p1 < ../qcad.patch - sed -i "s:"-pedantic"::g" mkspecs/defs.pro - - cd scripts - sed -i "s|INCLUDEPATH += ../include|INCLUDEPATH += ../include /usr/include/qt3|" ../*/src/*.pro - sed -i "s|../../qcadlib/include|../../qcadlib/include /usr/include/qt3|" ../qcad/src/qcad.pro - sed -i "s/qmake/qmake-qt3/" build_qcad.sh - sed -i 's|eval $MAKE|sed -i "s/-lqt/-lqt-mt/" ../qcad/src/Makefile;eval $MAKE|' build_qcad.sh - QTDIR=/usr/lib/qt3 ./build_qcad.sh notrans + cd ${srcdir}/qcad-$pkgver + + qmake-qt4 + make PREFIX=/usr CXX="g++ -fpermissive" } package() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad - - install -D -m755 qcad ${pkgdir}/usr/bin/qcad - install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications} - install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm - install -m644 ../../QCad.desktop \ - ${pkgdir}/usr/share/applications/QCad.desktop - cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad - #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/ + cd ${srcdir}/qcad-$pkgver + + # remove project files + find . \( -name '*.pri' -or -name '.pro' -or -name '*.ts' \) -delete + find . \( -name 'Makefile' -name '.gitignore' \) -delete + + install -dm755 ${pkgdir}/usr/share/{qcad,pixmaps,applications} + cp -r examples fonts libraries patterns plugins scripts ts ${pkgdir}/usr/share/qcad + cp release/* ${pkgdir}/usr/share/qcad + + install -m755 qcad ${pkgdir}/usr/share/qcad/qcad + install -m755 readme.txt ${pkgdir}/usr/share/qcad/readme.txt + + # qtwebkit + ln -s /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so + # qt + for sofiles in /usr/lib/qt4/plugins/imageformats/*.so + do + ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/} + done + for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so + do + ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/} + done + + install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png + install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop + + install -dm0755 $pkgdir/usr/bin + echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad + chmod 0755 $pkgdir/usr/bin/qcad } diff --git a/community/qcad/QCad.desktop b/community/qcad/QCad.desktop index a55f5940f..5841b786e 100644 --- a/community/qcad/QCad.desktop +++ b/community/qcad/QCad.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -Exec=/usr/bin/qcad -Icon=/usr/share/pixmaps/qcad.xpm +Exec=/usr/share/qcad/qcad +Icon=/usr/share/pixmaps/qcad_icon.png Name=QCad StartupNotify=true Terminal=false diff --git a/community/qcad/qcad-intptr.patch b/community/qcad/qcad-intptr.patch deleted file mode 100644 index 6d8b6acca..000000000 --- a/community/qcad/qcad-intptr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500 -@@ -849,7 +849,7 @@ - os << " layer: NULL "; - } else { - os << " layer: " << e.layer->getName().latin1() << " "; -- os << " layer address: " << (int)(e.layer) << " "; -+ os << " layer address: " << (intptr_t)(e.layer) << " "; - } - - os << e.pen << "\n"; -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500 -@@ -57,7 +57,7 @@ - os << " name: " << l.getName().latin1() - << " pen: " << l.getPen() - << " frozen: " << (int)l.isFrozen() -- << " address: " << (int)(&l) -+ << " address: " << (intptr_t)(&l) - << std::endl; - return os; - } diff --git a/community/qcad/qcad.patch b/community/qcad/qcad.patch deleted file mode 100644 index f051f29af..000000000 --- a/community/qcad/qcad.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h ---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h 2008-12-11 22:29:51.000000000 +0100 -@@ -37,6 +37,7 @@ - #endif - - #include <iostream> -+#include <cstring> - - #include "dl_attributes.h" - #include "dl_codes.h" -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:29:51.000000000 +0100 -@@ -23,7 +23,7 @@ - ** not clear to you. - ** - **********************************************************************/ -- -+#include <cstdlib> - #include "rs_actionzoompan.h" - #include "rs_snapper.h" - #include "rs_point.h" -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej. -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp 2008-12-11 22:30:18.000000000 +0100 -@@ -25,7 +25,7 @@ - **********************************************************************/ - - #include "rs_information.h" -- -+#include <cstdlib> - #include "rs_constructionline.h" - - -diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh ---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh 2008-12-11 22:31:37.000000000 +0100 -@@ -16,9 +16,6 @@ - echo " distcc use distcc for distributed compilation. DISTCC_HOSTS must be set." - echo - --echo "QTDIR is: $QTDIR" --echo "QMAKESPEC is: $QMAKESPEC" -- - # detect system: - if [ "x$OS" == "xWindows_NT" ] - then diff --git a/community/qcad/qcad.xpm b/community/qcad/qcad.xpm deleted file mode 100644 index e747fa984..000000000 --- a/community/qcad/qcad.xpm +++ /dev/null @@ -1,132 +0,0 @@ -/* XPM */ -static const char * qcad_xpm[] = { -"32 32 97 2", -" c None", -". c #3F3F3F", -"+ c #010180", -"@ c #FFFFFF", -"# c #E0E0EF", -"$ c #41419F", -"% c #4545A1", -"& c #4949A3", -"* c #4D4DA5", -"= c #5151A7", -"- c #5555A9", -"; c #5959AB", -"> c #4444A2", -", c #3C3C9D", -"' c #40409F", -") c #4444A1", -"! c #4848A3", -"~ c #4C4CA5", -"{ c #5050A7", -"] c #5454A9", -"^ c #5858AB", -"/ c #5D5DAD", -"( c #6161AF", -"_ c #6565B1", -": c #5C5CAD", -"< c #6060AF", -"[ c #6464B1", -"} c #6868B3", -"| c #6C6CB5", -"1 c #7070B7", -"2 c #7474B9", -"3 c #7878BB", -"4 c #3F3F9E", -"5 c #4343A0", -"6 c #4747A3", -"7 c #4B4BA5", -"8 c #000000", -"9 c #7C7CBD", -"0 c #8080BF", -"a c #4747A2", -"b c #4B4BA4", -"c c #4F4FA6", -"d c #7B7BBD", -"e c #7F7FBF", -"f c #8383C1", -"g c #5353A8", -"h c #8787C3", -"i c #5757AA", -"j c #8B8BC5", -"k c #4E4EA6", -"l c #5252A8", -"m c #5656AA", -"n c #5A5AAC", -"o c #8787C2", -"p c #8F8FC7", -"q c #5E5EAE", -"r c #8B8BC4", -"s c #8F8FC6", -"t c #9393C8", -"u c #6262B0", -"v c #8E8EC6", -"w c #9292C8", -"x c #9696CA", -"y c #6666B2", -"z c #9A9ACC", -"A c #6A6AB4", -"B c #9E9ECE", -"C c #6565B2", -"D c #6969B4", -"E c #6D6DB6", -"F c #7171B8", -"G c #7575BA", -"H c #9D9DCE", -"I c #A1A1D0", -"J c #7171B7", -"K c #7575B9", -"L c #7979BC", -"M c #7D7DBE", -"N c #8181C0", -"O c #8585C2", -"P c #8989C4", -"Q c #8D8DC6", -"R c #9191C8", -"S c #9595CA", -"T c #9999CC", -"U c #A5A5D2", -"V c #7979BB", -"W c #7D7DBD", -"X c #8181BF", -"Y c #8585C1", -"Z c #8989C3", -"` c #A9A9D4", -" . c #8D8DC5", -".. c #9191C7", -"+. c #9595C9", -"@. c #9999CB", -"#. c #ADADD6", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . ", -" . . . + + + + + + + . . . ", -" . @ . @ + + # # # # # # # + + @ . @ . @ . ", -" . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . . ", -" . . + # , ' ) ! ~ { ] ^ / ( _ > + . . ", -" . . + # , ' ) ! ~ { ] ^ : < [ } | > + . . ", -" . @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ . @ . ", -" . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . . ", -" . + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + . . ", -" . + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + . . ", -" . + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + . @ . ", -" . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . . ", -" . + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + . . ", -" . + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + . . ", -" . + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + . @ . ", -" . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . . ", -" . + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + . . ", -" . + > C D E . . . . . . . . . 8 z B > + . . ", -" . @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ . @ . ", -" . . . . . + > J K L M N O P Q R S T H I U + . . . . . . . ", -" . . + > V W X Y Z Q R S T H I U ` > + . . ", -" . . + > > Y Z ...+.@.H > U ` #.#.> + . . ", -" . @ . @ + + > > > > > > > + > #.#.#.> + . @ . ", -" . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . . ", -" . . . . . + > > + . . ", -" . . . . . + + . . ", -" . @ . @ . @ . @ . @ . @ . @ . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" ", -" "}; diff --git a/community/qiv/PKGBUILD b/community/qiv/PKGBUILD index 2e6c7c963..6c3350d74 100644 --- a/community/qiv/PKGBUILD +++ b/community/qiv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=qiv pkgver=2.2.4 pkgrel=2 pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://spiegl.de/qiv/" license=('GPL2') depends=('file' 'gtk2' 'imlib2') diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD index 7bb4da70a..7a34262ed 100644 --- a/community/qpxtool/PKGBUILD +++ b/community/qpxtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90084 2013-05-06 19:39:19Z foutrelis $ +# $Id: PKGBUILD 91840 2013-05-28 17:05:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com> pkgname=qpxtool pkgver=0.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." arch=('i686' 'x86_64' 'mips64el') url="http://qpxtool.sourceforge.net/" @@ -24,7 +24,7 @@ build() { -e 's|lrelease|lrelease-qt4|' \ configure patch -p1 <$srcdir/libpng15.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 4ec09ea8e..b06e66b1d 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86795 2013-03-22 10:46:14Z svenstaro $ +# $Id: PKGBUILD 90973 2013-05-16 23:06:59Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,8 +7,8 @@ # Contributor: delor <bartekpiech gmail com> pkgname=qtcreator -pkgver=2.7.0 -_pkgver=2.7.0 +pkgver=2.7.1 +_pkgver=2.7.1 pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') @@ -26,22 +26,16 @@ optdepends=('qt5-doc: for the integrated Qt documentation' 'bzr: for bazaar support' 'valgrind: for analyze support') install=qtcreator.install -source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" - 'qtcreator.desktop' - 'fix-build.patch') -md5sums=('7bf25d211ff8babea47c2034f1b93d08' - '82888d4be900e7833d768050a135cd37' - '4087c00d853addf97ca329d304e9a0a5') +source=("https://qt.gitorious.org/qt-creator/qt-creator/archive-tarball/v${_pkgver}" + 'qtcreator.desktop') +md5sums=('3f552e173918b2705c9dbb17725057b5' + '82888d4be900e7833d768050a135cd37') build() { - cd qt-creator-${_pkgver}-src - patch -p1 -i "${srcdir}"/fix-build.patch - cd ../ - [[ -d build ]] && rm -r build mkdir build && cd build - qmake ../qt-creator-${_pkgver}-src/qtcreator.pro + qmake ../qt-creator-qt-creator/qtcreator.pro make make docs -j1 } @@ -53,5 +47,5 @@ package() { make INSTALL_ROOT="${pkgdir}/usr/" install_docs install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT + install -Dm644 ${srcdir}/qt-creator-qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT } diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 3ad639a35..e235e817f 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88141 2013-04-12 12:11:57Z seblu $ +# $Id: PKGBUILD 90540 2013-05-13 00:51:44Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga pkgver=0.99.22.1 -pkgrel=1 +pkgrel=2 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64' 'mips64el') url='http://www.quagga.net' @@ -21,14 +21,14 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ripngd.service' 'zebra.service') md5sums=('d9ab848661720d6da2551c7a4a19c731' - '87bf4ae8aca3b3cf70e3986bc669aa78' - '9b14110bed4982baa801808db6ac9135' - 'b685b5c12637cb963e1fb78ecd926e14' - '1fee8cdf03f87b9bb129948058246c88' - '4d95a4af1ddb4ae21b867bebbedc77d5' - '7e33c2a2e1c12309ba28d75a34294ed0' - '6c682c0cd06c109bc10d29c1d9af3e38' - '18964536b7ed012aa5b22f2fa9fb3e87') + '20a8e36ad851d4e06467aeb56a84b245' + 'cc90c234aac9098c5132d653037d5269' + '67d0ada0f3000b9a86351798786c5256' + '6e2569ef339838aa41375e913a8e19ce' + '260f5fcf9b53ef201a8fb34e7ea90457' + 'b6e3549d780355914ae8edd43e15630a' + '72dd63c49fdaea41729a4318d0fbac79' + '577f1e7caeea31d910f2dc29c28ada7d') prepare() { cd $pkgname-$pkgver @@ -43,6 +43,7 @@ build() { cd $pkgname-$pkgver ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/quagga \ --localstatedir=/run/quagga \ --enable-exampledir=/usr/share/doc/quagga/examples \ diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service index aa107afca..7279f0336 100644 --- a/community/quagga/babeld.service +++ b/community/quagga/babeld.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/babeld.conf [Service] Type=forking PIDFile=/run/quagga/babeld.pid -ExecStart=/usr/sbin/babeld -d +ExecStart=/usr/bin/babeld -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service index aae58be2c..b0bf1db0f 100644 --- a/community/quagga/bgpd.service +++ b/community/quagga/bgpd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/bgpd.conf [Service] Type=forking PIDFile=/run/quagga/bgpd.pid -ExecStart=/usr/sbin/bgpd -d +ExecStart=/usr/bin/bgpd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service index fa5a716e8..5ad16c1a4 100644 --- a/community/quagga/isisd.service +++ b/community/quagga/isisd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/isisd.conf [Service] Type=forking PIDFile=/run/quagga/isisd.pid -ExecStart=/usr/sbin/isisd -d +ExecStart=/usr/bin/isisd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service index eacb89159..dae3dc322 100644 --- a/community/quagga/ospf6d.service +++ b/community/quagga/ospf6d.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ospf6d.conf [Service] Type=forking PIDFile=/run/quagga/ospf6d.pid -ExecStart=/usr/sbin/ospf6d -d +ExecStart=/usr/bin/ospf6d -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service index 57a946f8e..e43c474cc 100644 --- a/community/quagga/ospfd.service +++ b/community/quagga/ospfd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ospfd.conf [Service] Type=forking PIDFile=/run/quagga/ospfd.pid -ExecStart=/usr/sbin/ospfd -d +ExecStart=/usr/bin/ospfd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service index bf7c5ac6f..a55498100 100644 --- a/community/quagga/ripd.service +++ b/community/quagga/ripd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ripd.conf [Service] Type=forking PIDFile=/run/quagga/ripd.pid -ExecStart=/usr/sbin/ripd -d +ExecStart=/usr/bin/ripd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service index 465263ba3..4990669d2 100644 --- a/community/quagga/ripngd.service +++ b/community/quagga/ripngd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ripngd.conf [Service] Type=forking PIDFile=/run/quagga/ripngd.pid -ExecStart=/usr/sbin/ripngd -d +ExecStart=/usr/bin/ripngd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service index c8707083e..02813c37c 100644 --- a/community/quagga/zebra.service +++ b/community/quagga/zebra.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/zebra.conf Type=forking PIDFile=/run/quagga/zebra.pid ExecStartPre=/sbin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra -d +ExecStart=/usr/bin/zebra -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index d47a1edc8..da26dca53 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,50 +1,90 @@ -# $Id: PKGBUILD 79252 2012-11-01 19:02:54Z mtorromeo $ +# $Id: PKGBUILD 91733 2013-05-26 19:25:26Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -pkgname=quassel -pkgver=0.8.0 -pkgrel=2 +pkgbase=quassel +pkgname=('quassel-client' 'quassel-core') +pkgver=0.9.0 +pkgrel=1 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64' 'mips64el') url="http://quassel-irc.org/" license=('GPL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=quassel.install -backup=(etc/conf.d/quassel) -source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2" +makedepends=('cmake' 'automoc4' 'qt4' 'icu') +source=("http://quassel-irc.org/pub/quassel-$pkgver.tar.bz2" 'quassel.service' - 'rc.quassel' 'quassel.conf') -sha256sums=('a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071' + +sha256sums=('2e3fe06ae3731c829aa3c2f6bb5320619bad264c831f322985c3aa3fe58b6027' '91a1aaae47d41c11aa418dd560039ddbbfb659e02b86379d8c4789c5ada362d3' - '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') - build() { + cd $srcdir [[ ! -d build ]] && mkdir build + mkdir build-client + + # Core cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DWITH_KDE=1 \ + -DWITH_KDE=0 \ + -DCMAKE_BUILD_TYPE="Release" \ + -DWITH_OPENSSL=ON \ + -DWANT_CORE=ON \ + -DWANT_MONO=OFF \ + -DWANT_QTCLIENT=OFF \ + -DWITH_DBUS=OFF \ + -DWITH_OXYGEN=OFF \ + -DWITH_PHONON=OFF \ + -DWITH_WEBKIT=OFF \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + + make + + # Client + cd $srcdir/build-client + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DWITH_KDE=0 \ + -DWITH_OPENSSL=ON \ -DCMAKE_BUILD_TYPE="Release" \ - ../${pkgname}-${pkgver}/ \ + -DWANT_CORE=OFF \ + -DWANT_QTCLIENT=ON \ + -DWANT_MONO=ON \ + ../quassel-${pkgver}/ \ -Wno-dev make + } -package() { - cd build +package_quassel-core() { +pkgdesc="Qt4 IRC client with a separated core - core only" +depends=('qt4' 'icu') +backup=(etc/conf.d/quassel) +install=quassel.install + cd $srcdir/build make DESTDIR="${pkgdir}" install + + # Remove unneeded pixmap icons + rm -r $pkgdir/usr/share + + + install -Dm644 "${srcdir}"/$pkgbase.service \ + "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service + install -Dm644 "${srcdir}"/$pkgbase.conf \ + "${pkgdir}"/etc/conf.d/$pkgbase +} + +package_quassel-client() { +pkgdesc="Qt4 IRC client with a separated core - client only" +depends=('qt4') +install=quassel-client.install + cd $srcdir/build-client - install -Dm644 "${srcdir}"/$pkgname.service \ - "${pkgdir}"/usr/lib/systemd/system/$pkgname.service - install -D "${srcdir}"/rc.$pkgname \ - "${pkgdir}"/etc/rc.d/$pkgname - install -Dm644 "${srcdir}"/$pkgname.conf \ - "${pkgdir}"/etc/conf.d/$pkgname + make DESTDIR=${pkgdir} install } diff --git a/community/quassel/quassel-client.install b/community/quassel/quassel-client.install new file mode 100644 index 000000000..1c93ee3f9 --- /dev/null +++ b/community/quassel/quassel-client.install @@ -0,0 +1,9 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} +post_upgrade() { + post_install +} +post_remove() { + post_install +} diff --git a/community/quassel/quassel.install b/community/quassel/quassel.install index 289ecc63f..5cd29276b 100644 --- a/community/quassel/quassel.install +++ b/community/quassel/quassel.install @@ -1,7 +1,7 @@ post_install() { useradd -r -s /bin/sh -d /var/lib/quassel quassel mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel - xdg-icon-resource forceupdate --theme hicolor &> /dev/null +# xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { @@ -12,15 +12,10 @@ post_upgrade() { ==> - quasselcore now listens to port 127.0.0.1 by default ==> - both of above are configurable: /etc/conf.d/quassel EOF - /etc/rc.d/quassel stop post_install ) || true } -pre_remove() { - /etc/rc.d/quassel stop -} - post_remove() { userdel quassel } diff --git a/community/quassel/rc.quassel b/community/quassel/rc.quassel deleted file mode 100644 index 99b82eec9..000000000 --- a/community/quassel/rc.quassel +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/quassel - -PIDFILE=/var/run/quassel.pid -PID=`pidof -o %PPID /usr/bin/quasselcore` - -case "$1" in - start) - stat_busy "Starting Quassel Core" - [ -z "$PID" ] && su -l -c "/usr/bin/quasselcore --configdir=/var/lib/quassel --listen=$LISTEN &" $QUASSEL_USER &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > $PIDFILE - add_daemon quassel - stat_done - fi - ;; - stop) - stat_busy "Stopping Quassel Core" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $PIDFILE - rm_daemon quassel - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 8c93df3e5..6dd3df121 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88368 2013-04-16 19:57:49Z seblu $ +# $Id: PKGBUILD 90532 2013-05-13 00:28:44Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') @@ -15,10 +15,14 @@ backup=('etc/radvd.conf') source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.service") sha1sums=('14b025bdcec77ea7278cd8ee2a32af3f81d26f4d' - 'f1e97885117b5ee2a533916624fa4297ce66e418') + '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc') build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \ + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --with-pidfile=/run/radvd.pid \ --mandir=/usr/share/man make } diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service index 92685d73b..2f1b1a7fa 100644 --- a/community/radvd/radvd.service +++ b/community/radvd/radvd.service @@ -3,7 +3,7 @@ Description=IPv6 Router Advertisement Daemon After=network.target [Service] -ExecStart=/usr/sbin/radvd --nodaemon --logmethod=stderr +ExecStart=/usr/bin/radvd --nodaemon --logmethod=stderr [Install] WantedBy=multi-user.target diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 9025408c6..9dced31e5 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88329 2013-04-16 13:30:45Z spupykin $ +# $Id: PKGBUILD 91024 2013-05-18 10:14:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.18.2 +pkgver=1.19.2 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('fee17c0edbe9199ae7662f6ec46eda07') +md5sums=('caffd86c122476ca0bcdde55177b393b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index e1a879ac5..6d45cce5f 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89919 2013-05-05 14:50:37Z spupykin $ +# $Id: PKGBUILD 90717 2013-05-13 14:36:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis pkgver=2.6.13 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" @@ -15,11 +15,9 @@ makedepends=('gcc>=3.1' 'make' 'pkgconfig') backup=("etc/redis.conf" "etc/logrotate.d/redis") source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" - "redis.d" "redis.service" "redis.logrotate") md5sums=('c4be422013905c64af18b1ef140de21f' - '8d843919d9f165e9a47e56cadb4ac2ed' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') @@ -35,7 +33,6 @@ package() { make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" - install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis" install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis" sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf diff --git a/community/redis/redis.d b/community/redis/redis.d deleted file mode 100644 index e1c79dd2b..000000000 --- a/community/redis/redis.d +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -daemon_name=redis - -. /etc/rc.conf -. /etc/rc.d/functions - -REDISPORT=6379 -EXEC=/usr/bin/redis-server -CLIEXEC=/usr/bin/redis-cli -PIDFILE=/var/run/redis.pid -WORKDIR=/var/lib/redis -CONF="/etc/redis.conf" - -# Check if process exists -PID=$(cat $PIDFILE 2>/dev/null) -[ -d /proc/${PID} ] || rm -f $PIDFILE - -# Grab the server password, if exists -REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\ -f 2` -[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS" - -case "$1" in - start) - stat_busy "Starting $daemon_name" - [ -d $WORKDIR ] || mkdir $WORKDIR - - if [ -f $PIDFILE ]; then - stat_fail - exit 1 - else - $EXEC $CONF >/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - fi - ;; - - stop) - stat_busy "Stopping $daemon_name" - - if [ ! -f $PIDFILE ]; then - stat_fail - exit 1 - else - PID=$(cat $PIDFILE) - - # And grab the server address - REDISADDR=`egrep -o '^bind ([^#]+)' $CONF | cut -d' ' -f2` - [ -n "$REDISADDR" ] && CLIEXEC="$CLIEXEC -h $REDISADDR" - - $CLIEXEC -p $REDISPORT shutdown - [ -d /proc/${PID} ] && sleep 1 - [ -d /proc/${PID} ] && sleep 5 - [ -d /proc/${PID} ] && kill -9 $PID - [ -d /proc/${PID} ] && stat_fail || { stat_done; rm_daemon $daemon_name; } - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index aa558a490..aded6c0b6 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88305 2013-04-16 12:29:33Z ttoepper $ +# $Id: PKGBUILD 92214 2013-06-02 21:00:23Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=1 pkgdesc='Tabbed, VTE-based terminal emulator' arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme') makedepends=('docbook-xsl' 'xmlto' 'po4a' 'python2' 'python2-lockfile' 'imagemagick' 'librsvg') install=roxterm.install source=("http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.bz2") -md5sums=('97b33c75fbded13d99ecdc1452ec6d0b') -sha1sums=('3fb4012d5b5283cb740962cd295cdfd5c6c0044d') +md5sums=('8ef80f9a5e0aea659b1f9cd6de9869b4') +sha1sums=('fa32ceeb19a097d5fb8a54c24cb7a6f1b957e74d') build() { diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 9d8e173b6..90f24a027 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88526 2013-04-19 10:32:19Z spupykin $ +# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.7 -pkgrel=1 +pkgrel=3 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -19,19 +19,16 @@ backup=('etc/rsyslog.conf' 'etc/conf.d/rsyslog') options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog' 'rsyslog.logrotate' - 'rsyslog.conf.d' 'rsyslog.conf') md5sums=('4a61d182acb5b5487e7b99dea8974857' - 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' - '8065db4bef3061a4f000ba58779f6829' - '18565f38a4445136446a31a3c95ffc3e' + '304bc9ea26aa1ff910870899a30512f1' 'd61dd424e660eb16401121eed20d98bc') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-mysql \ --enable-pgsql \ --enable-mail \ @@ -47,11 +44,9 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make install DESTDIR=${pkgdir} # Install Daemons and Configuration Files - install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} # fix location of systemctl and remove start precondition sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ diff --git a/community/rsyslog/rsyslog b/community/rsyslog/rsyslog deleted file mode 100644 index ee0145418..000000000 --- a/community/rsyslog/rsyslog +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rsyslog - -PID=`pidof -o %PPID /usr/sbin/rsyslogd` -case "$1" in - start) - stat_busy "Starting RSyslogd" - [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rsyslogd - stat_done - fi - ;; - stop) - stat_busy "Stopping RSyslogd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/rsyslogd.pid - rm -f /var/rsyslogd.persist - rm_daemon rsyslogd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rsyslog/rsyslog.conf.d b/community/rsyslog/rsyslog.conf.d deleted file mode 100644 index fc0770666..000000000 --- a/community/rsyslog/rsyslog.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Parameters to be passed to rsyslogd -# This should almost certainly include at least the current compatability -# level, e.g. -c4 -# -RSYSLOGD_ARGS="-c6" diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate index 76306c560..354581767 100644 --- a/community/rsyslog/rsyslog.logrotate +++ b/community/rsyslog/rsyslog.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - /usr/bin/killall -HUP /usr/sbin/rsyslogd + /usr/bin/killall -HUP /usr/bin/rsyslogd endscript } diff --git a/community/rtorrent/PKGBUILD b/community/rtorrent/PKGBUILD index 7968cc713..a9c30ac5c 100644 --- a/community/rtorrent/PKGBUILD +++ b/community/rtorrent/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: sh__ pkgname=rtorrent -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=2 pkgdesc='Ncurses BitTorrent client based on libTorrent' url='http://libtorrent.rakshasa.no/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('libtorrent=0.13.2' 'curl' 'xmlrpc-c') +depends=('libtorrent=0.13.3' 'curl' 'xmlrpc-c' 'libsigc++') source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz") -sha1sums=('2a642d722745091265037ed8929a23c237a3b99f') +sha1sums=('89ec5683a46f000dc23c9bf8a8808985759220e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,8 +29,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -D doc/faq.xml "${pkgdir}"/usr/share/doc/rtorrent/faq.xml - install -D doc/rtorrent.1 "${pkgdir}"/usr/share/man/man1/rtorrent.1 install -D doc/rtorrent.rc "${pkgdir}"/usr/share/doc/rtorrent/rtorrent.rc } diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 7fe16ed85..ad961fe99 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -29,7 +29,8 @@ prepare() { "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \ "$pkgdir/ruby-pango/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ - "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" + "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \ + "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/mips64el-linux" } build() { diff --git a/community/rxvt-unicode/01-fix-tabber-perl-ext.patch b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch new file mode 100644 index 000000000..adb140bcc --- /dev/null +++ b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch @@ -0,0 +1,12 @@ +# https://bugs.archlinux.org/task/35420 +--- a/src/perl/tabbed 2012-09-12 17:32:04.000000000 +0900 ++++ b/src/perl/tabbed 2013-05-24 13:04:37.000000000 +0900 +@@ -402,7 +402,7 @@ + # simply proxies all interesting calls back to the tabbed class. + + { +- for my $hook qw(start destroy key_press property_notify) { ++ for my $hook (qw(start destroy key_press property_notify)) { + eval qq{ + sub on_$hook { + my \$parent = \$_[0]{term}{parent} diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index a362b9f26..4881e7f10 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90167 2013-05-07 19:14:34Z seblu $ +# $Id: PKGBUILD 91706 2013-05-26 09:26:28Z bluewind $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> @@ -6,7 +6,7 @@ pkgname=rxvt-unicode pkgver=9.18 -pkgrel=3 +pkgrel=5 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' arch=('i686' 'x86_64' 'mips64el') url='http://software.schmorp.de/pkg/rxvt-unicode.html' @@ -18,11 +18,17 @@ source=( 'urxvt.desktop' 'urxvtc.desktop' 'urxvt-tabbed.desktop' + '01-fix-tabber-perl-ext.patch' ) md5sums=('963ccc748fe5bca925e7b92c0404d68b' 'fec94dc986fa37ec380079d81de3e0b2' 'fac55f0a8404c86dad3e702146762332' - '8a5599197568c63720e282b9722a7990') + '8a5599197568c63720e282b9722a7990' + '0c26ae7022a128e68981577785358b63') + +prepare() { + patch -p1 -d $pkgname-$pkgver < 01-fix-tabber-perl-ext.patch +} build() { cd $pkgname-$pkgver diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 27c573cb0..57d6934a8 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87136 2013-03-27 19:52:53Z dwallace $ +# $Id: PKGBUILD 91566 2013-05-23 21:46:56Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.8 +pkgver=5.9 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -15,17 +15,16 @@ arch=('i686' 'x86_64') license=('GPL') #depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo') depends=('desktop-file-utils') -makedepends=('gcc-fortran' ) +makedepends=('gcc-fortran' 'freetype2') optdepends=('imagemagick: some plotting functionality benefits from it' 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' 'openssh: to use the notebook in secure mode' - 'ffmpeg: to show animations') -options=('!makeflags') + 'ffmpeg: to show animations' + 'cairo: R plots') install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" - 'SAGE-notebook.desktop') -md5sums=('fc5b401174ee1efa7aea163e804c2b42' - 'b82f94383829eee26648feb977e2d89b') + 'SAGE-notebook.desktop' + 'sage.service') build() { cd sage-${pkgver} @@ -38,8 +37,7 @@ build() { unset LDFLAGS # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS - export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') - export MAKE="make -j${SAGE_BUILD_THREADS}" + export MAKE="make -j$(nproc)" # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran export FC=/usr/bin/gfortran @@ -52,7 +50,11 @@ build() { export SAGE_FAT_BINARY='yes' # can't write to root in a clean chroot - export DOT_SAGE='/build/src/' + mkdir "$srcdir/buiild" + export DOT_SAGE="$srcdir/build" + + # Singular is broken + export CPP='/usr/bin/cpp' # only build sage, no documents #make build @@ -95,8 +97,12 @@ package() { # remove source packages, since they are rarely needed, they are 300mb in size (compressed) rm -f ${pkgdir}/opt/sage/spkg/base/*spkg rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg + + # install a systemd user unit + install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service } # vim :set ts=2 sw=2 et: -md5sums=('b91d6c20798f396a9c875527c78b3587' - 'b82f94383829eee26648feb977e2d89b') +md5sums=('708520904f2d42039c714ac72a631948' + 'b82f94383829eee26648feb977e2d89b' + '985da1c1d1dcdc3ea9aa73035cb7996b') diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install index ab5dae235..3da751689 100644 --- a/community/sage-mathematics/sage-mathematics.install +++ b/community/sage-mathematics/sage-mathematics.install @@ -41,6 +41,8 @@ echo ' post_upgrade() { post_install $1 + echo "There is now a user session unit included to run a sage notebook as your user." + echo "The wiki includes a guide on starting systemd user sessions" } post_remove() { diff --git a/community/sage-mathematics/sage.service b/community/sage-mathematics/sage.service new file mode 100644 index 000000000..d999414de --- /dev/null +++ b/community/sage-mathematics/sage.service @@ -0,0 +1,8 @@ +[Unit] +Description=A free open-source mathematics software system + +[Service] +ExecStart=/opt/sage/sage -n + +[Install] +WantedBy=default.target diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD index 004b76ec2..a2e3164f9 100644 --- a/community/scponly/PKGBUILD +++ b/community/scponly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65429 2012-02-21 05:43:32Z spupykin $ +# $Id: PKGBUILD 91530 2013-05-23 11:17:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=scponly pkgver=4.8 -pkgrel=8 +pkgrel=9 pkgdesc="A limited shell for ssh/scp" arch=(i686 x86_64 'mips64el') url="http://sublimation.org/scponly/" @@ -19,9 +19,9 @@ md5sums=('139ac9abd7f3b8dbc5c5520745318f8a' build() { cd $srcdir/$pkgname-$pkgver - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --build=$CHOST --sysconfdir=/etc \ - --enable-scp-compat --enable-winscp-compat --enable-chrooted-binary + --enable-scp-compat --enable-winscp-compat --enable-chrooted-binary \ + --sbindir=/usr/bin sed -i 's|^#elif|#else|' helper.c make } diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD index ddcc11a27..b3974172f 100644 --- a/community/scummvm/PKGBUILD +++ b/community/scummvm/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') url="http://www.scummvm.org/" depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d71d1df5c8262556fedbe885972fbf6e') +md5sums=('473c151ff44e3db7b603ecacd800a0d2') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD index 8b43b2ade..210848517 100644 --- a/community/sdcc/PKGBUILD +++ b/community/sdcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78263 2012-10-17 10:27:37Z allan $ +# $Id: PKGBUILD 91250 2013-05-20 17:00:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jose Negron <josenj.arch@mailnull.net> pkgname=sdcc -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.0 +pkgrel=1 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,15 +14,25 @@ optdepends=('python') url="http://sdcc.sourceforge.net/" options=(!strip) source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) -md5sums=('0808a9b4109d2ba6046ddd7b679a0012') +md5sums=('c7c6aa75415580795ecc4fd31948e5ba') + +prepare() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|CC -E|CC -O2 -E|g' support/sdbinutils/libiberty/configure +} build() { - cd $srcdir/$pkgname + cd $srcdir/$pkgname-$pkgver ./configure \ --prefix=/usr \ --includedir=/usr/include/sdcc \ --libdir=/usr/lib/sdcc make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make install DESTDIR=$pkgdir if [ -d $pkgdir/usr/lib/lib ]; then diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD index b01a9324a..917763d9c 100644 --- a/community/ser2net/PKGBUILD +++ b/community/ser2net/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77110 2012-10-05 10:16:21Z spupykin $ +# $Id: PKGBUILD 91532 2013-05-23 11:17:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=ser2net pkgver=2.8rc3 -pkgrel=1 +pkgrel=3 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/ser2net" @@ -12,15 +12,13 @@ license=('GPL') depends=('glibc') backup=(etc/ser2net.conf) source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz - ser2net.init ser2net.service) md5sums=('bbe95fb557781c314d321356897a50b9' - '6db420d54ce8f78464e885efe935dd18' - '7f9d879325b9ed6ddc313dcbc3f83e56') + '9a94f9ba5595359c92d099465ab7c828') build() { cd $srcdir/${pkgname}-${pkgver/rc/-rc} - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -28,6 +26,5 @@ package() { cd $srcdir/${pkgname}-${pkgver/rc/-rc} make DESTDIR=$pkgdir install install -Dm0644 ser2net.conf $pkgdir/etc/ser2net.conf - install -Dm0755 $srcdir/ser2net.init $pkgdir/etc/rc.d/ser2net install -Dm0644 $srcdir/ser2net.service $pkgdir/usr/lib/systemd/system/ser2net.service } diff --git a/community/ser2net/ser2net.init b/community/ser2net/ser2net.init deleted file mode 100644 index f35984686..000000000 --- a/community/ser2net/ser2net.init +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof ser2net -} - -case "$1" in - start) - stat_busy "Starting ser2net daemon" - - PID=`get_pid` - if [ -z "$PID" ]; then - [ -f /var/run/ser2net.pid ] && rm -f /var/run/ser2net.pid - ser2net - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/ser2net.pid - add_daemon ser2net - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping ser2net daemon" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ser2net.pid &> /dev/null - rm_daemon ser2net - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ser2net/ser2net.service b/community/ser2net/ser2net.service index fcf054e22..7bb3137d4 100644 --- a/community/ser2net/ser2net.service +++ b/community/ser2net/ser2net.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -ExecStart=/usr/sbin/ser2net +ExecStart=/usr/bin/ser2net [Install] WantedBy=multi-user.target diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD index a5b491226..eee3f1403 100644 --- a/community/siege/PKGBUILD +++ b/community/siege/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90182 2013-05-08 09:32:40Z bluewind $ +# $Id: PKGBUILD 91394 2013-05-21 16:28:38Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Sven Kauber <celeon@gmail.com> pkgname=siege -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -29,4 +29,4 @@ package() { sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc" } -md5sums=('e0ace61f7e01c6b545ac767fc499f817') +md5sums=('3401d9c8a02f227b63a0d10e2718ab37') diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD index 72fba4f35..50f8142b7 100644 --- a/community/signon-plugin-oauth2/PKGBUILD +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84333 2013-02-16 20:09:04Z bgyorgy $ +# $Id: PKGBUILD 90878 2013-05-15 06:48:00Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=signon-plugin-oauth2 _pkgname=signon-oauth2 -pkgver=0.15 +pkgver=0.17 pkgrel=1 pkgdesc="OAuth 2 plugin for signon" arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,18 @@ license=('LGPL') depends=('signon-ui' 'qjson') makedepends=('signon') source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('31f63f73eca2c8341ab41ec0d63650c9a0b4820a') +sha1sums=('400301bf4a0cc7ad005ed552f9700e00a74b7237') build() { cd "$srcdir/$_pkgname-$pkgver" + sed -i '/-Werror/d' common-project-config.pri + # Do not install tests and example echo 'INSTALLS =' >>tests/tests.pro echo 'INSTALLS =' >>example/example.pro - qmake PREFIX=/usr LIBDIR=/usr/lib + qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index 9e8762906..05f6d3c93 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87393 2013-03-30 17:15:21Z bgyorgy $ +# $Id: PKGBUILD 90876 2013-05-15 06:33:09Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.49 +pkgver=8.51 pkgrel=1 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=(etc/signond.conf) install=$pkgname.install source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 use_keyring.patch) -sha1sums=('349d700eed718977463020f252269786883bc4c6' +sha1sums=('5d62d9f2923381baf5cffbd112adf3ae935e6c65' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') build() { diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index 9a2d46733..f89d77c77 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85723 2013-03-05 18:54:32Z jlichtblau $ +# $Id: PKGBUILD 91047 2013-05-18 14:03:22Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> pkgname=skrooge -pkgver=1.6.0 +pkgver=1.7.1 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('kdepim-libkdepim: for KDE PIM integration') install=$pkgname.install changelog=$pkgname.changelog source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('7237400f0ae9af317ec9ac45d8d35144f827146b8cb4e37fa092412fec5f0b0e') +sha256sums=('7427c9c4a93a9c6794e6419ef225c8f512548217ab2eac7abf217f5802cd6a88') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog index 81cf3a3d2..862db7099 100644 --- a/community/skrooge/skrooge.changelog +++ b/community/skrooge/skrooge.changelog @@ -1,4 +1,7 @@ -2013-03-50 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * skrooge 1.7.1-1 + +2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * skrooge 1.6.0-1 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD index 8c11194a9..8acee1114 100644 --- a/community/smbnetfs/PKGBUILD +++ b/community/smbnetfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76408 2012-09-17 10:51:59Z spupykin $ +# $Id: PKGBUILD 90723 2013-05-13 14:38:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=smbnetfs pkgver=0.5.3a -pkgrel=5 +pkgrel=6 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory." arch=('i686' 'x86_64' 'mips64el') url="http://smbnetfs.sourceforge.net/" @@ -17,19 +17,23 @@ backup=('etc/smbnetfs/.smb/smb.conf' install=smbnetfs.install options=(docs) source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 - rc-smbnetfs conf-smbnetfs smbnetfs.service) md5sums=('66d1477ca981f5a07b4b21c6bdbdc442' - 'b6cff0ee75cafd739ad44216236b5e28' 'e150c4cd894cc6ade11b94c95cf17ec4' '0fdd0dbaa5f16b1ecd00ec1ddcdfc223') build() { cd $srcdir/$pkgname-$pkgver - + sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|g' \ + src/smb_conn_srv.c src/smb_conn_proto.h src/function.c src/main.c src/event.c [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --docdir=/usr/share/doc/smbnetfs --with-gnome-keyring=no make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install mv $pkgdir/usr/share/doc/smbnetfs* $pkgdir/usr/share/doc/smbnetfs @@ -37,7 +41,6 @@ build() { mkdir -p $pkgdir/etc/smbnetfs/.smb install -m0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/ install -Dm0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README - install -Dm0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs install -Dm0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs install -Dm0644 $srcdir/smbnetfs.service $pkgdir/usr/lib/systemd/system/smbnetfs.service touch $pkgdir/etc/smbnetfs/.smb/smb.conf diff --git a/community/smbnetfs/rc-smbnetfs b/community/smbnetfs/rc-smbnetfs deleted file mode 100644 index 69c00d120..000000000 --- a/community/smbnetfs/rc-smbnetfs +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/smbnetfs -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - echo `pidof smbnetfs` -} - -case "$1" in - start) - stat_busy "Starting smbnetfs" - - [ -f /var/run/smbnetfs.pid ] && rm -f /var/run/smbnetfs.pid - PID=`get_pid` - if [ -z "$PID" ]; then - cd /tmp && \ - [ -d $SMBNETFS_MOUNT_POINT ] && \ - su - nobody -s /bin/bash -c "HOME=/etc/smbnetfs exec smbnetfs -o allow_other $SMBNETFS_MOUNT_POINT" &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/smbnetfs.pid - add_daemon smbnetfs - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping smbnetfs" - - fusermount -u $SMBNETFS_MOUNT_POINT &> /dev/null - rm -f /var/run/smbnetfs.pid &> /dev/null - rm_daemon smbnetfs - stat_done - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/smem/PKGBUILD b/community/smem/PKGBUILD index aa03be4fc..7f8253657 100644 --- a/community/smem/PKGBUILD +++ b/community/smem/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88078 2013-04-11 05:47:45Z cinelli $ +# $Id: PKGBUILD 91603 2013-05-25 11:22:11Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Dave Reisner <d@falconindy.com> # Contributor: Isaac Dupree <id@isaac.cedarswampstudios.org> @@ -6,7 +6,7 @@ pkgname=smem pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Generate reports on memory usage." url="http://www.selenic.com/smem/" license=("GPL") diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD index 2bd24d7f9..4e1d69ae4 100644 --- a/community/sniffit/PKGBUILD +++ b/community/sniffit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65453 2012-02-21 05:52:41Z spupykin $ +# $Id: PKGBUILD 91957 2013-05-30 09:44:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> pkgname=sniffit pkgver=0.3.7.beta -pkgrel=11 -pkgdesc="very good packet sniffer for unix with ncurses interactive mode." +pkgrel=13 +pkgdesc="Very good packet sniffer for unix with ncurses interactive mode" arch=('i686' 'x86_64' 'mips64el') url="http://packages.ubuntu.com/source/sniffit" #seems the website are out, ubuntu have all sources @@ -27,9 +27,13 @@ build() { rm -f config.sub config.guess cp /usr/share/libtool/config/config.{guess,sub} . - ./configure --prefix=/usr --no-recursion + ./configure --prefix=/usr --no-recursion --sbindir=/usr/bin make - install -d -m0755 -g root -o root ${pkgdir}/usr/{sbin,share/licenses/${pkgname}} - install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/sbin/sniffit +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" + install -d -m0755 -g root -o root ${pkgdir}/usr/{bin,share/licenses/${pkgname}} + install -D -m0744 -g root -o root sniffit ${pkgdir}/usr/bin/sniffit install -D -m0644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname} } diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD index aaaa0ba11..cb9016c33 100644 --- a/community/sqlitebrowser/PKGBUILD +++ b/community/sqlitebrowser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85413 2013-03-01 10:40:34Z andrea $ +# $Id: PKGBUILD 91008 2013-05-17 10:22:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> @@ -6,21 +6,28 @@ pkgname=sqlitebrowser pkgver=2.0b1 _pkgrealver=200_b1 -pkgrel=3 +pkgrel=4 pkgdesc="SQLite Database browser is a light GUI editor for SQLite databases, built on top of QT" arch=('i686' 'x86_64' 'mips64el') url="http://sqlitebrowser.sf.net" license=('GPL') -depends=('qt4') +depends=('qt4' 'sqlite') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${_pkgrealver}_src.tar.gz) md5sums=('5ca3d41cca454235b93ce72cd585dfe3') -build() { +prepare() { cd $srcdir/trunk/$pkgname sed -i 's|getline|xgetline|' sqlitebrowser/sqlbrowser_util.c sed -i 's|: name( 0 ) { }|: name( ) { }|' sqlitebrowser/sqlitedb.h - qmake - make LINK="g++ -ldl" + sed -i '/sqlite_source\/sqlite3.h/d' sqlitebrowser/sqlbrowser_util.c # Remove two useless #include + sed -i 's/"sqlite_source\/sqlite3.h"/<sqlite3.h>/' sqlitebrowser/sqlbrowser_util.h + sed -i -e '1i LIBS += -lsqlite3' -e '/sqlite_source/d' sqlitebrowser/sqlitebrowser.pro +} + +build() { + cd $srcdir/trunk/$pkgname + qmake-qt4 + make } package() { diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD index 00d33aaa0..ffefbc54e 100644 --- a/community/squashfs-tools/PKGBUILD +++ b/community/squashfs-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65461 2012-02-21 05:55:21Z spupykin $ +# $Id: PKGBUILD 91959 2013-05-30 09:44:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Original TU: Jeff Mickey <j@codemac.net> @@ -6,7 +6,7 @@ pkgname=squashfs-tools pkgver=4.2 -pkgrel=2 +pkgrel=4 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux." url="http://squashfs.sourceforge.net" license=("GPL") @@ -17,13 +17,11 @@ md5sums=('1b7a781fb4cf8938842279bd3e8ee852') build() { cd ${srcdir}/squashfs${pkgver}/${pkgname} - sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile - sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile - make + make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 } package() { cd ${srcdir}/squashfs${pkgver}/${pkgname} - install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs - install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs + install -Dm755 mksquashfs ${pkgdir}/usr/bin/mksquashfs + install -m755 unsquashfs ${pkgdir}/usr/bin/unsquashfs } diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 9e63cf082..396e514a3 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88474 2013-04-18 12:16:13Z spupykin $ +# $Id: PKGBUILD 91502 2013-05-23 10:15:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.3.3 -pkgrel=1 +pkgver=3.3.5 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') url='http://www.squid-cache.org' @@ -15,21 +15,16 @@ makedepends=('libcap') license=('GPL') options=('emptydirs') backup=('etc/squid/squid.conf' - 'etc/squid/mime.conf' - 'etc/conf.d/squid') + 'etc/squid/mime.conf') install=$pkgname.install source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" - 'squid' - 'squid.conf.d' 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('20f63ab34eae93b36969c9c7519f6462' - 'e90895ce22c0b618c89a46a9a181fe6c' - '2383772ef94efddc7b920628bc7ac5b0' +md5sums=('c7991aa8528034af0e21a69edf26e41b' '270977cdd9b47ef44c0c427ab9034777' - 'b499c2b725aefd7bd60bec2f1a9de392' - '20e00e1aa1198786795f3da32db3c1d8') + 'a71425c4951f2e5b640d19e6a5048531' + 'ceeb57c69ebb165676219222f109a24e') build() { cd "$srcdir/$pkgname-$pkgver" @@ -46,6 +41,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --datadir=/usr/share/squid \ --sysconfdir=/etc/squid \ --libexecdir=/usr/lib/squid \ @@ -85,9 +81,7 @@ package() { cd "$srcdir" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid" install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid" - install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid" install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid" install -Dm644 "$srcdir/squid.service" \ "$pkgdir/usr/lib/systemd/system/squid.service" diff --git a/community/squid/squid b/community/squid/squid deleted file mode 100644 index ea80aaa2e..000000000 --- a/community/squid/squid +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/squid.pid -{ read -r PID </run/squid.pid; } 2>/dev/null -if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then - rm /run/squid.pid - unset PID -fi - -case $1 in - start) - stat_busy "Starting squid" - if [[ $PID ]] || ! squid $SQUID_ARGS; then - stat_fail - else - add_daemon squid - stat_done - fi - ;; - - stop) - stat_busy "Stopping squid" - if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then - stat_fail - else - # squid takes forever to shutdown all its listening FDs - while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do - stat_append "." - sleep 3 - done - rm_daemon squid - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/squid/squid.conf.d b/community/squid/squid.conf.d deleted file mode 100644 index ea248b76c..000000000 --- a/community/squid/squid.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to squid -# -SQUID_ARGS="-sYC" diff --git a/community/squid/squid.cron b/community/squid/squid.cron index c78e51105..7425df894 100644 --- a/community/squid/squid.cron +++ b/community/squid/squid.cron @@ -4,6 +4,6 @@ { read pid </run/squid.pid; } 2>/dev/null || exit 0 # make sure found PID really is a squid process -if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then - /usr/sbin/squid -k rotate +if [ /proc/$pid/exec -ef /usr/bin/squid ]; then + /usr/bin/squid -k rotate fi diff --git a/community/squid/squid.install b/community/squid/squid.install index e7aa5ff68..a7c76d87a 100644 --- a/community/squid/squid.install +++ b/community/squid/squid.install @@ -1,10 +1,10 @@ post_install() { if [ -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupadd -g 15 proxy &>/dev/null + groupadd -g 15 proxy &>/dev/null fi id proxy &>/dev/null || \ - usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy + useradd -u 15 -g proxy -d /var/empty proxy chown proxy.proxy var/{cache,log}/squid @@ -18,9 +18,9 @@ post_upgrade() { } pre_remove() { - usr/sbin/userdel proxy &> /dev/null + userdel proxy &> /dev/null if [ ! -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupdel proxy &>/dev/null + groupdel proxy &>/dev/null fi } diff --git a/community/squid/squid.service b/community/squid/squid.service index 9d41cc243..1db8860e5 100644 --- a/community/squid/squid.service +++ b/community/squid/squid.service @@ -5,9 +5,9 @@ After=network.target [Service] Type=forking PIDFile=/run/squid.pid -ExecStart=/usr/sbin/squid -sYC -ExecStop=/usr/sbin/squid -k shutdown -ExecReload=/usr/sbin/squid -k reconfigure +ExecStart=/usr/bin/squid -sYC +ExecStop=/usr/bin/squid -k shutdown +ExecReload=/usr/bin/squid -k reconfigure [Install] WantedBy=multi-user.target diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index e786ec243..276987c87 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84143 2013-02-11 15:20:18Z spupykin $ +# $Id: PKGBUILD 92088 2013-05-31 11:33:59Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=10 +pkgrel=13 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64' 'mips64el') #url="http://sourceforge.net/projects/sshguard/" @@ -14,20 +14,16 @@ depends=('iptables') options=(zipman) install=sshguard.install source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2" - sshguard.rc - sshguard.conf.d sshguard.service sshguard-journalctl) sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' - 'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e' - '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3' - '2b2a3c1140349296c3629e77f74c3b29f4ef2ce5f77cb3a811cbed5b46d23028' - '9491c4cd23d789dd04af551e16dc123f1517ca02ad3539f25715bbeec70ee21e') + 'e9713a067b33b8ea91d203853a033c0b9f6d40ebebd77f2e72903ed4fd355ebd' + '7423224107b28cabb69489056968581f1c9e94f3edc6a1d189e56a9df0bab4f7') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's|^DAYNO.*|DAYNO [0-9]?[1-9]|' src/parser/attack_scanner.l - ./configure --prefix=/usr --with-firewall=iptables + ./configure --prefix=/usr --sbindir=/usr/bin --with-firewall=iptables make } @@ -38,9 +34,7 @@ check() { package() { cd "$srcdir/$pkgname-$pkgver" - make prefix="$pkgdir/usr" install + make DESTDIR="$pkgdir" install install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service" - install -Dm0755 "$srcdir/sshguard.rc" "$pkgdir/etc/rc.d/sshguard" - install -Dm0644 "$srcdir/sshguard.conf.d" "$pkgdir/etc/conf.d/sshguard" install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl" } diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl index 13afd6f33..fb106f5b6 100644 --- a/community/sshguard/sshguard-journalctl +++ b/community/sshguard/sshguard-journalctl @@ -1,2 +1,2 @@ #!/bin/sh -/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@" +/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/bin/sshguard -l- "$@" diff --git a/community/sshguard/sshguard.conf.d b/community/sshguard/sshguard.conf.d deleted file mode 100644 index 8fa351a19..000000000 --- a/community/sshguard/sshguard.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Arguments to be passed to sshguard -# -SSHGUARD_ARGS="" diff --git a/community/sshguard/sshguard.install b/community/sshguard/sshguard.install index 0821c61e0..486e55fbd 100644 --- a/community/sshguard/sshguard.install +++ b/community/sshguard/sshguard.install @@ -1,8 +1,14 @@ post_install() { - mkdir -p /var/db/sshguard - echo "-- You should add chain to your firewall:" + mkdir -p var/db/sshguard + echo "-- You should add chains to your firewall:" echo "-- iptables -N sshguard" echo "-- iptables -A INPUT -p tcp --dport 22 -j sshguard" - echo "-- For more information, see http://www.sshguard.net/doc/" - /bin/true + echo "-- ip6tables -N sshguard" + echo "-- ip6tables -A INPUT -p tcp --dport 22 -j sshguard" + echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6" + echo "-- For more information, see https://wiki.archlinux.org/index.php/Sshguard" +} + +post_upgrade() { + echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6" } diff --git a/community/sshguard/sshguard.rc b/community/sshguard/sshguard.rc deleted file mode 100644 index dbd95c9ea..000000000 --- a/community/sshguard/sshguard.rc +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/sshguard ] && . /etc/conf.d/sshguard - -case "$1" in - start) - stat_busy "Starting SSHGuard" - /usr/sbin/sshguard -l /var/log/auth.log -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} &> /dev/null & - add_daemon sshguard - stat_done - ;; - stop) - stat_busy "Stopping SSHGuard" - kill `pidof sshguard` &> /dev/null - rm_daemon sshguard - stat_done - ;; - restart) - $0 stop - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service index 9340d8e9f..d6324d459 100644 --- a/community/sshguard/sshguard.service +++ b/community/sshguard/sshguard.service @@ -1,7 +1,7 @@ [Unit] Description=Block hacking attempts -After=iptables.service network.target -Wants=iptables.service +After=iptables.service ip6tables.service network.target +Wants=iptables.service ip6tables.service [Service] ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 09c883e80..3a860f36e 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.12.0 -pkgrel=2 +pkgver=0.12.1 +pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64' 'mips64el') url='http://crawl.develz.org/' @@ -64,4 +64,4 @@ package() { "${pkgdir}/usr/share/applications/${pkgname}.desktop" } -md5sums=('38ed5bae81f6513cc898aa12efda2c38') +md5sums=('47d7c65cf72786d446e1289533af01de') diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index e218d11a8..a889fa914 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87349 2013-03-30 09:40:31Z lfleischer $ +# $Id: PKGBUILD 92065 2013-05-31 02:33:12Z seblu $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel pkgver=4.56 -pkgrel=1 +pkgrel=2 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') url="http://www.stunnel.org" @@ -15,13 +15,11 @@ install=$pkgname.install options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' - 'stunnel.rc.d' 'stunnel.tmpfiles.conf') md5sums=('ac4c4a30bd7a55b6687cbd62d864054c' 'd68c7dd65d515c678cdde15bbf0ce344' 'f15398497e10e080c2406d2fc541660c' - '4c7e3634a9d4dc040102f5d4160fb123' '2e065a39998e57727ee79887bbd1751e') build() { @@ -48,7 +46,6 @@ package() { done install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" - install -Dm755 "$srcdir/stunnel.rc.d" "$pkgdir/etc/rc.d/stunnel" install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" # move systemd service into place diff --git a/community/stunnel/stunnel.rc.d b/community/stunnel/stunnel.rc.d deleted file mode 100644 index 76f7b796a..000000000 --- a/community/stunnel/stunnel.rc.d +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/var/run/stunnel/stunnel.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ $PID && ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case "$1" in - start) - stat_busy "Starting stunnel" - if [[ -z $PID ]] && /usr/bin/stunnel; then - add_daemon stunnel - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping stunnel" - if [[ $PID ]] && kill $PID &>/dev/null; then - rm_daemon stunnel - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD index 168bbc623..5c286dcdc 100644 --- a/community/stuntrally/PKGBUILD +++ b/community/stuntrally/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Jason Melton <jason.melton@gmail.com> pkgname=stuntrally -pkgver=1.9 -pkgrel=3 +pkgver=2.0 +pkgrel=1 pkgdesc='Stunt Rally game with track editor, based on VDrift' arch=('x86_64' 'i686') license=('GPL3') @@ -14,14 +14,16 @@ depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stu makedepends=('cmake' 'boost') install=stuntrally.install source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/$pkgname/$pkgname/tar.gz/$pkgver") -sha256sums=('651d10aa00cf73b275198f08b0360a34ff98e6b520013041863854babeb20da7') +sha256sums=('ef3e645e4911f37c28925e3339c39555e849b7ac13511f009742030f531eed68') build() { cd "$srcdir/stuntrally-$pkgver/" rm -rf build mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX="/usr" -DSHARE_INSTALL="share/stuntrally" .. + cmake .. \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DSHARE_INSTALL="share/stuntrally" make } diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index 578ad1447..c93ee70a1 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78943 2012-10-27 23:45:45Z ebelanger $ +# $Id: PKGBUILD 91300 2013-05-20 22:16:28Z foutrelis $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: vande198 @@ -6,24 +6,32 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=7 +pkgrel=8 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64' 'mips64el') url="http://super-tux.sourceforge.net/" license=('GPL') depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew') -makedepends=('cmake' 'boost' 'mesa') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 +makedepends=('cmake' 'boost' 'mesa' 'optipng') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 supertux2-0.3.3-squirrel-gcc47.patch) md5sums=('f3f803e629ee51a9de0b366a036e393d' 'eb06315514be4f200428f14b927beb66') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch" sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp sed -i '/types\.h/d' src/addon/addon_manager.cpp + + # Fix invalid PNG image to work with libpng 1.6 + optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . make } diff --git a/community/swftools/PKGBUILD b/community/swftools/PKGBUILD index eef2325c0..4fcf46c12 100644 --- a/community/swftools/PKGBUILD +++ b/community/swftools/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 70956 2012-05-20 17:24:25Z jlichtblau $ +# $Id: PKGBUILD 91933 2013-05-29 20:22:20Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=swftools pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of SWF manipulation and creation utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.swftools.org/" license=('GPL') -depends=('avifile' 'giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') +depends=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig') makedepends=('bison' 'flex' 'zlib' 'patch') changelog=$pkgname.changelog source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz @@ -17,6 +17,12 @@ source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1' '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d') +prepare() { + cd ${srcdir}/$pkgname-$pkgver + + sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c +} + build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index 26d0d5691..b760e510f 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 87533 2013-04-02 17:43:50Z bpiotrowski $ +# $Id: PKGBUILD 92171 2013-06-02 10:38:24Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=sxiv -pkgver=1.1 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc='Simple X Image Viewer' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') install=sxiv.install url='https://github.com/muennich/sxiv' depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils') -source=(https://github.com/muennich/sxiv/archive/$pkgver.tar.gz +source=(https://github.com/muennich/sxiv/archive/v$pkgver.tar.gz sxiv.desktop config.h) -sha256sums=('7d22b060d264be25ee0e95afff9df535299dbdd48067c9fc795133e583e2583f' +sha256sums=('30569b7cb1568a7f60d102f6eb21f25c93de42243a1c8ac3c1a521d58b08281f' 'bd14b9b6bc6d78f18cdff8535b4d1c13b3c76e35091dd6bc675011d42a01bb47' '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c') diff --git a/community/synce-serial/PKGBUILD b/community/synce-serial/PKGBUILD index 5dcf03feb..9eeee0884 100644 --- a/community/synce-serial/PKGBUILD +++ b/community/synce-serial/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65481 2012-02-21 06:01:39Z spupykin $ +# $Id: PKGBUILD 91842 2013-05-28 17:05:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-serial pkgver=0.11 -pkgrel=4 +pkgrel=5 pkgdesc="provide a means of communication with a Windows CE device - helper scripts for setting up a serial connection" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" @@ -15,10 +15,13 @@ md5sums=('a83f20eb59c845de192645158d051062') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --sbindir=/usr/bin make - make DESTDIR=$pkgdir install +} +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial-common sed -i 's#/usr/etc/#/etc/#' $pkgdir/usr/share/synce/synce-serial.conf } diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 1c1817a07..55df83ac8 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -2,15 +2,16 @@ # Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> +# Contributor: Michael Düll <mail@akurei.me> pkgname=synergy -pkgver=1.4.10 -pkgrel=2 +pkgver=1.4.12 +pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxtst' 'libxinerama') -makedepends=('libxt' 'cmake' 'qt4') +depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++') +makedepends=('libxt' 'cmake' 'qt4' 'unzip') optdepends=('qt4: gui support') license=('GPL2') source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" @@ -18,15 +19,13 @@ source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "synergys.service" "synergy.png" "synergy.desktop") -md5sums=('18aee04a7e232e4d821f46ff24da3364' - '58f48336836d6faf3d5eecbe4155b77e' - 'b95e4b83d8a19c0bd81a15280078fcd5' - '11fdb13390908e02c6e2f19c4c09eded' - '1e8d574c19994d13e6f342ed08e531bb') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" + # Unzip the crypto library + unzip -d tools/cryptopp562 tools/cryptopp562.zip + cmake -D CMAKE_INSTALL_PREFIX=/usr . make @@ -55,3 +54,9 @@ package() { install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png" install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" } + +sha512sums=('5305e03d871e5408640ece55364067418f9b8b160dda31f994ebafe807b31291bdaa688a901f2e81710acb0857952c37f0c1823a50c927573feaec0c8659be9d' + 'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad' + 'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f' + 'cb3db9593c943bce11ce5ae962e120feb70e6afa9206887a6971c77491711afcebc78653e7413e87e33d031c43a507f4a9a6e8747d10b60c6642106ae1690f18' + 'c1c76ecfbed5c22f1a2a7562dce20971a784ff6b0edbf5c9b5f7c796f9ead882b82f970bb24f35533b928c341f87f66b0b10d9d96e122d14d74102cac8997445') diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index c1e1c441d..411267419 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 90094 2013-05-06 19:39:42Z foutrelis $ +# $Id: PKGBUILD 90606 2013-05-13 10:37:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.63.05 -pkgrel=3 +pkgver=0.64.0 +pkgrel=1 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" license=('GPL2') depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng' - 'libtiff' 'libdv' 'libmng') + 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs') +makedepends=('boost') optdepends=('openexr' 'libsigc++') conflicts=('synfig-core') replaces=('synfig-core') @@ -18,7 +19,7 @@ options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch ffmpeg-0.8.patch) -md5sums=('8591cf17c26405d68d2cc050a2929292' +md5sums=('124cb4059b9f48dc5c37204660053d6f' 'b5568b06fae1a7ee465b5380b1139b83' 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index 053d9c098..11cffef70 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69586 2012-04-19 09:14:58Z spupykin $ +# $Id: PKGBUILD 90608 2013-05-13 10:38:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -pkgver=0.63.05 +pkgver=0.64.0 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64 'mips64el') @@ -11,11 +11,11 @@ url="http://synfig.org" license=('GPL2') depends=('gtkmm' 'synfig') makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' - 'xorg-fonts-misc' 'xorg-fonts-type1') + 'xorg-fonts-misc' 'xorg-fonts-type1' 'intltool') install=synfigstudio.install options=('!libtool') source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('ca01b7523118e32c904b681d8ff0a085') +md5sums=('bbda14359a07254b8efe5e706de192df') build() { cd $srcdir/synfigstudio-$pkgver diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 4a1e94626..85dfb62ac 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87478 2013-04-01 10:36:38Z spupykin $ +# $Id: PKGBUILD 91152 2013-05-20 09:56:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat pkgver=10.1.5 -pkgrel=1 +pkgrel=3 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -16,10 +16,8 @@ options=(zipman) backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz - sysstat sysstat.service) md5sums=('cdf66d6acd5c8cab709e07980b77ea6b' - '3ce41ebf7330aba01e70b38658afed1f' '12ba479c606620193e8b7c6e982d5088') build() { @@ -37,7 +35,7 @@ package() { make DESTDIR=$pkgdir install install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat - install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat chown -R root:root $pkgdir install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + mv $pkgdir/usr/bin/nfsiostat $pkgdir/usr/bin/$pkgname-nfsiostat } diff --git a/community/sysstat/sysstat b/community/sysstat/sysstat deleted file mode 100644 index d0e40aa05..000000000 --- a/community/sysstat/sysstat +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /etc/rc.d/functions -. /etc/conf.d/sysstat -. /etc/rc.conf - -case "$1" in - start) - stat_busy "Writing SysStat restart record" - /usr/lib/sa/sadc -L -F ${SADC_OPTIONS} - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sysstat - stat_done - fi - ;; - stop) - echo "Stopping SysStat is useless" - rm_daemon sysstat - ;; - *) - echo "usage: $0 {start|stop}" -esac -exit 0 diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD index b6a2bfc08..59dc75b5b 100644 --- a/community/tabbed/PKGBUILD +++ b/community/tabbed/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75438 2012-08-23 21:00:37Z lfleischer $ +# $Id: PKGBUILD 92069 2013-05-31 08:05:10Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: totoloco <totoloco at gmx> pkgname=tabbed -pkgver=0.4.1 +pkgver=0.5 pkgrel=1 pkgdesc='Simple generic tabbed fronted to xembed aware applications.' arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('libx11') install='tabbed.install' source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz" 'config.h') -md5sums=('6349b763f8a4d5e42d18245169fb136c' - '5aa6c1fdc7971b21363704391bea6e1b') +md5sums=('cd9cfd696db745637486ec3b9bbe4b75' + 'cea7b04d4f67d917c68673cd0e63ae32') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tabbed/config.h b/community/tabbed/config.h index 402cf25d1..ca4b8d6b4 100644 --- a/community/tabbed/config.h +++ b/community/tabbed/config.h @@ -1,21 +1,36 @@ -static const char *font = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"; -static const char *normbgcolor = "#cccccc"; -static const char *normfgcolor = "#000000"; -static const char *selbgcolor = "#0066ff"; -static const char *selfgcolor = "#ffffff"; -static const char *before = "<"; -static const char *after = ">"; -static const int tabwidth = 200; -static const Bool foreground = False; +/* See LICENSE file for copyright and license details. */ + +/* appearance */ +static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*"; +static const char normbgcolor[] = "#222222"; +static const char normfgcolor[] = "#cccccc"; +static const char selbgcolor[] = "#555555"; +static const char selfgcolor[] = "#ffffff"; +static const char before[] = "<"; +static const char after[] = ">"; +static const int tabwidth = 200; +static const Bool foreground = True; + +/* + * Where to place a new tab when it is opened. When npisrelative is True, + * then the current position is changed + newposition. If npisrelative + * is False, then newposition is an absolute position. + */ +static int newposition = 0; +static Bool npisrelative = False; #define MODKEY ControlMask static Key keys[] = { \ /* modifier key function argument */ { MODKEY|ShiftMask, XK_Return, focusonce, { 0 } }, - { MODKEY|ShiftMask, XK_Return, spawn, { .v = (char*[]){ "surf", "-e", winid, NULL} } }, + { MODKEY|ShiftMask, XK_Return, spawn, { 0 } }, + { MODKEY|ShiftMask, XK_l, rotate, { .i = +1 } }, { MODKEY|ShiftMask, XK_h, rotate, { .i = -1 } }, + { MODKEY|ShiftMask, XK_j, movetab, { .i = -1 } }, + { MODKEY|ShiftMask, XK_k, movetab, { .i = +1 } }, { MODKEY, XK_Tab, rotate, { .i = 0 } }, + { MODKEY, XK_1, move, { .i = 0 } }, { MODKEY, XK_2, move, { .i = 1 } }, { MODKEY, XK_3, move, { .i = 2 } }, @@ -26,5 +41,9 @@ static Key keys[] = { \ { MODKEY, XK_8, move, { .i = 7 } }, { MODKEY, XK_9, move, { .i = 8 } }, { MODKEY, XK_0, move, { .i = 9 } }, + { MODKEY, XK_q, killclient, { 0 } }, + + { 0, XK_F11, fullscreen, { 0 } }, }; + diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 8ba258d91..916c25874 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89278 2013-04-28 12:14:49Z cinelli $ +# $Id: PKGBUILD 91601 2013-05-25 11:19:17Z bpiotrowski $ #Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=texmaker -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=1 pkgdesc='Free cross-platform LaTeX editor' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('ghostscript: LaTeX to HTML conversion command' 'poppler: PDF rendering support') install="$pkgname.install" source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('62f87f7b44e92ca68817663d3d5aeca4') +md5sums=('2097b5911acc461a85fd631dd1e2e5dc') build() { cd "$pkgname-$pkgver" diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index d0454b011..3fe65db54 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88838 2013-04-23 16:26:01Z tredaelli $ +# $Id: PKGBUILD 92047 2013-05-31 00:34:01Z seblu $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: helios # Contributor: Lothar Gesslein @@ -6,26 +6,23 @@ pkgname=tinc pkgver=1.0.21 -pkgrel=1 +pkgrel=2 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64' 'mips64el') url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'openssl') -backup=(etc/conf.d/tincd.conf) install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} - tincd.rc tincd.conf tincd@.service) + tincd@.service) md5sums=('d7bc9ca38672c9da08d74ff2a3e8e36d' 'SKIP' - '64bb53748d9051255f243003f0d511f5' - '7c0276d4812cc5d3cc18142562a3aa82' - '035b0e549b08da55d19a8df5b8306e4d') + '112327da32fdb56ab779fe004712235f') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin make } @@ -38,7 +35,5 @@ package() { find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} + find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} + - install -Dm755 "$srcdir/tincd.rc" "$pkgdir/etc/rc.d/tincd" - install -Dm644 "$srcdir/tincd.conf" "$pkgdir/etc/conf.d/tincd.conf" install -Dm644 "$srcdir/tincd@.service" "$pkgdir/usr/lib/systemd/system/tincd@.service" } diff --git a/community/tinc/tincd.conf b/community/tinc/tincd.conf deleted file mode 100644 index 6e0902bbb..000000000 --- a/community/tinc/tincd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Extra options to be passed to tincd. -# TINCD_EXTRAOPTS="-d" - -# Arrays containing all names of the networks to be started from rc.d. -NETNAMES=() diff --git a/community/tinc/tincd.rc b/community/tinc/tincd.rc deleted file mode 100644 index 48c132f25..000000000 --- a/community/tinc/tincd.rc +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -daemon_name=tincd - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -case "$1" in - start) - for net in "${NETNAMES[@]}"; do - stat_busy "Starting ${daemon_name}" - /usr/sbin/tincd -n "${net}" $TINCD_EXTRAOPTS &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ${daemon_name} - stat_done - fi - done - ;; - stop) - stat_busy "Stopping ${daemon_name}" - for net in "${NETNAMES[@]}"; do - /usr/sbin/tincd -k -n "${net}" &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ${daemon_name} - stat_done - fi - done - ;; - restart) - "$0" stop - sleep 5 - "$0" start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/tinc/tincd@.service b/community/tinc/tincd@.service index ef8f2da9f..069bf4570 100644 --- a/community/tinc/tincd@.service +++ b/community/tinc/tincd@.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/tincd -n %i +ExecStart=/usr/bin/tincd -n %i [Install] WantedBy=multi-user.target diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 7206f5728..af06dc7ef 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80139 2012-11-16 17:14:04Z lfleischer $ +# $Id: PKGBUILD 92033 2013-05-30 23:55:47Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy pkgver=1.8.3 -pkgrel=6 +pkgrel=7 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64' 'mips64el') url='https://banu.com/tinyproxy/' @@ -13,18 +13,17 @@ makedepends=('asciidoc') install="${pkgname}.install" backup=('etc/tinyproxy/tinyproxy.conf') source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" - 'tinyproxy' 'tinyproxy.tmpfiles.conf' 'tinyproxy.service') md5sums=('292ac51da8ad6ae883d4ebf56908400d' - '90eb2b3371e56d5a784fd826d4a6e5f8' '3c2764578f26581346fe312da0519a3e' - '299ca484c08d9873c74e1eb96f6a5cc0') + '41938243faca487a14beeee5114f244e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --localstatedir=/var --enable-transparent + ./configure --prefix=/usr --sysconfdir=/etc/tinyproxy --sbindir=/usr/bin \ + --localstatedir=/var --enable-transparent make } @@ -32,7 +31,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm0755 "${srcdir}/tinyproxy" "${pkgdir}/etc/rc.d/tinyproxy" install -Dm0644 "${srcdir}/tinyproxy.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/tinyproxy.conf" install -dm0755 -o nobody -g nobody "${pkgdir}/var/log/${pkgname}" diff --git a/community/tinyproxy/tinyproxy b/community/tinyproxy/tinyproxy deleted file mode 100644 index 5580ea804..000000000 --- a/community/tinyproxy/tinyproxy +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/sbin/tinyproxy) - -start() { - stat_busy "Starting Tinyproxy" - - [ -z "$PID" ] && rm -f /var/run/tinyproxy/tinyproxy.pid && \ - /usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf 2>/dev/null - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon tinyproxy - stat_done - fi -} - -stop() { - stat_busy "Stopping Tinyproxy" - - [ ! -z "$PID" ] && kill $PID &> /dev/null - - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon tinyproxy - stat_done - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/tinyproxy/tinyproxy.service b/community/tinyproxy/tinyproxy.service index 8776a0ee1..f1ef18faa 100644 --- a/community/tinyproxy/tinyproxy.service +++ b/community/tinyproxy/tinyproxy.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf +ExecStart=/usr/bin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf PIDFile=/run/tinyproxy/tinyproxy.pid [Install] diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD index 1dfa52704..7fc5fabe6 100644 --- a/community/tnftp/PKGBUILD +++ b/community/tnftp/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 56963 2011-10-17 10:15:04Z spupykin $ +# $Id: PKGBUILD 91426 2013-05-22 10:27:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> pkgname=tnftp -pkgver=20100108 -pkgrel=2 +pkgver=20130505 +pkgrel=1 pkgdesc="NetBSD FTP client with several advanced features" arch=('i686' 'x86_64' 'mips64el') url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/" license=('BSD') -depends=('ncurses' 'dante') +depends=('ncurses' 'dante' 'openssl') source=(ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/$pkgname-$pkgver.tar.gz) -md5sums=('192aac255abd515d7d4cc9b397dc0cba') +md5sums=('66e218d02ec7d9fc39ab70ba2900305a') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --enable-editcomplete + ./configure --prefix=/usr --enable-editcomplete --enable-ssl make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make install DESTDIR=$pkgdir install -Dm755 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 3e1d64afd..40a71d07f 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87706 2013-04-05 10:24:39Z spupykin $ +# $Id: PKGBUILD 91910 2013-05-29 10:07:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> @@ -7,7 +7,7 @@ _basever=2.5.0 _timestamp=20130214 _file=53357 pkgver=${_basever}.${_timestamp} -pkgrel=2 +pkgrel=3 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' arch=('i686' 'x86_64' 'mips64el') url='http://tomoyo.sourceforge.jp' @@ -21,10 +21,10 @@ md5sums=('ffff6b531ed9ac32b01722a9cd749a2f') build() { cd "${srcdir}/${pkgname}" - make + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin } package() { cd "${srcdir}/${pkgname}" - make INSTALLDIR="${pkgdir}" install + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install } diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 8c5975a32..53b161791 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80483 2012-11-22 17:38:18Z lfleischer $ +# $Id: PKGBUILD 90563 2013-05-13 08:20:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor pkgver=0.2.3.25 -pkgrel=1.1 +pkgrel=2 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') url='http://www.torproject.org/' @@ -13,19 +13,14 @@ depends=('openssl' 'libevent' 'tsocks' 'bash') makedepends=('ca-certificates') backup=('etc/tor/torrc' 'etc/tor/torrc-dist' - 'etc/tor/tor-tsocks.conf' - 'etc/conf.d/tor') + 'etc/tor/tor-tsocks.conf') install='tor.install' source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'torrc' - 'tor' - 'tor.conf.d' 'tor.service') md5sums=('a1c364189a9a66ed9daa8e6436489daf' 'a4c12795ffb8f68550a5dab4a9eb0654' '56c75d4e8a66f34167d31e38c43793dd' - 'f8e6868a389877346e7eebaacd1078bb' - '5c7c6834064b3530c442def6079ac3aa' 'b8989a7b3ab39d697624b243f7fc255d') build() { @@ -44,8 +39,6 @@ package() { mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist" install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc" - install -Dm0755 "${srcdir}/tor" "${pkgdir}/etc/rc.d/tor" - install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor" install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/community/tor/tor b/community/tor/tor deleted file mode 100644 index 522c498ce..000000000 --- a/community/tor/tor +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/tor ] && . /etc/conf.d/tor - -PID=`pidof -o %PPID /usr/bin/tor` -case "$1" in - start) - stat_busy "Starting Tor Daemon" - if [ -z "${TOR_MAX_FD}" ] || ulimit -n "${TOR_MAX_FD}"; then - [ -z "$PID" ] && /usr/bin/tor -f ${TOR_CONF} ${TOR_ARGS} &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon tor - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping Tor Daemon" - [ ! -z "$PID" ] && kill -INT $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon tor - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ft=sh ts=2 sw=2 diff --git a/community/tor/tor.conf.d b/community/tor/tor.conf.d deleted file mode 100644 index e9fa098e0..000000000 --- a/community/tor/tor.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Location of the config file. -TOR_CONF='/etc/tor/torrc' - -# Custom ulimit for maximum number of open files. -TOR_MAX_FD= - -# Additional arguments. -TOR_ARGS="--quiet" - diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD index 30aa15133..0497dd696 100644 --- a/community/torsocks/PKGBUILD +++ b/community/torsocks/PKGBUILD @@ -4,7 +4,7 @@ pkgname=torsocks pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc='Wrapper to safely torify applications' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/torsocks' @@ -13,36 +13,18 @@ depends=('tor') makedepends=('git') options=(!libtool) backup=("etc/${pkgname}.conf") - -__gitroot=https://git.torproject.org/torsocks -__gitname=torsocks +source=("git://git.torproject.org/torsocks.git#tag=1.3") +md5sums=(SKIP) build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$__gitname" ]]; then - cd "$__gitname" && git pull origin - msg "The local files are updated." - else - git clone "$__gitroot" "$__gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$__gitname-build" - git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" - cd "$srcdir/$__gitname-build" - - git checkout $pkgver - + cd $pkgname ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "$srcdir/$__gitname-build" + cd $pkgname make DESTDIR="$pkgdir/" install + find "$pkgdir/usr/share" -maxdepth 1 -type f -delete } diff --git a/community/turbojpeg/PKGBUILD b/community/turbojpeg/PKGBUILD deleted file mode 100644 index d6f7dba16..000000000 --- a/community/turbojpeg/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> - -pkgname=turbojpeg -pkgver=1.2.1 -pkgrel=1 -pkgdesc="turbojpeg library from libjpeg-turbo" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.libjpeg-turbo.org/About/TurboJPEG" -license=('GPL' 'custom') -depends=('glibc' 'libjpeg') -makedepends=('nasm') -options=('!libtool') -source=(http://sourceforge.net/projects/libjpeg-turbo/files/$pkgver/libjpeg-turbo-$pkgver.tar.gz) -sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361') - -build() { - cd "$srcdir/libjpeg-turbo-$pkgver" - - ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man - make -} - -check() { - cd "$srcdir/libjpeg-turbo-$pkgver" - - make test -} - -package() { - cd "$srcdir/libjpeg-turbo-$pkgver" - - make DESTDIR="$pkgdir/" install - - # only distribute libturbojpeg - rm -rf "$pkgdir"/usr/share - rm "$pkgdir"/usr/include/j*.h - rm "$pkgdir"/usr/lib/libj* - rm "$pkgdir"/usr/bin/{djpeg,rdjpgcom,wrjpgcom,jpegtran,cjpeg} - - install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README" - install -Dm644 README-turbo.txt "$pkgdir/usr/share/licenses/$pkgname/README-turbo.txt" -} - diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD index 4b5f98823..fb55d868d 100644 --- a/community/tuxpaint/PKGBUILD +++ b/community/tuxpaint/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90097 2013-05-06 19:39:46Z foutrelis $ +# $Id: PKGBUILD 91097 2013-05-19 11:35:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com> @@ -6,7 +6,7 @@ pkgname=tuxpaint pkgver=0.9.21 -pkgrel=8 +pkgrel=9 pkgdesc='Drawing program designed for young children' arch=('x86_64' 'i686' 'mips64el') url='http://www.tuxpaint.org/' @@ -14,7 +14,7 @@ license=('GPL') backup=('etc/tuxpaint/tuxpaint.conf') depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg') -makedepends=('setconf') +makedepends=('setconf' 'optipng') optdepends=('tuxpaint-stamps: more stamps' 'tuxpaint-conf: configuration manager') source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz" @@ -22,18 +22,28 @@ source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver. sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9' '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" + setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;' + sed -i 's:# fu:fu:' src/tuxpaint.conf + # python2 fix for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do sed -i '0,/on/s//on2/' $f done + # libpng15 fix patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile - setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;' - sed -i 's:# fu:fu:' src/tuxpaint.conf + + # libpng16 fix + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + make PREFIX=/usr } diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD index 2c37d9c3c..fdcea7796 100644 --- a/community/twin/PKGBUILD +++ b/community/twin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70178 2012-05-01 12:01:36Z andrea $ +# $Id: PKGBUILD 91844 2013-05-28 17:06:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=twin pkgver=0.6.2 -pkgrel=3 +pkgrel=4 pkgdesc="A text-mode window environment" arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.net/projects/twin/' @@ -17,7 +17,7 @@ md5sums=('6211c8b2e655003eb96b1fc5dc37e7d9') build() { cd $srcdir/$pkgname-$pkgver - LDFLAGS="-lX11" ./configure --prefix=/usr \ + LDFLAGS="-lX11" ./configure --prefix=/usr --sbindir=/usr/bin \ --enable-tt=yes \ --enable-tt-hw-twin=yes --enable-tt-hw-twin-tunnel=yes --enable-tt-hw-twin-detunnel=yes \ --enable-tt-hw-xml=yes diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD index c1c9c1c7b..d0e01b090 100644 --- a/community/ubuntuone-client-gnome/PKGBUILD +++ b/community/ubuntuone-client-gnome/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ubuntuone-client-gnome pkgver=4.2.0 pkgrel=2 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/ubuntuone-client-gnome" license=('GPL') depends=('nautilus' 'gconf' 'ubuntuone-client') diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD index 17a8bc881..84bdb16b1 100644 --- a/community/ucarp/PKGBUILD +++ b/community/ucarp/PKGBUILD @@ -1,37 +1,37 @@ -# $Id: PKGBUILD 83576 2013-02-03 13:21:29Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 90534 2013-05-13 00:32:20Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=ucarp pkgver=1.5.2 -pkgrel=4 +pkgrel=5 pkgdesc='Userspace implementation of the CARP protocol' arch=('i686' 'x86_64' 'mips64el') url='http://www.ucarp.org/project/ucarp' license=('GPL2') depends=('libpcap') optdepends=('iproute2') -source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz" - 'ucarp.service' - 'ucarp.8' +source=("http://download.pureftpd.org/pub/$pkgname/$pkgname-$pkgver.tar.gz" + "$pkgname.service" + "$pkgname.8" '01-fix-getopt.patch' '02-fix-downscript-on-error.c') md5sums=('e3caa733316a32c09e5d3817617e9145' - '40fdef66560e3c98eb7c04adf7c31739' + 'fdc72a8d6f89224b40c78705df1f46f9' '2ccfdc464b88c437b38bd0324cf1fef3' '3f20699aaf2ef8139dcd337f1e7f06ab' '09d26233c37956cf08e629554a91b8cd') +prepare() { + # Apply patches + patch -N -p1 -d $pkgname-$pkgver < 01-fix-getopt.patch + patch -N -p1 -d $pkgname-$pkgver < 02-fix-downscript-on-error.c +} + build() { cd $pkgname-$pkgver - patch -N -p1 -i ../01-fix-getopt.patch - patch -N -p1 -i ../02-fix-downscript-on-error.c - - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make - # fix iproute2 path - sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-down.sh - sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-up.sh } package() { diff --git a/community/ucarp/ucarp.service b/community/ucarp/ucarp.service index 41c8322e2..2ff694d2c 100644 --- a/community/ucarp/ucarp.service +++ b/community/ucarp/ucarp.service @@ -2,7 +2,7 @@ Description=UCARP daemon [Service] -ExecStart=/usr/sbin/ucarp +ExecStart=/usr/bin/ucarp [Install] WantedBy=multi-user.target diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD index ce25824bf..465716987 100644 --- a/community/ude/PKGBUILD +++ b/community/ude/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 65333 2012-02-21 02:10:03Z spupykin $ +# $Id: PKGBUILD 90591 2013-05-13 09:59:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: eric <eric@archlinux.org> # Contributor: dorphell <dorphell@gmx.net> pkgname=ude -pkgver=0.2.10a -pkgrel=4 -pkgdesc="Unix Desktop Environment is a GUI desktop environment" -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.2.11 +pkgrel=1 +pkgdesc="Unix Desktop Environment (GUI desktop environment)" +arch=('x86_64' 'i686' 'mips64el') license=('GPL') -depends=('libjpeg' 'libxmu' 'libxpm') +depends=('libjpeg' 'libxmu' 'libxpm' 'bash') +makedepends=('gendesk') url="http://udeproject.sourceforge.net/index.shtml" -source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz - $pkgname.desktop) -md5sums=('1370418179f56612ffe63d6ed0c89d13' - '84f94253ea284258c4465cd76edf599f') +source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz) +md5sums=('d4952a7edffd30ac07f32fce244c86d7') build() { - cd $srcdir/uwm-$pkgver + cd "$srcdir" + gendesk + + cd "uwm-$pkgver" ./configure --prefix=/usr make } package() { - cd $srcdir/uwm-$pkgver + cd "$srcdir/uwm-$pkgver" + mkdir -p $pkgdir/etc/X11/sessions make prefix=$pkgdir/usr install - cp $srcdir/$pkgname.desktop $pkgdir/etc/X11/sessions + install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/etc/X11/sessions" + install -Dm644 "$srcdir/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" mv $pkgdir/usr/doc $pkgdir/usr/share/ } diff --git a/community/ude/ude.desktop b/community/ude/ude.desktop deleted file mode 100644 index 48a022d0b..000000000 --- a/community/ude/ude.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Ude -Comment=The ude window manager -Exec=uwm -# no icon yet, only the top three are currently used -Icon= -Type=Application diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 7aaf3345d..5d44fd6d2 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87022 2013-03-25 19:17:05Z bpiotrowski $ +# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=ulogd pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/ulogd/index.html' @@ -30,12 +30,18 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" md5sums=('660516de4b5b1e110c12dae414619e0f' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' - '42fc2c0568ff89ec00c2f0797280f296') + '092d72209e30c132e0a08112e4062772') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --with-mysql \ + --with-pgsql \ + --with-dbi make } diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service index 8858427fa..12450c9cc 100644 --- a/community/ulogd/ulogd.service +++ b/community/ulogd/ulogd.service @@ -3,7 +3,7 @@ Description=Netfilter Ulogd daemon After=network.target [Service] -ExecStart=/usr/sbin/ulogd +ExecStart=/usr/bin/ulogd [Install] WantedBy=multi-user.target diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD index cdbe120c7..dcbdf5b73 100644 --- a/community/ultimate-ircd/PKGBUILD +++ b/community/ultimate-ircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78358 2012-10-17 15:20:09Z spupykin $ +# $Id: PKGBUILD 90729 2013-05-13 14:39:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ultimate-ircd pkgver=3.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="ultimate irc server" arch=(i686 x86_64 'mips64el') url="http://www.shadow-realm.org/" @@ -16,12 +16,10 @@ provides=(ircd) backup=() install=ircd.install source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2 - ultimate-ircd ultimate-ircd.service ultimate-ircd.tmpfiles conf-fix.patch) md5sums=('8bc14b97d22a3ce3415cc0540ae459f6' - 'cf6ab14d8dd8805342b70a9beb01c9af' '526fd78018b9b011787e4e9012437116' 'e51723ab29e7a3ddc3589846815de0c9' '5e0f2a02e12675ac070a148c3234e111') @@ -42,7 +40,10 @@ build() { cd include && patch -N <../../conf-fix.patch && cd .. make || return 1 +} +package() { + cd $srcdir/Ultimate$pkgver mkdir -p $pkgdir/usr/bin mkdir -p $pkgdir/var/log/ircd mkdir -p $pkgdir/etc/ircd/networks @@ -54,7 +55,6 @@ build() { mv mkpasswd irc-mkpasswd mv ssl-cert.sh irc-ssl-cert.sh mv ssl-search.sh irc-ssl-search.sh - install -D -m 0755 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd install -d -m 0755 $pkgdir/var/lib/ircd install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf diff --git a/community/ultimate-ircd/ultimate-ircd b/community/ultimate-ircd/ultimate-ircd deleted file mode 100644 index df73d7389..000000000 --- a/community/ultimate-ircd/ultimate-ircd +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/bin/ircd -} - -case "$1" in - start) - stat_busy "Starting Ultimate IRCd" - - [ -d /var/run/ircd ] || mkdir -p /var/run/ircd - [ -f /var/run/ircd/ircd.pid ] && rm -f /var/run/ircd/ircd.pid - PID=`get_pid` - if [ -z "$PID" ]; then - su -c '/usr/bin/ircd -f /etc/ircd/ircd.conf' ircd 1>>/var/log/ircd/stdout.log 2>>/var/log/ircd/sterr.log - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ultimate-ircd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Ultimate IRCd" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ircd/ircd.pid &> /dev/null - rm_daemon ultimate-ircd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/uml_utilities/PKGBUILD b/community/uml_utilities/PKGBUILD deleted file mode 100644 index a5620b335..000000000 --- a/community/uml_utilities/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mike Sampson <mike at sambodata dot com> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=uml_utilities -pkgver=20070815 -pkgrel=5 -pkgdesc="User Mode Linux Utilities" -arch=(i686 x86_64 'mips64el') -depends=('fuse' 'readline' 'perl') -url="http://user-mode-linux.sourceforge.net/" -source=(http://user-mode-linux.sourceforge.net/${pkgname}_${pkgver}.tar.bz2) -license=('GPL2') -md5sums=('b0468ac8b79cef53f36f5f9517907462') - -build() { - cd $srcdir/tools-$pkgver - sed 's|lib64|lib|g' -i Makefile - make all -} - -package() { - cd $srcdir/tools-$pkgver - make DESTDIR=$pkgdir install - chown root $pkgdir/usr/bin/* -} diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index c9e0357c4..38dde02e3 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,54 +1,48 @@ -# $Id: PKGBUILD 87924 2013-04-08 17:07:36Z bisson $ +# $Id: PKGBUILD 91247 2013-05-20 14:50:41Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.20 -pkgrel=1 +pkgrel=2 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') -options=('!libtool') depends=('openssl' 'ldns') makedepends=('expat') optdepends=('expat: unbound-anchor') backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" - 'unbound.service' - 'unbound.conf' - 'rc.d') + 'service' + 'conf') sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43' - 'a2493cb105ff6aa23d756514badb13b02d37f319' - '5d473ec2943fd85367cdb653fcd58e186f07383f' - 'dc96e772f467b32555df21d16fdb15e98194c228') + 'b543ae6f8b87423bec095fca6b335a9ee43739a8' + '5d473ec2943fd85367cdb653fcd58e186f07383f') +options=('!libtool') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ + --sbindir=/usr/bin \ + --disable-static \ --disable-rpath \ --with-conf-file=/etc/unbound/unbound.conf \ - --with-pidfile=/run/unbound.pid \ - + --with-pidfile=/run/unbound.pid make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf" - install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" - install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service" + install -Dm644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/unbound.service" + install -Dm644 ../conf "${pkgdir}/etc/unbound/unbound.conf" } diff --git a/community/unbound/unbound.conf b/community/unbound/conf index 445bceff1..445bceff1 100644 --- a/community/unbound/unbound.conf +++ b/community/unbound/conf diff --git a/community/unbound/rc.d b/community/unbound/rc.d deleted file mode 100644 index b5b6466de..000000000 --- a/community/unbound/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=unbound -prog="/usr/sbin/unbound" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && eval $prog &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community/unbound/unbound.service b/community/unbound/service index 8e59e5a6a..c569602de 100644 --- a/community/unbound/unbound.service +++ b/community/unbound/service @@ -4,7 +4,7 @@ After=network.target [Service] PIDFile=/run/unbound.pid -ExecStart=/usr/sbin/unbound -d +ExecStart=/usr/bin/unbound -d ExecReload=/bin/kill -HUP $MAINPID Restart=always diff --git a/community/unhide/PKGBUILD b/community/unhide/PKGBUILD index 598623562..18f16e8f4 100644 --- a/community/unhide/PKGBUILD +++ b/community/unhide/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 66390 2012-02-24 12:30:25Z lfleischer $ +# $Id: PKGBUILD 92031 2013-05-30 23:43:09Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=unhide -pkgver=20110113 -pkgrel=3 +pkgver=20130526 +pkgrel=1 pkgdesc='A forensic tool to find processes hidden by rootkits, LKMs or by other techniques.' arch=('i686' 'x86_64' 'mips64el') -url='http://www.unhide-forensics.info/' +url='http://sourceforge.net/projects/unhide/' license=('GPL3') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tgz") -md5sums=('0dff8ee5029615f1f81db96dcf6758f7') +depends=('iproute2' 'lsof' 'psmisc' 'net-tools' 'procps-ng') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver.tgz") +md5sums=('f3d68ed8eb239614abb0ff5ace22cf85') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - cc -Os -static unhide.c -o unhide-posix - cc -Os -static -pthread unhide-linux26.c -o unhide-linux26 - cc -Os -static unhide-tcp.c -o unhide-tcp + cd $pkgname-$pkgver + cc -Wall -O2 --static -pthread unhide-linux*.c unhide-output.c -o unhide-linux + cc -Wall -O2 --static unhide_rb.c -o unhide_rb + cc -Wall -O2 --static unhide-posix.c -o unhide-posix + cc -Wall -O2 --static unhide-tcp.c unhide-tcp-fast.c unhide-output.c -o unhide-tcp } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -Dm0755 unhide-posix "${pkgdir}/usr/sbin/unhide-posix" - install -Dm0755 unhide-linux26 "${pkgdir}/usr/sbin/unhide-linux26" - install -Dm0755 unhide-tcp "${pkgdir}/usr/sbin/unhide-tcp" - ln -fs ./unhide-linux26 "${pkgdir}/usr/sbin/unhide" - install -Dm0644 man/unhide.8 "${pkgdir}/usr/share/man/man8/unhide.8" + cd $pkgname-$pkgver + for _p in unhide-linux unhide-posix unhide_rb unhide-tcp; do + install -Dm0755 "$_p" "$pkgdir/usr/bin/$_p" + done + ln -s unhide-linux "$pkgdir/usr/bin/unhide" + install -Dm0644 man/unhide.8 "$pkgdir/usr/share/man/man8/unhide.8" } diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD index f5b6c0477..eeaae0545 100644 --- a/community/unifdef/PKGBUILD +++ b/community/unifdef/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88335 2013-04-16 13:31:44Z spupykin $ +# $Id: PKGBUILD 90818 2013-05-14 10:59:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=unifdef -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc="Remove #ifdef'ed lines" arch=(i686 x86_64 'mips64el') @@ -10,7 +10,7 @@ url="http://dotat.at/prog/unifdef/" license=('GPL') depends=() source=("http://dotat.at/prog/unifdef/unifdef-$pkgver.tar.gz") -md5sums=('72357e9faa877fe21f5d621d2024a242') +md5sums=('1cfb5fa5dcab6e6246c07897a1a304b4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index e3adb060e..8ed04aa6b 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82103 2013-01-08 15:57:53Z spupykin $ +# $Id: PKGBUILD 91865 2013-05-28 17:38:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.10 -pkgrel=1 +pkgrel=4 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -15,17 +15,13 @@ provides=('ircd') backup=('etc/unrealircd/unrealircd.conf' 'etc/conf.d/unrealircd') source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz - unrealircd.rc unrealircd.service arch-fixes.patch) md5sums=('05b0bbdbfab9ffc2304f7595951d7cec' - '07ffa1e82a01f319a8b997e155d2af1d' - '2103ce8a4a4e79f6955920bfebea0202' + '93276a1cd426e4a811c072c35fc31e94' '77807313c4578f2c30286b9f9e3fb21c') build() { - mkdir -p $pkgdir/etc/unrealircd - mkdir -p $pkgdir/usr/bin cd $srcdir/Unreal$pkgver patch -p1 <$srcdir/arch-fixes.patch @@ -40,10 +36,19 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ + --enable-ipv6 \ --enable-libcurl=/usr \ --with-system-cares make +} + +package() { + cd $srcdir/Unreal$pkgver + + mkdir -p $pkgdir/etc/unrealircd + mkdir -p $pkgdir/usr/bin + make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install mv $srcdir/Unreal$pkgver/src/ircd $pkgdir/usr/bin/unrealircd @@ -51,7 +56,6 @@ build() { mkdir -p $pkgdir/usr/lib/unrealircd mv $pkgdir/etc/unrealircd/modules $pkgdir/usr/lib/unrealircd/ ln -s /usr/lib/unrealircd/modules $pkgdir/etc/unrealircd/modules - install -D -m0755 $srcdir/unrealircd.rc $pkgdir/etc/rc.d/unrealircd # log mkdir -p $pkgdir/var/log/unrealircd/ diff --git a/community/unrealircd/unrealircd.rc b/community/unrealircd/unrealircd.rc deleted file mode 100644 index 2cede46c8..000000000 --- a/community/unrealircd/unrealircd.rc +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -daemon_name=unrealircd - -. /etc/conf.d/unrealircd -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof ircd unrealircd -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=`get_pid` - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - export PID_FILE="/var/run/unrealircd.pid" - su -c /usr/bin/unrealircd -p - $UNREALIRCD_USER 1>>/var/log/unrealircd/ircd.log 2>>/var/log/unrealircd/ircd.log - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=`get_pid` - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service index 42279fae0..a81419f2a 100644 --- a/community/unrealircd/unrealircd.service +++ b/community/unrealircd/unrealircd.service @@ -6,7 +6,7 @@ After=network.target remote-fs.target nss-lookup.target Type=forking User=ircd PIDFile=/var/run/unrealircd.pid -ExecStart=/usr/bin/unrealircd -p +ExecStart=/usr/bin/unrealircd [Install] WantedBy=multi-user.target diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD index 3f6ae3fa8..e3dbdc641 100644 --- a/community/uptimed/PKGBUILD +++ b/community/uptimed/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72798 2012-06-22 12:52:28Z dreisner $ +# $Id: PKGBUILD 91504 2013-05-23 10:15:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Tom Killian <tomk@runbox.com> @@ -6,7 +6,7 @@ pkgname=uptimed pkgver=0.3.17 -pkgrel=2 +pkgrel=4 pkgdesc="A system uptime record daemon" arch=(i686 x86_64 'mips64el') url="http://podgorny.cz/uptimed/" @@ -16,33 +16,31 @@ backup=(etc/uptimed.conf) options=('!libtool') install=$pkgname.install source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2 - rc.d service) md5sums=('528b62c33454b33537c3bf2366977bdb' - '4ae90bee9fc78014a889a5072effb735' - '657102b06613ddb9811427bee1973c6b') + '6d1e97b9c54d622edc0bd607acbf3c10') build() { cd $srcdir/$pkgname-$pkgver - + # Change log path to Arch standard for M in `ls M*`; do - sed -i "s|/var/spool/uptimed|$pkgdir/var/log/uptimed|" $M + sed -i "s|/var/spool/uptimed|/var/log/uptimed|" $M done sed -i 's|spool|log|' libuptimed/urec.h + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac autoreconf libtoolize --force - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install + make install DESTDIR=$pkgdir mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf - install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/uptimed install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/uptimed.service } diff --git a/community/uptimed/rc.d b/community/uptimed/rc.d deleted file mode 100644 index 6fe9ec3e3..000000000 --- a/community/uptimed/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/uptimed` -case "$1" in - start) - stat_busy "Starting Uptimed Daemon" - [ -z "$PID" ] && /usr/sbin/uptimed -b # create the boot record - if [ $? -gt 0 ] ; then - stat_fail - else - add_daemon uptimed # create the 'state' dir - /usr/sbin/uptimed # fire up the daemon - if [ $? -gt 0 ]; then - stat_fail - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping Uptimed Daemon" - [ "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon uptimed # remove the 'state' dir - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/uptimed/service b/community/uptimed/service index 2fd785318..36e074d04 100644 --- a/community/uptimed/service +++ b/community/uptimed/service @@ -4,8 +4,8 @@ Description=System uptime record daemon [Service] Type=forking PIDFile=/var/run/uptimed -ExecStartPre=/usr/sbin/uptimed -b -ExecStart=/usr/sbin/uptimed +ExecStartPre=/usr/bin/uptimed -b +ExecStart=/usr/bin/uptimed [Install] WantedBy=multi-user.target diff --git a/community/uptimed/uptimed.install b/community/uptimed/uptimed.install index 178061706..7edd1f66c 100644 --- a/community/uptimed/uptimed.install +++ b/community/uptimed/uptimed.install @@ -1,7 +1,3 @@ -# arg 1: the old package version pre_remove() { - # clean up after ourselves - # - /bin/rm -rf /var/log/uptimed + rm -rf var/log/uptimed } - diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD index d482a3e4b..a9b6b7e44 100644 --- a/community/uriparser/PKGBUILD +++ b/community/uriparser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88337 2013-04-16 13:32:04Z spupykin $ +# $Id: PKGBUILD 91154 2013-05-20 09:57:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> pkgname=uriparser -pkgver=0.7.7 +pkgver=0.7.8 pkgrel=1 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" url="http://sourceforge.net/projects/uriparser/" @@ -12,7 +12,7 @@ makedepends=(doxygen graphviz) arch=('i686' 'x86_64' 'mips64el') license=("custom") source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) -md5sums=('2da950ef006be5a842dcc383cbbeaa78') +md5sums=('1ff590e25e8d9f5eaaa409c741fc387b') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 456616062..97ff732c9 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80001 2012-11-15 11:55:13Z spupykin $ +# $Id: PKGBUILD 91584 2013-05-24 18:58:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch pkgver=1.2.5 -pkgrel=1 +pkgrel=3 _pkgdata=20121109 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') @@ -19,10 +19,15 @@ md5sums=('c393603908eceab95444c5bde790f6f0' 'a7d23a03157871013a0d708ab2b1b6df' '9918bbdc0f68873410688604c80d25c4') +prepare() { + cd $srcdir/usb-modeswitch-$pkgver/ + sed -i 's|/usr/sbin/usb_mode|/usr/bin/usb_mode|g' usb_modeswitch.{conf,tcl,sh} +} + build() { cd $srcdir/usb-modeswitch-$pkgver/ make clean - make + make SBINDIR=/usr/bin } package() { @@ -32,7 +37,7 @@ package() { mkdir -p $pkgdir/etc mkdir -p $pkgdir/usr/share/man/man1 - make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install + make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev SBINDIR=$pkgdir/usr/bin install cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 597b1541f..f2f2a48ca 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75096 2012-08-13 19:22:01Z spupykin $ +# $Id: PKGBUILD 90735 2013-05-13 14:41:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=18 +pkgrel=19 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') @@ -15,13 +15,11 @@ backup=('etc/ushare/ushare.conf' 'etc/conf.d/ushare') install=ushare.install source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" - "ushare" "upnp-build-fix.patch" "ushare-config.patch" "segfault.patch" "ushare.service") md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251' - 'e3cf0a44b0280da4966177c21e49361c' '32c29f9f673e8b3a3d9e7bf5e60febbc' '5243475c0cebc5db49296b2f3691085b' '0b0fbf5d103f0ebb72716cbad0b28ffa' @@ -44,7 +42,6 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/etc/${pkgname}/init.d - install -Dm0755 ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare install -dm0755 ${pkgdir}/etc/conf.d/ cat >${pkgdir}/etc/conf.d/ushare <<EOF #PARAMS="-c /tmp -i eth0" diff --git a/community/ushare/ushare b/community/ushare/ushare deleted file mode 100644 index b545b85d4..000000000 --- a/community/ushare/ushare +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -DESC="uShare UPnP A/V Media Server" - -. /etc/rc.conf -. /etc/rc.d/functions -[ -r "/etc/ushare/ushare.conf" ] && . /etc/ushare/ushare.conf -[ -r "/etc/conf.d/ushare" ] && . /etc/conf.d/ushare - -[ -z $USHARE_USER ] && USHARE_USER=ushare - -# abort if no executable exists -#[ -x $DAEMON ] || stat_fail - -# abort if no shared directory is defined -#[ -z "$USHARE_DIR" ] && stat_fail - -#set -e - -#checkpid() { -# [ -e $PIDFILE ] || touch $PIDFILE -#} - -PID=`pidof -o %PPID /usr/bin/ushare` -case "$1" in - start) - stat_busy "Starting $DESC" - [ -z "$PID" ] && sudo -u $USHARE_USER /usr/bin/ushare -D -x $PARAMS - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/bin/ushare` - echo $PID > /var/run/ushare.pid - add_daemon ushare - stat_done - fi - ;; - stop) - stat_busy "Stopping $DESC" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/ushare.pid - rm_daemon ushare - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/ussp-push/PKGBUILD b/community/ussp-push/PKGBUILD index 950caff8a..c0a6e4e1f 100644 --- a/community/ussp-push/PKGBUILD +++ b/community/ussp-push/PKGBUILD @@ -1,25 +1,34 @@ -# $Id: PKGBUILD 65357 2012-02-21 02:19:32Z spupykin $ +# $Id: PKGBUILD 92147 2013-06-01 15:32:36Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=ussp-push pkgver=0.11 -pkgrel=4 +pkgrel=6 pkgdesc="OBEX object pusher for Linux" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://xmailserver.org/ussp-push.html" depends=('openobex') source=(http://xmailserver.org/$pkgname-$pkgver.tar.gz - ussp-push-remote-name.patch) + build-fix.patch) md5sums=('5c44983ee27809867041feff6bb4423a' - '3c58795be3a977a5bf7b267f00dde660') + 'b9020ea9bb34b811206366b407f5e3cd') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch +} build() { cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/ussp-push-remote-name.patch + export LDFLAGS="$LDFLAGS -lopenobex-apps-common" ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/ussp-push/build-fix.patch b/community/ussp-push/build-fix.patch new file mode 100644 index 000000000..ae57ca00f --- /dev/null +++ b/community/ussp-push/build-fix.patch @@ -0,0 +1,66 @@ +diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c +--- ussp-push-0.11.old/src/obex_socket.c 2009-05-15 11:03:34.904797689 +0200 ++++ ussp-push-0.11/src/obex_socket.c 2009-05-15 11:03:45.599797286 +0200 +@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c + for (i = 0; i < niinf; i++) { + char devname[128]; + +- if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, ++ if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, + devname, 100000) >= 0) { + if (strcasecmp(devname, btname) == 0) { + *btaddr = piinf[i].bdaddr; +diff -wbBur ussp-push-0.11/src/obex_main.c ussp-push-0.11.q/src/obex_main.c +--- ussp-push-0.11/src/obex_main.c 2008-08-25 00:48:53.000000000 +0400 ++++ ussp-push-0.11.q/src/obex_main.c 2013-05-27 14:13:06.533474671 +0400 +@@ -85,41 +85,6 @@ + int bt_debug; + + +- +-/* +- * These two functions are from affix/profiles/obex/obex_io.c +- */ +-int get_filesize(const char *filename) +-{ +- struct stat stats; +- +- stat(filename, &stats); +- return (int) stats.st_size; +-} +- +-uint8_t *easy_readfile(const char *filename, int *file_size) +-{ +- int actual; +- int fd; +- uint8_t *buf; +- +- fd = open(filename, O_RDONLY, 0); +- if (fd == -1) { +- return NULL; +- } +- *file_size = get_filesize(filename); +- printf("name=%s, size=%d\n", filename, *file_size); +- if (!(buf = malloc(*file_size))) { +- return NULL; +- } +- +- actual = read(fd, buf, *file_size); +- close(fd); +- +- *file_size = actual; +- return buf; +-} +- + /* + * This function comes from affix/profiles/obex/obex_client.c .. All I changed + * was a BTERROR() macro. The OBEX_HandleInput() calls inside the loop should +@@ -197,7 +197,7 @@ + *err = -1; + return NULL; + } +- if (!(handle = OBEX_Init(OBEX_TRANS_CUST, obex_event, 0))) { ++ if (!(handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0))) { + BTERROR("OBEX_Init failed: %s\n", strerror(errno)); + obex_free(gt); + *err = -1; diff --git a/community/ussp-push/ussp-push-remote-name.patch b/community/ussp-push/ussp-push-remote-name.patch deleted file mode 100644 index 6cc6b7e9b..000000000 --- a/community/ussp-push/ussp-push-remote-name.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dupr ussp-push-0.11.old/src/obex_socket.c ussp-push-0.11/src/obex_socket.c ---- ussp-push-0.11.old/src/obex_socket.c 2009-05-15 11:03:34.904797689 +0200 -+++ ussp-push-0.11/src/obex_socket.c 2009-05-15 11:03:45.599797286 +0200 -@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c - for (i = 0; i < niinf; i++) { - char devname[128]; - -- if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, -+ if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, - devname, 100000) >= 0) { - if (strcasecmp(devname, btname) == 0) { - *btaddr = piinf[i].bdaddr; diff --git a/community/uucp/PKGBUILD b/community/uucp/PKGBUILD index b4b7ee31d..d8cf4e153 100644 --- a/community/uucp/PKGBUILD +++ b/community/uucp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61375 2011-12-29 09:59:32Z spupykin $ +# $Id: PKGBUILD 91914 2013-05-29 10:32:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jick Nan <jick.nan@gmail.com> pkgname=uucp pkgver=1.07 -pkgrel=3.1 +pkgrel=4 pkgdesc="Taylor UUCP is a free implementation of UUCP and is the standard UUCP used on the GNU system" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/uucp/uucp.html" @@ -16,11 +16,25 @@ backup=('etc/uucp/config' source=(http://ftp.gnu.org/gnu/uucp/${pkgname}-${pkgver}.tar.gz) md5sums=('64c54d43787339a7cced48390eb3e1d0') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|${CC-cc} -E|${CC-cc} -E -O2|g' configure +# sed -i \ +# -e '1,1i#include <unistd.h>' \ +# -e '1,1i#include <fcntl.h>' \ +# -e '1,1i#include <sys/types.h>' \ +# uuconf/rdlocs.c unix/{efopen,cusub,init}.c +# sed -i '1,1i#include <sys/statvfs.h>' unix/fsusg.c +} - ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --with-newconfigdir=/etc/uucp --sbindir=/usr/bin make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 sample/config ${pkgdir}/etc/uucp/config @@ -28,4 +42,3 @@ build() { install -D -m644 sample/port ${pkgdir}/etc/uucp/port mv ${pkgdir}/usr/info ${pkgdir}/usr/share/ } - diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index c3100085b..f84a6d362 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84803 2013-02-24 19:02:59Z bpiotrowski $ +# $Id: PKGBUILD 90963 2013-05-16 17:56:17Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: tocer <tocer.deng@gmail.com> pkgname=v8 -pkgver=3.16.4.1 -pkgrel=3 +pkgver=3.19.0 +pkgrel=1 pkgdesc='Fast and modern Javascript engine' arch=('i686' 'x86_64') url='http://code.google.com/p/v8' @@ -12,18 +12,18 @@ license=('BSD') depends=('gcc-libs' 'readline') makedepends=('subversion' 'python2') source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2) -sha256sums=('74ab3bc11f6761e5108affcbe15bc673d2ecbe06aa38ea4b27d850321c0fdc2b') +sha256sums=('35af5629792e958968eacc94daef3ad358b6ed7126875db6138664f51c061368') [[ "$CARCH" = 'i686' ]] && ARCH=ia32 [[ "$CARCH" = 'x86_64' ]] && ARCH=x64 -build() { - cd $srcdir/$pkgname-$pkgver +prepare() { + cd $pkgname-$pkgver # Fetch gyp make dependencies - # The world isn't ready for python2 + # The world isn't ready for python3 export PYTHON=python2 find build/ test/ tools/ src/ -type f \ -exec sed -e 's_^#!/usr/bin/env python$_&2_' \ @@ -31,24 +31,28 @@ build() { -e 's_^#!/usr/bin/python$_&2_' \ -e "s_'python'_'python2'_" -i {} \; sed -i 's/python /python2 /' Makefile +} + +build() { + cd $pkgname-$pkgver - make $ARCH.release library=shared console=readline + make $ARCH.release library=shared console=readline werror=no - cd $srcdir && cp -r $pkgname-$pkgver d8-static-$pkgver + cd "$srcdir" && cp -r $pkgname-$pkgver d8-static-$pkgver cd d8-static-$pkgver - make $ARCH.release library=static console=readline + make $ARCH.release library=static console=readline werror=no } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver - install -Dm755 $srcdir/d8-static-$pkgver/out/$ARCH.release/d8 $pkgdir/usr/bin/d8 - install -Dm755 out/$ARCH.release/lib.target/libv8.so $pkgdir/usr/lib/libv8.so + install -Dm755 "$srcdir"/d8-static-$pkgver/out/$ARCH.release/d8 "$pkgdir"/usr/bin/d8 + install -Dm755 out/$ARCH.release/lib.target/libv8.so "$pkgdir"/usr/lib/libv8.so - install -d $pkgdir/usr/include - install -Dm644 include/*.h $pkgdir/usr/include + install -d "$pkgdir"/usr/include + install -Dm644 include/*.h "$pkgdir"/usr/include - install -d $pkgdir/usr/share/licenses/v8 + install -d "$pkgdir"/usr/share/licenses/v8 install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8 } diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD index d39993d3b..a6e2058eb 100644 --- a/community/vbetool/PKGBUILD +++ b/community/vbetool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55527 2011-09-14 07:33:04Z andrea $ +# $Id: PKGBUILD 92026 2013-05-30 23:36:55Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Christian Storm <Christian.Storm@gmx.DE> # Contributor: James Rayner <james@archlinux.org> @@ -6,7 +6,7 @@ pkgname=vbetool pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Uses lrmi in order to run code from the video BIOS" url="http://www.srcf.ucam.org/~mjg59/vbetool/" license=('GPL2') @@ -19,9 +19,9 @@ md5sums=('ffb03b118867a02296d7449019ad8846') build() { cd "${srcdir}"/$pkgname-$pkgver if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --without-x86emu + ./configure --prefix=/usr --sbindir=/usr/bin --without-x86emu else - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin fi make LIBS=-lpci } diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index ebed24e7d..e843dd9b5 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 83376 2013-01-30 19:44:55Z jlichtblau $ +# $Id: PKGBUILD 91037 2013-05-18 13:22:47Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.7.4b +pkgver=0.7.5 pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('ncurses' 'gtk2') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('90b4fb64501e436d7ac8699f0cc75d013a72aa471f978ada0ce9b90506213c57') +sha256sums=('01346f3573fa40d3c851b4844fb19ea2f1f63416bc8500bacb243997bf482de4') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog index ce8f9ff9c..62411bb21 100644 --- a/community/vifm/vifm.changelog +++ b/community/vifm/vifm.changelog @@ -1,3 +1,6 @@ +2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.7.5-1 + 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vifm 0.7.4b-1 diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index 528d5fcc2..6be683faa 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84763 2013-02-24 12:35:22Z jlichtblau $ +# $Id: PKGBUILD 91039 2013-05-18 13:32:51Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking -pkgver=1.4 +pkgver=1.4.1 pkgrel=1 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,17 @@ url="http://viking.sourceforge.net/" license=('GPL2') depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme' 'libexif' 'gpsbabel') makedepends=('intltool' 'gnome-doc-utils') -options=('!emptydirs' '!makeflags') +optdepends=(geo: for geocaches) +options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('80aa4c7bf3be75441a435f6681831b8aeb08f7eb6f7a5a86872eec16cda67799') +sha256sums=('20d91b048d2bfbb33498af4da5dc120a3a9232ed05a4a87a3ce6e341445ef640') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --enable-expedia #--enable-geocaches gives error + ./configure --prefix=/usr --enable-expedia --enable-geocaches make } diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog index c8005b19e..6f22365fd 100644 --- a/community/viking/viking.changelog +++ b/community/viking/viking.changelog @@ -1,3 +1,6 @@ +2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * viking 1.4.1-1 + 2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * viking 1.4-1 diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 838f836fd..b03e92a2d 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 90419 2013-05-12 09:09:05Z thomas $ +# $Id: PKGBUILD 91789 2013-05-27 20:00:36Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux-headers' +makedepends=('linux' + 'linux-headers' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'expac' + 'sed' 'bc') build() { - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.9.0-1-ARCH + _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -30,39 +32,36 @@ build() { } package_virtualbox-host-modules(){ - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.9.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH + _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) pkgdesc='Host kernel modules for VirtualBox' - depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") + depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules.install" } package_virtualbox-guest-modules(){ - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.9.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH - + _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") + depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules.install" } # vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 9084c05fd..8706a7205 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,17 +1,18 @@ +VERSION='3.9.4-1-ARCH' + post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_upgrade() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_remove() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 78791f71d..c75dd089c 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,19 +1,20 @@ +VERSION='3.9.4-1-ARCH' + post_install() { cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } post_upgrade() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' + depmod $VERSION + echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.9-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $VERSION } + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD index 8bf79dcd3..0f6721646 100644 --- a/community/virtualgl/PKGBUILD +++ b/community/virtualgl/PKGBUILD @@ -4,12 +4,12 @@ pkgname=virtualgl pkgver=2.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card" arch=('i686' 'x86_64' 'mips64el') url="http://virtualgl.org" license=('LGPL') -depends=('libxv' 'glu' 'turbojpeg') +depends=('libxv' 'glu' 'libjpeg-turbo') makedepends=('cmake' 'mesa') source=("http://downloads.sourceforge.net/project/virtualgl/VirtualGL/$pkgver/VirtualGL-$pkgver.tar.gz") sha1sums=('f042862c21ceaba57c6e1f0ec72adb4f838725e9') diff --git a/community/vlan/PKGBUILD b/community/vlan/PKGBUILD index ca8374104..9c8e97647 100644 --- a/community/vlan/PKGBUILD +++ b/community/vlan/PKGBUILD @@ -6,7 +6,7 @@ pkgname=vlan pkgver=1.9 pkgrel=2 pkgdesc='Virtual LAN configuration utility' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.candelatech.com/~greear/vlan.html' license=('GPL') source=("http://www.candelatech.com/~greear/vlan/vlan.${pkgver}.tar.gz") diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD index 355eedeee..bf84f067f 100644 --- a/community/vnstat/PKGBUILD +++ b/community/vnstat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72799 2012-06-22 12:52:33Z dreisner $ +# $Id: PKGBUILD 91534 2013-05-23 11:17:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=vnstat pkgver=1.11 -pkgrel=3 +pkgrel=5 pkgdesc="A console-based network traffic monitor" arch=('i686' 'x86_64' 'mips64el') url="http://humdi.net/vnstat/" @@ -15,22 +15,19 @@ makedepends=('gd') optdepends=('gd: image output') backup=(etc/vnstat.conf) source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz - http://humdi.net/vnstat/init.d/arch/vnstat - service) + service) md5sums=('a5a113f9176cd61fb954f2ba297f5fdb' - 'e89a566dd7514ff0d2d3fc77b2d4ca7e' - 'fcc189e3dee616ff414dac72637c1a19') + 'df452896729db4a569005f1ebf6b57f4') build() { cd $srcdir/$pkgname-$pkgver - make all + make all SBIN=/usr/bin } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install SBIN=$pkgdir/usr/bin - install -D -m0755 $srcdir/vnstat $pkgdir/etc/rc.d/vnstat install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service install -D -m0644 examples/vnstat.cron $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron diff --git a/community/vnstat/service b/community/vnstat/service index f312351ea..5c593eb1b 100644 --- a/community/vnstat/service +++ b/community/vnstat/service @@ -2,7 +2,7 @@ Description=Network traffic monitor [Service] -ExecStart=/usr/sbin/vnstatd -n +ExecStart=/usr/bin/vnstatd -n ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD index e23bd81d8..b96a2a0f7 100644 --- a/community/webfs/PKGBUILD +++ b/community/webfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79331 2012-11-03 03:32:04Z kkeen $ +# $Id: PKGBUILD 92107 2013-05-31 15:10:32Z foutrelis $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: Mark Rosenstand <mark@archlinux.org> @@ -7,18 +7,18 @@ pkgname=webfs pkgver=1.21 -pkgrel=9 +pkgrel=10 pkgdesc="Simple and instant http server for mostly static content." arch=(i686 x86_64 'mips64el') url="http://linux.bytesex.org/misc/webfs.html" license=("GPL") depends=('mime-types' 'openssl') -backup=(etc/conf.d/webfsd) +backup=('etc/conf.d/webfsd') source=(http://dl.bytesex.org/releases/webfs/webfs-${pkgver}.tar.gz - webfsd.rc webfsd.conf webfs.patch + webfsd.conf + webfs.patch webfsd.service) md5sums=('6dc125fe160479404147e7bbfc781dbc' - '3ae9fcdcf79b193aa88e386055e9ebd7' 'b2c1ab041a82acd8391b06dc38d986be' '7294edcec2589df04bb775270d56536e' 'e1202dd915cba1a02e0016aa3a516b4a') @@ -34,7 +34,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make prefix=/usr DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/webfsd.rc" "$pkgdir/etc/rc.d/webfsd" install -Dm644 "$srcdir/webfsd.conf" "$pkgdir/etc/conf.d/webfsd" install -Dm755 "$srcdir/webfsd.service" "$pkgdir/usr/lib/systemd/system/webfsd.service" } diff --git a/community/webfs/webfsd.rc b/community/webfs/webfsd.rc deleted file mode 100644 index 1c854ebdb..000000000 --- a/community/webfs/webfsd.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# source application-specific settings -[ -f /etc/conf.d/webfsd ] && . /etc/conf.d/webfsd - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID webfsd` -case "$1" in - start) - stat_busy "Starting webfsd" - [ -z "$PID" ] && /usr/bin/webfsd ${WEBFSD_ARGS} & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon webfsd - stat_done - fi - ;; - stop) - stat_busy "Stopping webfsd" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon webfsd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index b78ea24fe..e915453bf 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90106 2013-05-06 19:40:04Z foutrelis $ +# $Id: PKGBUILD 90785 2013-05-13 21:57:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -7,7 +7,7 @@ pkgname=wesnoth pkgver=1.10.6 -pkgrel=3 +pkgrel=5 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') @@ -19,15 +19,19 @@ options=(!emptydirs) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 wesnothd.tmpfiles.conf wesnothd.rc.d - wesnothd.service) + wesnothd.service + https://github.com/wesnoth/wesnoth-old/commit/bbd7f6.patch) md5sums=('547e3489bbfa778912b11dbee612c380' '2d2fea6b3d86dfd589f5ad35a3be1f97' '85659b47d22dfdf4e4d046556973fc3e' - 'd1b6bf1d3dc05086ee6a370adff0ae4a') + 'd1b6bf1d3dc05086ee6a370adff0ae4a' + 'edc7c0547e67cba4ca4f813ca261f572') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/bbd7f6.patch + mkdir build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index e081f135d..40b6c260a 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84936 2013-02-26 10:20:29Z spupykin $ +# $Id: PKGBUILD 90592 2013-05-13 10:00:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.7.0 +pkgver=4.7.1 pkgrel=1 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('gendesk') optdepends=('perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('646e5091f7ee4b5fa9998d2cca9cf795') +md5sums=('e42383c4594c24ebf2f9fdc5dc89e255') build() { cd "${srcdir}" diff --git a/community/xdelta/PKGBUILD b/community/xdelta/PKGBUILD index c1fef78a1..3933f9a48 100644 --- a/community/xdelta/PKGBUILD +++ b/community/xdelta/PKGBUILD @@ -4,9 +4,9 @@ pkgname=xdelta pkgver=1.1.4 -pkgrel=4 +pkgrel=4.1 pkgdesc="binary file delta generator" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/xdelta/" license=('GPL') depends=('glib' 'zlib') diff --git a/community/xdelta3/PKGBUILD b/community/xdelta3/PKGBUILD index 58270c4a4..bd8d6cd9f 100644 --- a/community/xdelta3/PKGBUILD +++ b/community/xdelta3/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 83184 2013-01-27 16:27:33Z pierre $ +# $Id: PKGBUILD 90967 2013-05-16 19:50:32Z bpiotrowski $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> # Contributor: Henning Garus <henning.garus@gmail.com> pkgname=xdelta3 -pkgver=3.0.6 +pkgver=3.0.7 pkgrel=1 -pkgdesc="A diff utility which works with binary files" +pkgdesc="Diff utility which works with binary files" arch=('i686' 'x86_64' 'mips64el') url="http://xdelta.org/" license=('GPL') depends=('xz') source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('652048ab4a7e5f927bce045228a17b31') +md5sums=('ef6631e4f9219a80bcb9e3020962b6ec') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./xdelta3 test } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/xe-guest-utilities/PKGBUILD b/community/xe-guest-utilities/PKGBUILD index 3fd142e5c..f3af11392 100644 --- a/community/xe-guest-utilities/PKGBUILD +++ b/community/xe-guest-utilities/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90393 2013-05-12 07:10:12Z dwallace $ +# $Id: PKGBUILD 91549 2013-05-23 14:44:31Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at code gtmanfred com> # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gnu-tech.pl> @@ -6,7 +6,7 @@ pkgbase=xe-guest-utilities pkgname=('xe-guest-utilities' 'xenstore') pkgver=6.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="Citrix XenServer Tools" arch=('i686' 'x86_64') url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US" @@ -69,6 +69,7 @@ package_xe-guest-utilities(){ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service" install -Dm644 $srcdir/xe-linux-distribution.service "$pkgdir/usr/lib/systemd/system/" + sed -i 's:sbin:bin:' $pkgdir/usr/bin/xe-daemon } # vim:set ts=2 sw=2 et: diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 9a11417c6..258f5d9de 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79633 2012-11-09 12:06:24Z spupykin $ +# $Id: PKGBUILD 91508 2013-05-23 10:16:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd pkgver=1.3.1 -pkgrel=1 +pkgrel=3 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -13,7 +13,6 @@ depends=('ppp') options=(emptydirs zipman docs) backup=(etc/ppp/options.l2tpd) source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz - xl2tpd.rc xl2tpd.conf.client-example xl2tpd.conf.server-example options.l2tpd @@ -21,11 +20,10 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p xl2tpd.tmpfiles ipparam.patch) md5sums=('38c2461d3562f98b08454ca403706886' - '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' - '5ba9ddaf66c9827fe4a2caef67cf61c2' + '219942dd098ce4fdba37d1db327baf57' '2e95e4fc03e1521ab20fd7e249efab5a' '4d258a58cc109d5c4d96af8f81d481cf') @@ -34,10 +32,14 @@ build() { patch -p1 <$srcdir/ipparam.patch - make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr - make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir install + make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr SBINDIR=/usr/bin +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir SBINDIR=$pkgdir/usr/bin install - install -D -m0755 $srcdir/xl2tpd.rc $pkgdir/etc/rc.d/xl2tpd install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd diff --git a/community/xl2tpd/xl2tpd.rc b/community/xl2tpd/xl2tpd.rc deleted file mode 100644 index a06e0d41e..000000000 --- a/community/xl2tpd/xl2tpd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - [ -d /var/run/xl2tpd ] || mkdir -p /var/run/xl2tpd - stat_busy "Starting xl2tpd" - /usr/sbin/xl2tpd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon xl2tpd - stat_done - fi - ;; - stop) - stat_busy "Stopping xl2tpd" - [ -f /var/run/xl2tpd.pid ] && kill `cat /var/run/xl2tpd.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/xl2tpd.pid - rm_daemon xl2tpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service index b47cadf02..e55b9cb12 100644 --- a/community/xl2tpd/xl2tpd.service +++ b/community/xl2tpd/xl2tpd.service @@ -7,8 +7,8 @@ After=ipsec.service [Service] Type=simple -PIDFile=/var/run/xl2tpd/xl2tpd.pid -ExecStart=/usr/sbin/xl2tpd -D +PIDFile=/run/xl2tpd/xl2tpd.pid +ExecStart=/usr/bin/xl2tpd -D Restart=on-abort [Install] diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 41b8529cc..7a67d6d18 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88557 2013-04-19 17:25:15Z spupykin $ +# $Id: PKGBUILD 90741 2013-05-13 14:42:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=12 +pkgrel=13 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -53,12 +53,10 @@ conflicts=('xmms2-devel') install=xmms2.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "xmms2d.conf" - "xmms2d.rc" "xmms2d.service" "ffmpeg-0.11.diff") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' - '31ab8c0980966dbe3e9f5e80b7b82612' '47e68461589578e8a99857746c5b6f29' 'e176971ef96807f72fa8fc17d260c20a') @@ -91,7 +89,6 @@ package() { ./waf build ./waf --destdir=${pkgdir} install - install -Dm0755 $srcdir/xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d install -Dm0644 $srcdir/xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf install -Dm0644 $srcdir/xmms2d.service $pkgdir/usr/lib/systemd/system/xmms2d.service } diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc deleted file mode 100644 index 5387448d9..000000000 --- a/community/xmms2/xmms2d.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/xmms2d.conf -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof xmms2d xmms2-et` -case "$1" in - start) - stat_busy "Starting xmms2d" - [ -z "$PID" ] && su -c "/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null" - $XMMS2_USER - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon xmms2d - stat_done - fi - ;; - stop) - stat_busy "Stopping xmms2d" - [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER - if [ $? -gt 0 ]; then - stat_fail - else - for i in `seq 1 10`; do - [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD index 8bdff37a9..2b788f819 100644 --- a/community/zathura-djvu/PKGBUILD +++ b/community/zathura-djvu/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 82565 2013-01-21 01:01:19Z dwallace $ +# $Id: PKGBUILD 91452 2013-05-22 23:23:11Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-djvu -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="Adds DjVu support to zathura by using the djvulibre library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" license=('custom') depends=('djvulibre' 'zathura') +install="$pkgname.install" source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz") -md5sums=('38344cb762e1f5b5fe66f6ef49ac173f') +md5sums=('a472f706d6f6384d8bc2750141a84fc6') build(){ make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zathura-djvu/zathura-djvu.install b/community/zathura-djvu/zathura-djvu.install new file mode 100644 index 000000000..247455a1d --- /dev/null +++ b/community/zathura-djvu/zathura-djvu.install @@ -0,0 +1,6 @@ +post_install(){ + update-desktop-database -q +} +post_remove(){ + update-desktop-database -q +} diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index d11cfdb2b..3a19e8af9 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Moritz Lipp <mlq@pwmt.org> pkgname=zathura-pdf-mupdf -pkgver=0.2.3 -pkgrel=2 +pkgver=0.2.4 +pkgrel=1 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" @@ -13,7 +13,7 @@ license=('custom') depends=('mupdf>=1.1' 'zathura') conflicts=('zathura-pdf-poppler') source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('777ba69a321ef4bb9cbced8f6733927a') +md5sums=('aa9667425dab93147dd8605eda020e59') build() { make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD index e18440510..cfa86d218 100644 --- a/community/zathura-pdf-poppler/PKGBUILD +++ b/community/zathura-pdf-poppler/PKGBUILD @@ -4,15 +4,17 @@ # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-pdf-poppler -pkgver=0.2.2 -pkgrel=1 +pkgver=0.2.3 +pkgrel=2 pkgdesc="Adds pdf support to zathura by using the poppler engine" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" license=('custom') depends=('poppler-glib' 'zathura') +install="$pkgname.install" + source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('83f2dba1f6d715f5b1a33044d2a64829') +md5sums=('1d8deb2d2ee5a6847267f977b8f2e542') build() { make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zathura-pdf-poppler/zathura-pdf-poppler.install b/community/zathura-pdf-poppler/zathura-pdf-poppler.install new file mode 100644 index 000000000..247455a1d --- /dev/null +++ b/community/zathura-pdf-poppler/zathura-pdf-poppler.install @@ -0,0 +1,6 @@ +post_install(){ + update-desktop-database -q +} +post_remove(){ + update-desktop-database -q +} diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD index a74eab3c6..b470d5a34 100644 --- a/community/zathura-ps/PKGBUILD +++ b/community/zathura-ps/PKGBUILD @@ -3,15 +3,16 @@ # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-ps -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Adds ps support to zathura by using the libspectre library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-ps/" license=('custom') depends=('libspectre' 'zathura') +install="$pkgname.install" source=(https://pwmt.org/projects/zathura/plugins/download/zathura-ps-$pkgver.tar.gz) -md5sums=('45619e744b69bf16b408b50cf32f2df5') +md5sums=('338af976c03c0aa1471b156a0efdc45c') build(){ make -C "$pkgname-$pkgver" diff --git a/community/zathura-ps/zathura-ps.install b/community/zathura-ps/zathura-ps.install new file mode 100644 index 000000000..247455a1d --- /dev/null +++ b/community/zathura-ps/zathura-ps.install @@ -0,0 +1,6 @@ +post_install(){ + update-desktop-database -q +} +post_remove(){ + update-desktop-database -q +} diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index 65ea30a7d..568c017ce 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82563 2013-01-21 00:12:49Z dwallace $ +# $Id: PKGBUILD 90594 2013-05-13 10:03:23Z spupykin $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="a document viewer" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,11 @@ url="http://pwmt.org/projects/zathura/" license=('custom') depends=('girara-gtk2' 'sqlite' 'desktop-file-utils') makedepends=('python2-docutils') -optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') +optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-pdf-mupdf' 'zathura-ps') install=zathura.install source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz bash-completion) -md5sums=('51558163e942b52036ee00c60bd1500c' +md5sums=('c0265fd9fa64a37b01d729efb75a7c32' 'cac20c37f0e77ba62a8138788f4ccabb') build() { diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 0cbac9901..b82957a75 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81614 2012-12-25 00:34:19Z foutrelis $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 91707 2013-05-26 09:26:32Z bluewind $ +# Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=1.0 -pkgrel=4 +pkgrel=7 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') @@ -27,7 +27,7 @@ build() { --enable-python \ --enable-perl \ --enable-tcl \ - --with-systemdsystemunitdir=yes + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD index b5ce8787a..1e3602001 100644 --- a/community/zynaddsubfx/PKGBUILD +++ b/community/zynaddsubfx/PKGBUILD @@ -8,7 +8,7 @@ pkgname=zynaddsubfx pkgver=2.4.3 pkgrel=1 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://zynaddsubfx.sourceforge.net" license=('GPL') depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml') @@ -17,11 +17,13 @@ options=('!emptydirs') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2" "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch" "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch" - "$pkgname.svg") + "$pkgname.svg" + "zynaddsubfx-2.4.3-no_sse_generic.patch") md5sums=('2e8994cc54e5f1a64b77dfac3baf0d9a' 'eb95d339ff5deac8c6b54965f04a8c60' '49464a33ab9c4250520eda0df7705663' - '6f7e9c3ce3947088a10c99c46a65431f') + '6f7e9c3ce3947088a10c99c46a65431f' + 'd997b35b47eff56a2d056df61b737ddc') build() { cd "$srcdir" @@ -33,6 +35,7 @@ build() { # patches # patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" # patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" + patch -Np1 -i ${srcdir}/zynaddsubfx-2.4.3-no_sse_generic.patch sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp [ -d build ] || mkdir build && cd build diff --git a/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch b/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch new file mode 100644 index 000000000..8eb295689 --- /dev/null +++ b/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch @@ -0,0 +1,21 @@ +--- ZynAddSubFX-2.4.3.orig/src/CMakeLists.txt 2012-06-15 23:22:35.000000000 -0500 ++++ ZynAddSubFX-2.4.3/src/CMakeLists.txt 2013-06-15 10:53:13.109741210 -0500 +@@ -116,8 +116,8 @@ + ) + + set (BuildOptionsBasic +- "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer" +- CACHE STRING "basic X86 complier options" ++ "-O3 -ffast-math -fomit-frame-pointer" ++ CACHE STRING "basic complier options" + ) + + set (BuildOptionsDebug +@@ -173,7 +173,6 @@ + include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS}) + + add_definitions( +- -DASM_F2I_YES + -g #TODO #todo put in a better location + -Wall + -Wextra diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 1c4e76350..b55347e34 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,43 +1,46 @@ -# $Id: PKGBUILD 177869 2013-02-10 13:06:27Z tomegun $ +# $Id: PKGBUILD 186631 2013-05-30 10:13:30Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs -pkgver=0.20rc1.1 +pkgver=0.20rc1.2 pkgrel=1 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64 mips64el) -depends=('glibc' 'e2fsprogs') +depends=('glibc' 'e2fsprogs' 'lzo2') +makedepends=('git') url="http://btrfs.wiki.kernel.org/" replaces=('btrfs-progs-unstable') conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-0.20-rc1.1.tar.xz +source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=7854c8b667" initcpio-install-btrfs initcpio-hook-btrfs) install=btrfs-progs.install +options=(!staticlibs) build() { - cd $srcdir/$pkgname-0.20-rc1.1 + cd $pkgname make CFLAGS="$CFLAGS" } package() { - cd $srcdir/$pkgname-0.20-rc1.1 + cd $pkgname + make prefix=$pkgdir/usr install + # fix manpage mkdir -p $pkgdir/usr/share/ mv $pkgdir/usr/man $pkgdir/usr/share/man - mkdir -p ${pkgdir}/sbin - ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + # install mkinitcpio hooks install -Dm644 "$srcdir/initcpio-install-btrfs" \ "$pkgdir/usr/lib/initcpio/install/btrfs" install -Dm644 "$srcdir/initcpio-hook-btrfs" \ "$pkgdir/usr/lib/initcpio/hooks/btrfs" } -md5sums=('4046bebaae014db1fd50cec2da0e94c0' +md5sums=('SKIP' '7241ba3a4286d08da0d50b7176941112' 'b09688a915a0ec8f40e2f5aacbabc9ad') diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index 48bad694f..929e840e4 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176334 2013-01-30 17:44:19Z tpowa $ +# $Id: PKGBUILD 186294 2013-05-24 07:56:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib pkgver=2.8.22 -pkgrel=1 +pkgrel=3 pkgdesc="Password Checking Library" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ md5sums=('463177b5c29c7a598c991e12a4898e06') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-python + ./configure --prefix=/usr --sbindir=/usr/bin --without-python make } @@ -28,7 +28,9 @@ check() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -Dm644 dicts/cracklib-small $pkgdir/usr/share/dict/cracklib-small + # symlink cracklib-small #34778 + mkdir -p $pkgdir/usr/share/dict + ln -sf /usr/share/cracklib/cracklib-small $pkgdir/usr/share/dict/cracklib-small sh ./util/cracklib-format dicts/cracklib-small \ | sh ./util/cracklib-packer $pkgdir/usr/share/cracklib/pw_dict } diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index fff9f3511..2a6568539 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179635 2013-03-08 23:40:38Z foutrelis $ +# $Id: PKGBUILD 186207 2013-05-22 04:47:50Z foutrelis $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda @@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el') url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw') -makedepends=('python-m2crypto') +makedepends=('python2-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 set-wireless-regdom) diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index 795b8882e..ccd6b5de5 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.9 -pkgrel=2 +pkgrel=4 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -16,13 +16,11 @@ optdepends=('pm-utils: defer anacron on battery power' source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' 'service' - 'pam.d' - 'rc.d') + 'pam.d') sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' '0f279b8fb820340267d578dc85511c980715f91e' - 'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0' - '5eff7fb31f6bc0a924243ff046704726cf20c221' - 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') + 'de455f11a310e64d6930390e57726ed70f3295d0' + '5eff7fb31f6bc0a924243ff046704726cf20c221') backup=('etc/anacrontab' 'etc/conf.d/crond' @@ -33,6 +31,11 @@ conflicts=('cron') provides=('cron') groups=('base') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -40,6 +43,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --enable-anacron \ --with-inotify \ --with-pam \ @@ -56,7 +60,6 @@ package() { install -d "${pkgdir}"/var/spool/{ana,}cron install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service diff --git a/core/cronie/rc.d b/core/cronie/rc.d deleted file mode 100755 index d0659685c..000000000 --- a/core/cronie/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=crond -. /etc/conf.d/crond -PID=$(pidof -o %PPID /usr/sbin/crond) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/core/cronie/service b/core/cronie/service index 4fa4d4593..cc671f7b6 100644 --- a/core/cronie/service +++ b/core/cronie/service @@ -2,7 +2,7 @@ Description=Periodic Command Scheduler [Service] -ExecStart=/usr/sbin/crond -n +ExecStart=/usr/bin/crond -n ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 077ae8ff2..34752d162 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175124 2013-01-14 12:47:12Z stephane $ +# $Id: PKGBUILD 186478 2013-05-27 12:00:13Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.2_20121230 +pkgver=1.2_20130523 pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('f6ba16481e04c707c7cbfc3c3c1340040bdb0aa3') +sha1sums=('54768b8443af3de2e6cd16073ec666f19d4ded7a') build() { cd "${srcdir}/$pkgname-${pkgver/_/-}" @@ -24,4 +24,6 @@ build() { package() { cd "${srcdir}/$pkgname-${pkgver/_/-}" make DESTDIR="${pkgdir}" install install-lib + + rm "${pkgdir}"/usr/lib/libdialog.a } diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 91063cf9a..64564e85c 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173944 2012-12-28 19:27:14Z dreisner $ +# $Id: PKGBUILD 186295 2013-05-24 07:56:32Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=8 +pkgrel=9 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -19,10 +19,10 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid.service) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - 'dea048cc09b49b02da1009adae563866' + '7a040ebcba305aba1e47dfe6ca8323b5' 'faec669dc85f87187b45b5d3968efe2c' '56a8bb0ece8d206cd8efb504ee072ddd' - '1cd201496e52bd05c1c3048bf6dd809f') + 'ea6d280fc6f63fb799abcd882bca53c8') build() { cd "$pkgname/1.0.0.rc16-3/$pkgname" @@ -32,7 +32,7 @@ build() { package() { cd "$pkgname/1.0.0.rc16-3/$pkgname" - make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install + make DESTDIR="$pkgdir" sbindir=/usr/bin prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf diff --git a/core/dmraid/dmraid.service b/core/dmraid/dmraid.service index a31f8b39f..c5d3d5309 100644 --- a/core/dmraid/dmraid.service +++ b/core/dmraid/dmraid.service @@ -8,7 +8,7 @@ Conflicts=shutdown.target [Service] Type=oneshot -ExecStart=/sbin/dmraid --ignorelocking --activate y -Z +ExecStart=/usr/bin/dmraid --ignorelocking --activate y -Z RemainAfterExit=true [Install] diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index 2003b5cdf..acbc43d95 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -6,6 +6,7 @@ build() { add_binary 'dmraid' add_binary 'dmsetup' + add_file "/usr/lib/device-mapper/libdmraid-events-isw.so" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" diff --git a/extra/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index 3ff9a11cc..a51005dbe 100644 --- a/extra/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,15 +1,13 @@ -# $Id: PKGBUILD 179303 2013-03-05 10:42:06Z tpowa $ +# $Id: PKGBUILD 186902 2013-05-31 16:49:40Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.16 +pkgver=3.0.17 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') depends=('glibc') -#source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz) -# using debian source, main page is down since quite some time -source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz{,.sig}) +source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') @@ -20,7 +18,7 @@ build() { package () { cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install + make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } -md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e' - 'e8b460ab9c27279e652ddbd1ce7fa4b2') +md5sums=('468b953ddc8baf66e9881d1a5eae03e2' + 'SKIP') diff --git a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch index 44e6e86b5..44e6e86b5 100644 --- a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch +++ b/core/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index 8c6c199ad..447c2c22f 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $ +# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=fakeroot -pkgver=1.18.4 +pkgver=1.19 pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('706171d8d520b1ca1576ac73f2ceb4f3') +md5sums=('3a00a1264cb31a815552050ef0c2468b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index 5adb1153f..288e552d6 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 174267 2013-01-03 13:58:07Z allan $ +# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk -pkgver=4.0.2 -pkgrel=1.1 +pkgver=4.1.0 +pkgrel=1 pkgdesc="GNU version of awk" arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/directory/GNU/gawk.html" +url="http://www.gnu.org/software/gawk/" license=('GPL') groups=('base' 'base-devel') -depends=('sh' 'glibc') +depends=('sh' 'glibc' 'mpfr') provides=('awk') install=gawk.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('4d505dc2c9f1eb3e9f8d6cac87d4bd1a' - '131f79e5aa1528649c90ccf0440db0a6') +md5sums=('13e02513105417818a31ef375f9f9f42' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib + ./configure --prefix=/usr --libexecdir=/usr/lib --without-libsigsegv make } @@ -32,7 +32,7 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/bin - ln -sf /usr/bin/gawk ${pkgdir}/bin/ - ln -sf gawk ${pkgdir}/bin/awk + #install -dm755 ${pkgdir}/bin + #ln -sf /usr/bin/gawk ${pkgdir}/bin/ + #ln -sf gawk ${pkgdir}/bin/awk } diff --git a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch deleted file mode 100644 index b4ce93e83..000000000 --- a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001 -From: Jan de Groot <jgc@archlinux.org> -Date: Thu, 21 Mar 2013 20:47:57 +0100 -Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations - (tabs to spaces) - Replace print with print(), still works with Python 2.x - ---- - glib/gtester-report | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/glib/gtester-report b/glib/gtester-report -index 0fcdd9a..00296ea 100755 ---- a/glib/gtester-report -+++ b/glib/gtester-report -@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter): - if binary.success_cases: - oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter - if real_cases != 0: -- self.oprint ('<a %s>ER</a>\n' % erlink) -- self.oprint ('<a %s>OK</a>\n' % oklink) -- self.oprint ('</td>\n') -- perc = binary.success_cases * 100.0 / real_cases -- pcolor = { -- 100 : 'bgcolor="lightgreen"', -- 0 : 'bgcolor="red"', -- }.get (int (perc), 'bgcolor="yellow"') -- self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc)) -- self.oprint ('</tr>\n') -+ self.oprint ('<a %s>ER</a>\n' % erlink) -+ self.oprint ('<a %s>OK</a>\n' % oklink) -+ self.oprint ('</td>\n') -+ perc = binary.success_cases * 100.0 / real_cases -+ pcolor = { -+ 100 : 'bgcolor="lightgreen"', -+ 0 : 'bgcolor="red"', -+ }.get (int (perc), 'bgcolor="yellow"') -+ self.oprint ('<td align="right" %s>%.2f%%</td>\n' % (pcolor, perc)) -+ self.oprint ('</tr>\n') - else: -- self.oprint ('Empty\n') -- self.oprint ('</td>\n') -- self.oprint ('</tr>\n') -+ self.oprint ('Empty\n') -+ self.oprint ('</td>\n') -+ self.oprint ('</tr>\n') - for tc in binary.testcases: - self.handle_testcase (tc, binary) - def handle_totals (self): -@@ -466,7 +466,7 @@ def parse_opts(): - " Needs python-subunit]") - options, files = parser.parse_args() - if options.version: -- print parser.epilog -+ print(parser.epilog) - return None, None - if len(files) != 1: - parser.error("Must supply a log file to parse.") --- -1.8.2 - diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 406379318..70d8f6d24 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,33 +1,25 @@ -# $Id: PKGBUILD 183737 2013-04-27 14:20:45Z jgc $ +# $Id: PKGBUILD 185564 2013-05-15 07:54:44Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.36.1 -pkgrel=3 +pkgver=2.36.2 +pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64 mips64el) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz - revert-warn-glib-compile-schemas.patch - gvariant-fix-annotation.patch - partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch) -sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' - 'ebbb0581322b1fc546f93f9d77f39f37584004086d2f6f2637a8bb7894e36b2b' - '5928ac4fd114cda846fe38a3b8bedc5b038dbf9e47f76029af7d75e5dc8ae5be') + revert-warn-glib-compile-schemas.patch) +sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - # fix FS#34630 https://bugs.archlinux.org/task/34630 + # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716 export CFLAGS+=" -Wall" - # Upstream fixes from 2.36 branch - patch -Np1 -i ../gvariant-fix-annotation.patch - patch -Np1 -i ../partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/core/glib2/gvariant-fix-annotation.patch b/core/glib2/gvariant-fix-annotation.patch deleted file mode 100644 index ee10312c8..000000000 --- a/core/glib2/gvariant-fix-annotation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7304bbd5d8ad56dcf3ee9fadf74f6104c49d4df7 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna <gcampagna@src.gnome.org> -Date: Fri, 12 Apr 2013 15:25:15 +0000 -Subject: GVariant: fix transfer annotation - -g_variant_new_from_bytes() returns a floating reference, so it -must be annotated (transfer none) - -https://bugzilla.gnome.org/show_bug.cgi?id=697887 ---- -diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c -index b96bc90..f823e01 100644 ---- a/glib/gvariant-core.c -+++ b/glib/gvariant-core.c -@@ -498,7 +498,7 @@ g_variant_alloc (const GVariantType *type, - * - * A reference is taken on @bytes. - * -- * Returns: a new #GVariant with a floating reference -+ * Returns: (transfer none): a new #GVariant with a floating reference - * - * Since: 2.36 - */ --- -cgit v0.9.1 diff --git a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch b/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch deleted file mode 100644 index f623c1b21..000000000 --- a/core/glib2/partially-revert-ce0022933c255313e010b27f977f4ae02aad1e7e.patch +++ /dev/null @@ -1,132 +0,0 @@ -From f3b1054b0ebb4912f700e08da0c3d35c30113e79 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Tue, 23 Apr 2013 17:26:48 +0000 -Subject: Partially revert "Merge waitpid() from g_spawn_sync into gmain()" - -This partially reverts commit ce0022933c255313e010b27f977f4ae02aad1e7e. - -It used to be safe to use g_spawn_sync() from processes that had their -own SIGCHLD handler because it simply called wait(). When it was -changed to depend on the GLib child watching infrastructure this meant -that GLib had to own the SIGCHLD handler. - -This caused hangs in at least Pidgin. - -The patch contained two other improvements to the child watch code which -we want to keep, so only revert the changes to gspawn itself. - -https://bugzilla.gnome.org/show_bug.cgi?id=698081 ---- -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 381ed5c..01cedf6 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -47,7 +47,6 @@ - - #include "genviron.h" - #include "gmem.h" --#include "gmain.h" - #include "gshell.h" - #include "gstring.h" - #include "gstrfuncs.h" -@@ -207,21 +206,6 @@ read_data (GString *str, - } - } - --typedef struct { -- GMainLoop *loop; -- gint *status_p; --} SyncWaitpidData; -- --static void --on_sync_waitpid (GPid pid, -- gint status, -- gpointer user_data) --{ -- SyncWaitpidData *data = user_data; -- *(data->status_p) = status; -- g_main_loop_quit (data->loop); --} -- - /** - * g_spawn_sync: - * @working_directory: (allow-none): child's current working directory, or %NULL to inherit parent's -@@ -277,7 +261,6 @@ g_spawn_sync (const gchar *working_directory, - GString *errstr = NULL; - gboolean failed; - gint status; -- SyncWaitpidData waitpid_data; - - g_return_val_if_fail (argv != NULL, FALSE); - g_return_val_if_fail (!(flags & G_SPAWN_DO_NOT_REAP_CHILD), FALSE); -@@ -410,32 +393,45 @@ g_spawn_sync (const gchar *working_directory, - close_and_invalidate (&outpipe); - if (errpipe >= 0) - close_and_invalidate (&errpipe); -- -- /* Now create a temporary main context and loop, with just one -- * waitpid source. We used to invoke waitpid() directly here, but -- * this way we unify with the worker thread in gmain.c. -+ -+ /* Wait for child to exit, even if we have -+ * an error pending. - */ -- { -- GMainContext *context; -- GMainLoop *loop; -- GSource *source; -- -- context = g_main_context_new (); -- loop = g_main_loop_new (context, TRUE); -+ again: -+ -+ ret = waitpid (pid, &status, 0); - -- waitpid_data.loop = loop; -- waitpid_data.status_p = &status; -- -- source = g_child_watch_source_new (pid); -- g_source_set_callback (source, (GSourceFunc)on_sync_waitpid, &waitpid_data, NULL); -- g_source_attach (source, context); -- g_source_unref (source); -- -- g_main_loop_run (loop); -+ if (ret < 0) -+ { -+ if (errno == EINTR) -+ goto again; -+ else if (errno == ECHILD) -+ { -+ if (exit_status) -+ { -+ g_warning ("In call to g_spawn_sync(), exit status of a child process was requested but ECHILD was received by waitpid(). Most likely the process is ignoring SIGCHLD, or some other thread is invoking waitpid() with a nonpositive first argument; either behavior can break applications that use g_spawn_sync either directly or indirectly."); -+ } -+ else -+ { -+ /* We don't need the exit status. */ -+ } -+ } -+ else -+ { -+ if (!failed) /* avoid error pileups */ -+ { -+ int errsv = errno; - -- g_main_context_unref (context); -- g_main_loop_unref (loop); -- } -+ failed = TRUE; -+ -+ g_set_error (error, -+ G_SPAWN_ERROR, -+ G_SPAWN_ERROR_READ, -+ _("Unexpected error in waitpid() (%s)"), -+ g_strerror (errsv)); -+ } -+ } -+ } - - if (failed) - { --- -cgit v0.9.1 diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index 410d1e736..2f651d2c0 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178046 2013-02-14 11:43:39Z allan $ +# $Id: PKGBUILD 186344 2013-05-25 03:05:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=1 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('LGPL3') options=('!libtool') install=gmp.install source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig}) -md5sums=('485b1296e6287fa381e6015b19767989' - '5cec115b99dc498b079430dd62084d9c') +md5sums=('06fe2ca164221c59ce74867155cfc1ac' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 63e04994f..c3e4d18b9 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 183489 2013-04-22 09:10:16Z tpowa $ +# $Id: PKGBUILD 185721 2013-05-17 17:22:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg -pkgver=2.0.19 -pkgrel=7 +pkgver=2.0.20 +pkgrel=2 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -17,11 +17,8 @@ optdepends=('curl: gpg2keys_curl' makedepends=('curl' 'libldap' 'libusb-compat') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'valid-keyblock-packet.patch' 'protect-tool-env.patch') -sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' - 'f6e6830610a8629b0aad69d789373bf8ca481733' - '474d827f1c2976bb107985047f61ac9096ae0953' +sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP' '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') install=install @@ -30,15 +27,17 @@ conflicts=('gnupg2') provides=("gnupg2=${pkgver}") replaces=('gnupg2') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../protect-tool-env.patch # FS#31900 - patch -p1 -i ../valid-keyblock-packet.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib/gnupg \ --enable-maintainer-mode \ --enable-symcryptrun \ diff --git a/core/gnupg/valid-keyblock-packet.patch b/core/gnupg/valid-keyblock-packet.patch deleted file mode 100644 index 64bf1c2da..000000000 --- a/core/gnupg/valid-keyblock-packet.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Werner Koch <wk@gnupg.org> -Date: Thu, 20 Dec 2012 08:43:41 +0000 (+0100) -Subject: gpg: Import only packets which are allowed in a keyblock. -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=498882296ffac7987c644aaf2a0aa108a2925471;hp=20c95ef258f8520283406239f7c6f4729341d463 - -gpg: Import only packets which are allowed in a keyblock. - -* g10/import.c (valid_keyblock_packet): New. -(read_block): Store only valid packets. --- - -A corrupted key, which for example included a mangled public key -encrypted packet, used to corrupt the keyring. This change skips all -packets which are not allowed in a keyblock. - -GnuPG-bug-id: 1455 - -(cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e) ---- - -diff --git a/g10/import.c b/g10/import.c -index ba2439d..ad112d6 100644 ---- a/g10/import.c -+++ b/g10/import.c -@@ -347,6 +347,27 @@ import_print_stats (void *hd) - } - - -+/* Return true if PKTTYPE is valid in a keyblock. */ -+static int -+valid_keyblock_packet (int pkttype) -+{ -+ switch (pkttype) -+ { -+ case PKT_PUBLIC_KEY: -+ case PKT_PUBLIC_SUBKEY: -+ case PKT_SECRET_KEY: -+ case PKT_SECRET_SUBKEY: -+ case PKT_SIGNATURE: -+ case PKT_USER_ID: -+ case PKT_ATTRIBUTE: -+ case PKT_RING_TRUST: -+ return 1; -+ default: -+ return 0; -+ } -+} -+ -+ - /**************** - * Read the next keyblock from stream A. - * PENDING_PKT should be initialzed to NULL -@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root ) - } - in_cert = 1; - default: -- if( in_cert ) { -+ if (in_cert && valid_keyblock_packet (pkt->pkttype)) { - if( !root ) - root = new_kbnode( pkt ); - else diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 9e0f895ea..5c5e106c5 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $ +# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.7 -pkgrel=2 +pkgrel=3 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64' 'mips64el') url="http://www.nico.schottelius.org/software/gpm/" license=('GPL') -depends=('ncurses' 'bash') +depends=('bash') options=('!makeflags') install=gpm.install source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ gpm.sh gpm.service) sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369' '88fe5ff10916c68a87abc8418a56eb0073f69fa9' - '20b92360f0ad38a2032fcae37bdbd01b31e43f77') + 'f9bde96eb9c78da9f225bcf40822647f6592cf23') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service index 59e837d80..510ee9f85 100644 --- a/core/gpm/gpm.service +++ b/core/gpm/gpm.service @@ -3,7 +3,7 @@ Description=Virtual console mouse server [Service] Type=forking -ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2 +ExecStart=/usr/bin/gpm -m /dev/input/mice -t imps2 [Install] WantedBy=multi-user.target diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD index ce83ab075..a0ab19609 100644 --- a/core/groff/PKGBUILD +++ b/core/groff/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 178100 2013-02-16 08:46:34Z allan $ +# $Id: PKGBUILD 185682 2013-05-17 08:28:58Z tpowa $ # Maintainer: pkgname=groff pkgver=1.22.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNU troff text-formatting system" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/groff/groff.html" license=('GPL') groups=('base-devel') depends=('perl' 'gcc-libs') -makedepends=('netpbm' 'psutils' 'ghostscript') +makedepends=('netpbm' 'psutils' 'ghostscript' 'libxaw') optdepends=('netpbm: for use together with man -H command interaction in browsers' - 'psutils: for use together with man -H command interaction in browsers') + 'psutils: for use together with man -H command interaction in browsers' + 'libxaw: for gxditview') source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz{,.sig} site.tmac) options=('!docs' '!emptydirs') @@ -23,7 +24,7 @@ md5sums=('9f4cd592a5efc7e36481d8d8d8af6d16' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-x + ./configure --prefix=/usr --with-x --with-appresdir=/usr/share/X11/app-defaults make } diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD index 2ab0c823b..980f98214 100644 --- a/core/hdparm/PKGBUILD +++ b/core/hdparm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172450 2012-12-02 17:54:26Z tpowa $ +# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm pkgver=9.43 -pkgrel=1 +pkgrel=2 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" arch=(i686 x86_64 'mips64el') depends=('glibc') @@ -17,25 +17,27 @@ options=('emptydirs') md5sums=('f73233be118d86c779a8463d8b6a3cdb' '74e368f384166a7710b447573cda120a') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # Fix Range input/output error when wiping Intel G2 and OCZ drives patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch - - # build +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} make } package() { cd ${srcdir}/${pkgname}-${pkgver} # install - mkdir -p ${pkgdir}/{usr,sbin} - make DESTDIR=${pkgdir} install - install -m755 contrib/idectl ${pkgdir}/sbin - install -m755 contrib/ultrabayd ${pkgdir}/sbin + mkdir -p ${pkgdir}/usr/bin + make DESTDIR=${pkgdir} sbindir=/usr/bin install + install -m755 contrib/idectl ${pkgdir}/usr/bin + install -m755 contrib/ultrabayd ${pkgdir}/usr/bin install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt - install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh + install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh #install license file install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD index 77eff3bac..e998eb2ef 100644 --- a/core/ifenslave/PKGBUILD +++ b/core/ifenslave/PKGBUILD @@ -1,21 +1,17 @@ -# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $ -# Maintainer: +# $Id: PKGBUILD 186263 2013-05-23 06:41:01Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ifenslave pkgver=1.1.0 -pkgrel=7.1 +pkgrel=8 pkgdesc='Utility for bonding ethernet interfaces' -arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxfoundation.org/en/Net:Bonding' +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('glibc') makedepends=('linux-api-headers') -backup=('etc/conf.d/bonding') -source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf' - 'bonding.conf.d') -sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73' - '6843971c0254768868b556af33289d7d32d6208d') +source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=450faacc') +sha1sums=('cf0ca36e4a82f259f4bd5d7268ce758581a76fb0') build() { cd "${srcdir}" @@ -24,6 +20,5 @@ build() { package() { cd "${srcdir}" - install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave - install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding + install -Dm755 ifenslave "${pkgdir}"/usr/bin/ifenslave } diff --git a/core/ifenslave/bonding.conf.d b/core/ifenslave/bonding.conf.d deleted file mode 100644 index 3092c5e95..000000000 --- a/core/ifenslave/bonding.conf.d +++ /dev/null @@ -1,12 +0,0 @@ -# -# Settings for ethernet bonding -# -# For each bond interface declared in INTERFACES (in rc.conf), declare -# a bond_${IF} variable that contains the real ethernet interfaces that -# should be bonded to the bond interface with the ifenslave utility. -# Then list the bond interface name in the BOND_INTERFACES array. -# - -#bond_bond0="eth0 eth1" -#BOND_INTERFACES=(bond0) - diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index 28574ea92..affca856a 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,38 +1,40 @@ -# $Id: PKGBUILD 165908 2012-09-03 17:29:57Z eric $ +# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=inetutils pkgver=1.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/inetutils/" license=('GPL3') groups=('base') -depends=('readline' 'ncurses' 'pam') -backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ +depends=('pam') +backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \ 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh') 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 \ + telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ ftpd.service dnsdomainname) sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' - 'ff0aad9946a38915580b094dadf67e790e8a2f87' - '84dc802b5e57b5e04c847572225a3b9612017155' - '68a590083b45997dfdb80e666b2de762f494ba74' - 'bfad98a4a62f1fff8779f076c6019ed07f9111af' - '27d99b910eec0fc26bd79ccc2c1de26608330298' - '81f10b3b688e3952f793b35bcef63b5bf257a92b' - '81f4a8da823cf0bb14284fc71ee6108849691eda' - 'fb607dafe177f074e14891dd887ef9e9ab67a875' + 'SKIP' + '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3' + 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c' + 'd9b8f8aab094ecb779d0f16f21b4683ab327516f' + '26763ae31b8a5be256666a0ba55746941d75d6ee' + 'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802' 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${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 \ +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --libexec=/usr/bin \ + --localstatedir=/var --sysconfdir=/etc \ --without-wrap --with-pam \ --enable-ftp --enable-ftpd \ --enable-telnet --enable-telnetd \ @@ -50,20 +52,19 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d "${pkgdir}/bin" - ln -s /usr/bin/hostname "${pkgdir}/bin/hostname" - install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname" + ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname" + ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname" + install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname" echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" - install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd" - install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd" install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" diff --git a/core/inetutils/ftpd.conf b/core/inetutils/ftpd.conf deleted file mode 100644 index f660f0035..000000000 --- a/core/inetutils/ftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to ftpd -# -FTPD_ARGS="" diff --git a/core/inetutils/ftpd.rc b/core/inetutils/ftpd.rc deleted file mode 100644 index 3d0d34421..000000000 --- a/core/inetutils/ftpd.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ftpd - -PID=$(pidof -o %PPID /usr/sbin/ftpd) -case "$1" in - start) - stat_busy "Starting ftpd" - [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ftpd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/inetutils/ftpd.service b/core/inetutils/ftpd.service index 5708bdfd1..57549c088 100644 --- a/core/inetutils/ftpd.service +++ b/core/inetutils/ftpd.service @@ -3,7 +3,7 @@ Description=FTPD Daemon After=network.target [Service] -ExecStart=/usr/sbin/ftpd -D +ExecStart=/usr/bin/ftpd -D Type=forking [Install] diff --git a/core/inetutils/inetutils.install b/core/inetutils/inetutils.install index b338fa498..bd2a283b8 100644 --- a/core/inetutils/inetutils.install +++ b/core/inetutils/inetutils.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(inetutils.info.gz) post_install() { diff --git a/core/inetutils/rlogin.xinetd b/core/inetutils/rlogin.xinetd index 5c72f86df..bffdb9011 100644 --- a/core/inetutils/rlogin.xinetd +++ b/core/inetutils/rlogin.xinetd @@ -4,7 +4,7 @@ service login socket_type = stream wait = no user = root - server = /usr/sbin/rlogind + server = /usr/bin/rlogind log_on_failure += USERID disable = yes } diff --git a/core/inetutils/rsh.xinetd b/core/inetutils/rsh.xinetd index a13738c31..c8848ce7f 100644 --- a/core/inetutils/rsh.xinetd +++ b/core/inetutils/rsh.xinetd @@ -4,7 +4,7 @@ service shell socket_type = stream wait = no user = root - server = /usr/sbin/rshd + server = /usr/bin/rshd log_on_failure += USERID disable = yes } diff --git a/core/inetutils/talk.xinetd b/core/inetutils/talk.xinetd index 6abef359c..b62e56310 100644 --- a/core/inetutils/talk.xinetd +++ b/core/inetutils/talk.xinetd @@ -4,7 +4,7 @@ service ntalk socket_type = dgram wait = yes user = root - server = /usr/sbin/talkd + server = /usr/bin/talkd log_on_failure += USERID disable = yes } diff --git a/core/inetutils/telnet.xinetd b/core/inetutils/telnet.xinetd index bd3a5e4b1..c56f33985 100644 --- a/core/inetutils/telnet.xinetd +++ b/core/inetutils/telnet.xinetd @@ -4,7 +4,7 @@ service telnet socket_type = stream wait = no user = root - server = /usr/sbin/telnetd + server = /usr/bin/telnetd log_on_failure += USERID disable = yes } diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index e852b87fa..0bc1cb89e 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180028 2013-03-14 20:45:48Z foutrelis $ +# $Id: PKGBUILD 186735 2013-05-30 21:29:53Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables pkgver=1.4.18 -pkgrel=1 +pkgrel=2 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -13,11 +13,8 @@ depends=('glibc' 'bash') makedepends=('linux-api-headers' 'chrpath') options=('!libtool') source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" - iptables - ip6tables empty.rules simple_firewall.rules - iptables.conf.d empty-filter.rules empty-mangle.rules empty-nat.rules @@ -27,21 +24,17 @@ source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.t iptables.service ip6tables.service iptables-flush) -backup=(etc/conf.d/iptables) sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e' - '5bb6fa526665cdd728c26f0f282f5a51f220cf88' - '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec' - 'cdb830137192bbe002c6d01058656bd053ed0ddd' 'd9f9f06b46b4187648e860afa0552335aafe3ce4' 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '5f2e76985a751f635a45612565a6e1bc9547398a' - 'fe6bbe214b3a13bd084f62a8ee9631fd8326c464' + '9306cba67dbeaa004af084a816f66920a6a10faf' + '38fa2ffe7965e63b494d333f69193029c1258c28' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') build() { @@ -55,7 +48,8 @@ build() { ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ - --enable-devel --enable-shared + --enable-devel --enable-shared \ + --sbindir=/usr/bin make } @@ -69,11 +63,8 @@ package() { chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so cd "${srcdir}" - install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables - install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules - install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables} install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables diff --git a/core/iptables/ip6tables b/core/iptables/ip6tables deleted file mode 100755 index 2d119e3ed..000000000 --- a/core/iptables/ip6tables +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables - -# Set defaults if settings are missing -[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - if [ ! -f "$IP6TABLES_CONF" ]; then - echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2 - exit 1 - fi - stat_busy "Starting IP6 Tables" - if [ "$IPTABLES_FORWARD" = "1" ]; then - echo 1 >/proc/sys/net/ipv6/conf/default/forwarding - echo 1 >/proc/sys/net/ipv6/conf/all/forwarding - fi - if ck_daemon ip6tables; then - /usr/sbin/ip6tables-restore < $IP6TABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ip6tables - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping IP6 Tables" - if ! ck_daemon ip6tables; then - fail=0 - for table in $(cat /proc/net/ip6_tables_names); do - ip6tables-restore < /var/lib/iptables/empty-$table.rules - [ $? -gt 0 ] && fail=1 - done - if [ $fail -gt 0 ]; then - stat_fail - else - rm_daemon ip6tables - stat_done - fi - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - save) - stat_busy "Saving IP6 Tables" - /usr/sbin/ip6tables-save >$IP6TABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|save}" -esac -exit 0 diff --git a/core/iptables/ip6tables.service b/core/iptables/ip6tables.service index 60d76becf..7a8d39ca0 100644 --- a/core/iptables/ip6tables.service +++ b/core/iptables/ip6tables.service @@ -3,8 +3,8 @@ Description=IPv6 Packet Filtering Framework [Service] Type=oneshot -ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules -ExecReload=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules +ExecStart=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules +ExecReload=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules ExecStop=/usr/lib/systemd/scripts/iptables-flush 6 RemainAfterExit=yes diff --git a/core/iptables/iptables b/core/iptables/iptables deleted file mode 100755 index fbb02face..000000000 --- a/core/iptables/iptables +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables - -# Set defaults if settings are missing -[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - if [ ! -f "$IPTABLES_CONF" ]; then - echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2 - exit 1 - fi - stat_busy "Starting IP Tables" - if [ "$IPTABLES_FORWARD" = "1" ]; then - echo 1 >/proc/sys/net/ipv4/ip_forward - fi - if ck_daemon iptables; then - /usr/sbin/iptables-restore < $IPTABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon iptables - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping IP Tables" - if ! ck_daemon iptables; then - fail=0 - for table in $(cat /proc/net/ip_tables_names); do - iptables-restore < /var/lib/iptables/empty-$table.rules - [ $? -gt 0 ] && fail=1 - done - if [ $fail -gt 0 ]; then - stat_fail - else - rm_daemon iptables - stat_done - fi - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - save) - stat_busy "Saving IP Tables" - /usr/sbin/iptables-save >$IPTABLES_CONF - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|save}" -esac -exit 0 diff --git a/core/iptables/iptables.conf.d b/core/iptables/iptables.conf.d deleted file mode 100644 index 1c6cc7b5d..000000000 --- a/core/iptables/iptables.conf.d +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration for iptables rules -IPTABLES_CONF=/etc/iptables/iptables.rules -IP6TABLES_CONF=/etc/iptables/ip6tables.rules - -# Enable IP forwarding (both IPv4 and IPv6) -# NOTE: this is not the recommended way to do this, and is supported only for -# backward compatibility. Instead, use /etc/sysctl.conf and set the following -# options: -# * net.ipv4.ip_forward=1 -# * net.ipv6.conf.default.forwarding=1 -# * net.ipv6.conf.all.forwarding=1 -#IPTABLES_FORWARD=0 diff --git a/core/iptables/iptables.service b/core/iptables/iptables.service index eb1a967f3..5441e4577 100644 --- a/core/iptables/iptables.service +++ b/core/iptables/iptables.service @@ -3,8 +3,8 @@ Description=Packet Filtering Framework [Service] Type=oneshot -ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules -ExecReload=/usr/sbin/iptables-restore /etc/iptables/iptables.rules +ExecStart=/usr/bin/iptables-restore /etc/iptables/iptables.rules +ExecReload=/usr/bin/iptables-restore /etc/iptables/iptables.rules ExecStop=/usr/lib/systemd/scripts/iptables-flush RemainAfterExit=yes diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index fabd4e92f..f0a0d9d73 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175125 2013-01-14 12:47:14Z stephane $ +# $Id: PKGBUILD 185694 2013-05-17 11:13:03Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils pkgver=20121221 -pkgrel=1 +pkgrel=2 pkgdesc="Network monitoring tools, including ping" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'BSD') @@ -40,16 +40,14 @@ build() { package() { cd "${srcdir}/${pkgname}-s${pkgver}" - install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin + install -dm755 "${pkgdir}"/usr/bin - install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \ - "${pkgdir}"/usr/sbin/ + install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 "${pkgdir}"/usr/bin/ install -m755 ping{,6} "${pkgdir}"/usr/bin/ - ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/ - install -dm755 "${pkgdir}"/usr/share/man/man8 - install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \ + install -dm755 "${pkgdir}"/usr/share/man/man8 + install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \ "${pkgdir}"/usr/share/man/man8/ cd "${pkgdir}"/usr/share/man/man8 diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD index 31368268b..7c5f74615 100644 --- a/core/jfsutils/PKGBUILD +++ b/core/jfsutils/PKGBUILD @@ -1,21 +1,30 @@ -# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $ +# $Id: PKGBUILD 186264 2013-05-23 06:41:02Z bisson $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=jfsutils pkgver=1.1.15 -pkgrel=3.1 +pkgrel=4 pkgdesc='JFS filesystem utilities' -arch=('i686' 'x86_64' 'mips64el') url='http://jfs.sourceforge.net' +arch=('i686' 'x86_64' 'mips64el') license=('GPL') +depends=('util-linux') +source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz" + 'inttypes.patch') +sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50' + '88551e7d8418bab0df4643dce248110d4c9b0a53') + groups=('base') -depends=('util-linux-ng') -source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz") -sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../inttypes.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --sbindir=/sbin + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/core/jfsutils/inttypes.patch b/core/jfsutils/inttypes.patch new file mode 100644 index 000000000..2018bb8a8 --- /dev/null +++ b/core/jfsutils/inttypes.patch @@ -0,0 +1,12 @@ +diff -Naur old/libfs/devices.h new/libfs/devices.h +--- old/libfs/devices.h 2005-11-23 07:43:55.000000000 +1100 ++++ new/libfs/devices.h 2013-01-06 11:30:25.381538024 +1100 +@@ -40,6 +40,8 @@ + #define ERROR_INVALID_PARAMETER 87 + #define ERROR_DISK_FULL 112 + ++#include <inttypes.h> ++ + struct stat; + + int ujfs_get_dev_size(FILE *, int64_t * size); diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index 425d03a23..4487c9e94 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 175749 2013-01-21 10:51:33Z tpowa $ +# $Id: PKGBUILD 186234 2013-05-22 12:12:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd pkgver=1.15.5 -pkgrel=3 +pkgrel=4 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.kbd-project.org" license=('GPL') depends=('glibc' 'pam') source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz - 'fix-keymap-loading-1.15.5.patch') + 'fix-keymap-loading-1.15.5.patch' + 'fix-dvorak-es.patch' + 'fix-euro2.patch') provides=('vlock') conflicts=('vlock') replaces=('vlock') -md5sums=('34c71feead8ab9c01ec638acea8cd877' - '4362091d5e23bab2d158f8c7693a45d8') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} # rename keymap files with the same names # this is needed because when only name of keymap is specified @@ -32,6 +32,14 @@ build() { # fix https://bugs.archlinux.org/task/33308 # keymap loading is broken for cetain keymaps patch -Np1 -i ../fix-keymap-loading-1.15.5.patch + # fix es-dvorak #33662 + patch -Np1 -i ../fix-dvorak-es.patch + # fix euro2 #28213 + patch -Np1 -i ../fix-euro2.patch +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes } @@ -40,3 +48,7 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install } +md5sums=('34c71feead8ab9c01ec638acea8cd877' + '4362091d5e23bab2d158f8c7693a45d8' + '998957c4f815347dcc874c4d7555dc66' + 'd869200acbc0aab6a9cafa43cb140d4e') diff --git a/core/kbd/fix-dvorak-es.patch b/core/kbd/fix-dvorak-es.patch new file mode 100644 index 000000000..95760fd3a --- /dev/null +++ b/core/kbd/fix-dvorak-es.patch @@ -0,0 +1,11 @@ +--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old 2013-05-08 14:58:03.393349828 +0200 ++++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map 2013-05-08 14:58:20.206415053 +0200 +@@ -4,7 +4,7 @@ + + keymaps 0-2,4,5,6,8-10,12,14 + include "linux-with-alt-and-altgr" +-include "euro" ++include "euro.map" + strings as usual + + keycode 1 = Escape diff --git a/core/kbd/fix-euro2.patch b/core/kbd/fix-euro2.patch new file mode 100644 index 000000000..572cba740 --- /dev/null +++ b/core/kbd/fix-euro2.patch @@ -0,0 +1,9 @@ +--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 15:00:25.917752313 +0200 ++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 15:00:54.943957367 +0200 +@@ -2,5 +2,5 @@ + # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt) + # on the positions where many keyboards have E and C. + # To get it displayed, use a latin0 (i.e., latin9) font.] +-altgr keycode 18 = currency ++altgr keycode 18 = euro + altgr keycode 46 = cent diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index c8dfba094..3bfd63f4b 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 162664 2012-06-27 18:33:40Z tpowa $ +# $Id: PKGBUILD 186780 2013-05-31 07:19:13Z tpowa $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils pkgver=1.5.5 -pkgrel=3 +pkgrel=5 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64 'mips64el') url="http://www.kernel.org" license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) -source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d759680b2f23c99af95938f5026f25fb') +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +request-key.conf.patch) +md5sums=('d759680b2f23c99af95938f5026f25fb' + '89a819a7e4e90936b210c9d5020d296d') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix paths of binaries in /etc/request-key.conf + patch -Np0 -i ../request-key.conf.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin' } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install - # add nfsidmap to config file #30396 - echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf - echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \ - >> $pkgdir/etc/request-key.conf + make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib' install } diff --git a/core/keyutils/request-key.conf.patch b/core/keyutils/request-key.conf.patch new file mode 100644 index 000000000..9ab479631 --- /dev/null +++ b/core/keyutils/request-key.conf.patch @@ -0,0 +1,21 @@ +--- request-key.conf.old 2013-05-28 15:34:10.966001242 +0200 ++++ request-key.conf 2013-05-28 15:35:34.857969598 +0200 +@@ -31,11 +31,11 @@ + + #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... + #====== ======= =============== =============== =============================== +-create dns_resolver * * /sbin/key.dns_resolver %k +-create user debug:* negate /bin/keyctl negate %k 30 %S +-create user debug:* rejected /bin/keyctl reject %k 30 %c %S +-create user debug:* expired /bin/keyctl reject %k 30 %c %S +-create user debug:* revoked /bin/keyctl reject %k 30 %c %S +-create user debug:loop:* * |/bin/cat ++create dns_resolver * * /usr/bin/key.dns_resolver %k ++create user debug:* negate /usr/bin/keyctl negate %k 30 %S ++create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S ++create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S ++create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S ++create user debug:loop:* * |/usr/bin/cat + create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +-negate * * * /bin/keyctl negate %k 30 %S ++negate * * * /usr/bin/keyctl negate %k 30 %S diff --git a/core/krb5/CVE-2002-2443.patch b/core/krb5/CVE-2002-2443.patch new file mode 100644 index 000000000..3ef88155c --- /dev/null +++ b/core/krb5/CVE-2002-2443.patch @@ -0,0 +1,69 @@ +From cf1a0c411b2668c57c41e9c4efd15ba17b6b322c Mon Sep 17 00:00:00 2001 +From: Tom Yu <tlyu@mit.edu> +Date: Fri, 3 May 2013 16:26:46 -0400 +Subject: [PATCH] Fix kpasswd UDP ping-pong [CVE-2002-2443] + +The kpasswd service provided by kadmind was vulnerable to a UDP +"ping-pong" attack [CVE-2002-2443]. Don't respond to packets unless +they pass some basic validation, and don't respond to our own error +packets. + +Some authors use CVE-1999-0103 to refer to the kpasswd UDP ping-pong +attack or UDP ping-pong attacks in general, but there is discussion +leading toward narrowing the definition of CVE-1999-0103 to the echo, +chargen, or other similar built-in inetd services. + +Thanks to Vincent Danen for alerting us to this issue. + +CVSSv2: AV:N/AC:L/Au:N/C:N/I:N/A:P/E:P/RL:O/RC:C + +ticket: 7637 (new) +target_version: 1.11.3 +tags: pullup +--- + src/kadmin/server/schpw.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c +index 15b0ab5..7f455d8 100644 +--- a/src/kadmin/server/schpw.c ++++ b/src/kadmin/server/schpw.c +@@ -52,7 +52,7 @@ + ret = KRB5KRB_AP_ERR_MODIFIED; + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request was truncated", sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + ptr = req->data; +@@ -67,7 +67,7 @@ + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request length was inconsistent", + sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + /* verify version number */ +@@ -80,7 +80,7 @@ + numresult = KRB5_KPASSWD_BAD_VERSION; + snprintf(strresult, sizeof(strresult), + "Request contained unknown protocol version number %d", vno); +- goto chpwfail; ++ goto bailout; + } + + /* read, check ap-req length */ +@@ -93,7 +93,7 @@ + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request was truncated in AP-REQ", + sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + /* verify ap_req */ +-- +1.8.1.6 + diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index a90ed343b..d1cc0c166 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183174 2013-04-18 12:38:02Z stephane $ +# $Id: PKGBUILD 186200 2013-05-22 00:37:41Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.11.2 -pkgrel=1 +pkgrel=4 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -12,22 +12,18 @@ depends=('e2fsprogs' 'libldap' 'keyutils') makedepends=('perl') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar + CVE-2002-2443.patch krb5-config_LDFLAGS.patch - krb5-kadmind krb5-kadmind.service - krb5-kdc krb5-kdc.service - krb5-kpropd krb5-kpropd.service krb5-kpropd@.service krb5-kpropd.socket) sha1sums=('3863f7bdb2d8fc3e50484fb566124373c4b0a250' + '78ec307c2b5e32481a6da401013c428e0b867f36' '09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa' - '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' 'a2a01e7077d9e89cda3457ea0e216debb3dc353c' - '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e' - '7f402078fa65bb9ff1beb6cbbbb017450df78560' '614401dd4ac18e310153240bb26eb32ff1e8cf5b' '023a8164f8ee7066ac814486a68bc605e79f6101' 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') @@ -40,6 +36,9 @@ build() { # cf https://bugs.gentoo.org/show_bug.cgi?id=448778 patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch + # Fix kpasswd UDP ping-pong (CVE-2002-2443) + patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch + rm lib/krb5/krb/deltat.c # FS#25384 @@ -48,6 +47,7 @@ build() { export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var/lib \ @@ -77,9 +77,6 @@ package() { install -dm 755 "${pkgdir}"/etc install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf - install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d - install -dm 755 "${pkgdir}"/usr/share/aclocal install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal diff --git a/core/krb5/krb5-kadmind b/core/krb5/krb5-kadmind deleted file mode 100644 index 04df0dcff..000000000 --- a/core/krb5/krb5-kadmind +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kadmind` -case "$1" in - start) - stat_busy "Starting Kerberos Admin Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kadmind - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kadmind - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Admin Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kadmind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/krb5/krb5-kdc b/core/krb5/krb5-kdc deleted file mode 100644 index 05a03411e..000000000 --- a/core/krb5/krb5-kdc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/krb5kdc` -case "$1" in - start) - stat_busy "Starting Kerberos Authentication" - if [ -z "$PID" ]; then - /usr/sbin/krb5kdc - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kdc - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Authentication" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kdc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/krb5/krb5-kpropd b/core/krb5/krb5-kpropd deleted file mode 100644 index a0077d68e..000000000 --- a/core/krb5/krb5-kpropd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kpropd` -case "$1" in - start) - stat_busy "Starting Kerberos Database Propagation Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kpropd -S - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon kpropd - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Database Propagation Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kpropd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 1066620dd..24d2ade35 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 182644 2013-04-12 00:05:24Z allan $ +#$Id: PKGBUILD 185557 2013-05-15 05:24:44Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap pkgver=2.22 -pkgrel=4 +pkgrel=5 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64' 'mips64el') url="http://sites.google.com/site/fullycapable/" @@ -15,6 +15,13 @@ source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.a md5sums=('b4896816b626bea445f0b3849bdd4077' '9d0983e25e5a251d098507f9561d2b27') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # install into /usr/bin + sed -i "/SBINDIR/s#sbin#bin#" Make.Rules +} + build() { cd ${srcdir}/${pkgname}-${pkgver} make lib=lib diff --git a/core/libsasl/0003_saslauthd_mdoc.patch b/core/libsasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/core/libsasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by <fabbe@debian.org> - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/core/libsasl/0012_xopen_crypt_prototype.patch b/core/libsasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/core/libsasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by <dannf@debian.org> - -When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h> -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/core/libsasl/0016_pid_file_lock_creation_mask.patch b/core/libsasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/core/libsasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org> - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/core/libsasl/0018_auth_rimap_quotes.patch b/core/libsasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/core/libsasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by <fabbe@debian.org> - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/core/libsasl/0019_ldap_deprecated.patch b/core/libsasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/core/libsasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier <dannf@debian.org> - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm <fabbe@debian.org>) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include <openssl/des.h> - #endif - -+#define LDAP_DEPRECATED 1 - #include <ldap.h> - #include <lber.h> - #include <sasl.h> diff --git a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by <fabbe@paniq.net> - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/core/libsasl/0027_db5_support.patch b/core/libsasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/core/libsasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý <ondrej@debian.org> -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index e54faf432..fc1aaba80 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,81 +1,58 @@ -# $Id: PKGBUILD 180675 2013-03-25 19:13:43Z bpiotrowski $ +# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> -# This package spans multiple repositories. +# This package spans multiple repositories. # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. #pkgbase=('cyrus-sasl') #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl -pkgver=2.1.23 -pkgrel=10 +pkgver=2.1.26 +pkgrel=3 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') +source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch + cyrus-sasl-2.1.26-size_t.patch 0010_maintainer_mode.patch 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.service saslauthd.conf.d - saslauthd) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' + saslauthd + tmpfiles.conf) +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' + 'f45aa8c42b32e0569ab3d14a83485b37' 'f45d8b60e8f74dd7f7c2ec1665fa602a' '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' + '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20') + '75542f613185d5a90520ad0d7d926a20' + '45bb0192d2f188066240b9a66ee6365f') build() { + export CFLAGS="$CFLAGS -fPIC" + cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -144,21 +121,22 @@ package_libsasl() { rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" } package_cyrus-sasl() { - depends=("libsasl=${pkgver}-${pkgrel}") + depends=("libsasl=${pkgver}" 'krb5') pkgdesc="Cyrus saslauthd SASL authentication daemon" backup=('etc/conf.d/saslauthd') cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 -d "${pkgdir}/etc/conf.d" - install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" - install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" + install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" + install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" @@ -166,12 +144,13 @@ package_cyrus-sasl() { package_cyrus-sasl-gssapi() { pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + depends=("libsasl=${pkgver}" 'krb5') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" @@ -179,7 +158,7 @@ package_cyrus-sasl-gssapi() { package_cyrus-sasl-ldap() { pkgdesc="ldapdb auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + depends=("libsasl=${pkgver}" 'libldap') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" @@ -192,7 +171,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmariadbclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/core/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch b/core/libsasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include <string.h> - #include <stdlib.h> - #include <pwd.h> -+#include <unistd.h> - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/core/libsasl/cyrus-sasl-2.1.26-size_t.patch b/core/libsasl/cyrus-sasl-2.1.26-size_t.patch new file mode 100644 index 000000000..3a4820f16 --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.26-size_t.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include <sys/types.h> ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); diff --git a/core/libsasl/saslauthd.service b/core/libsasl/saslauthd.service new file mode 100644 index 000000000..978dbd37d --- /dev/null +++ b/core/libsasl/saslauthd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Cyrus SASL authentication daemon + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/saslauthd +ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS +PIDFile=/var/run/saslauthd/saslauthd.pid + +[Install] +WantedBy=multi-user.target diff --git a/core/libsasl/tmpfiles.conf b/core/libsasl/tmpfiles.conf new file mode 100644 index 000000000..7258b1a9f --- /dev/null +++ b/core/libsasl/tmpfiles.conf @@ -0,0 +1 @@ +d /run/saslauthd 0755 root root - - diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD index e84fe6afc..a14393a05 100644 --- a/core/linux-atm/PKGBUILD +++ b/core/linux-atm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $ +# $Id: PKGBUILD 186297 2013-05-24 07:57:23Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm pkgver=2.5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64' 'mips64el') depends=('glibc') @@ -23,7 +23,7 @@ build() { # install firmware in /usr/lib sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc make } diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index 44771a6c9..e4e360c9c 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184326 2013-05-06 09:32:38Z pierre $ +# $Id: PKGBUILD 185626 2013-05-16 13:54:50Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=logrotate pkgver=3.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64' 'mips64el') url="https://fedorahosted.org/logrotate/" @@ -21,7 +21,7 @@ md5sums=('7be7f1eabea33a1d0483438a6e33d634' 'cd76976b5ce37d328b452c806b55a015' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '86209d257c8b8bc0ae34d6f6ef057c0f' - 'aa8ac8283908b6114483a293adcb650f') + '3909380f8a55fa160f62ed976a8bef4b') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -40,7 +40,9 @@ check() { package() { cd "$srcdir/${pkgname}-${pkgver}" make PREFIX="$pkgdir" MANDIR="/usr/share/man" install + mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin + install -dm755 "$pkgdir/etc/logrotate.d" install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" } diff --git a/core/logrotate/logrotate.cron.daily b/core/logrotate/logrotate.cron.daily index ee0eeeb48..37d9e534c 100755 --- a/core/logrotate/logrotate.cron.daily +++ b/core/logrotate/logrotate.cron.daily @@ -9,16 +9,16 @@ IONICE_CLASS=2 # 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest IONICE_PRIORITY=7 -CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf" - +CMD_LOGROTATE="/usr/bin/logrotate /etc/logrotate.conf" + if [ -x /usr/bin/nice ]; then CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}" fi - + if [ -x /usr/bin/ionice ]; then CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}" fi - + ${CMD_LOGROTATE} - + exit 0 diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index 818087e98..304458770 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 166836 2012-09-19 19:45:35Z andyrtr $ +# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db pkgver=2.6.3 -pkgrel=1 +pkgrel=3 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/man-db/" license=('GPL' 'LGPL') groups=('base') -depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') -optdepends=('less' 'gzip') +depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less') +optdepends=('gzip') backup=('etc/man_db.conf' - 'etc/cron.daily/man-db') + 'etc/cron.daily/man-db') conflicts=('man') provides=('man') replaces=('man') @@ -22,21 +22,26 @@ source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig convert-mans man-db.cron.daily) options=('!libtool') md5sums=('a593a095599ae97bcacf8d038659a146' - '64975c20b1a6453f9b860ff7f916bcf1' + 'SKIP' '2b7662a7d5b33fe91f9f3e034361a2f6' - 'd30c39ae47560304471b5461719e0f03') + '934fd047fecb915038bf4bf844ea609c') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-db=gdbm \ + --disable-setuid \ + --enable-mandirs=GNU \ --with-sections="1 n l 8 3 0 2 5 4 9 6 7" make } check() { cd ${srcdir}/${pkgname}-${pkgver} - make check + make -k check } package() { diff --git a/core/man-db/man-db.cron.daily b/core/man-db/man-db.cron.daily index 53e66e1e9..9b4abd894 100755 --- a/core/man-db/man-db.cron.daily +++ b/core/man-db/man-db.cron.daily @@ -12,7 +12,7 @@ IONICE_PRIORITY=7 UPDATEMANDB="/usr/bin/mandb --quiet" # Update the "whatis" database -#/usr/sbin/makewhatis -u -w +#/usr/bin/makewhatis -u -w # taken from Debian # man-db cron daily diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 1ceafa35a..8c8d6aa83 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $ +# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7') depends=('glibc') backup=('etc/mdadm.conf') source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 - mdadm mdadm.conf mdadm_install mdadm_hook @@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 disable-werror.patch mdadm-fix-udev-rules.patch) replaces=('raidtools') +md5sums=('3e255dc71e5144bbcb872788ca647267' + '5a37c112aa07dccdde62f9fa5b888607' + 'af2f73f0094ebee66f503ca4710c7142' + 'fbfb7d07efcbaf5dc61af424c5f6e352' + 'b6b0bfd6487c99264578630616dfe5eb' + 'eb1786b18fa4d13cfd7b71d6b05cfb4f' + '4ad87b74a4bc9a34621280abe0e0c3e4' + '6c76f2f261c1c3397c7290633f0a9acc') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch patch -p1 -i ../mdadm-fix-udev-rules.patch - make CXFLAGS="$CFLAGS" +} + +build() { + cd $srcdir/$pkgname-$pkgver + make CXFLAGS="$CFLAGS" BINDIR=/usr/bin # build static mdassemble for Arch's initramfs make MDASSEMBLE_AUTO=1 mdassemble @@ -35,22 +46,12 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make INSTALL=/usr/bin/install DESTDIR=$pkgdir install - install -D -m755 mdassemble $pkgdir/sbin/mdassemble + make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf - install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev # systemd service file install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service } -md5sums=('3e255dc71e5144bbcb872788ca647267' - '8333d405f550317c2bacd5510bf1cb60' - '00cbed931db4f15b6ce49e3e7d433966' - '815245a3af16a73ec1c5e5989fb892e9' - 'fbb5542d9bdf87441a11dd7e7a0a17f8' - '0e35422d0cc007c3654a5e2591a9f9b5' - 'aafb5f9ac8437a284cbf948b9b13b179' - '4ad87b74a4bc9a34621280abe0e0c3e4' - '0bf45d6dcb3ea14facddbb10b3303806') diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm deleted file mode 100755 index 9bf468e98..000000000 --- a/core/mdadm/mdadm +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/mdadm.pid -if [[ -r $pidfile ]]; then - read -r PID <"$pidfile" - if [[ $PID && ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting mdadm RAID Monitor" - if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then - add_daemon mdadm - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping mdadm RAID Monitor" - if [[ $PID ]] && kill "$PID" &>/dev/null; then - rm_daemon mdadm - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch index 60f5ae131..941cadf3a 100644 --- a/core/mdadm/mdadm-fix-udev-rules.patch +++ b/core/mdadm/mdadm-fix-udev-rules.patch @@ -39,7 +39,7 @@ index 0000000..883ee4d +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end" +LABEL="md_ignore_state" + -+IMPORT{program}="/sbin/mdadm --detail --export $devnode" ++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode" +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" @@ -75,9 +75,9 @@ index 0000000..b89775e + +# remember you can limit what gets auto/incrementally assembled by +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' -+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot" -+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" -+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name" ++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot" ++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}" ++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name" + +LABEL="md_inc_end" diff --git a/udev-md-raid.rules b/udev-md-raid.rules diff --git a/core/mdadm/mdadm.conf b/core/mdadm/mdadm.conf index 57bd4c683..36eaa0cc0 100644 --- a/core/mdadm/mdadm.conf +++ b/core/mdadm/mdadm.conf @@ -59,8 +59,8 @@ DEVICE partitions # When used in --follow (aka --monitor) mode, mdadm needs a -# mail address and/or a program. To start mdadm's monitor mode, add -# "mdadm" to your DAEMONS array in /etc/rc.conf +# mail address and/or a program. To start mdadm's monitor mode, enable +# mdadm.service in systemd. # # If the lines are not found, mdadm will exit quietly #MAILADDR root@mydomain.tld diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service index 8389715e8..b3ca5f7a7 100644 --- a/core/mdadm/mdadm.service +++ b/core/mdadm/mdadm.service @@ -2,7 +2,7 @@ Description=MDADM Event Monitor [Service] -ExecStart=/sbin/mdadm --monitor --scan +ExecStart=/usr/bin/mdadm --monitor --scan [Install] WantedBy=multi-user.target diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 787be5d0c..5371baaca 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -43,7 +43,7 @@ run_hook() { fi # assemble everything - [ -s "$mdconfig" ] && /sbin/mdassemble + [ -s "$mdconfig" ] && /usr/bin/mdassemble } # vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index 36b37fd0b..7390509fa 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -8,7 +8,7 @@ build() { echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdassemble" + add_binary "/usr/bin/mdassemble" add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" add_runscript diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install index 5635b8f63..c01cbaf24 100644 --- a/core/mdadm/mdadm_udev_install +++ b/core/mdadm/mdadm_udev_install @@ -9,7 +9,7 @@ build() { add_file "/etc/mdadm.conf" fi - add_binary "mdadm" + add_binary "/usr/bin/mdadm" add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules" add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules" } @@ -17,7 +17,7 @@ build() { help() { cat <<HELPEOF This hook loads the necessary modules for a RAID array and uses incremental -assembly via udev at runtime to create the devices. This hook with NOT work +assembly via udev at runtime to create the devices. This hook will NOT work without the udev hook included on the image. HELPEOF } diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 768cf9d69..6cbbc88fa 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185039 2013-05-10 16:21:44Z tomegun $ +# $Id: PKGBUILD 186779 2013-05-31 07:19:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.8 -pkgrel=3 +pkgrel=6 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' @@ -20,7 +20,6 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn nfs-server.conf exports idmapd.conf - start-statd.patch nfs nfs-utils-1.1.4-mtab-sym.patch nfs-utils-1.1.4-no-exec.patch @@ -33,54 +32,59 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount blkmapd.service - nfs-utils.conf) + nfs-utils.conf + id_resolver.conf + start-statd.patch) install=nfs-utils.install md5sums=('6e7d97de51e428a0b8698c16ca23db77' 'f73f197a16b02c3e248488ec35c4cf43' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e9144277a89a620d9bc80413158a7d27' 'f5e7bba09a46c5c5d7007cac6eff9df5' '7674106eaaa4c149bccd4f05fe3604e9' '4f4827dfc93008dfadd0a530ad0872b2' - '3694619813cebc5b4502b58f1992b442' - '965311784d49a7d126d512cadbe91deb' - 'e05705d9ccccaeaeb1ecaee20adc05bc' - '359d84a85f8781dc3f45f4cf1dbe4b53' - 'beff8a426b3b14c46e3e78a2a283e2ab' - '5d33d2e754fd37280365b287603bac90' + '6aeb4a80b2a5162f5951438474ea22f3' + 'ff95ad9275ef774e0a2ea8adfe55ee66' + '2e991f0e440b4809e22b6c7689544fc0' + '42d0088add3beab0284be1379391382b' + '60d82e2d2d19d21ceb72665e54bf913e' + '3bcc9901478f4f9ea0a03b67171c13e3' '1cd65909fa0983047f3f06a3ab352401' '8f1b5282795895c9b8ce8430d20cdda6' - '8ffc2ebe932d29efe17d6f3f23d5b975' - '8ac484023d786766d287ccbe878ae4ba') + '8f03e708b230619ffc2a799a48bffb53' + '8ac484023d786766d287ccbe878ae4ba' + 'bed57f7c3911af695ec7b469248c104a' + 'f8bb29c2ca1ce178e6371091a3e1090d') prepare() { cd $srcdir/${pkgname}-${pkgver} patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch + # fix /usr/bin in start-statd shell script + patch -Np1 -i ../start-statd.patch #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - # arch specific patch - patch -Np0 -i $srcdir/start-statd.patch } build() { cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ + ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41 --enable-gss \ --without-tcp-wrappers --with-statedir=/var/lib/nfs \ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ - --enable-mountconfig - + --enable-mountconfig --with-start-statd=/usr/bin/start-statd + # move mount helpers to /usr/bin + sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile + # move osd_login to /usr/bin + sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/osd_login/Makefile make } package() { cd $srcdir/${pkgname}-${pkgver} # fix make install - mkdir -p $pkgdir/sbin make DESTDIR=$pkgdir install # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} + sed -i '1s/python$/python2/' "$pkgdir"/usr/bin/{nfsiostat,mountstats} # Configuration install -D -m 644 ../exports "$pkgdir/"etc/exports @@ -89,6 +93,8 @@ package() { install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf + # keyutils id_resolver #35463 + install -D -m 644 ../id_resolver.conf "$pkgdir/"etc/request-key.d/id_resolver.conf # systemd files for i in ${srcdir}/*.{service,mount}; do install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}" @@ -99,3 +105,4 @@ package() { mkdir -m 555 "$pkgdir/"var/lib/nfs/rpc_pipefs mkdir "$pkgdir/"var/lib/nfs/v4recovery } + diff --git a/core/nfs-utils/blkmapd.service b/core/nfs-utils/blkmapd.service index 16cb68bbb..fa7ce394b 100644 --- a/core/nfs-utils/blkmapd.service +++ b/core/nfs-utils/blkmapd.service @@ -5,7 +5,7 @@ Requires=var-lib-nfs-rpc_pipefs.mount [Service] Type=forking -ExecStart=/usr/sbin/blkmapd +ExecStart=/usr/bin/blkmapd [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/id_resolver.conf b/core/nfs-utils/id_resolver.conf new file mode 100644 index 000000000..9c0fee337 --- /dev/null +++ b/core/nfs-utils/id_resolver.conf @@ -0,0 +1 @@ +create id_resolver * * /usr/bin/nfsidmap %k %d
\ No newline at end of file diff --git a/core/nfs-utils/nfs-common b/core/nfs-utils/nfs-common deleted file mode 100644 index 7b16b4b3c..000000000 --- a/core/nfs-utils/nfs-common +++ /dev/null @@ -1,315 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-common - -NEED_STATD= -STATD_OPTS= -NEED_IDMAPD= -IDMAPD_OPTS= -NEED_GSSD= -GSSD_OPTS= -PIPEFS_MOUNTPOINT= -PIPEFS_MOUNTOPTS= - -# rpc.statd daemon & binary location -STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.gssd daemon & binary location -GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default mountpoint and options for rpc_pipefs filesystem -[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" -[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" - -# Parse the fstab file, and determine whether we need idmapd and gssd. (The -# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) -AUTO_NEED_IDMAPD=no -AUTO_NEED_GSSD=no - -if [ -f /etc/fstab ]; then - exec 9<&0 </etc/fstab - - while read DEV MTPT FSTYPE OPTS REST; do - if [ "$FSTYPE" = "nfs4" ]; then - AUTO_NEED_IDMAPD=yes - fi - case "$OPTS" in - sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*) - AUTO_NEED_GSSD=yes - ;; - esac - done - - exec 0<&9 9<&- -fi - -# We also need idmapd if we run an NFSv4 server. It's fairly difficult -# to autodetect whether there are NFSv4 exports or not, and idmapd is not a -# particularily heavy daemon, so we auto-enable it if we find an /etc/exports -# file. This does not mean that there are NFSv4 or other mounts active (or -# even that nfs-kernel-server is installed), but it matches what the "start" -# condition in nfs-kernel-server's init script does, which has a value in -# itself. -if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then - AUTO_NEED_IDMAPD=yes -fi - -case "$NEED_STATD" in - yes|no) - ;; - *) - NEED_STATD=yes - ;; -esac - -case "$NEED_IDMAPD" in - yes|no) - ;; - *) - NEED_IDMAPD=$AUTO_NEED_IDMAPD - ;; -esac - -case "$NEED_GSSD" in - yes|no) - ;; - *) - NEED_GSSD=$AUTO_NEED_GSSD - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } - rc=0 - if [ "$NEED_STATD" = yes ]; then - stat_busy "Starting $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid - # RUN - $STATD $STATD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - # Run sm-notify - /usr/sbin/sm-notify $SMNOTIFY_OPTS - fi - - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - stat_busy "Mounting pipefs filesystem" - do_modprobe sunrpc - do_modprobe nfs - do_modprobe nfsd - do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid - # RUN - $IDMAPD $IDMAPD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid - # RUN - $GSSD $GSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Stopping $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true - fi - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Stopping $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Daemon $STATD_DAEMON_NAME running" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Daemon $GSSD_DAEMON_NAME running" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Daemon $IDMAPD_DAEMON_NAME running" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|restart}" -esac -exit 0 - diff --git a/core/nfs-utils/nfs-server b/core/nfs-utils/nfs-server deleted file mode 100644 index 6aa609d8c..000000000 --- a/core/nfs-utils/nfs-server +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-server - -NFSD_COUNT= -NFSD_OPTS= -NEED_SVCGSSD= -SVCGSSD_OPTS= -MOUNTD_OPTS= -PROCNFSD_MOUNTPOINT= -PROCNFSD_MOUNTOPTS= - -# rpc.nfsd daemon & binary location -NFSD_PROCESS_NAME=nfsd -NFSD_DAEMON_NAME=rpc.nfsd -NFSD="/usr/sbin/rpc.nfsd" - -# rpc.svcgssd daemon & binary location -SVCGSSD_DAEMON_NAME=rpc.svcgssd -SVCGSSD="/usr/sbin/rpc.svcgssd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.mountd daemon & binary location -MOUNTD_DAEMON_NAME=rpc.mountd -MOUNTD="/usr/sbin/rpc.mountd" - -# exortfs binary location -EXPORTFS="/usr/sbin/exportfs" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default number of nfsd servers -[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 - -# Default mountpoint and options for nfsd filesystem -[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" -[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" - -case "$NEED_SVCGSSD" in - yes|no) - ;; - *) - NEED_SVCGSSD=no - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } - rc=0 - stat_busy "Mounting nfsd filesystem" - do_modprobe nfsd - do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Starting $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid - # RUN - $NFSD $NFSD_OPTS $NFSD_COUNT - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid - # RUN - $SVCGSSD $SVCGSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - PID=$(get_pid $IDMAPD) - [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null - - stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid - # RUN - $MOUNTD $MOUNTD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - stat_busy "Stopping $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (SIGINT) - [ ! -z "$PID" ] && kill -2 $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - sleep 1 - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (KILL) - just to be sure - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - # - rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - stat_busy "Unexporting all directories" - $EXPORTFS -au - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - # flush everything out of the kernels export table - if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then - $EXPORTFS -f - fi - do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - stat_busy "Daemon $NFSD_DAEMON_NAME running" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - stat_busy "Daemon $MOUNTD_DAEMON_NAME running" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - reload) - rc=0 - stat_busy "Re-exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|reload|restart}" -esac -exit 0 diff --git a/core/nfs-utils/nfsd.service b/core/nfs-utils/nfsd.service index e5481c3d1..d63e49016 100644 --- a/core/nfs-utils/nfsd.service +++ b/core/nfs-utils/nfsd.service @@ -6,10 +6,10 @@ Requires=rpcbind.service [Service] Type=oneshot EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT -ExecStartPost=/usr/sbin/exportfs -a -ExecStop=/usr/sbin/rpc.nfsd 0 -ExecStopPost=/usr/sbin/exportfs -a -u +ExecStart=/usr/bin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT +ExecStartPost=/usr/bin/exportfs -a +ExecStop=/usr/bin/rpc.nfsd 0 +ExecStopPost=/usr/bin/exportfs -a -u RemainAfterExit=yes [Install] diff --git a/core/nfs-utils/rpc-gssd.service b/core/nfs-utils/rpc-gssd.service index da4c71307..182d9b72c 100644 --- a/core/nfs-utils/rpc-gssd.service +++ b/core/nfs-utils/rpc-gssd.service @@ -7,7 +7,7 @@ Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS +ExecStart=/usr/bin/rpc.gssd $GSSD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-idmapd.service b/core/nfs-utils/rpc-idmapd.service index 7785c1bd5..1167daf36 100644 --- a/core/nfs-utils/rpc-idmapd.service +++ b/core/nfs-utils/rpc-idmapd.service @@ -7,7 +7,7 @@ Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS +ExecStart=/usr/bin/rpc.idmapd $IDMAPD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-mountd.service b/core/nfs-utils/rpc-mountd.service index edd8c851d..7528884c2 100644 --- a/core/nfs-utils/rpc-mountd.service +++ b/core/nfs-utils/rpc-mountd.service @@ -6,7 +6,7 @@ Requires=rpcbind.service nfsd.service [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS +ExecStart=/usr/bin/rpc.mountd $MOUNTD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-statd.service b/core/nfs-utils/rpc-statd.service index 46e19673e..c2fd63b3d 100644 --- a/core/nfs-utils/rpc-statd.service +++ b/core/nfs-utils/rpc-statd.service @@ -7,7 +7,7 @@ Before=remote-fs-pre.target [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-common.conf -ExecStart=/usr/sbin/rpc.statd $STATD_OPTS +ExecStart=/usr/bin/rpc.statd $STATD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/rpc-svcgssd.service b/core/nfs-utils/rpc-svcgssd.service index 8152e8338..876bad38c 100644 --- a/core/nfs-utils/rpc-svcgssd.service +++ b/core/nfs-utils/rpc-svcgssd.service @@ -6,7 +6,7 @@ Requires=rpcbind.service [Service] Type=forking EnvironmentFile=/etc/conf.d/nfs-server.conf -ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS +ExecStart=/usr/bin/rpc.svcgssd $SVCGSSD_OPTS [Install] WantedBy=multi-user.target diff --git a/core/nfs-utils/start-statd.patch b/core/nfs-utils/start-statd.patch index 5d73b6e35..6f6f1194d 100644 --- a/core/nfs-utils/start-statd.patch +++ b/core/nfs-utils/start-statd.patch @@ -1,22 +1,10 @@ ---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 -+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 -@@ -1,9 +1,16 @@ --#!/bin/bash -p -+#!/bin/sh -+ -+# Original script provided by the NFS project -+# Modified for Arch Linux by Tom Killian -+ - # nfsmount calls this script when mounting a filesystem with locking - # enabled, but when statd does not seem to be running (based on +--- nfs-utils-1.2.8/utils/statd/start-statd.old 2013-05-23 11:35:10.408221686 +0200 ++++ nfs-utils-1.2.8/utils/statd/start-statd 2013-05-23 11:35:22.191356904 +0200 +@@ -4,6 +4,6 @@ # /var/run/rpc.statd.pid). # It should run statd with whatever flags are apropriate for this # site. -PATH=/sbin:/usr/sbin --exec rpc.statd --no-notify -+ -+# source application-specific settings -+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf -+ -+exec /usr/sbin/rpc.statd $STATD_OPTS ++PATH=/sbin:/usr/sbin:/usr/bin + exec rpc.statd --no-notify diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index 24723ca85..4f9ca816a 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163896 2012-07-21 19:19:52Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 185727 2013-05-17 18:43:30Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils -pkgver=2.1.4 +pkgver=2.1.5 pkgrel=1 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ backup=('etc/nilfs_cleanerd.conf') depends=('util-linux') options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('e72f941f5041a057a81a1ce22e03497d') +md5sums=('f072cc53c288492061b3199d63e32177') build() { cd $pkgname-$pkgver diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 14abe79d0..876ca439c 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 184147 2013-05-02 19:39:44Z eric $ +# $Id: PKGBUILD 186436 2013-05-26 15:20:21Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.35 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') -options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch) sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' - '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393' + '2441815efbfa01ad7a1d39068e5503b53d1d04b0' 'f86a82e35ebe15026980467c9dee4007e686b795' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' 'b2d11b4c522750ad9da3409333094fb599ac2c85') @@ -31,7 +30,7 @@ prepare() { build() { cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ - --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap --sbindir=/usr/bin \ --enable-ipv6 --enable-syslog --enable-local \ --enable-bdb --enable-hdb \ --enable-crypt --enable-dynamic \ @@ -101,7 +100,7 @@ package_openldap() { # get rid of duplicate default conf files rm "${pkgdir}"/etc/openldap/*.default - ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + ln -s ../lib/slapd "${pkgdir}"/usr/bin/slapd chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} diff --git a/core/openldap/slapd.service b/core/openldap/slapd.service index 79b2cf81f..a664fa38e 100644 --- a/core/openldap/slapd.service +++ b/core/openldap/slapd.service @@ -3,7 +3,7 @@ Description=OpenLDAP server daemon [Service] Type=forking -ExecStart=/usr/sbin/slapd -u ldap -g ldap +ExecStart=/usr/bin/slapd -u ldap -g ldap [Install] WantedBy=multi-user.target diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 43f9709e1..c3d65deb3 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180812 2013-03-26 12:05:13Z bisson $ +# $Id: PKGBUILD 186025 2013-05-20 14:49:38Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=6.2p1 +pkgver=6.2p2 pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' @@ -15,31 +15,28 @@ depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.close-sessions' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('8824708c617cc781b2bb29fa20bd905fd3d2a43d' - '954bf1660aa32620c37034320877f4511b767ccb' + 'sshd.pam') +sha1sums=('c2b4909eba6f5ec6f9f75866c202db47f3b501ba' '6df5be396f8c593bb511a249a1453294d18a01a6' - 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - 'f9af4a442b804ab661cec0edb25dd76dee16d8d2' + '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' + '2d87de52a6b2f764180f9f67cb9747392784b4a5' 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - 'd93dca5ebda4610ff7647187f8928a3de28703f3' - '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7') + 'd93dca5ebda4610ff7647187f8928a3de28703f3') -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') + +install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib/ssh \ --sysconfdir=/etc/ssh \ --with-ldns \ @@ -69,20 +66,14 @@ package() { make DESTDIR="${pkgdir}" install - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1 install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service 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 -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id diff --git a/core/openssh/install b/core/openssh/install new file mode 100644 index 000000000..6f0cd3703 --- /dev/null +++ b/core/openssh/install @@ -0,0 +1,10 @@ +post_upgrade() { + if [[ $(vercmp $2 6.2p2) = -1 ]]; then + cat <<EOF + +==> The sshd daemon has been moved to /usr/bin alongside all binaries. +==> Please update this path in your scripts if applicable. + +EOF + fi +} diff --git a/core/openssh/sshd b/core/openssh/sshd deleted file mode 100755 index d60804e84..000000000 --- a/core/openssh/sshd +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/openssh/sshd.close-sessions b/core/openssh/sshd.close-sessions deleted file mode 100644 index be2a709fc..000000000 --- a/core/openssh/sshd.close-sessions +++ /dev/null @@ -1,17 +0,0 @@ -# Close sshd sessions before shutting down the network; see FS#17389. - -sshd_close_sessions () { - if ck_daemon sshd; then - return - fi - /etc/rc.d/sshd stop - stat_busy "Stopping Secure Shell Sessions" - for i in $(pgrep sshd); do - if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then - kill $i - fi - done &>/dev/null - stat_done -} - -add_hook shutdown_start sshd_close_sessions diff --git a/core/openssh/sshd.confd b/core/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/core/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service index 633164e5d..349bde59d 100644 --- a/core/openssh/sshd.service +++ b/core/openssh/sshd.service @@ -4,7 +4,7 @@ Wants=sshdgenkeys.service After=sshdgenkeys.service [Service] -ExecStart=/usr/sbin/sshd -D +ExecStart=/usr/bin/sshd -D ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/openssh/sshd@.service b/core/openssh/sshd@.service index 2fd9b0814..7ce3d37ba 100644 --- a/core/openssh/sshd@.service +++ b/core/openssh/sshd@.service @@ -3,6 +3,6 @@ Description=OpenSSH Per-Connection Daemon After=sshdgenkeys.service [Service] -ExecStart=-/usr/sbin/sshd -i +ExecStart=-/usr/bin/sshd -i StandardInput=socket StandardError=syslog diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index 0257a6aa3..a562da503 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185040 2013-05-10 16:21:45Z tomegun $ +# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.6 -pkgrel=3 +pkgrel=4 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -25,13 +25,13 @@ md5sums=('7b73e58b7ce79ffa321d408de06db2c4' build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --libdir=/usr/lib + ./configure --libdir=/usr/lib --sbindir=/usr/bin patch -Np0 -i ../pam_namespace-build-1.1.6.patch make cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib + ./configure --libdir=/usr/lib --sbindir=/usr/bin make } @@ -62,5 +62,5 @@ _EOT ln -s pam_unix.so pam_unix_session.so # set unix_chkpwd uid - chmod +s $pkgdir/sbin/unix_chkpwd + chmod +s $pkgdir/usr/bin/unix_chkpwd } diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 2327821f6..960c043e4 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $ +# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64 'mips64el') license=('GPL2') @@ -15,15 +15,15 @@ md5sums=('3fccb0b28879adb57d8156115f8003c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean - make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" # this is now supplied by the hwids package rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index 2e9902106..b83d8cc50 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173746 2012-12-22 15:22:21Z tomegun $ +# $Id: PKGBUILD 185562 2013-05-15 07:34:58Z tpowa $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=pcmciautils pkgver=018 -pkgrel=6 +pkgrel=7 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" @@ -19,6 +19,7 @@ options=(!makeflags) build() { cd "$pkgname-$pkgver" sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile + sed -i -e 's,/sbin,/usr/bin,g' Makefile make } diff --git a/core/perl/CVE-2012-6329.patch b/core/perl/CVE-2012-6329.patch deleted file mode 100644 index 5f59e03c1..000000000 --- a/core/perl/CVE-2012-6329.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit 1735f6f53ca19f99c6e9e39496c486af323ba6a8 -Author: Brian Carlson <brian.carlson@cpanel.net> -Date: Wed Nov 28 08:54:33 2012 -0500 - - Fix misparsing of maketext strings. - - Case 61251: This commit fixes a misparse of maketext strings that could - lead to arbitrary code execution. Basically, maketext was compiling - bracket notation into functions, but neglected to escape backslashes - inside the content or die on fully-qualified method names when - generating the code. This change escapes all such backslashes and dies - when a method name with a colon or apostrophe is specified. ---- - AUTHORS | 1 + - dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++---------------- - 2 files changed, 9 insertions(+), 16 deletions(-) - -diff --git a/AUTHORS b/AUTHORS -index 70734b0..009dea0 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -154,6 +154,7 @@ Breno G. de Oliveira <garu@cpan.org> - Brent Dax <brentdax@cpan.org> - Brooks D Boyd - Brian Callaghan <callagh@itginc.com> -+Brian Carlson <brian.carlson@cpanel.net> - Brian Clarke <clarke@appliedmeta.com> - brian d foy <brian.d.foy@gmail.com> - Brian Fraser <fraserbn@gmail.com> -diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm -index 4822027..63e5fba 100644 ---- a/dist/Locale-Maketext/lib/Locale/Maketext.pm -+++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm -@@ -625,21 +625,9 @@ sub _compile { - # 0-length method name means to just interpolate: - push @code, ' ('; - } -- elsif($m =~ /^\w+(?:\:\:\w+)*$/s -- and $m !~ m/(?:^|\:)\d/s -- # exclude starting a (sub)package or symbol with a digit -+ elsif($m =~ /^\w+$/s -+ # exclude anything fancy, especially fully-qualified module names - ) { -- # Yes, it even supports the demented (and undocumented?) -- # $obj->Foo::bar(...) syntax. -- $target->_die_pointing( -- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, -- 2 + length($c[-1]) -- ) -- if $m =~ m/^SUPER::/s; -- # Because for SUPER:: to work, we'd have to compile this into -- # the right package, and that seems just not worth the bother, -- # unless someone convinces me otherwise. -- - push @code, ' $_[0]->' . $m . '('; - } - else { -@@ -693,7 +681,9 @@ sub _compile { - elsif(substr($1,0,1) ne '~') { - # it's stuff not containing "~" or "[" or "]" - # i.e., a literal blob -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - - } - elsif($1 eq '~~') { # "~~" -@@ -731,7 +721,9 @@ sub _compile { - else { - # It's a "~X" where X is not a special character. - # Consider it a literal ~ and X. -- $c[-1] .= $1; -+ my $text = $1; -+ $text =~ s/\\/\\\\/g; -+ $c[-1] .= $text; - } - } - } diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 59542f137..039a7c240 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183473 2013-04-21 22:15:16Z bluewind $ +# $Id: PKGBUILD 186370 2013-05-26 09:24:10Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> @@ -6,8 +6,8 @@ # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.16.3 -pkgrel=3 +pkgver=5.18.0 +pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64 'mips64el') license=('GPL' 'PerlArtistic') @@ -15,32 +15,27 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 - cgi-cr-escaping.diff perlbin.sh perlbin.csh - CVE-2012-6329.patch provides.pl) install=perl.install options=('makeflags' '!purge') -md5sums=('025102de0e4a597cf541e57da80c6aa3' - '0486659c9eefe682364a3e364d814296' +md5sums=('a832e928adfd36d162d2a5d3b631265c' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' - '5dc374e095d896fb30618e414aeb9017' '999c3eea6464860704abbb055a0f0896') + # workaround to let the integrity check find the correct provides array if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) fi -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} +} - patch -i "$srcdir/cgi-cr-escaping.diff" -p1 - patch -i "$srcdir/CVE-2012-6329.patch" -p1 - - # Fix FS#34531; in perl upstream >= 5.17.9 - sed -i "s/Is_dos/is_dos/" cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +build() { + cd ${srcdir}/${pkgname}-${pkgver} if [ "${CARCH}" != "i686" ]; then # for x86_64 @@ -69,7 +64,7 @@ build() { check() { cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness + TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true # make test } diff --git a/core/perl/cgi-cr-escaping.diff b/core/perl/cgi-cr-escaping.diff deleted file mode 100644 index 51adf7231..000000000 --- a/core/perl/cgi-cr-escaping.diff +++ /dev/null @@ -1,75 +0,0 @@ -From 18b607e4544c0cffc85207a8f9901ba37ac917d9 Mon Sep 17 00:00:00 2001 -From: Ryo Anazawa <anazawa@cpan.org> -Date: Wed, 14 Nov 2012 09:47:32 +0900 -Subject: CR escaping for P3P and Set-Cookie headers - -Bug: https://github.com/markstos/CGI.pm/pull/23 -Bug-Debian: http://bugs.debian.org/693420 -Origin: https://github.com/markstos/CGI.pm/commit/cb39938b45206093a363e36fd104e4a0f26deecb -Patch-Name: fixes/cgi-cr-escaping.diff ---- - cpan/CGI/lib/CGI.pm | 24 ++++++++++++------------ - cpan/CGI/t/headers.t | 6 ++++++ - 2 files changed, 18 insertions(+), 12 deletions(-) - -diff --git a/cpan/CGI/lib/CGI.pm b/cpan/CGI/lib/CGI.pm -index 1a52c70..c70e9c1 100644 ---- a/cpan/CGI/lib/CGI.pm -+++ b/cpan/CGI/lib/CGI.pm -@@ -1550,8 +1550,17 @@ sub header { - 'EXPIRES','NPH','CHARSET', - 'ATTACHMENT','P3P'],@p); - -+ # Since $cookie and $p3p may be array references, -+ # we must stringify them before CR escaping is done. -+ my @cookie; -+ for (ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie) { -+ my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_; -+ push(@cookie,$cs) if defined $cs and $cs ne ''; -+ } -+ $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY'; -+ - # CR escaping for values, per RFC 822 -- for my $header ($type,$status,$cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) { -+ for my $header ($type,$status,@cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) { - if (defined $header) { - # From RFC 822: - # Unfolding is accomplished by regarding CRLF immediately -@@ -1595,18 +1604,9 @@ sub header { - - push(@header,"Status: $status") if $status; - push(@header,"Window-Target: $target") if $target; -- if ($p3p) { -- $p3p = join ' ',@$p3p if ref($p3p) eq 'ARRAY'; -- push(@header,qq(P3P: policyref="/w3c/p3p.xml", CP="$p3p")); -- } -+ push(@header,"P3P: policyref=\"/w3c/p3p.xml\", CP=\"$p3p\"") if $p3p; - # push all the cookies -- there may be several -- if ($cookie) { -- my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie; -- for (@cookie) { -- my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_; -- push(@header,"Set-Cookie: $cs") if $cs ne ''; -- } -- } -+ push(@header,map {"Set-Cookie: $_"} @cookie); - # if the user indicates an expiration time, then we need - # both an Expires and a Date header (so that the browser is - # uses OUR clock) -diff --git a/cpan/CGI/t/headers.t b/cpan/CGI/t/headers.t -index 661b74b..4b4922c 100644 ---- a/cpan/CGI/t/headers.t -+++ b/cpan/CGI/t/headers.t -@@ -22,6 +22,12 @@ like($@,qr/contains a newline/,'invalid header blows up'); - like $cgi->header( -type => "text/html".$CGI::CRLF." evil: stuff " ), - qr#Content-Type: text/html evil: stuff#, 'known header, with leading and trailing whitespace on the continuation line'; - -+eval { $cgi->header( -p3p => ["foo".$CGI::CRLF."bar"] ) }; -+like($@,qr/contains a newline/,'P3P header with CRLF embedded blows up'); -+ -+eval { $cgi->header( -cookie => ["foo".$CGI::CRLF."bar"] ) }; -+like($@,qr/contains a newline/,'Set-Cookie header with CRLF embedded blows up'); -+ - eval { $cgi->header( -foobar => "text/html".$CGI::CRLF."evil: stuff" ) }; - like($@,qr/contains a newline/,'unknown header with CRLF embedded blows up'); - diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 504665858..1f65bae8d 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $ +# $Id: PKGBUILD 186305 2013-05-24 13:04:43Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=popt pkgver=1.16 -pkgrel=5 +pkgrel=6 pkgdesc="A commandline option parser" arch=('i686' 'x86_64' 'mips64el') url="http://rpm5.org" @@ -20,7 +20,7 @@ sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index dfcaa3ea3..158f407f1 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180917 2013-03-28 02:20:12Z bisson $ +# $Id: PKGBUILD 186686 2013-05-30 13:43:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng -pkgver=3.3.7 +pkgver=3.3.8 pkgrel=1 pkgdesc='Utilities for monitoring your system and its processes' url='http://gitorious.org/procps' @@ -12,9 +12,9 @@ arch=('i686' 'x86_64' 'mips64el') groups=('base') depends=('ncurses') backup=('etc/sysctl.conf') -source=("procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}" +source=("${pkgname}-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}" 'sysctl.conf') -sha1sums=('436ce9e585210340ff1673157e402e07879a6239' +sha1sums=('63aed46ba4b5b05698beb25d2aa3eee6779d7f45' '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53') conflicts=('procps') @@ -23,11 +23,22 @@ replaces=('procps') options=('!libtool') -build() { +prepare() { cd "${srcdir}/procps-procps" echo ${pkgver} > .tarball-version ./autogen.sh - ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib +} + +build() { + cd "${srcdir}/procps-procps" + ./configure \ + --prefix=/usr \ + --exec-prefix=/ \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ + --disable-static make } @@ -37,6 +48,6 @@ package() { install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf" # provided by util-linux - rm "${pkgdir}/bin/kill" + rm "${pkgdir}/usr/bin/kill" rm "${pkgdir}/usr/share/man/man1/kill.1" } diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD index bac2a687a..a3c94bdf1 100644 --- a/core/reiserfsprogs/PKGBUILD +++ b/core/reiserfsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176315 2013-01-29 16:20:21Z andrea $ +# $Id: PKGBUILD 186498 2013-05-27 20:01:02Z tpowa $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs pkgver=3.6.22 -pkgrel=1 +pkgrel=2 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.kernel.org/" @@ -16,7 +16,7 @@ md5sums=('91d2fdb5eeaa15c8afcc9e815179690d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sbindir=/sbin + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD index 580296392..32e24b430 100644 --- a/core/rfkill/PKGBUILD +++ b/core/rfkill/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 175740 2013-01-21 04:49:48Z bisson $ +# $Id: PKGBUILD 186265 2013-05-23 06:41:04Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rfkill -pkgver=0.4 -pkgrel=7 +pkgver=0.5 +pkgrel=1 pkgdesc='Tool for enabling and disabling wireless devices' -url='http://linuxwireless.org/en/users/Documentation/rfkill' +url='http://wireless.kernel.org/en/users/Documentation/rfkill' license=('custom') arch=('i686' 'x86_64' 'mips64el') -source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'service.unblock' 'service.block' - 'rules.d' - 'conf.d' - 'rc.d') -sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b' - '4d0ef151891c32c882dcec8b03ab7204f015d0d1' - 'c44581c4cc19509f53afd0abea1341cc30751fe2' - '6390eaa793b473098aaa11b13c5254d611a4c13a' - 'd969fe927a9fb2926af43a311a7c1fa126fe59a9' - '380af0b002f51543557306ed68a27f0059fd5a6f') - -backup=('etc/conf.d/rfkill') + 'rules.d') +sha1sums=('03025d4ae285c40d5c19ec99ef7b317afda9d900' + '5f4a04a434df2ca28ca6687326c67c1f125aa3d4' + '6cc294af37232469cd5ba63455b571fe258e1cc6' + '6390eaa793b473098aaa11b13c5254d611a4c13a') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,11 +26,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make SBINDIR=/usr/bin DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service" install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service" - install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill" - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill" } diff --git a/core/rfkill/conf.d b/core/rfkill/conf.d deleted file mode 100644 index 4483da26c..000000000 --- a/core/rfkill/conf.d +++ /dev/null @@ -1,20 +0,0 @@ -# -# /etc/conf.d/rfkill -# Configuration for the rfkill startup script -# - -# List of devices to block on startup (space-separated) -RFKILL_BLOCK="" - -# List of devices to unblock on startup (space-separated) -RFKILL_UNBLOCK="all" - -# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... -# See "rfkill list" for available devices -# Examples: -# -# Block all bluetooth devices: -# RFKILL_BLOCK="bluetooth" -# -# Unblock the phy0 wifi device and all wwan devices: -# RFKILL_UNBLOCK="phy0 wwan" diff --git a/core/rfkill/rc.d b/core/rfkill/rc.d deleted file mode 100755 index ce90ee150..000000000 --- a/core/rfkill/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rfkill - -case "$1" in - start) - for device in ${RFKILL_BLOCK}; do - stat_busy "Blocking rfkill device: ${device}" - /usr/sbin/rfkill block ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - for device in ${RFKILL_UNBLOCK}; do - stat_busy "Unblocking rfkill device: ${device}" - /usr/sbin/rfkill unblock ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - ;; - stop) - ;; - restart) - $0 start - ;; - *) - echo "usage: $0 {start}" - exit 1 - ;; -esac -exit 0 diff --git a/core/rfkill/service.block b/core/rfkill/service.block index 420272c5d..ede74d12d 100644 --- a/core/rfkill/service.block +++ b/core/rfkill/service.block @@ -4,7 +4,7 @@ After=rfkill-unblock@all.service [Service] Type=oneshot -ExecStart=/usr/sbin/rfkill block %I +ExecStart=/usr/bin/rfkill block %I [Install] WantedBy=multi-user.target diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock index 40f4e3244..94ebf35af 100644 --- a/core/rfkill/service.unblock +++ b/core/rfkill/service.unblock @@ -4,7 +4,7 @@ After=rfkill-block@all.service [Service] Type=oneshot -ExecStart=/usr/sbin/rfkill unblock %I +ExecStart=/usr/bin/rfkill unblock %I [Install] WantedBy=multi-user.target diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index 4e68056b1..2eed8c3ff 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185041 2013-05-10 16:21:46Z tomegun $ +# $Id: PKGBUILD 186778 2013-05-31 07:19:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=11 +pkgrel=12 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') @@ -12,17 +12,19 @@ license=('custom') replaces=('portmap') source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 rpcbind-sunrpc.patch - rpcbind.service - rpcbind) + rpcbind.service) md5sums=('1a77ddb1aaea8099ab19c351eeb26316' 'c02ac36a98baac70b8a26190524b7b73' - 'a7b23a32be2eb52d7dec52da36d4eba1' - '78a963654f57cbb209e228884767836e') + 'a7b23a32be2eb52d7dec52da36d4eba1') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver # patch for iana services file patch -Np1 -i ../rpcbind-sunrpc.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run make } @@ -37,8 +39,6 @@ package() { make DESTDIR=$pkgdir install # install missing man page - https://bugs.archlinux.org/task/21271 install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/ - # install daemon - install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind # install systemd service file install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service # install license diff --git a/core/rpcbind/rpcbind b/core/rpcbind/rpcbind deleted file mode 100755 index 87c5b50da..000000000 --- a/core/rpcbind/rpcbind +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$(pidof -o %PPID /usr/bin/rpcbind)" -case "$1" in - start) - stat_busy "Starting rpcbind" - [ -z "$PID" ] && /usr/bin/rpcbind &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/bin/rpcbind) - echo $PID > /var/run/rpcbind.pid - add_daemon rpcbind - stat_done - fi - ;; - stop) - stat_busy "Stopping rpcbind" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/rpcbind.pid - rm_daemon rpcbind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 5c856e591..e822537e6 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182700 2013-04-12 23:52:17Z foutrelis $ +# $Id: PKGBUILD 185547 2013-05-14 21:53:57Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -6,7 +6,7 @@ pkgname=sudo _sudover=1.8.6p8 pkgver=${_sudover/p/.p} -pkgrel=1 +pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64' 'mips64el') url="http://www.sudo.ws/sudo/" @@ -26,6 +26,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --libexecdir=/usr/lib \ --with-logfac=auth \ --with-pam \ diff --git a/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch new file mode 100644 index 000000000..84cce7121 --- /dev/null +++ b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch @@ -0,0 +1,255 @@ +From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Thu, 16 May 2013 00:19:03 +0200 +Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal + runtime service + +With this change systemd-update-utmp-shutdown.service is replaced by +systemd-update-utmp.service which is started at boot and stays around +until shutdown. This allows us to properly order the unit against both +/var/log and auditd. + +https://bugzilla.redhat.com/show_bug.cgi?id=853104 +https://bugs.freedesktop.org/show_bug.cgi?id=64365 +--- + Makefile-man.am | 12 ++++++------ + Makefile.am | 8 ++++---- + ....service.xml => systemd-update-utmp.service.xml} | 16 ++++++++-------- + src/update-utmp/update-utmp.c | 2 +- + units/.gitignore | 2 +- + units/systemd-update-utmp-runlevel.service.in | 8 +++++--- + units/systemd-update-utmp-shutdown.service.in | 19 ------------------- + units/systemd-update-utmp.service.in | 21 +++++++++++++++++++++ + 8 files changed, 46 insertions(+), 42 deletions(-) + rename man/{systemd-update-utmp-runlevel.service.xml => systemd-update-utmp.service.xml} (82%) + delete mode 100644 units/systemd-update-utmp-shutdown.service.in + create mode 100644 units/systemd-update-utmp.service.in + +diff --git a/Makefile-man.am b/Makefile-man.am +index 7d62094..5888158 100644 +--- a/Makefile-man.am ++++ b/Makefile-man.am +@@ -72,7 +72,7 @@ MANPAGES += \ + man/systemd-tmpfiles.8 \ + man/systemd-tty-ask-password-agent.1 \ + man/systemd-udevd.service.8 \ +- man/systemd-update-utmp-runlevel.service.8 \ ++ man/systemd-update-utmp.service.8 \ + man/systemd.1 \ + man/systemd.automount.5 \ + man/systemd.device.5 \ +@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \ + man/systemd-udevd-control.socket.8 \ + man/systemd-udevd-kernel.socket.8 \ + man/systemd-udevd.8 \ +- man/systemd-update-utmp-shutdown.service.8 \ ++ man/systemd-update-utmp-runlevel.service.8 \ + man/systemd-update-utmp.8 \ + man/systemd-user.conf.5 + man/SD_ALERT.3: man/sd-daemon.3 +@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 + man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 + man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 + man/systemd-udevd.8: man/systemd-udevd.service.8 +-man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 +-man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 ++man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8 ++man/systemd-update-utmp.8: man/systemd-update-utmp.service.8 + man/systemd-user.conf.5: man/systemd-system.conf.5 + man/SD_ALERT.html: man/sd-daemon.html + $(html-alias) +@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html + man/systemd-udevd.html: man/systemd-udevd.service.html + $(html-alias) + +-man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html ++man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html + $(html-alias) + +-man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html ++man/systemd-update-utmp.html: man/systemd-update-utmp.service.html + $(html-alias) + + man/systemd-user.conf.html: man/systemd-system.conf.html +diff --git a/Makefile.am b/Makefile.am +index 8d8139c..4c5e6fc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \ + units/systemd-initctl.service \ + units/systemd-shutdownd.service \ + units/systemd-remount-fs.service \ ++ units/systemd-update-utmp.service \ + units/systemd-update-utmp-runlevel.service \ +- units/systemd-update-utmp-shutdown.service \ + units/systemd-tmpfiles-setup-dev.service \ + units/systemd-tmpfiles-setup.service \ + units/systemd-tmpfiles-clean.service \ +@@ -463,8 +463,8 @@ EXTRA_DIST += \ + units/systemd-initctl.service.in \ + units/systemd-shutdownd.service.in \ + units/systemd-remount-fs.service.in \ ++ units/systemd-update-utmp.service.in \ + units/systemd-update-utmp-runlevel.service.in \ +- units/systemd-update-utmp-shutdown.service.in \ + units/systemd-tmpfiles-setup-dev.service.in \ + units/systemd-tmpfiles-setup.service.in \ + units/systemd-tmpfiles-clean.service.in \ +@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \ + RUNLEVEL5_TARGET_WANTS += \ + systemd-update-utmp-runlevel.service + endif +-SHUTDOWN_TARGET_WANTS += \ +- systemd-update-utmp-shutdown.service ++SYSINIT_TARGET_WANTS += \ ++ systemd-update-utmp.service + LOCAL_FS_TARGET_WANTS += \ + systemd-remount-fs.service \ + systemd-fsck-root.service \ +diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp.service.xml +similarity index 82% +rename from man/systemd-update-utmp-runlevel.service.xml +rename to man/systemd-update-utmp.service.xml +index 867b958..846fc95 100644 +--- a/man/systemd-update-utmp-runlevel.service.xml ++++ b/man/systemd-update-utmp.service.xml +@@ -19,10 +19,10 @@ + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. + --> +-<refentry id="systemd-update-utmp-runlevel.service"> ++<refentry id="systemd-update-utmp.service"> + + <refentryinfo> +- <title>systemd-update-utmp-runlevel.service</title> ++ <title>systemd-update-utmp.service</title> + <productname>systemd</productname> + + <authorgroup> +@@ -36,21 +36,21 @@ + </refentryinfo> + + <refmeta> +- <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle> ++ <refentrytitle>systemd-update-utmp.service</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <refnamediv> ++ <refname>systemd-update-utmp.service</refname> + <refname>systemd-update-utmp-runlevel.service</refname> +- <refname>systemd-update-utmp-shutdown.service</refname> + <refname>systemd-update-utmp</refname> +- <refpurpose>Write audit and utmp updates at runlevel ++ <refpurpose>Write audit and utmp updates at bootup, runlevel + changes and shutdown</refpurpose> + </refnamediv> + + <refsynopsisdiv> ++ <para><filename>systemd-update-utmp.service</filename></para> + <para><filename>systemd-update-utmp-runlevel.service</filename></para> +- <para><filename>systemd-update-utmp-shutdown.service</filename></para> + <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para> + </refsynopsisdiv> + +@@ -60,8 +60,8 @@ + <para><filename>systemd-update-utmp-runlevel.service</filename> + is a service that writes SysV runlevel changes to utmp + and wtmp, as well as the audit logs, as they +- occur. <filename>systemd-update-utmp-shutdown.service</filename> +- does the same for shut-down requests.</para> ++ occur. <filename>systemd-update-utmp.service</filename> ++ does the same for system reboots and shut-down requests.</para> + </refsect1> + + <refsect1> +diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c +index 9184025..202aa98 100644 +--- a/src/update-utmp/update-utmp.c ++++ b/src/update-utmp/update-utmp.c +@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) { + { '3', SPECIAL_RUNLEVEL3_TARGET }, + { '4', SPECIAL_RUNLEVEL4_TARGET }, + { '2', SPECIAL_RUNLEVEL2_TARGET }, +- { 'S', SPECIAL_RESCUE_TARGET }, ++ { '1', SPECIAL_RESCUE_TARGET }, + }; + const char + *interface = "org.freedesktop.systemd1.Unit", +diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in +index 27fae2c..99783e2 100644 +--- a/units/systemd-update-utmp-runlevel.service.in ++++ b/units/systemd-update-utmp-runlevel.service.in +@@ -7,12 +7,14 @@ + + [Unit] + Description=Update UTMP about System Runlevel Changes +-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) ++Documentation=man:systemd-update-utmp.service(8) man:utmp(5) + DefaultDependencies=no + RequiresMountsFor=/var/log/wtmp +-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service ++Conflicts=shutdown.target ++Requisite=systemd-update-utmp.service ++After=systemd-update-utmp.service + After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target +-Before=final.target ++Before=shutdown.target + + [Service] + Type=oneshot +diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in +deleted file mode 100644 +index aa93562..0000000 +--- a/units/systemd-update-utmp-shutdown.service.in ++++ /dev/null +@@ -1,19 +0,0 @@ +-# This file is part of systemd. +-# +-# systemd 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. +- +-[Unit] +-Description=Update UTMP about System Shutdown +-Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) +-DefaultDependencies=no +-RequiresMountsFor=/var/log/wtmp +-After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service +-After=systemd-update-utmp-runlevel.service +-Before=final.target +- +-[Service] +-Type=oneshot +-ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown +diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in +new file mode 100644 +index 0000000..e7c20a5 +--- /dev/null ++++ b/units/systemd-update-utmp.service.in +@@ -0,0 +1,21 @@ ++# This file is part of systemd. ++# ++# systemd 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. ++ ++[Unit] ++Description=Update UTMP about System Reboot/Shutdown ++Documentation=man:systemd-update-utmp.service(8) man:utmp(5) ++DefaultDependencies=no ++RequiresMountsFor=/var/log/wtmp ++Conflicts=shutdown.target ++After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service ++Before=sysinit.target shutdown.target ++ ++[Service] ++Type=oneshot ++RemainAfterExit=yes ++ExecStart=@rootlibexecdir@/systemd-update-utmp reboot ++ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown +-- +1.8.2.3 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 1a106b14e..d26c533fb 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=204 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -13,11 +13,13 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('!libtool' '!distcc') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' 'use-split-usr-path.patch') md5sums=('a07619bb19f48164fbf0761d12fd39a8' + '7f39f9fde1ff7b48293ed1e3d0a6c213' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' @@ -28,6 +30,9 @@ prepare() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + + patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch" + autoreconf } build() { @@ -102,9 +107,6 @@ package_systemd() { install -d "$pkgdir/sbin" ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" - # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? - ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" - # add back tmpfiles.d/legacy.conf install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" diff --git a/core/sysvinit/0001-simplify-writelog.patch b/core/sysvinit-tools/0001-simplify-writelog.patch index cc28f14bc..cc28f14bc 100644 --- a/core/sysvinit/0001-simplify-writelog.patch +++ b/core/sysvinit-tools/0001-simplify-writelog.patch diff --git a/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch index 89b3280df..89b3280df 100644 --- a/core/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch +++ b/core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD new file mode 100644 index 000000000..e51f5baab --- /dev/null +++ b/core/sysvinit-tools/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 185338 2013-05-13 13:18:59Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Maintainer: Eric Belanger <eric@archlinux.org> + +pkgname=sysvinit-tools +pkgver=2.88 +pkgrel=10 +arch=('i686' 'x86_64' 'mips64el') +url="http://savannah.nongnu.org/projects/sysvinit" +license=('GPL') +depends=('glibc') +source=(http://download.savannah.gnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2 + "0001-simplify-writelog.patch" + "0002-remove-ansi-escape-codes-from-log-file.patch") +sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26' + '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d' + 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32') + +build() { + cd "${srcdir}/sysvinit-${pkgver}dsf" + + # FS#30005 + patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" + patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch" + + make +} + +package() { + pkgdesc="Linux System V Init Tools" + + cd "${srcdir}/sysvinit-${pkgver}dsf" + make ROOT="${pkgdir}" install + + ### drop the stuff provided by systemd-sysvcompat and util-linux + cd "${pkgdir}" + rm -r usr/share/man/man5 + rm -r usr/include + rm bin/mountpoint + rm sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin} + rm usr/bin/{mesg,utmpdump,wall} + rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1 + rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8 +} diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD deleted file mode 100644 index b0bdb8f21..000000000 --- a/core/sysvinit/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 168539 2012-10-13 09:28:52Z thomas $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -pkgbase=sysvinit -pkgname=('sysvinit-tools' 'sysvinit') -pkgver=2.88 -pkgrel=9 -arch=('i686' 'x86_64' 'mips64el') -url="http://savannah.nongnu.org/projects/sysvinit" -license=('GPL') -depends=('util-linux' 'coreutils' 'glibc' 'awk') -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' - '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d' - 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}dsf" - - # FS#30005 - patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch" - patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch" - - make -} - -package_sysvinit-tools() { - pkgdesc="Linux System V Init Tools" - - cd "${srcdir}/${pkgbase}-${pkgver}dsf" - make ROOT="${pkgdir}" install - - # provided by util-linux - cd "${pkgdir}" - rm bin/mountpoint - rm usr/share/man/man1/mountpoint.1 - 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/core/sysvinit/sysvinit.install b/core/sysvinit/sysvinit.install deleted file mode 100644 index 2f0e62e74..000000000 --- a/core/sysvinit/sysvinit.install +++ /dev/null @@ -1,3 +0,0 @@ -post_upgrade() { - [ -x sbin/init ] && sbin/init u -} diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 9e91a0934..4f7e2c06e 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184217 2013-05-03 23:40:29Z dreisner $ +# $Id: PKGBUILD 186677 2013-05-30 12:45:22Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.23 +pkgver=2.23.1 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" @@ -13,10 +13,10 @@ depends=('pam' 'shadow' 'coreutils' 'glibc') makedepends=('systemd') # checkdepends=('bc') conflicts=('util-linux-ng' 'eject') -provides=("util-linux-ng=${pkgver}" 'eject') +provides=("util-linux-ng=$pkgver" 'eject') license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.23/${pkgname}-${pkgver}.tar.xz +source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz" uuidd.tmpfiles pam-login pam-common @@ -27,9 +27,14 @@ backup=(etc/pam.d/chfn etc/pam.d/su etc/pam.d/su-l) install=util-linux.install +md5sums=('33ba55ce82f8e3b8d7a38fac0f62779a' + 'a39554bfd65cccfd8254bb46922f4a67' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --libdir=/usr/lib \ @@ -56,12 +61,10 @@ build() { #} package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" make DESTDIR="${pkgdir}" install - cd "${pkgdir}" - # setuid chfn and chsh chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} @@ -76,8 +79,3 @@ package() { # TODO(dreisner): offer this upstream? install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('cf5e9bb402371beaaffc3a5f276d5783' - 'a39554bfd65cccfd8254bb46922f4a67' - '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4' - 'fa85e5cce5d723275b14365ba71a8aad') diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD index 92d2f15d0..8a6b6cb41 100644 --- a/core/wireless_tools/PKGBUILD +++ b/core/wireless_tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165574 2012-08-25 15:33:20Z bisson $ +# $Id: PKGBUILD 186266 2013-05-23 06:41:05Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=wireless_tools pkgver=29 -pkgrel=7.1 +pkgrel=8 pkgdesc='Tools allowing to manipulate the Wireless Extensions' url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html' license=('GPL') @@ -15,16 +15,20 @@ source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgve sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710' '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72') -build() { +prepare() { cd "${srcdir}/${pkgname}.${pkgver}" patch -p1 -i ../dense.patch # FS#15363 +} + +build() { + cd "${srcdir}/${pkgname}.${pkgver}" make CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}" } package() { cd "${srcdir}/${pkgname}.${pkgver}" make \ - INSTALL_DIR="${pkgdir}/usr/sbin" \ + INSTALL_DIR="${pkgdir}/usr/bin" \ INSTALL_LIB="${pkgdir}/usr/lib" \ INSTALL_INC="${pkgdir}/usr/include" \ INSTALL_MAN="${pkgdir}/usr/share/man" \ diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index c56832ad2..eeb8d3b10 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 175120 2013-01-14 07:38:18Z tpowa $ +# $Id: PKGBUILD 186296 2013-05-24 07:56:54Z tpowa $ # pkgname=xfsprogs -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -12,20 +12,20 @@ depends=('util-linux') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('d6159f7a664d95b4c150d580399d4400') +md5sums=('de9f1f45026c2f4e0776058d429ff4b6') build() { cd "${srcdir}/${pkgname}-${pkgver}" export OPTIMIZER="-march=${CARCH/_/-} -O1" [ "$CARCH" = "mips64el" ] && export OPTIMIZER="-mabi=n32 -march=mips3 -mtune=loongson2f -O1" export DEBUG=-DNDEBUG - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev + make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev chown -R root $pkgdir chgrp -R root $pkgdir # add hack as we cannot set rootlibdir diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index 5bee80902..fbdf3d48d 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162234 2012-06-24 05:44:41Z tpowa $ +# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=xinetd pkgver=2.3.15 -pkgrel=2 +pkgrel=3 pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64' 'mips64el') url="http://www.xinetd.org/" @@ -13,30 +13,31 @@ optdepends=('perl: for xconv.pl script') backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz xinetd.conf - xinetd servers services xinetd.service) md5sums=('77358478fd58efa6366accae99b8b04c' 'f109f699a07bc8cfb5791060f5e87f9e' - 'ea37a2794f202e6b953d9b6956dad16a' '21f47b4aa20921cfaddddd9f9a407f81' '9fa2061dc7dd738c8424251deb86f81e' - '08466ed714ea8ba42ad81f6fb3aa62e7') + '38be35b6e7146dc59902e243d9063b4c') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver sed -i "s#${prefix}/man#${prefix}/share/man#" configure - ./configure --prefix=/usr --without-libwrap \ +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap \ --build=${CHOST} --host=${CHOST} make } package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install + make prefix=$pkgdir/usr DAEMONDIR=$pkgdir/usr/bin install - install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service index c6f6271fd..1c587e291 100644 --- a/core/xinetd/xinetd.service +++ b/core/xinetd/xinetd.service @@ -3,7 +3,7 @@ Description=A secure replacement for inetd After=network.target [Service] -ExecStart=/usr/sbin/xinetd -dontfork +ExecStart=/usr/bin/xinetd -dontfork ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index a552605ac..3ca1c1ce8 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $ +# $Id: PKGBUILD 185560 2013-05-15 07:14:20Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.31 +pkgver=0.6.32 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('d594f1da95c6a83c0463695ca31815b2' +md5sums=('0c2c87f3bf982bdab54be887fed25bc5' '1d5cf127e5aac407fe7c37b2f4fd503c') build() { diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index b67790a53..f40c2a88f 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184466 2013-05-07 10:49:12Z tpowa $ +# $Id: PKGBUILD 186216 2013-05-22 06:35:12Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.27 -pkgrel=2 +pkgver=1.0.27.1 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -12,20 +12,7 @@ optdepends=('python2: for python smixer plugin') makedepends=('python2') license=('GPL') options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 - alsa-lib-1.0.27-segfault.patch - alsa-lib-1.0.27-kernel.patch - alsa-lib-1.0.27-inline.patch - alsa-lib-1.0.27-inline2.patch) - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - # add upstream patches - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-segfault.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-kernel.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline2.patch" -} +source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" @@ -37,8 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('f090c7dbd0fe57d786d82e411eac2d08' - '755cfcd116c28feac437eb6b5bdc51bb' - '277e2bc587de25e3294a0f597ae9246e' - 'db14deccb57d8dbcfc6f6d22bed45c1e' - '92ca1fec0cb99bfc302896cf9393a936') +md5sums=('17102aaab10e9d4b19f6b02937bab015') diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch deleted file mode 100644 index cc5cb8d75..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 25 Apr 2013 09:52:33 +0200 -Subject: [PATCH] Use __inline__ for exported headers - -Some programs are still using C90. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077 -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/control.h | 4 ++-- - include/iatomic.h | 14 +++++++------- - include/pcm.h | 2 +- - include/pcm_extplug.h | 4 ++-- - include/use-case.h | 4 ++-- - 5 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/include/control.h b/include/control.h -index 27fe2ac..5fdf379 100644 ---- a/include/control.h -+++ b/include/control.h -@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t - int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode); - int snd_ctl_close(snd_ctl_t *ctl); - int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); --static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } -+static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } - int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, - snd_async_callback_t callback, void *private_data); - snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler); -@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode); - int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl); - int snd_hctl_close(snd_hctl_t *hctl); - int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock); --static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } -+static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } - int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl); - int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space); - int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); -diff --git a/include/iatomic.h b/include/iatomic.h -index e92dbfd..5711fe8 100644 ---- a/include/iatomic.h -+++ b/include/iatomic.h -@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v) - return result; - } - --static inline int atomic_add_negative(int i, volatile atomic_t *v) -+static __inline__ int atomic_add_negative(int i, volatile atomic_t *v) - { - unsigned long flags; - int result; -@@ -1160,36 +1160,36 @@ typedef struct { - - void snd_atomic_read_wait(snd_atomic_read_t *t); - --static inline void snd_atomic_write_init(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w) - { - w->begin = 0; - w->end = 0; - } - --static inline void snd_atomic_write_begin(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w) - { - w->begin++; - wmb(); - } - --static inline void snd_atomic_write_end(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w) - { - wmb(); - w->end++; - } - --static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) -+static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) - { - r->write = w; - } - --static inline void snd_atomic_read_begin(snd_atomic_read_t *r) -+static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r) - { - r->end = r->write->end; - rmb(); - } - --static inline int snd_atomic_read_ok(snd_atomic_read_t *r) -+static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r) - { - rmb(); - return r->end == r->write->begin; -diff --git a/include/pcm.h b/include/pcm.h -index e440030..95b8aed 100644 ---- a/include/pcm.h -+++ b/include/pcm.h -@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm); - int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); - int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); - int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock); --static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } -+static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } - int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, - snd_async_callback_t callback, void *private_data); - snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler); -diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h -index 884f322..e3b71bc 100644 ---- a/include/pcm_extplug.h -+++ b/include/pcm_extplug.h -@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type, - /** - * set the parameter constraint with a single value - */ --static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) -+static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) - { - return snd_pcm_extplug_set_param_list(extplug, type, 1, &val); - } -@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type - /** - * set the parameter constraint for slave PCM with a single value - */ --static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) -+static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) - { - return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val); - } -diff --git a/include/use-case.h b/include/use-case.h -index defd4ea..93b3456 100644 ---- a/include/use-case.h -+++ b/include/use-case.h -@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr); - * \param list Returned allocated list - * \return Number of list entries if success, otherwise a negative error code - */ --static inline int snd_use_case_card_list(const char **list[]) -+static __inline__ int snd_use_case_card_list(const char **list[]) - { - return snd_use_case_get_list(NULL, NULL, list); - } -@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[]) - * \param list Returned list of verbs - * \return Number of list entries if success, otherwise a negative error code - */ --static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, -+static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, - const char **list[]) - { - return snd_use_case_get_list(uc_mgr, "_verbs", list); --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch deleted file mode 100644 index e99bae864..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 25 Apr 2013 09:55:49 +0200 -Subject: [PATCH] Add definition of __inline__ for non-GCC - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/asoundlib-head.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h -index 6edbab0..71b5c29 100644 ---- a/include/asoundlib-head.h -+++ b/include/asoundlib-head.h -@@ -40,6 +40,10 @@ - #include <errno.h> - #include <stdarg.h> - -+#ifndef __GNUC__ -+#define __inline__ inline -+#endif -+ - #include <alsa/asoundef.h> - #include <alsa/version.h> - #include <alsa/global.h> --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch deleted file mode 100644 index 3d4eaf3cb..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001 -From: Daniel Mack <zonque@gmail.com> -Date: Thu, 18 Apr 2013 10:37:50 +0200 -Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list - -In particular, this adds definitions and descriptions for G.723 and -DSD types. - -Signed-off-by: Daniel Mack <zonque@gmail.com> -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/pcm.h | 14 +++++++++++++- - src/pcm/pcm.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/include/pcm.h b/include/pcm.h -index d94ba90..e440030 100644 ---- a/include/pcm.h -+++ b/include/pcm.h -@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format { - SND_PCM_FORMAT_U18_3LE, - /** Unsigned 18bit Big Endian in 3bytes format */ - SND_PCM_FORMAT_U18_3BE, -- SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE, -+ /* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */ -+ SND_PCM_FORMAT_G723_24, -+ /* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */ -+ SND_PCM_FORMAT_G723_24_1B, -+ /* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */ -+ SND_PCM_FORMAT_G723_40, -+ /* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */ -+ SND_PCM_FORMAT_G723_40_1B, -+ /* Direct Stream Digital (DSD) in 1-byte samples (x8) */ -+ SND_PCM_FORMAT_DSD_U8, -+ /* Direct Stream Digital (DSD) in 2-byte samples (x16) */ -+ SND_PCM_FORMAT_DSD_U16_LE, -+ SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE, - - #if __BYTE_ORDER == __LITTLE_ENDIAN - /** Signed 16 bit CPU endian */ -diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c -index 2a87a7b..438fb3f 100644 ---- a/src/pcm/pcm.c -+++ b/src/pcm/pcm.c -@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = { - FORMAT(S18_3BE), - FORMAT(U18_3LE), - FORMAT(U18_3BE), -+ FORMAT(G723_24), -+ FORMAT(G723_24_1B), -+ FORMAT(G723_40), -+ FORMAT(G723_40_1B), -+ FORMAT(DSD_U8), -+ FORMAT(DSD_U16_LE), - }; - - static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = { -@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = { - FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"), - FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"), - FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"), -+ FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"), -+ FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"), -+ FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"), -+ FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"), -+ FORMATD(DSD_U8, "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"), -+ FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"), - }; - - static const char *const snd_pcm_type_names[] = { --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch deleted file mode 100644 index 72df46185..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch +++ /dev/null @@ -1,102 +0,0 @@ -From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Mon, 15 Apr 2013 18:12:17 +0200 -Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code - -When multiple dlobj_cache items point to the same dlobj, dlclose() may -be called wrongly multiple times when these items are cleared, because -we manage the dlobj_cache list as a flat list. This results in a bad -segfault we've seen in openal-soft, for example. - -For fixing this, we need the refcounting of dlobj itself. But, in -this case, we don't have to manage yet another list, since dlopen() -does a proper refcounting by itself. That is, we can just call always -dlopen() at each time a new function is assigned, and also call -dlclose() for each released dlobj_cache item at cleanup. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250 - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - src/dlmisc.c | 31 +++++++++++-------------------- - 1 file changed, 11 insertions(+), 20 deletions(-) - -diff --git a/src/dlmisc.c b/src/dlmisc.c -index 3788382..2de0234 100644 ---- a/src/dlmisc.c -+++ b/src/dlmisc.c -@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - { - struct list_head *p; - struct dlobj_cache *c; -- void *func, *dlobj = NULL; -- int dlobj_close = 0; -+ void *func, *dlobj; - - snd_dlobj_lock(); - list_for_each(p, &pcm_dlobj_list) { -@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - continue; - if (!lib && c->lib) - continue; -- dlobj = c->dlobj; - if (strcmp(c->name, name) == 0) { - c->refcnt++; - func = c->func; -@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - return func; - } - } -+ -+ dlobj = snd_dlopen(lib, RTLD_NOW); - if (dlobj == NULL) { -- dlobj = snd_dlopen(lib, RTLD_NOW); -- if (dlobj == NULL) { -- if (verbose) -- SNDERR("Cannot open shared library %s", -+ if (verbose) -+ SNDERR("Cannot open shared library %s", - lib ? lib : "[builtin]"); -- snd_dlobj_unlock(); -- return NULL; -- } -- dlobj_close = 1; -+ snd_dlobj_unlock(); -+ return NULL; - } -+ - func = snd_dlsym(dlobj, name, version); - if (func == NULL) { - if (verbose) -@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - free((void *)c->lib); - free(c); - __err: -- if (dlobj_close) -- snd_dlclose(dlobj); -+ snd_dlclose(dlobj); - snd_dlobj_unlock(); - return NULL; - } -@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void) - struct list_head *p, *npos; - struct dlobj_cache *c; - -- /* clean up caches only when really no user is present */ - snd_dlobj_lock(); -- list_for_each(p, &pcm_dlobj_list) { -- c = list_entry(p, struct dlobj_cache, list); -- if (c->refcnt) -- goto unlock; -- } -- - list_for_each_safe(p, npos, &pcm_dlobj_list) { - c = list_entry(p, struct dlobj_cache, list); -+ if (c->refcnt) -+ continue; - list_del(p); - snd_dlclose(c->dlobj); - free((void *)c->name); /* shut up gcc warning */ --- -1.7.11.7 - diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index af7ad9d40..6dfe5274a 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183071 2013-04-17 07:11:00Z tpowa $ +# $Id: PKGBUILD 186452 2013-05-26 17:55:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.27 -pkgrel=4 +pkgver=1.0.27.1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -13,25 +13,18 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - 90alsa - alsa-restore-1.0.27.service.patch - alsactl-fix-buffer-overflow-1.0.27.patch - arecord-1.0.27.patch) + 90alsa) backup=(etc/conf.d/alsa) -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch - patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch - patch -Np1 -i ${srcdir}/arecord-1.0.27.patch -} - build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-alsaconf \ + ./configure --prefix=/usr --disable-alsaconf --sbindir=/usr/bin \ --with-udev-rules-dir=/usr/lib/udev/rules.d \ --with-systemdsystemunitdir=/usr/lib/systemd/system make + # fix udev rules genaration + cd alsactl + make 90-alsa-restore.rules } package() { @@ -39,11 +32,12 @@ package() { make DESTDIR=${pkgdir} install install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa + # install alsa udev rule file + install -D -m644 alsactl/90-alsa-restore.rules \ + ${pkgdir}/usr/lib/udev/rules.d/90-alsa-restore.rules + # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('cbfb21a24f63fb052b3392195639ce48' - '529216f6a46e61a546640e08ea7a0879' - '0a27f7b80351d6baa274c32d859bf037' - 'cd577445636542f9f60b420e4ffe3f0f' - 'cecb38f03bd245d0584bfd63370e9a05') +md5sums=('3d81357b997744a139881ef72bc6921a' + '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/alsa-utils/alsa b/extra/alsa-utils/alsa deleted file mode 100755 index 1e7b57fa3..000000000 --- a/extra/alsa-utils/alsa +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/alsa -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Restoring ALSA Levels" - if [[ ! -e /var/lib/alsa/asound.state ]]; then - /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; } - fi - if /usr/sbin/alsactl $ALSA_ARGS restore; then - stat_done - add_daemon alsa - else - stat_fail - exit 1 - fi - - POWERSAVE=${POWERSAVE:-0} - if [[ -e /sys/module/snd_ac97_codec/parameters/power_save ]] \ - && (( $POWERSAVE )); then - echo $POWERSAVE > /sys/module/snd_ac97_codec/parameters/power_save - [[ -c /dev/dsp ]] && echo 1 > /dev/dsp - fi - if [[ -e /sys/module/snd_hda_intel/parameters/power_save ]] \ - && (( $POWERSAVE )); then - echo $POWERSAVE > /sys/module/snd_hda_intel/parameters/power_save - [[ -c /dev/dsp ]] && echo 1 > /dev/dsp - fi - ;; - stop) - SAVE_VOLUME=${SAVE_VOLUME:-yes} - if [[ "$SAVE_VOLUME" = "yes" ]]; then - stat_busy "Saving ALSA Levels" - /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; } - else - stat_busy "Stopping ALSA" - fi - if [ "$MUTE_VOLUME" == "yes" ]; then - /usr/bin/amixer -q set Master 0 mute || { stat_fail; exit 1; } - fi - stat_done - rm_daemon alsa - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - force-restart) - stat_busy "Trying to TERM or KILL processes that are blocking ALSA..." - FILES="$(ls -1 /dev/snd/* | grep -vi control)" - fuser -k -SIGTERM $FILES - fuser -k $FILES - stat_done - $0 restart - ;; - *) - echo "usage: $0 {start|stop|restart|force-restart}" -esac diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch deleted file mode 100644 index b3a9d48fd..000000000 --- a/extra/alsa-utils/alsa-restore-1.0.27.service.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old 2013-04-15 14:37:57.326541394 +0200 -+++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-15 14:38:10.179673494 +0200 -@@ -12,6 +12,6 @@ - Conflicts=shutdown.target - - [Service] --Type=oneshop -+Type=oneshot - ExecStart=-@sbindir@/alsactl restore - StandardOutput=syslog diff --git a/extra/alsa-utils/alsa.conf.d b/extra/alsa-utils/alsa.conf.d deleted file mode 100644 index bd50dcca2..000000000 --- a/extra/alsa-utils/alsa.conf.d +++ /dev/null @@ -1,15 +0,0 @@ -# Arguments for alsactl -# example: ALSA_ARGS="--file /var/lib/alsa/asound.state" -ALSA_ARGS="--file /var/lib/alsa/asound.state" - -# Enables powersaving mode for AC97 and hda_intel audio chips. -# Set to 1 to enable powersaving. -# Set to 0 to disable powersaving (default). -POWERSAVE=0 - -# Whether to save volume levels when stopped ("yes" or "no"). -SAVE_VOLUME="yes" - -# Whether to mute the master volume when stopped ("yes" or "no"). -# Useful for bad audio cards which make a noise on system poweroff. -MUTE_VOLUME="no" diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch deleted file mode 100644 index d4b526614..000000000 --- a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200) -Subject: alsactl: Fix the string size for the lock file contents -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b - -alsactl: Fix the string size for the lock file contents - -The string length is 10 characters + LF + '\0' = 12 characters. - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/alsactl/lock.c b/alsactl/lock.c -index d34d013..fce208b 100644 ---- a/alsactl/lock.c -+++ b/alsactl/lock.c -@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout) - int fd = -1, err = 0; - struct flock lck; - struct stat st; -- char lcktxt[11]; -+ char lcktxt[12]; - char *nfile; - - if (!do_lock) diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch deleted file mode 100644 index f9edb2d21..000000000 --- a/extra/alsa-utils/arecord-1.0.27.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200) -Subject: arecord: add a missing break to the capture loop -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977 - -arecord: add a missing break to the capture loop - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/aplay/aplay.c b/aplay/aplay.c -index 5bdc39c..000d25b 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -3021,6 +3021,9 @@ static void capture(char *orig_name) - fd = -1; - } - -+ if (in_aborting) -+ break; -+ - /* repeat the loop when format is raw without timelimit or - * requested counts of data are recorded - */ diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 72551800a..0c302fd47 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 180679 2013-03-25 19:15:28Z bpiotrowski $ +# $Id: PKGBUILD 185605 2013-05-15 22:40:19Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.7.0 -pkgrel=4 +pkgver=2.7.1 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" @@ -23,7 +23,7 @@ optdepends=("libgpod: support for Apple iPod audio devices" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d0ae4a2cb81a54ae94ca24fdb3aed88d7f3a921e') +sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d') build() { mkdir build diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index d3c7e43b1..ade163a66 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183314 2013-04-21 22:06:32Z heftig $ +# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -14,21 +14,12 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v python) url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - fix-compile-error.patch anjuta-glade.xml.diff) -sha256sums=('ef5d8a5032d4c2025e1870bef044fa025f01096a86f8f226eb178688a960c5b9' - 'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d' - 'e480c41a92198c9158f7d66f248b83464e6d0745d5756dae581b204d5439cc4d') +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95') build() { cd "$pkgbase-$pkgver" - patch -Np1 -i ../fix-compile-error.patch - patch -Np1 -i ../anjuta-glade.xml.diff - - # Bump vala version - sed -i '/vala/s/-0\.18/-0.20/' configure.ac - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum make diff --git a/extra/anjuta/anjuta-glade.xml.diff b/extra/anjuta/anjuta-glade.xml.diff deleted file mode 100644 index a33c530e5..000000000 --- a/extra/anjuta/anjuta-glade.xml.diff +++ /dev/null @@ -1,101 +0,0 @@ -diff -u -rN anjuta-3.8.1/libanjuta/anjuta-glade.xml anjuta-3.8.0/libanjuta/anjuta-glade.xml ---- anjuta-3.8.1/libanjuta/anjuta-glade.xml 1970-01-01 01:00:00.000000000 +0100 -+++ anjuta-3.8.0/libanjuta/anjuta-glade.xml 2012-09-26 22:53:46.000000000 +0200 -@@ -0,0 +1,97 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+ -+<glade-catalog name="anjuta" supports="gtkbuilder" -+ library="gladeanjuta" depends="gtk+"> -+ -+ <glade-widget-classes> -+ <glade-widget-class name="AnjutaVcsStatusTreeView" title="Status Tree View" -+ generic-name="vcsstatus"> -+ -+ <properties> -+ <property id="show-status" default="True" /> -+ <property id="conflicted-selectable" default="True" /> -+ <property id="status-codes" ignore="True"> -+ <displayable-values> -+ <value id="ANJUTA_VCS_STATUS_MODIFIED" name="Modified" /> -+ <value id="ANJUTA_VCS_STATUS_ADDED" name="Added" /> -+ <value id="ANJUTA_VCS_STATUS_DELETED" name="Deleted" /> -+ <value id="ANJUTA_VCS_STATUS_CONFLICTED" name="Conflicted" /> -+ <value id="ANJUTA_VCS_STATUS_UPTODATE" name="Up to date" /> -+ <value id="ANJUTA_VCS_STATUS_LOCKED" name="Locked" /> -+ <value id="ANJUTA_VCS_STATUS_MISSING" name="Missing" /> -+ <value id="ANJUTA_VCS_STATUS_UNVERSIONED" name="Unversioned" /> -+ <value id="ANJUTA_VCS_STATUS_IGNORED" name="Ignored" /> -+ </displayable-values> -+ </property> -+ </properties> -+ </glade-widget-class> -+ -+ <glade-widget-class name="AnjutaDropEntry" title="Drop Entry" -+ generic-name="dropentry" /> -+ -+ <glade-widget-class name="AnjutaFileList" title="File List" -+ generic-name="filelist"> -+ -+ <properties> -+ <property id="show-add-button" default="False" /> -+ </properties> -+ </glade-widget-class> -+ -+ <glade-widget-class name="AnjutaPkgConfigChooser" title="pkg-config chooser" -+ generic-name="pkg_config_chooser" /> -+ -+ <glade-widget-class name="AnjutaColumnTextView" title="Column Text View" -+ generic-name="columntextview" /> -+ -+ <glade-widget-class name="AnjutaFileDropEntry" title="File Drop Entry" -+ generic-name="filedropentry" /> -+ -+ <glade-widget-class name="AnjutaEntry" title="Entry" -+ generic-name="entry"> -+ -+ <properties> -+ <property translatable="True" id="help-text" default="" /> -+ </properties> -+ </glade-widget-class> -+ -+ <glade-widget-class name="AnjutaEnvironmentEditor" title="Environment editor" -+ generic-name="environment_editor" /> -+ -+ <glade-widget-class name="AnjutaTreeComboBox" title="Tree combo box" -+ generic-name="combo"> -+ <properties> -+ <property id="glade-type" disabled="True"/> -+ <property id="label" disabled="True"/> -+ <property id="use-underline" disabled="True"/> -+ <property id="stock" disabled="True"/> -+ </properties> -+ </glade-widget-class> -+ <glade-widget-class name="AnjutaPmChooserButton" title="Project node chooser" -+ generic-name="button" parent="AnjutaTreeComboBox"> -+ <properties> -+ <property id="glade-type" disabled="True"/> -+ <property id="label" disabled="True"/> -+ <property id="use-underline" disabled="True"/> -+ <property id="stock" disabled="True"/> -+ </properties> -+ </glade-widget-class> -+ <glade-widget-class name="GbfProjectView" title="Project node view" -+ generic-name="view" parent="GtkTreeView"> -+ </glade-widget-class> -+ -+ </glade-widget-classes> -+ -+ <glade-widget-group name="Anjuta" title="Anjuta"> -+ <glade-widget-class-ref name="AnjutaVcsStatusTreeView" /> -+ <glade-widget-class-ref name="AnjutaDropEntry" /> -+ <glade-widget-class-ref name="AnjutaFileList" /> -+ <glade-widget-class-ref name="AnjutaPkgConfigChooser" /> -+ <glade-widget-class-ref name="AnjutaColumnTextView" /> -+ <glade-widget-class-ref name="AnjutaFileDropEntry" /> -+ <glade-widget-class-ref name="AnjutaEntry" /> -+ <glade-widget-class-ref name="AnjutaEnvironmentEditor" /> -+ <glade-widget-class-ref name="AnjutaTreeComboBox" /> -+ <glade-widget-class-ref name="AnjutaPmChooserButton" /> -+ <glade-widget-class-ref name="GbfProjectView" /> -+ </glade-widget-group> -+</glade-catalog> diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch deleted file mode 100644 index bc8fa7c41..000000000 --- a/extra/anjuta/fix-compile-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c ---- anjuta-3.8.0/libanjuta/anjuta-token.c 2013-01-14 22:45:09.000000000 +0100 -+++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c 2013-03-31 13:56:11.722332230 +0200 -@@ -329,7 +329,7 @@ - if (string == NULL) - { - /* Value doesn't contain a newline */ -- fprintf (stderr, "(%lu)", length); -+ fprintf (stderr, "(%lu)", (long unsigned)length); - } - else - { -diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c ---- anjuta-3.8.0/plugins/dir-project/dir-project.c 2012-11-19 00:34:57.000000000 +0100 -+++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c 2013-03-31 13:55:35.922610895 +0200 -@@ -268,7 +268,7 @@ - { - ptr++; - } while (*ptr == '?'); -- g_string_append_printf (regex, "(.{%d})", ptr - next); -+ g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next)); - } - else if (*ptr == '\\') - { diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index dbe9af7b7..08e5895df 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184361 2013-05-06 19:36:36Z foutrelis $ +# $Id: PKGBUILD 186027 2013-05-20 14:49:50Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=7 +pkgrel=9 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -30,34 +30,32 @@ backup=('etc/avahi/hosts' 'etc/avahi/services/sftp-ssh.service' 'usr/lib/avahi/service-types.db' 'usr/share/avahi/service-types') -source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'rc.d.patch') -sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' - '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz") +sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684') conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf + sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action +} - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i ../rc.d.patch - - [ "$CARCH" = "mips64el" ] && \ - extra="--disable-mono" - +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export MOC_QT3=/usr/bin/moc-qt3 export MOC_QT4=/usr/bin/moc-qt4 + export PYTHON=/usr/bin/python2 + [ "$CARCH" = "mips64el" ] && extra="--disable-mono" - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --disable-static \ --disable-monodoc \ --enable-compat-libdns_sd \ @@ -66,8 +64,8 @@ build() { --with-avahi-priv-access-group=network \ --with-autoipd-user=avahi \ --with-autoipd-group=avahi \ - $extra \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ + $extra make } @@ -75,12 +73,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} - sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action + rm -fr "${pkgdir}"/etc/rc.d # howl and mdnsresponder compatability - (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) - (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) + cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl + cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc } diff --git a/extra/avahi/rc.d.patch b/extra/avahi/rc.d.patch deleted file mode 100644 index fd735734b..000000000 --- a/extra/avahi/rc.d.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in ---- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 -+++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 -@@ -33,6 +33,7 @@ - - case "$1" in - start) -+ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } - stat_busy "Starting $DESC" - $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index e1ae6bf4c..6c1d840d9 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64') url="http://banshee.fm/" @@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' options=('!libtool') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz) -sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a') +md5sums=('3c7775eecc079a018c468e9b4ab6cbe3') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD index 8242786a5..19ddaa5b7 100644 --- a/extra/baobab/PKGBUILD +++ b/extra/baobab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183333 2013-04-21 22:08:32Z heftig $ +# $Id: PKGBUILD 185372 2013-05-13 18:01:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('740c123cbc49f0e479a9c67d7cc7a6330b2a9d3e6a7ffde55665a1130d9209bb') +sha256sums=('68ce73e34378909a384d17355d2b80c14423dc54ace6a363dc93653cf608614a') build() { cd "$pkgname-$pkgver" diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 8d3a91031..12f32c9a3 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $ +# $Id: PKGBUILD 186657 2013-05-30 12:20:27Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -9,7 +9,7 @@ pkgname=bitlbee pkgver=3.2 -pkgrel=2 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -35,6 +35,7 @@ build() { ./configure \ --prefix=/usr \ --etcdir=/etc/bitlbee \ + --sbindir=/usr/bin \ --pidfile=/run/bitlbee/bitlbee.pid \ --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 5b1d35995..fc4d04b4e 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -5,7 +5,7 @@ pkgname=bluez pkgver=4.101 -pkgrel=1 +pkgrel=1.1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/bmp/0.9.7.1-visualization.patch b/extra/bmp/0.9.7.1-visualization.patch deleted file mode 100644 index ac03323f6..000000000 --- a/extra/bmp/0.9.7.1-visualization.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- beep/vis.c 2004-12-04 10:04:29.000000000 +0100 -+++ beep/vis.c 2005-02-17 12:02:25.391044008 +0100 -@@ -223,7 +223,8 @@ vis_draw(Widget * w) - /* FIXME: The check "shouldn't" be neccessary? */ - /* if (GTK_IS_WINDOW(vis->vs_window)) { */ - GDK_THREADS_ENTER(); -- gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, -+ if (GDK_IS_DRAWABLE(vis->vs_window)) -+ gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, - vis->vs_widget.x, vis->vs_widget.y, - vis->vs_widget.width, vis->vs_widget.height, - GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data, diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD deleted file mode 100644 index 10231f63f..000000000 --- a/extra/bmp/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 148682 2012-02-05 11:46:44Z ibiru $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> - -pkgname=bmp -pkgver=0.9.7.1 -pkgrel=9.2 -pkgdesc="gtk2 port of xmms" -arch=(i686 x86_64 mips64el) -url="http://sourceforge.net/projects/beepmp/" -license=('GPL') -depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') -makedepends=('libxt') -options=('!libtool' '!makeflags') -install=bmp.install -source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ - ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) -md5sums=('c25d5a8d49cc5851d13d525a20023c4c' - 'fa1bdf5a8d03e8539a6bed5caa471176' - '42ad4109ddb66024d4c6d1f3e572ab86') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../${pkgver}-visualization.patch - patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch - LIBS+="-lgmodule-2.0 -lm" ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch deleted file mode 100644 index 4c1e46da9..000000000 --- a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch +++ /dev/null @@ -1,108 +0,0 @@ -Patch taken from xmms-crossfade 3.10 tarball. Required for crossfade to -work. http://www.eisenlohr.org/xmms-crossfade/ - -diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c ---- bmp-0.9.7.1/beep/mainwin.c 2005-05-09 10:45:39.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/mainwin.c 2005-11-25 00:03:59.000000000 +0100 -@@ -655,9 +655,11 @@ - mainwin_set_shade(!cfg.player_shaded); - } - -+gboolean is_quitting = FALSE; - void - mainwin_quit_cb(void) - { -+ is_quitting = TRUE; - gtk_widget_hide(equalizerwin); - gtk_widget_hide(playlistwin); - gtk_widget_hide(mainwin); -@@ -1318,7 +1320,7 @@ - change_song(guint pos) - { - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - playlist_set_position(pos); - bmp_playback_initiate(); -diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c ---- bmp-0.9.7.1/beep/playback.c 2005-01-26 06:56:15.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.c 2005-11-25 00:03:59.000000000 +0100 -@@ -89,7 +89,7 @@ - return; - - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - vis_clear_data(mainwin_vis); - vis_clear_data(playlistwin_vis); -@@ -135,6 +135,15 @@ - get_current_input_plugin()->pause(ip_data.paused); - } - -+gboolean input_stopped_for_restart = FALSE; -+void -+bmp_playback_stop_for_restart(void) -+{ -+ input_stopped_for_restart = TRUE; -+ bmp_playback_stop(); -+ input_stopped_for_restart = FALSE; -+} -+ - void - bmp_playback_stop(void) - { -diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h ---- bmp-0.9.7.1/beep/playback.h 2004-12-04 10:04:26.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.h 2005-11-25 00:03:59.000000000 +0100 -@@ -26,6 +26,7 @@ - void bmp_playback_initiate(void); - void bmp_playback_pause(void); - void bmp_playback_stop(void); -+void bmp_playback_stop_for_restart(void); - gboolean bmp_playback_play_file(const gchar * filename); - gboolean bmp_playback_get_playing(void); - gboolean bmp_playback_get_paused(void); -diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c ---- bmp-0.9.7.1/beep/playlist.c 2005-08-11 09:25:51.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/playlist.c 2005-11-25 00:03:59.000000000 +0100 -@@ -817,7 +817,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -868,7 +868,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1018,7 +1018,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1047,7 +1047,10 @@ - { - GList *plist_pos_list; - -- bmp_playback_stop(); -+ if (cfg.repeat) -+ bmp_playback_stop_for_restart(); -+ else -+ bmp_playback_stop(); - - PLAYLIST_LOCK(); - plist_pos_list = find_playlist_position_list(); diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index b6fa0a72c..91b9e4fb2 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $ +# $Id: PKGBUILD 186371 2013-05-26 09:24:20Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cairo-perl pkgver=1.103 -pkgrel=1 +pkgrel=2 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 25086fd32..cd20d86ff 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184364 2013-05-06 19:36:46Z foutrelis $ +# $Id: PKGBUILD 186633 2013-05-30 10:57:28Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -17,8 +17,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.6.3 -pkgrel=4 +pkgver=2.6.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' [ "$CARCH" != "mips64el" ] && makedepends+=('vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('90d6bb619191abbcc94094379d47e225') +md5sums=('a38fdc882888469ea8b0dea949c05dda') build() { mkdir build diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD index cd19fe056..2eb3af3eb 100644 --- a/extra/capi4hylafax/PKGBUILD +++ b/extra/capi4hylafax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159422 2012-05-24 06:11:44Z tpowa $ +# $Id: PKGBUILD 186226 2013-05-22 09:28:57Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=capi4hylafax pkgver=010300 -pkgrel=8 +pkgrel=9 pkgdesc="capi plugin for hylafax to enable isdn faxing" arch=(i686 x86_64 'mips64el') url="ftp://ftp.avm.de/tools" @@ -11,18 +11,24 @@ license=('GPL') depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog') source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz config.faxCAPI - capi4hylafax.rc c2faxrecv.service - capi4hylafax.conf) + capi4hylafax.conf + capi4hylafax-compile-gcc48-fix.patch) install=capi4hylafax.install backup=(var/spool/hylafax/etc/config.faxCAPI) -build() { +prepare() { cd "$srcdir"/$pkgname-01.03.00 -# fix config file + # fix compiling with gcc48 + patch -Np1 -i $srcdir/capi4hylafax-compile-gcc48-fix.patch + # fix config file sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in autoreconf --force --install +} + +build() { + cd "$srcdir"/$pkgname-01.03.00 ./configure make } @@ -33,7 +39,6 @@ package() { install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI - install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax # adding FIFO mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI @@ -59,6 +64,10 @@ EOF } md5sums=('d37dc652ac80d1525ef8693be55ee67f' '653b60695d21c128f020a86274ca9192' - '1fe40c58289fa3ba625ce6fe2fdb3d07' 'e2c085a00189ded0a659642c689a1be2' '7c41d4fa5c5ef7b1372813341fd0d02b') +md5sums=('d37dc652ac80d1525ef8693be55ee67f' + '653b60695d21c128f020a86274ca9192' + 'e2c085a00189ded0a659642c689a1be2' + '7c41d4fa5c5ef7b1372813341fd0d02b' + 'fa01597396c5493f90243a8d9e2841c0') diff --git a/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch new file mode 100644 index 000000000..88d948366 --- /dev/null +++ b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch @@ -0,0 +1,11 @@ +--- capi4hylafax-01.03.00/src/standard/aStdLib.cpp.old 2013-05-21 16:55:37.031658830 +0200 ++++ capi4hylafax-01.03.00/src/standard/aStdLib.cpp 2013-05-21 16:55:42.314905957 +0200 +@@ -233,7 +233,7 @@ + + tUInt a_pointer2string (void *pointer, tWiChar *string) { + tULong p = (tULong) pointer; +- tWiChar *fmt = (sizeof (p) > 4) ? L" . : . " : L" : "; // must be symmetric! ++ const tWiChar *fmt = (sizeof (p) > 4) ? L" . : . " : L" : "; // must be symmetric! + unsigned i = s_strlen (fmt); + + string[i] = '\0'; diff --git a/extra/capi4hylafax/capi4hylafax.rc b/extra/capi4hylafax/capi4hylafax.rc deleted file mode 100755 index 51025b020..000000000 --- a/extra/capi4hylafax/capi4hylafax.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/c2faxrecv` -case "$1" in - start) - stat_busy "Starting capi4hylafax" - if [ -z "$PID" ]; then - /usr/bin/c2faxrecv > /dev/null & - faxmodem faxCAPI - fi - if [ ! -f /var/run/faxq.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -f /var/run/hfaxd.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon capi4hylafax - stat_done - fi - ;; - stop) - stat_busy "Stopping capi4hylafax" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon capi4hylafax - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/cd-discid/PKGBUILD b/extra/cd-discid/PKGBUILD index 8814b9ac1..5dc3c5ec4 100644 --- a/extra/cd-discid/PKGBUILD +++ b/extra/cd-discid/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 150504 2012-02-18 11:38:44Z pierre $ +# $Id: PKGBUILD 185504 2013-05-14 12:01:48Z eric $ # Maintainer: # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=cd-discid -pkgver=0.9 -pkgrel=4.1 +pkgver=1.4 +pkgrel=1 pkgdesc="A backend utility to get CDDB discid information from a CD-ROM disc" arch=('i686' 'x86_64' 'mips64el') -url="http://lly.org/~rcw/cd-discid/" +url="http://linukz.org/cd-discid.shtml" license=('GPL') depends=('glibc') -source=("http://lly.org/~rcw/$pkgname/${pkgname}_${pkgver}.orig.tar.gz") -md5sums=('64677b8b63d1db0db015043f5455171a') +source=("http://linukz.org/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('85027b71d08fbbfb11ac2f0db6e8cea7') build() { - cd "${srcdir}"/$pkgname-$pkgver + cd $pkgname-$pkgver make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" INSTALL=/usr/bin/install install + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" PREFIX=/usr STRIP="/usr/bin/true" install } diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index c07352cef..ecb976ca3 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183338 2013-04-21 22:08:39Z heftig $ +# $Id: PKGBUILD 186990 2013-06-02 19:42:17Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.8.1 -pkgrel=1 +pkgver=3.8.2 +pkgrel=2 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -16,12 +16,16 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e9f7a7855c52451cfc59ffa23962eaa5fda7c9bc629bb975f4328af061d01eeb') +sha256sums=('79d21f2a7ebf1e91b2c2aa595f3a6dcf899258b1d2e307371440540c3d3a4ec3') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index b290cfd3f..defbf418b 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 179542 2013-03-06 13:51:08Z bisson $ +# $Id: PKGBUILD 185532 2013-05-14 19:17:44Z heftig $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.7 -pkgrel=4 +pkgrel=5 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('ffmpeg') -makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2' - '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2') +makedepends=('cmake' 'git') +source=('git+https://bitbucket.org/acoustid/chromaprint.git#commit=dd51f8e') +sha1sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../ffmpeg.patch + cd "${srcdir}/${pkgname}" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -30,6 +26,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install } diff --git a/extra/chromaprint/ffmpeg.patch b/extra/chromaprint/ffmpeg.patch deleted file mode 100644 index 4c41ca664..000000000 --- a/extra/chromaprint/ffmpeg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c ---- old/examples/fpcalc.c 2012-09-06 04:05:36.000000000 +1000 -+++ new/examples/fpcalc.c 2013-03-07 00:43:11.950928188 +1100 -@@ -65,6 +65,9 @@ - goto done; - } - -+ /* request regular signed 16-bit packed format */ -+ codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16; -+ - if (avcodec_open(codec_ctx, codec) < 0) { - fprintf(stderr, "ERROR: couldn't open the codec\n"); - goto done; -@@ -146,6 +149,7 @@ - int ostride[6] = { 2 }; - int len = buffer_size / istride[0]; - if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) { -+ fprintf(stderr, "WARNING: unable to convert %d samples\n", buffer_size); - break; - } - buffer = buffer2; diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index e6a70c6df..621c57386 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182654 2013-04-12 07:11:03Z tpowa $ +# $Id: PKGBUILD 185803 2013-05-19 09:33:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils pkgver=6.0 -pkgrel=1 +pkgrel=2 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64 'mips64el') url="http://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -14,7 +14,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" # systemd support is broken in mount.cifs # https://bugs.archlinux.org/task/30958 - ./configure --prefix=/usr --disable-systemd + ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd make } diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 070495a47..039a58c76 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 183595 2013-04-24 06:52:38Z bisson $ +# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.97.8 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') +backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'conf.d' 'service' 'service.fresh' 'logrotate' 'tmpfiles.d' 'config.patch') sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' - 'c9d508c1e5972f0f849d8694c1872455fa9e74de' - 'cb116cdab49a810381a515cbcfb6a6c148547f07' - 'df522b0488f3901e491f148c9300f6bae348c605' + 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' 'cda9a087e5593992150cb456e34c5f6f589aca82' '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' @@ -41,6 +37,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/clamav \ --with-dbdir=/var/lib/clamav \ --disable-clamav \ @@ -61,8 +58,6 @@ package() { install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav - install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav install -d -o 64 -g 64 "${pkgdir}"/run/clamav install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav diff --git a/extra/clamav/conf.d b/extra/clamav/conf.d deleted file mode 100644 index 9cd44d9f8..000000000 --- a/extra/clamav/conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# clamav startup script config options - -# change these to "yes" to start -START_FRESHCLAM="no" -START_CLAMD="no" - -# Options to pass to freshclam (man freshclam for more info). -FRESHCLAM_OPTS="-c 12" diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d deleted file mode 100644 index 127c86c0f..000000000 --- a/extra/clamav/rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav - -PID_FC=$(pidof -o %PPID /usr/bin/freshclam) -PID_CD=$(pidof -o %PPID /usr/sbin/clamd) - -case "$1" in - start) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Starting ClamD" - [[ -z $PID_CD ]] && /usr/sbin/clamd - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - sleep 1 - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Starting FreshClam" - [[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Stopping ClamD" - [[ -n $PID_CD ]] && kill $PID_CD &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Stopping FreshClam" - [[ -n $PID_FC ]] && kill $PID_FC &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/clamav/service b/extra/clamav/service index 5bf9eb14e..86608c40e 100644 --- a/extra/clamav/service +++ b/extra/clamav/service @@ -4,7 +4,7 @@ Description=clamav daemon [Service] Type=forking PIDFile=/run/clamav/clamd.pid -ExecStart=/usr/sbin/clamd +ExecStart=/usr/bin/clamd [Install] WantedBy=multi-user.target diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 54891f7b8..2b701d62a 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 183340 2013-04-21 22:08:41Z heftig $ +# $Id: PKGBUILD 186989 2013-06-02 19:40:09Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.2 +pkgver=2.0.4 pkgrel=2 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org/" -license=('LGPL') -depends=('clutter' 'gst-plugins-base-libs' 'libxdamage') -makedepends=('gobject-introspection') +license=(LGPL) +depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad) +makedepends=(gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4') +sha256sums=('bad69cca7dd9c0d54d4f9fc27cba59dd8d8b329db058844716dbdecec6caba97') build() { cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc - rm libtool - ln -s /usr/bin/libtool . + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 2da7dc023..2433a321b 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183339 2013-04-21 22:08:40Z heftig $ +# $Id: PKGBUILD 186662 2013-05-30 12:24:29Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.14.2 +pkgver=1.14.4 pkgrel=2 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') @@ -14,12 +14,16 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8') +sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection \ --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index f6ae39a5c..35d1b4d71 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,33 +1,24 @@ -# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $ +# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.10.2 -pkgrel=5 +pkgver=2.8.11 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt5-base' 'emacs') -optdepends=('qt5-base: cmake-gui') +makedepends=('qt4' 'emacs') +optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'qt4.patch') -md5sums=('097278785da7182ec0aea8769d06860c' - '4933fbe934d3989923f0a60a78dac44e') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('be6008f2299613d23fe82ab53ef7472e') build() { cd ${pkgname}-${pkgver} - # qmake refers to Qt5 - patch -p1 -i "${srcdir}"/qt4.patch - - # Qt is built with reduce-relocations - export CFLAGS="${CFLAGS} -fPIC" - export CXXFLAGS="${CXXFLAGS} -fPIC" - ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 7a7a29698..39f90d60c 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183342 2013-04-21 22:08:43Z heftig $ +# $Id: PKGBUILD 186660 2013-05-30 12:23:15Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl pkgver=1.14.0 -pkgrel=2 +pkgrel=3 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) url="http://www.clutter-project.org/" @@ -18,6 +18,10 @@ build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --enable-wayland-egl-{platform,server} --enable-gles{1,2} + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index a079913f0..1f01a480d 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184190 2013-05-03 11:21:48Z heftig $ +# $Id: PKGBUILD 185329 2013-05-13 11:18:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.34 +pkgver=1.0.0 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('e4168ca34c2ce228276299efaf12d2f9fb7ecb2e') +sha1sums=('a01547080f0905dacca37c5ded3886431144a36a') build() { cd $pkgname-$pkgver diff --git a/extra/cpio/PKGBUILD b/extra/cpio/PKGBUILD index 94d607333..d635193cc 100644 --- a/extra/cpio/PKGBUILD +++ b/extra/cpio/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 149526 2012-02-08 11:43:48Z tpowa $ +# $Id: PKGBUILD 185699 2013-05-17 11:26:28Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=cpio pkgver=2.11 -pkgrel=3.1 +pkgrel=4 pkgdesc="A tool to copy files into or out of a cpio or tar archive" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://www.gnu.org/software/cpio" depends=('glibc') source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz - gets.patch) + cpio-2.11-stdio.in.patch) install=cpio.install -md5sums=('1112bb6c45863468b5496ba128792f6c' - 'e9e9d1d64a2caa4b9f49b08dc09298db') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch +} build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i "$srcdir/gets.patch" ./configure --prefix=/usr --mandir=/usr/share/man make } @@ -25,10 +27,11 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1 - mv ${pkgdir}/usr/bin ${pkgdir}/bin rm -rf ${pkgdir}/usr/libexec # remove mt manpage it conflicts with mt-st from extra rm $pkgdir/usr/share/man/man1/mt.1 || return 1 # remove infodir rm $pkgdir/usr/share/info/dir } +md5sums=('1112bb6c45863468b5496ba128792f6c' + 'd7e58f2a1ec286febd09ea75042cf96e') diff --git a/extra/cpio/cpio-2.11-stdio.in.patch b/extra/cpio/cpio-2.11-stdio.in.patch new file mode 100644 index 000000000..f7016ba71 --- /dev/null +++ b/extra/cpio/cpio-2.11-stdio.in.patch @@ -0,0 +1,13 @@ +diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h +--- cpio-2.11-orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 ++++ cpio-2.11/gnu/stdio.in.h 2012-06-04 10:23:23.804471185 +0200 +@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/extra/cpio/gets.patch b/extra/cpio/gets.patch deleted file mode 100644 index 0203b645e..000000000 --- a/extra/cpio/gets.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru cpio-2.11.orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h ---- cpio-2.11.orig/gnu/stdio.in.h 2012-12-22 22:48:06.596855514 +0100 -+++ cpio-2.11/gnu/stdio.in.h 2012-12-22 22:49:21.496002937 +0100 -@@ -135,12 +135,6 @@ - "use gnulib module fflush for portable POSIX compliance"); - #endif - --/* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ --#undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -- - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 02a3f657c..b598ce0f3 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180282 2013-03-19 15:32:07Z andyrtr $ +# $Id: PKGBUILD 185777 2013-05-18 15:46:13Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -46,6 +46,7 @@ build() { autoconf -I config-scripts ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --sbindir=/usr/bin \ --libdir=/usr/lib \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-logdir=/var/log/cups \ @@ -84,7 +85,6 @@ backup=(etc/cups/client.conf) # install client.conf man page and config file install -dm755 ${pkgdir}/usr/share/man/man5 - #install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/ install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ install -dm755 ${pkgdir}/etc/cups touch ${pkgdir}/etc/cups/client.conf diff --git a/extra/cups/cups.install b/extra/cups/cups.install index fc015f951..121eeb0f3 100644 --- a/extra/cups/cups.install +++ b/extra/cups/cups.install @@ -1,6 +1,6 @@ post_install() { if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null fi echo ">> If you use an HTTPS connection to CUPS, the first time you access" echo ">> the interface it may take a very long time before the site comes up." @@ -10,13 +10,9 @@ post_install() { post_upgrade() { if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null fi - if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then - # important upgrade notice - echo "daemon script has been renamed to /etc/rc.d/cupsd" - echo "change your entry in /etc/rc.conf" - fi + if [ "`vercmp $2 1.6.0`" -lt 0 ]; then # important upgrade notice echo "* avahi-daemon should now run before you start cupsd for" @@ -24,7 +20,8 @@ post_upgrade() { echo "* check your config with cupsd -t" echo " and fix all Browsing related settings" fi - if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then + + if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then # important upgrade notice echo "> It's now safe to load usblp kernel module." echo "> There's no more need to blacklist it." @@ -33,6 +30,6 @@ post_upgrade() { post_remove() { if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null fi } diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD index 9121db0d8..52db75700 100644 --- a/extra/cvs/PKGBUILD +++ b/extra/cvs/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 146046 2012-01-04 17:18:48Z dan $ +# $Id: PKGBUILD 185415 2013-05-14 01:35:08Z dan $ # Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Dan McGee <dan@archlinux.org> pkgname=cvs pkgver=1.11.23 -pkgrel=8.1 +pkgrel=9 pkgdesc="Concurrent Versions System - a source control system" arch=(i686 x86_64 'mips64el') url="http://cvs.nongnu.org/" license=('GPL') depends=('krb5' 'zlib') +makedepends=('vim') optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh') install=cvs.install @@ -30,7 +32,9 @@ build() { # CVE-2010-3864, https://www.redhat.com/security/data/cve/CVE-2010-3846.html patch -Np1 < ../cvs-1.11.23-cve-2010-3846.patch - autoreconf + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in + find . -name Makefile.am | xargs sed -i -e 's/^INCLUDES/AM_CPPFLAGS/' + AUTOMAKE='automake --add-missing' autoreconf ./configure --prefix=/usr make } diff --git a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch b/extra/cyrus-sasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by <fabbe@debian.org> - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch b/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by <dannf@debian.org> - -When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h> -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org> - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch b/extra/cyrus-sasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by <fabbe@debian.org> - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/extra/cyrus-sasl/0019_ldap_deprecated.patch b/extra/cyrus-sasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/extra/cyrus-sasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier <dannf@debian.org> - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm <fabbe@debian.org>) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include <openssl/des.h> - #endif - -+#define LDAP_DEPRECATED 1 - #include <ldap.h> - #include <lber.h> - #include <sasl.h> diff --git a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by <fabbe@paniq.net> - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/extra/cyrus-sasl/0027_db5_support.patch b/extra/cyrus-sasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/extra/cyrus-sasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Ondřej Surý <ondrej@debian.org> -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index e35c47f05..7915d580f 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $ +# $Id: PKGBUILD 186312 2013-05-24 16:21:18Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -7,53 +7,33 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl -pkgver=2.1.23 -pkgrel=12 +pkgver=2.1.26 +pkgrel=3 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') +source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch + cyrus-sasl-2.1.26-size_t.patch 0010_maintainer_mode.patch 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d saslauthd tmpfiles.conf) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' + 'f45aa8c42b32e0569ab3d14a83485b37' 'f45d8b60e8f74dd7f7c2ec1665fa602a' '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' @@ -61,25 +41,18 @@ md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' '45bb0192d2f188066240b9a66ee6365f') build() { + export CFLAGS="$CFLAGS -fPIC" + cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -148,6 +121,7 @@ package_libsasl() { rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" } @@ -176,6 +150,7 @@ package_cyrus-sasl-gssapi() { cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" @@ -196,7 +171,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include <string.h> - #include <stdlib.h> - #include <pwd.h> -+#include <unistd.h> - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch new file mode 100644 index 000000000..3a4820f16 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include <sys/types.h> ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index e7d7035a2..dbc6fc4e3 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183344 2013-04-21 22:08:46Z heftig $ +# $Id: PKGBUILD 185584 2013-05-15 11:33:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96') +sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7') build() { cd $pkgname-$pkgver diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD index 3c5fe030d..d36f8c5e7 100644 --- a/extra/dmidecode/PKGBUILD +++ b/extra/dmidecode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183308 2013-04-21 10:54:50Z giovanni $ +# $Id: PKGBUILD 185822 2013-05-19 13:06:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=dmidecode pkgver=2.12 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Management Interface table related utilities" arch=('i686' 'x86_64') url="http://www.nongnu.org/dmidecode" @@ -16,11 +16,12 @@ md5sums=('a406f3cbb27736491698697beeddb781') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s:sbin:bin:g" Makefile make prefix=/usr } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr DESTDIR=${pkgdir} install + make prefix=/usr DESTDIR="${pkgdir}" install } diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 949455c7b..c21a98267 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185124 2013-05-11 09:39:43Z andyrtr $ +# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('6628f513ca841846176e81db870052f8' +md5sums=('e6c011b4bbddf19e79205d012723449a' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') @@ -38,8 +38,11 @@ build() { sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh # configure with openssl, mysql, and postgresql support - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ + ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --with-moduledir=/usr/lib/dovecot/modules \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --disable-static \ --with-nss \ diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index dd7668585..c8803a2eb 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 178954 2013-03-01 10:20:02Z andrea $ +# $Id: PKGBUILD 185936 2013-05-19 21:23:57Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.3.1 -pkgrel=2 +pkgver=1.8.4 +pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' 'texlive-latexextra' 'graphviz') source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('31b0aaab51c5cab7db9f0ebbe9f85530') -sha1sums=('289fc809f44b8025d45279deefbaee7680efd88f') +md5sums=('5f460b91c0d8c34a76173cf22015c2fc') +sha1sums=('a363811b932e44d479addbadffcc8257cde60b44') build() { - . /etc/profile.d/qt4.sh + export PATH=$PATH:/usr/lib/qt4/bin cd "${srcdir}/${pkgbase}-${pkgver}" QTDIR=/usr ./configure --prefix /usr --with-doxywizard make diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index 16b27d0f0..b68b66126 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184840 2013-05-09 09:27:18Z ronald $ +# $Id: PKGBUILD 185677 2013-05-16 20:58:57Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('94d839f5f198e82794e7cfeb174d42178c75c2e3') +sha1sums=('f13e9c3bcd4823920cdf3bacbd2c03a1935399a1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index 18fa30f4e..aa807856f 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184994 2013-05-09 17:25:25Z ronald $ +# $Id: PKGBUILD 185669 2013-05-16 20:56:13Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b7be13256b1cc91636127b167a83af2980f5a302') +sha1sums=('8ee61a186f2a41477415d78af4475e8a05132920') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index e939d19ed..6719ebf8c 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184836 2013-05-09 09:26:01Z ronald $ +# $Id: PKGBUILD 185673 2013-05-16 20:57:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('742080922ab71a76d157058ea01e603b577c12bc') +sha1sums=('cad21ed849b09d1436bebe3742e058177bc26a8b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index deab901f8..267b98676 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184829 2013-05-09 09:23:48Z ronald $ +# $Id: PKGBUILD 185666 2013-05-16 20:55:11Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b027777c723d199da665a2c32204d9b9f406bf5a') +sha1sums=('d3f756321147b26c89b69ece8c6115ba0f68490e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index 15589b70f..606513462 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184834 2013-05-09 09:25:29Z ronald $ +# $Id: PKGBUILD 185671 2013-05-16 20:56:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('e7087e2068fb9fd4a2e8dc9d006adce69cc97406') +sha1sums=('45b2920b059baa80a2ccf93320751139045e6a72') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD index d97c9587f..c538a4a96 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/extra/efibootmgr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 176067 2013-01-27 09:30:54Z tpowa $ +# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor : Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav P R <skodabenz at rocketmail dot com> pkgname=efibootmgr pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." arch=('i686' 'x86_64') url="http://linux.dell.com/efibootmgr/" @@ -34,12 +34,12 @@ build () { package() { - mkdir -p ${pkgdir}/usr/sbin/ + mkdir -p ${pkgdir}/usr/bin/ mkdir -p ${pkgdir}/usr/share/man/man8/ cd ${srcdir}/efibootmgr-${pkgver}_build/ - install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/sbin/efibootmgr + install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8 } diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index ed6be2205..f61d36291 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184839 2013-05-09 09:27:01Z ronald $ +# $Id: PKGBUILD 185676 2013-05-16 20:58:32Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('1c561497372c5b4c61074789c738b6d62bc9e5d0') +sha1sums=('df466e60825b24d9c0eb1dbac5f688f884e58404') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index 1243262e0..e7296c4db 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184828 2013-05-09 09:23:29Z ronald $ +# $Id: PKGBUILD 185665 2013-05-16 20:54:50Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('725667ed0448d27b63b76189267f8711fcdfaa2e') +sha1sums=('74260d239cdf1f7da1f0ab106fb144fa23d74a87') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index 1b25adac4..19ae2f149 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184833 2013-05-09 09:25:14Z ronald $ +# $Id: PKGBUILD 185670 2013-05-16 20:56:37Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('4660797bd87b0ba8c1285cbcb173aceaeb93f9e4') +sha1sums=('1c1bf133496de65c35a19319988796c9913d1d42') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 3b2380f05..550c9c36f 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183345 2013-04-21 22:08:47Z heftig $ +# $Id: PKGBUILD 185578 2013-05-15 08:05:39Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=4.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index a189e6323..fa079c039 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184841 2013-05-09 09:27:34Z ronald $ +# $Id: PKGBUILD 185678 2013-05-16 20:59:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('26df183adac7a3572f04e6a8fcb8be38010b203a') +sha1sums=('1a4dbc727780eff95c102cd8ecf9533c07a3631d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index c1558e82b..4051e860d 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184835 2013-05-09 09:25:45Z ronald $ +# $Id: PKGBUILD 185672 2013-05-16 20:57:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0d70796cd78b8ad9ed308193becdbb94dad5e51c') +sha1sums=('204fa38463b64d3b97e4c598942e9389dc89216e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index 72d83bfb1..5fe2807a6 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184837 2013-05-09 09:26:25Z ronald $ +# $Id: PKGBUILD 185674 2013-05-16 20:57:59Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('32b9d991cb33a7c1b96ad47b3c676238cdd278b7') +sha1sums=('e42b73a268afaa022efb179966991cfb3865168b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 3e2eb0c07..0ba87960e 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183346 2013-04-21 22:08:49Z heftig $ +# $Id: PKGBUILD 186309 2013-05-24 14:23:00Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.8.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!libtool' '!makeflags') groups=(gnome) install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917') +sha256sums=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0') build() { cd $pkgname-$pkgver diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index bc0d66b8b..06edaadd8 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184843 2013-05-09 09:30:22Z ronald $ +# $Id: PKGBUILD 185679 2013-05-16 21:02:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.2.1 +pkgver=0.17.3 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('5122a2b62d151d11b28457bd3626130e9c5bcc3c' +sha1sums=('998a5ada3861028ffd65f994270e5f7f8e9baf9b' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 112814b34..d781aa20f 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183348 2013-04-21 22:08:51Z heftig $ +# $Id: PKGBUILD 186992 2013-06-02 19:43:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=2 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,16 @@ makedepends=('intltool') install=eog-plugins.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a7e4822c46654f67ef25cbc82e4c955ee84ecae92cf356e15a136032cff35e78') +sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9') build() { cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index e0dd58e42..b60bc2c34 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183347 2013-04-21 22:08:50Z heftig $ +# $Id: PKGBUILD 185427 2013-05-14 09:33:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=(i686 x86_64 mips64el) @@ -15,7 +15,7 @@ groups=(gnome) options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0f2f6f1eb1a373b2a6f8e5627b20815e5bf13b8c856b67d8f72d2a10b6012f2b') +sha256sums=('689251b6dd18ef191cbfd9431c0324c70707b60edd73d86fc014bd8ae0bd8336') build() { cd "$pkgname-$pkgver" diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD deleted file mode 100644 index cca3a1c57..000000000 --- a/extra/epiphany-extensions/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 169866 2012-10-30 22:25:08Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=epiphany-extensions -pkgver=3.6.0 -pkgrel=1.1 -url="http://www.gnome.org/projects/epiphany/" -pkgdesc="Various extentions for the Epiphany web browser" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('epiphany' 'opensp' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') -options=('!libtool' '!emptydirs') -install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 3d0b8fe7b..b0fa14489 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183349 2013-04-21 22:08:53Z heftig $ +# $Id: PKGBUILD 186906 2013-05-31 18:10:20Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -15,12 +15,16 @@ options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f') +sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 93326438f..83413fc07 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179514 2013-03-05 18:49:59Z ioni $ +# $Id: PKGBUILD 185537 2013-05-14 20:42:07Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.8 +pkgver=3.9 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,11 +13,12 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('7ae96870bc4f9b43f666650ae30f2685') +md5sums=('5777759e85b3323917c6cc9327f5d99c') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man \ + --sbindir=/usr/bin make } diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index 3f8f6578c..0a8017308 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184838 2013-05-09 09:26:45Z ronald $ +# $Id: PKGBUILD 185675 2013-05-16 20:58:16Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('7917215aead3aaef9fd20c141759b1cc17ec5c19') +sha1sums=('37d173fea2ce68ee1cedd379f235663c1211d20d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index cf7ad02ed..f462e760e 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185003 2013-05-09 20:12:12Z ronald $ +# $Id: PKGBUILD 185668 2013-05-16 20:55:43Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('76b9b7338ae2a16fca25d6183355d425d4595594') +sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index c0efb7a01..cfde39745 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184830 2013-05-09 09:24:04Z ronald $ +# $Id: PKGBUILD 186339 2013-05-25 02:56:29Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.6 -pkgrel=1 +pkgver=1.7.7 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('6f3d6a0fd888f39d941436ff3e48d86981e9f636') +sha1sums=('f4c753e995a7adb5e18535f41446e222f19227c2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD index c0f983253..b4594a617 100644 --- a/extra/eventlog/PKGBUILD +++ b/extra/eventlog/PKGBUILD @@ -5,7 +5,7 @@ pkgname=eventlog pkgver=0.2.12 -pkgrel=3 +pkgrel=3.1 pkgdesc="API to format and send structured log messages" arch=('i686' 'x86_64' 'mips64el') url="http://www.balabit.com/support/community/products/" diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index afb38475a..f25b66339 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183350 2013-04-21 22:08:55Z heftig $ +# $Id: PKGBUILD 185565 2013-05-15 07:56:22Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -16,7 +16,7 @@ groups=(gnome) install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cf136d2a025ef486c4e248e0dc134e7a9420557d9edc0df1ceb6a6330fbd4e9a') +sha256sums=('dd35b54b82190ba01f0c481e2d073ccddaa325ce80964b655dc167752b6bc2f5') build() { cd $pkgname-$pkgver diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 40c6cc802..88621b001 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185256 2013-05-12 15:18:01Z heftig $ +# $Id: PKGBUILD 185541 2013-05-14 21:40:19Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index ad235fdcd..e7a3ac883 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185258 2013-05-12 15:23:32Z heftig $ +# $Id: PKGBUILD 185542 2013-05-14 21:40:20Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2.1') diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 506b1fc28..fd61dd3b3 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185257 2013-05-12 15:22:50Z heftig $ +# $Id: PKGBUILD 185540 2013-05-14 21:40:18Z andrea $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') license=(GPL) diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD new file mode 100644 index 000000000..d033c1e3b --- /dev/null +++ b/extra/f2fs-tools/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 186280 2013-05-23 15:59:36Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> + +pkgname=f2fs-tools +pkgver=1.1.0_130404 +pkgrel=1 +pkgdesc="Tools for Flash-Friendly File System (F2FS)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/f2fs-tools/" +depends=('util-linux') +license=('GPL') +#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') +source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('0bb44c174a2da2a7dd1216cc46b4612c') +options=(!libtool) + +build() { + cd "${pkgname}-${pkgver}" + + autoreconf -fi + ./configure --prefix=/usr --sbindir=/usr/bin + make +} + +package() { + cd "${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" sbindir=/usr/bin install +} + diff --git a/extra/fbset/PKGBUILD b/extra/fbset/PKGBUILD index 03dbdc892..b991dfd92 100644 --- a/extra/fbset/PKGBUILD +++ b/extra/fbset/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135993 2011-08-21 06:02:11Z eric $ +# $Id: PKGBUILD 185293 2013-05-13 00:49:44Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Paul Mattal <pjmattal@elys.com> pkgname=fbset pkgver=2.1 -pkgrel=4.1 +pkgrel=5 pkgdesc="Framebuffer setup utility" arch=('i686' 'x86_64' 'mips64el') url="http://users.telenet.be/geertu/Linux/fbdev/" @@ -22,7 +22,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -D -m755 fbset "${pkgdir}/usr/sbin/fbset" + install -D -m755 fbset "${pkgdir}/usr/bin/fbset" install -D -m644 fb.modes.5 "${pkgdir}/usr/share/man/man5/fb.modes.5" install -D -m644 fbset.8 "${pkgdir}/usr/share/man/man8/fbset.8" install -D -m644 etc/fb.modes.ATI "${pkgdir}/etc/fb.modes" diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD index 7de473167..bd3595ee2 100644 --- a/extra/five-or-more/PKGBUILD +++ b/extra/five-or-more/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183355 2013-04-21 22:09:04Z heftig $ +# $Id: PKGBUILD 186970 2013-06-01 21:56:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=five-or-more -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Remove colored balls from the board by forming lines" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=five-or-more.install url="https://live.gnome.org/Five%20or%20more" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a050f472dadbb3f44e5cd5e4ab31058a6058f4ccaa03558311706ec0c052b056') +sha256sums=('d63055c296a73762f68d900c753c5ecbec9b20cc1ed4595feb0b7bee9900c311') build() { cd $pkgname-$pkgver diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD index fa69e9dba..6c8f47393 100644 --- a/extra/flac/PKGBUILD +++ b/extra/flac/PKGBUILD @@ -1,46 +1,37 @@ -# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# $Id: PKGBUILD 186549 2013-05-28 18:39:02Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=flac pkgname=('flac' 'flac-doc') -pkgver=1.2.1 -pkgrel=3.2 +pkgver=1.3.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://flac.sourceforge.net/" license=('BSD' 'GPL') depends=('libogg') -makedepends=('nasm' 'xmms') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('nasm') # xmms doesn't build on mips +makedepends=('doxygen') +[ "$CARCH" = "mips64el" ] || makedepends+=('nasm' 'xmms') options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz - flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' - 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' - '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') +source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz) +sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ - --disable-sse --disable-rpath --with-pic + cd ${pkgbase}-${pkgver} + ./configure --prefix=/usr --disable-sse make } check() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make check } package_flac() { pkgdesc="Free Lossless Audio Codec" - optdepends=('xmms: for using the xmms plugin') -[ "$CARCH" = "mips64el" ] && \ - unset optdepends + [ "$CARCH" = "mips64el" ] || optdepends=('xmms: for using the xmms plugin') options=('!libtool' '!docs') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } @@ -49,7 +40,8 @@ package_flac-doc() { pkgdesc="Developer documentation for the Free Lossless Audio Codec" depends=('flac') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C doc install + sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag" install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch b/extra/flac/flac-1.2.1-gcc-4.3-includes.patch deleted file mode 100644 index 52fec8be5..000000000 --- a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 -@@ -30,6 +30,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <cstring> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD index ae6d2337d..07b790a4d 100644 --- a/extra/fluidsynth/PKGBUILD +++ b/extra/fluidsynth/PKGBUILD @@ -1,26 +1,21 @@ -# $Id: PKGBUILD 166870 2012-09-20 10:08:01Z schiv $ +# $Id: PKGBUILD 185445 2013-05-14 10:12:02Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fluidsynth pkgver=1.1.6 -pkgrel=1.1 +pkgrel=2 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" arch=(i686 x86_64 'mips64el') url="http://www.fluidsynth.org/" -depends=('glib2' 'jack' 'dbus-core' 'libpulse') +depends=('glib2' 'jack' 'libpulse') makedepends=('cmake' 'ladspa' 'doxygen') optdepends=('pulseaudio: PulseAudio sound support') license=('LGPL') -backup=('etc/conf.d/fluidsynth') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'fluidsynth.conf' - 'fluidsynth.rc' 'fluidsynth.systemd') md5sums=('ae5aca6de824b4173667cbd3a310b263' - '7d0ab0d75d4e87652f4cb7ffeac8a82b' - 'b296dbfb524c2164f552f68bd9abe2ec' 'e0406748a154409907df62292be32e8a') build() { @@ -36,16 +31,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/fluidsynth.conf" \ - "$pkgdir/etc/conf.d/fluidsynth" - - install -Dm755 "$srcdir/fluidsynth.rc" \ - "$pkgdir/etc/rc.d/fluidsynth" - - install -Dm644 "$srcdir/fluidsynth.systemd" \ - "$pkgdir/usr/lib/systemd/system/fluidsynth.service" + install -Dm644 "$srcdir/$pkgname.systemd" \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } # vim:set ts=2 sw=2 et: diff --git a/extra/fluidsynth/fluidsynth.conf b/extra/fluidsynth/fluidsynth.conf deleted file mode 100644 index b8465fa2e..000000000 --- a/extra/fluidsynth/fluidsynth.conf +++ /dev/null @@ -1,2 +0,0 @@ -FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000" -FSYNTH_SOUNDFONT="" # path to your soundfont diff --git a/extra/fluidsynth/fluidsynth.install b/extra/fluidsynth/fluidsynth.install index 86e05f892..b100fc989 100644 --- a/extra/fluidsynth/fluidsynth.install +++ b/extra/fluidsynth/fluidsynth.install @@ -1,19 +1,13 @@ post_install() { echo - echo " > To use FluidSynth as a daemon edit /etc/conf.d/fluidsynth" - echo - echo " > Systemd users need to copy the service file from:" + echo " > To use FluidSynth as a daemon copy the service file from:" echo " /usr/lib/systemd/system/fluidsynth.service" echo " > to:" echo " /etc/systemd/system/multi-user.target.wants/" echo " > and then edit accordingly." echo - echo " > PulseAudio output when running as a daemon" - echo " > is known to be problematic. See:" + echo " > PulseAudio output when running as a daemon is known to be" + echo " > problematic. See the following bulletin board post:" echo " https://bbs.archlinux.org/viewtopic.php?id=135092" echo } - -post_upgrade() { - post_install -} diff --git a/extra/fluidsynth/fluidsynth.rc b/extra/fluidsynth/fluidsynth.rc deleted file mode 100644 index ca1e8fa6e..000000000 --- a/extra/fluidsynth/fluidsynth.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth - -PID=`pidof -o %PPID /usr/bin/fluidsynth` -case "$1" in - start) - stat_busy "Starting Fluidsynth soundfont synthesizer" - [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 & - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/fluidsynth.pid - add_daemon fluidsynth - stat_done - fi - ;; - stop) - stat_busy "Stopping Fluidsynth soundfont synthesizer" - [ ! -z "$PID" ] && kill $PID &> /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/fluidsynth.pid - rm_daemon fluidsynth - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index d04e83746..611ae6a84 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $ +# $Id: PKGBUILD 186044 2013-05-20 18:22:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.92 -pkgrel=4 +pkgver=2.10.93 +pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64 'mips64el') url="http://www.fontconfig.org/release/" @@ -13,7 +13,7 @@ options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 29-replace-bitmap-fonts.conf git_fixes.diff) -sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22' +sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c' '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6' '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0') @@ -24,7 +24,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" # post release fixes - patch -Np1 -i ${srcdir}/git_fixes.diff + #patch -Np1 -i ${srcdir}/git_fixes.diff # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index c512c1dcd..2a7718ba0 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $ +# $Id: PKGBUILD 186276 2013-05-23 15:38:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.4 +pkgver=3.5 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,13 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('a4bc97804e630dbf26dfac8f28c78091') +md5sums=('2e17cb655aa4eb59b5a4a38a89e746ed') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --enable-ipv4 \ --enable-ipv6 @@ -30,5 +31,5 @@ package() { # install license install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" - chmod 4555 ${pkgdir}/usr/sbin/fping + chmod 4555 ${pkgdir}/usr/bin/fping } diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index ff0ed781c..f6fe3449e 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173707 2012-12-21 16:29:38Z andyrtr $ +# $Id: PKGBUILD 185748 2013-05-18 10:42:24Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.11 -pkgrel=2 +pkgver=2.4.12 +pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('b93435488942486c8d0ca22e8f768034' +md5sums=('3463102764315eb86c0d3c2e1f3ffb7d' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD index 319170b24..5381824f0 100644 --- a/extra/frozen-bubble/PKGBUILD +++ b/extra/frozen-bubble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160465 2012-06-02 10:25:48Z bluewind $ +# $Id: PKGBUILD 186373 2013-05-26 09:24:23Z bluewind $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> @@ -6,7 +6,7 @@ pkgname=frozen-bubble _pkgver=2.2.1-beta1 pkgver=${_pkgver/-/} -pkgrel=4 +pkgrel=5 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" arch=(i686 x86_64 'mips64el') url="http://www.frozen-bubble.org" diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD index bca9b4528..8b3ee55a9 100644 --- a/extra/gconf-perl/PKGBUILD +++ b/extra/gconf-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160467 2012-06-02 10:25:52Z bluewind $ +# $Id: PKGBUILD 186374 2013-05-26 09:24:24Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gconf-perl pkgver=1.044 -pkgrel=7 +pkgrel=8 pkgdesc="Gnome2-GConf perl bindings for gconf" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index c2868be99..1e7fc883c 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183363 2013-04-21 22:09:19Z heftig $ +# $Id: PKGBUILD 185365 2013-05-13 17:49:32Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="A text editor for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9e0b8a831c6d6d2b82a8f42a0e01ab1f3398fed2cca0b65d0a105d134a5c4dce') +sha256sums=('1b7450cb194d4dadb7a82635d0e7f92da2b65a8487341e0410b676d9f33e19d2') build() { cd $pkgname-$pkgver diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index f70aba975..ee2bd74bc 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183364 2013-04-21 22:09:21Z heftig $ +# $Id: PKGBUILD 185359 2013-05-13 17:41:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=ghex -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('intltool' 'itstool' 'docbook-xsl') options=('!libtool' '!emptydirs') install=ghex.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('40b08fff065575e91f161904952aaa14919ffe053f3849c47ab567ac93a4d3fc') +sha256sums=('84ce220eed0dc9f640a87db68533e65a4dc06a1a6136b244270d8b2a1ae93534') build() { cd $pkgname-$pkgver diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 420b9cbe0..161a431da 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185043 2013-05-10 16:49:05Z dan $ +# $Id: PKGBUILD 186460 2013-05-26 20:12:59Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2.3 +pkgver=1.8.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('03ebfd403a8cf355da0e3f15e53b8925' - '891481ec6ecd9ee530701378e5b61d3f' +md5sums=('d91b6099fb6763cf92c696977a247060' + '0b469c0fd81b4a56b9059d7c443282f0' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD index cf7eaf91c..f1047ceea 100644 --- a/extra/glade-perl/PKGBUILD +++ b/extra/glade-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160469 2012-06-02 10:25:54Z bluewind $ +# $Id: PKGBUILD 186375 2013-05-26 09:24:26Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glade-perl _realname=Gtk2-GladeXML pkgver=1.007 -pkgrel=6 +pkgrel=7 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index 2b35e7372..cb2cf05c4 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183367 2013-04-21 22:09:26Z heftig $ +# $Id: PKGBUILD 185433 2013-05-14 09:44:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.36.1 +pkgver=2.36.2 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=(intltool) options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea') +sha256sums=('2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9') build() { cd $pkgname-$pkgver diff --git a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch new file mode 100644 index 000000000..fe92fbd94 --- /dev/null +++ b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch @@ -0,0 +1,230 @@ +From ebf55199407d3be92162f5c2573c7f9c34614cb1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de> +Date: Thu, 2 Aug 2012 21:41:41 +0200 +Subject: [PATCH] Make Glib::Object subclassing more robust +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rearrange how we register the interfaces, properties and signals of a newly +created type so that: + +• The outcome is independent of the order of the arguments passed to +Glib::Object::Subclass or Glib::Type->register. This also avoids fallout from +the change to hash randomization in perl 5.17.6. + +• We register things in the correct order: interfaces first, before entering +class_init; then properties and signals from within class_init. This also +avoids prematurely creating the new type's class. +--- + GType.xs | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- + NEWS | 7 +++++ + 2 files changed, 77 insertions(+), 22 deletions(-) + +diff --git a/GType.xs b/GType.xs +index 02e24a4..fdaad68 100644 +--- a/GType.xs ++++ b/GType.xs +@@ -1234,13 +1234,10 @@ parse_signal_hash (GType instance_type, + + + static void +-add_signals (GType instance_type, HV * signals) ++add_signals (GType instance_type, HV * signals, AV * interfaces) + { +- GObjectClass *oclass; + HE * he; + +- oclass = g_type_class_ref (instance_type); +- + hv_iterinit (signals); + while (NULL != (he = hv_iternext (signals))) { + I32 keylen; +@@ -1250,9 +1247,36 @@ add_signals (GType instance_type, HV * signals) + + /* the key is the signal name */ + signal_name = hv_iterkey (he, &keylen); +- /* if the signal is defined at this point, we're going to +- * override the installed closure. */ +- signal_id = g_signal_lookup (signal_name, instance_type); ++ ++ /* if, at this point, the signal is already defined in the ++ * ancestry or the interfaces we just added to instance_type, ++ * we can only override the installed closure. trying to ++ * create a new signal with the same name is an error. ++ * ++ * unfortunately, we cannot simply use instance_type to do the ++ * lookup because g_signal_lookup would complain about it since ++ * it hasn't been fully loaded yet. see ++ * <https://bugzilla.gnome.org/show_bug.cgi?id=691096>. ++ * ++ * FIXME: the "if (signal_id)" check in the hash ref block ++ * below could be removed since g_signal_newv also checks this. ++ * consequently, this lookup code could be moved into the class ++ * closure block below. */ ++ signal_id = g_signal_lookup (signal_name, ++ g_type_parent (instance_type)); ++ if (!signal_id && interfaces) { ++ int i; ++ for (i = 0; i <= av_len (interfaces); i++) { ++ GType interface_type; ++ SV ** svp = av_fetch (interfaces, i, FALSE); ++ if (!svp || !gperl_sv_is_defined (*svp)) ++ continue; ++ interface_type = gperl_object_type_from_package (SvPV_nolen (*svp)); ++ signal_id = g_signal_lookup (signal_name, interface_type); ++ if (signal_id) ++ break; ++ } ++ } + + /* parse the key's value... */ + value = hv_iterval (signals, he); +@@ -1310,8 +1334,6 @@ add_signals (GType instance_type, HV * signals) + signal_name); + } + } +- +- g_type_class_unref (oclass); + } + + typedef struct { +@@ -1407,13 +1429,10 @@ prop_handler_lookup (GType instance_type, + } + + static void +-add_properties (GType instance_type, AV * properties) ++add_properties (GType instance_type, GObjectClass * oclass, AV * properties) + { +- GObjectClass *oclass; + int propid; + +- oclass = g_type_class_ref (instance_type); +- + for (propid = 0; propid <= av_len (properties); propid++) { + SV * sv = *av_fetch (properties, propid, 1); + GParamSpec * pspec = NULL; +@@ -1452,8 +1471,6 @@ add_properties (GType instance_type, AV * properties) + } + g_object_class_install_property (oclass, propid + 1, pspec); + } +- +- g_type_class_unref (oclass); + } + + /* +@@ -1776,12 +1793,26 @@ gperl_type_reg_quark (void) + return q; + } + ++typedef struct { ++ GType instance_type; ++ AV *interfaces; ++ AV *properties; ++ HV *signals; ++} GPerlClassData; ++ + static void +-gperl_type_class_init (GObjectClass * class) ++gperl_type_class_init (GObjectClass * class, GPerlClassData * class_data) + { + class->finalize = gperl_type_finalize; + class->get_property = gperl_type_get_property; + class->set_property = gperl_type_set_property; ++ ++ if (class_data->properties) ++ add_properties (class_data->instance_type, class, ++ class_data->properties); ++ if (class_data->signals) ++ add_signals (class_data->instance_type, ++ class_data->signals, class_data->interfaces); + } + + static void +@@ -2152,15 +2183,18 @@ g_type_register_object (class, parent_package, new_package, ...); + PREINIT: + int i; + GTypeInfo type_info; ++ GPerlClassData class_data; + GTypeQuery query; + GType parent_type, new_type; + char * new_type_name; + CODE: + /* start with a clean slate */ + memset (&type_info, 0, sizeof (GTypeInfo)); ++ memset (&class_data, 0, sizeof (GPerlClassData)); + type_info.base_init = (GBaseInitFunc) gperl_type_base_init; + type_info.class_init = (GClassInitFunc) gperl_type_class_init; + type_info.instance_init = (GInstanceInitFunc) gperl_type_instance_init; ++ type_info.class_data = &class_data; + + /* yeah, i could just call gperl_object_type_from_package directly, + * but i want the error messages to be more informative. */ +@@ -2196,29 +2230,43 @@ g_type_register_object (class, parent_package, new_package, ...); + /* mark this type as "one of ours". */ + g_type_set_qdata (new_type, gperl_type_reg_quark (), (gpointer) TRUE); + +- /* now look for things we should initialize presently, e.g. +- * signals and properties and interfaces and such, things that +- * would generally go into a class_init. */ ++ /* put it into the class data so that add_signals and add_properties ++ * can use it. */ ++ class_data.instance_type = new_type; ++ ++ /* now look for things we should initialize, e.g. signals and ++ * properties and interfaces. put the corresponding data into the ++ * class_data struct. the interfaces will be handled directly further ++ * below, while the properties and signals will be handled in the ++ * class_init function so that they have access to the class instance. ++ * this mimics the way things are supposed to be done in C: register ++ * interfaces in the get_type function, and register properties and ++ * signals in the class_init function. */ + for (i = 3 ; i < items ; i += 2) { + char * key = SvPV_nolen (ST (i)); + if (strEQ (key, "signals")) { + if (gperl_sv_is_hash_ref (ST (i+1))) +- add_signals (new_type, (HV*)SvRV (ST (i+1))); ++ class_data.signals = (HV*)SvRV (ST (i+1)); + else + croak ("signals must be a hash of signalname => signalspec pairs"); + } else if (strEQ (key, "properties")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_properties (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.properties = (AV*)SvRV (ST (i+1)); + else + croak ("properties must be an array of GParamSpecs"); + } else if (strEQ (key, "interfaces")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_interfaces (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.interfaces = (AV*)SvRV (ST (i+1)); + else + croak ("interfaces must be an array of package names"); + } + } + ++ /* add the interfaces to the type now before we create its class and ++ * enter the class_init function. */ ++ if (class_data.interfaces) ++ add_interfaces (new_type, class_data.interfaces); ++ + /* instantiate the class right now. perl doesn't let classes go + * away once they've been defined, so we'll just leak this ref and + * let the GObjectClass live as long as the program. in fact, +diff --git a/NEWS b/NEWS +index 5606566..ad71da0 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,10 @@ ++Overview of changes in Glib <next> (unstable) ++============================================ ++ ++* Make Glib::Object subclassing more robust. This should in particular fix ++ issues revealed by the change to hash randomization introduced in perl ++ 5.17.6. ++ + Overview of changes in Glib 1.280 (stable) + ========================================== + +-- +1.8.2.3 + diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index 8d1ad7ffd..ee1300607 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183484 2013-04-21 22:21:04Z heftig $ +# $Id: PKGBUILD 186376 2013-05-26 09:24:27Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=glib-perl pkgver=1.280 -pkgrel=1 +pkgrel=3 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,8 +12,17 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('glib2' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('1d81a8aec5f7f1182a96cfaaf119d866') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz + 0001-Make-Glib-Object-subclassing-more-robust.patch) +md5sums=('1d81a8aec5f7f1182a96cfaaf119d866' + 'ebe39d50eff182a1ad4390cbbef46e41') + +prepare() { + cd "${srcdir}/Glib-${pkgver}" + + # Needed for gtk2-perl to compile against Perl 5.18 + patch -Np1 -i "${srcdir}/0001-Make-Glib-Object-subclassing-more-robust.patch" +} build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD index 97732cd54..b785093ac 100644 --- a/extra/gnome-calculator/PKGBUILD +++ b/extra/gnome-calculator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183370 2013-04-21 22:09:37Z heftig $ +# $Id: PKGBUILD 185451 2013-05-14 10:16:40Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-calculator -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gnome-calculator.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('24ae856c90a3df62c52dc413ceb2c9bad15e7ad146de0469b53c70681a4ad435') +sha256sums=('13d67b6dfa2501b883add8adf5470c5fea5eb1f1fa87f84e8ceda069418f1e81') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index 5ec4bb961..c9dd18a58 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 183371 2013-04-21 22:09:39Z heftig $ +# $Id: PKGBUILD 185633 2013-05-16 14:54:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.8.1 +pkgver=3.8.2.1 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite') makedepends=('intltool' 'itstool' 'gobject-introspection') +optdepends=('gnuchess: Play against computer') conflicts=('gnome-games') replaces=('gnome-games') options=('!emptydirs' '!libtool') @@ -17,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('f8a756d0e532ee9532745257bcb3514b3e75a0e2fa7e75b7358b59cdaf3a7661') +sha256sums=('d38cf534eeeffa4db81edf9db92c0c188d5ffd52cd7091352a0972b2b5c655cb') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD index 2e25edaba..d31c53891 100644 --- a/extra/gnome-clocks/PKGBUILD +++ b/extra/gnome-clocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183372 2013-04-21 22:09:40Z heftig $ +# $Id: PKGBUILD 185477 2013-05-14 11:11:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-clocks -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Clocks applications for GNOME" arch=(i686 x86_64 mips64el) @@ -20,7 +20,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver} button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver} button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver}) -sha256sums=('6140cc1ae41460c5fc799b2a52d809ed4cf9035a72be7e878160b5e591486d31' +sha256sums=('afe8405e41d8d2ac570642c2d73a43a2a45f8c6e521640d0a266e0fe0a55410f' '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc' 'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24' 'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0' diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index d61a15334..e25240abd 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183373 2013-04-21 22:09:42Z heftig $ +# $Id: PKGBUILD 185315 2013-05-13 09:38:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('61851022ccfa090f21ce027c36cd440597648401aafa2c8b3d3f7787a866bb49') +sha256sums=('6b9999d8213c8cab7abb7c9b1833d1d599866546180d11603fdee5430f93bae1') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 6e74ca556..5ba599d6d 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184352 2013-05-06 17:20:30Z heftig $ +# $Id: PKGBUILD 185509 2013-05-14 12:14:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.1.5 +pkgver=3.8.2 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6756a97eb8e89fe16bd5e50ab85d7f0e4e0fb7fa4e9df5ab49a97de03033d211') +sha256sums=('abf6c1acb0b82631e730cb32762deff905fd4f776b89b475b8e732dc73a9d1fb') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index b5833da36..c1cd8b85d 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183376 2013-04-21 22:09:47Z heftig $ +# $Id: PKGBUILD 185455 2013-05-14 10:21:59Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('79c4790fdfc58a54ee32b2fd20f498f4d563d11fa40ab6599c757e45bee5b13f') +sha256sums=('af4ec330fa61ee761daf2d5e481e2f9ffbd068d135d5e31a3eaf274524cba33d') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index ebf26d532..17afe93d1 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $ +# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.8.0 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -14,8 +14,17 @@ depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hi makedepends=(intltool docbook-xsl gnome-settings-daemon) options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + typefixes.patch) +sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3' + '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2') + +prepare() { + cd $pkgname-$pkgver + + # Gets rid of warnings and compilation errors on i686 + patch -Np1 -i ../typefixes.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gnome-disk-utility/typefixes.patch b/extra/gnome-disk-utility/typefixes.patch new file mode 100644 index 000000000..79439e4de --- /dev/null +++ b/extra/gnome-disk-utility/typefixes.patch @@ -0,0 +1,97 @@ +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c 2013-05-29 03:17:37.201963964 +0200 +@@ -610,7 +610,7 @@ + error)) + { + g_prefix_error (error, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_write, + offset); + goto out; +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c 2013-05-29 03:18:30.224935009 +0200 +@@ -429,7 +429,7 @@ + if (widget->drive != NULL && udisks_drive_get_removable (widget->drive)) + { + /* default FAT for flash and disks/media smaller than 20G (assumed to be flash cards) */ +- if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < 20L * 1000L*1000L*1000L) ++ if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < (guint64)(20ULL * 1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (widget->type_combobox), "vfat"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c +--- gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -293,7 +293,7 @@ + /* Default to MBR for removable drives < 2TB... GPT otherwise */ + if (data->drive != NULL && + udisks_drive_get_removable (data->drive) && +- udisks_drive_get_size (data->drive) < 2 * 1000L*1000L*1000L*1000L) ++ udisks_drive_get_size (data->drive) < (guint64)(2ULL * 1000ULL*1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (data->type_combobox), "dos"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -91,11 +91,11 @@ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton))) + flags |= (1UL<<2); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton))) +- flags |= (1UL<<60); ++ flags |= (1ULL<<60); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton))) +- flags |= (1UL<<62); ++ flags |= (1ULL<<62); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton))) +- flags |= (1UL<<63); ++ flags |= (1ULL<<63); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +@@ -245,9 +245,9 @@ + flags = udisks_partition_get_flags (data->partition); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->system_checkbutton), (flags & (1UL<< 0)) != 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton), (flags & (1UL<< 2)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1UL<<60)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1UL<<62)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1UL<<63)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1ULL<<60)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1ULL<<62)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1ULL<<63)) != 0); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c 2013-05-29 03:17:37.485295361 +0200 +@@ -587,7 +587,7 @@ + &error)) + { + g_prefix_error (&error, +- "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", ++ "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_read, + num_bytes_completed); + goto out; +@@ -595,7 +595,7 @@ + if (num_bytes_read != num_bytes_to_read) + { + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes", ++ "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes", + num_bytes_read, + num_bytes_completed, + num_bytes_to_read); +@@ -610,7 +610,7 @@ + goto copy_write_again; + + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", + num_bytes_read, + num_bytes_completed); + goto out; diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index db1ce515f..a032e2db7 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183380 2013-04-21 22:09:52Z heftig $ +# $Id: PKGBUILD 185457 2013-05-14 10:25:02Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=3.8.1 +pkgver=3.8.2.1 pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -15,8 +15,8 @@ makedepends=(intltool gobject-introspection itstool) optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7cd05f5f2482ddae797300b233f499cbe410cb22d358bef37a387aff232d4e9f') +source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('52cbe1590b47fbf446becde227e0fa3772dda589b631ab1350a034c2eae77b85') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD index 99d1552d8..d0619306e 100644 --- a/extra/gnome-klotski/PKGBUILD +++ b/extra/gnome-klotski/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183386 2013-04-21 22:10:02Z heftig $ +# $Id: PKGBUILD 185360 2013-05-13 17:42:01Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-klotski -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Slide blocks to solve the puzzle" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=gnome-klotski.install url="https://live.gnome.org/Klotski" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('85b2936dc9390bb09d622984b169c0d921b99d786fbd0060d39d319c38d31c71') +sha256sums=('757a531542272b8d2191facb034e5033ba3aa340d5303b8d939f78045d91910c') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index e1da9bfed..e57680e55 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $ +# $Id: PKGBUILD 186905 2013-05-31 18:09:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=gnome-nettool -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64 mips64el) @@ -16,14 +16,11 @@ optdepends=('nmap: Port scanning' groups=(gnome-extra) url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - printf.patch) -sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28' - '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1') build() { cd $pkgname-$pkgver - patch -Np1 -i ../printf.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch deleted file mode 100644 index 89868411a..000000000 --- a/extra/gnome-nettool/printf.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c ---- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200 -+++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200 -@@ -232,13 +232,13 @@ - text_rx_bytes = util_legible_bytes (netload.bytes_in); - text_tx_bytes = util_legible_bytes (netload.bytes_out); - -- g_sprintf (rx_pkt, "%lld", netload.packets_in); -- g_sprintf (tx_pkt, "%lld", netload.packets_out); -+ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in); -+ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out); - -- g_sprintf (rx_error, "%lld", netload.errors_in); -- g_sprintf (tx_error, "%lld", netload.errors_out); -+ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in); -+ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out); - -- g_sprintf (collisions, "%lld", netload.collisions); -+ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions); - - gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes); - gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt); -diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c ---- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200 -+++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200 -@@ -272,7 +272,7 @@ - unit = "KiB"; - } - -- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10, -+ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10, - short_rx % 10, unit); - return result; - } diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index b58d1bcfb..253cec562 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183392 2013-04-21 22:10:11Z heftig $ +# $Id: PKGBUILD 185462 2013-05-14 10:31:45Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('26c334000ae74832042142a150e7d0c4b5ced4dc24bdb247f75cbb9e3d2e7261') +sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD index 9c101b8dd..62b340582 100644 --- a/extra/gnome-perl/PKGBUILD +++ b/extra/gnome-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160473 2012-06-02 10:26:01Z bluewind $ +# $Id: PKGBUILD 186378 2013-05-26 09:24:29Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-perl _realname=Gnome2 pkgver=1.042 -pkgrel=8 +pkgrel=9 pkgdesc="Perl bindings for libgnome" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD index 8e8d670bd..bd7d4686f 100644 --- a/extra/gnome-photos/PKGBUILD +++ b/extra/gnome-photos/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183480 2013-04-21 22:20:19Z heftig $ +# $Id: PKGBUILD 185464 2013-05-14 10:33:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-photos -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Access, organize, and share your photos on GNOME" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ options=(!libtool) groups=(gnome-extra) install=gnome-photos.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d5a42a6562eb2bebd404f1b932e105572e64abb0e3160b2834c7898cf090f3de') +sha256sums=('c6e777cdc6a4b0ee24b4dbd1b971fe239198926a3057c27c08eeda0a53ba6d58') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index ffe8a4a86..60e423d81 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183393 2013-04-21 22:10:14Z heftig $ +# $Id: PKGBUILD 185314 2013-05-13 09:37:19Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="System power information and statistics" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ makedepends=(intltool) options=(!emptydirs) install=gnome-power-manager.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f5b5ef2282fae3bcdcc8473af3cc5e32ad7ac7e2444fc93abf00c3d2967361bf') +sha256sums=('6f4fee6cce2c0a58ae52a2cae1b8f0acca0a08d8154fe056ca3bfb5e537c5b61') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD index 1ff4b40d6..a847016e1 100644 --- a/extra/gnome-screenshot/PKGBUILD +++ b/extra/gnome-screenshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183395 2013-04-21 22:10:17Z heftig $ +# $Id: PKGBUILD 185472 2013-05-14 11:00:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-screenshot -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Take pictures of your screen" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool') groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('113ab0fe98080f888ff8ff15011b21e74b5582576cb5455db47cbfd9e9075a05') +sha256sums=('673d3102bbd9d5ee493111e109adfa9ecc880c41f883d3db4be6dce70610513e') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 1f0f8e8d3..204d45b5f 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184166 2013-05-03 02:07:55Z heftig $ +# $Id: PKGBUILD 185463 2013-05-14 10:32:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.8.1 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') license=(GPL LGPL) @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770' +sha256sums=('a6ed1c109005f81ec34a8aa09b2f114c07b4fba8feef47d2f23559797be88640' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index def7ad389..898a2131b 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183398 2013-04-21 22:10:23Z heftig $ +# $Id: PKGBUILD 185507 2013-05-14 12:11:03Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee') +sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 23df6af4a..949e5a37b 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183399 2013-04-21 22:10:25Z heftig $ +# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.1 -pkgrel=1 +pkgver=3.8.2 +pkgrel=4 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,20 +19,31 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch) -sha256sums=('db0160d7c3fec3858805f218f961534d1a3f1486e005492433d4a28c40f83ac7' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + nm-libexecdir.patch popupmenu.patch) +sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' + '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d') -build() { +prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch + # FS#35326 (from gnome-3-8 branch) + patch -Np1 -i ../popupmenu.patch +} + +build() { + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gnome-shell/popupmenu.patch b/extra/gnome-shell/popupmenu.patch new file mode 100644 index 000000000..035432cd5 --- /dev/null +++ b/extra/gnome-shell/popupmenu.patch @@ -0,0 +1,28 @@ +From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001 +From: Florian Müllner <fmuellner@gnome.org> +Date: Tue, 14 May 2013 16:55:08 +0000 +Subject: PopupMenuManager: Fix child menus + +Since commit c84dc6254d2d65c, popup menus are closed automatically +when another menu opens (to catch the case where a menu is opened +by keyboard shortcut, which wasn't handled before). However in the +case of child menus, both child and parent are expected to be visible, +so handle this case explicitly. + +https://bugzilla.gnome.org/show_bug.cgi?id=699678 +--- +diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js +index fc37dd8..ab6c795 100644 +--- a/js/ui/popupMenu.js ++++ b/js/ui/popupMenu.js +@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({ + + _onMenuOpenState: function(menu, open) { + if (open) { +- if (this.activeMenu) ++ if (this.activeMenu && !this.activeMenu.isChildMenu(menu)) + this.activeMenu.close(BoxPointer.PopupAnimation.FADE); + this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor, + onUngrab: Lang.bind(this, this._closeMenu, menu) }); +-- +cgit v0.9.1 diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index e4850bb4d..e8417be42 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 183403 2013-04-21 22:10:31Z heftig $ +# $Id: PKGBUILD 185539 2013-05-14 20:47:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.8.0 +pkgver=3.8.2.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd') +depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd') makedepends=('itstool' 'docbook-xsl' 'intltool') options=(!emptydirs) url="http://www.gnome.org" groups=('gnome') install=gnome-system-monitor.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2d5bdd81c19bc34f83c0ccfde998007df9ef517f5e4bfb5e36513a76c21dce86') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('df4d2c4dbb4f3408b621140732efb3e38853658addd6aae73613027856f6bb44') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/gnome-system-monitor + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --enable-systemd make } diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index ac47357d6..a020fefaf 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183404 2013-04-21 22:10:33Z heftig $ +# $Id: PKGBUILD 185395 2013-05-13 18:52:30Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('c49afab26973225f41ed35a9d5b5180d6207757e524056656146b30692f39fff') +sha256sums=('4937dfe9e88fcf56de6ed670989cd119b468a32bb078c6cf720c3c8831915347') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD index 7807693af..0f6acbe2a 100644 --- a/extra/gnome-vfs-perl/PKGBUILD +++ b/extra/gnome-vfs-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177009 2013-02-04 08:18:57Z jgc $ +# $Id: PKGBUILD 186379 2013-05-26 09:24:30Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs-perl _realname=Gnome2-VFS pkgver=1.081 -pkgrel=6 +pkgrel=7 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD index 3544e97c1..227ee4050 100644 --- a/extra/gnome-weather/PKGBUILD +++ b/extra/gnome-weather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183410 2013-04-21 22:10:43Z heftig $ +# $Id: PKGBUILD 185432 2013-05-14 09:43:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-weather -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Access current weather conditions and forecasts" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ options=(!libtool) groups=(gnome-extra) install=gnome-weather.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9dbbf0aa50a940894a9ebf63001163a8fa89c3aa8febbddcd3c6c6eefbc00f3d') +sha256sums=('cf61afac1435dbdb87e8d9e4d86bca29cf1ff2c64cefc8db696cd27dad15adf4') build() { cd $pkgname-$pkgver diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD index ce12da891..5a6cd5a5d 100644 --- a/extra/gnomecanvas-perl/PKGBUILD +++ b/extra/gnomecanvas-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160477 2012-06-02 10:26:08Z bluewind $ +# $Id: PKGBUILD 186377 2013-05-26 09:24:28Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnomecanvas-perl _realname=Gnome2-Canvas pkgver=1.002 -pkgrel=10 +pkgrel=11 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 863ea8b3c..52c40c691 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184239 2013-05-04 19:38:00Z foutrelis $ +# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric pkgver=1.12.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" @@ -38,6 +38,7 @@ prepare() { # Fix invalid PNG images to work with libpng 1.6 # https://bugzilla.gnome.org/show_bug.cgi?id=699683 + # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out find -name '*.png' -exec optipng -quiet -force -fix {} + } diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index a80cb9d90..6fb18992c 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184007 2013-04-30 18:49:43Z giovanni $ +# $Id: PKGBUILD 186367 2013-05-26 06:28:56Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted pkgver=0.16.1 -pkgrel=1 +pkgrel=5 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" @@ -14,6 +14,9 @@ depends=('parted' 'gtkmm' 'hicolor-icon-theme') makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' + 'f2fs-tools: for Flash-Friendly File System' + 'btrfs-progs: for btrfs partitions' + 'exfat-utils: for exFAT partitions' 'ntfs-3g: for ntfs partitions' 'reiserfsprogs: for reiser partitions' 'xfsprogs: for xfs partitions' @@ -23,14 +26,18 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'mtools: utilities to access MS-DOS disks') install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'org.archlinux.pkexec.gparted.policy') + 'org.archlinux.pkexec.gparted.policy' + 'gparted_polkit') md5sums=('3f399bff031b5ce14d11a8c346f4b89c' - 'c031d7d2b845ccb025b9f83e0ddd5653') + '122ed3120c846376bead22b25f6a3b19' + '0b68a4e2bc6bc15440730ebe2d7bf9f6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in + ./configure --prefix=/usr \ + --sbindir=/usr/bin make } @@ -40,13 +47,10 @@ package() { make DESTDIR="${pkgdir}" install # Install policy file - install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" - - # We need rename the original script - mv "${pkgdir}/usr/sbin/gparted" "${pkgdir}/usr/sbin/gparted.elf" + install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" \ + "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/sbin/gparted - echo 'pkexec --disable-internal-agent "/usr/sbin/gparted.elf" "$@"' >> ${pkgdir}/usr/sbin/gparted - chmod 755 ${pkgdir}/usr/sbin/gparted + install -m755 "${srcdir}/gparted_polkit" \ + "${pkgdir}/usr/bin/gparted_polkit" } diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install index e8f6bed8f..1a05f573e 100644 --- a/extra/gparted/gparted.install +++ b/extra/gparted/gparted.install @@ -1,14 +1,11 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo 'If you use a lightweight windowmanager, remember to run' - echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' - echo 'graphical authentication, which may be needed for pkexec to work.' } post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gparted/gparted_polkit b/extra/gparted/gparted_polkit new file mode 100644 index 000000000..d9f94d1bd --- /dev/null +++ b/extra/gparted/gparted_polkit @@ -0,0 +1,6 @@ +#!/bin/bash +if [ $(which pkexec) ]; then + pkexec --disable-internal-agent "/usr/bin/gparted" "$@" +else + /usr/bin/gparted "$@" +fi diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy index 65894a0cc..4305e5e16 100644 --- a/extra/gparted/org.archlinux.pkexec.gparted.policy +++ b/extra/gparted/org.archlinux.pkexec.gparted.policy @@ -12,7 +12,7 @@ <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted.elf</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gparted</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 7490ad804..cf42e5a1f 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184760 2013-05-07 23:25:13Z tomegun $ +# $Id: PKGBUILD 185608 2013-05-15 22:56:58Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=gpsd pkgver=3.9 -pkgrel=1 +pkgrel=2 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') url="http://catb.org/gpsd/" @@ -73,6 +73,11 @@ package() { install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # move to /usr/bin + sed -i -e 's,/usr/sbin,/usr/bin,g' "${pkgdir}/usr/lib/systemd/system/gpsd.service" + mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/" + rm -r "${pkgdir}/usr/sbin" } md5sums=('53a88f24a0973d23427e82e9a8914f19' 'SKIP' diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index eadbb0559..9802dd885 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184386 2013-05-06 19:37:35Z foutrelis $ +# $Id: PKGBUILD 186381 2013-05-26 09:24:32Z bluewind $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.18 -pkgrel=2 +pkgrel=3 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index 9a254119d..dbf1df9d3 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179056 2013-03-02 11:28:27Z andyrtr $ +# $Id: PKGBUILD 186328 2013-05-24 20:18:53Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'freetype2' 'python2') # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly options=('!libtool' '!emptydirs') source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('edf70ab2f7d789be219f47b1df00d67e') +md5sums=('4bfd5db6c91a4097cd76a699beaca70e') build() { cd "${srcdir}" diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 197b40c88..f8952e875 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184387 2013-05-06 19:37:39Z foutrelis $ +# $Id: PKGBUILD 186382 2013-05-26 09:24:35Z bluewind $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.1 -pkgrel=3 +pkgrel=4 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -37,6 +37,9 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed \ + -e 's/ qw(\([^)]*\))/ (qw(\1))/g' \ + -i config/config_perl.pl + sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ -i config/config_ruby.rb diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index d5aff92e5..ec36f1b32 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183412 2013-04-21 22:10:47Z heftig $ +# $Id: PKGBUILD 186336 2013-05-25 00:10:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.6 +pkgver=0.2.8 pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') license=(LGPL) depends=(grilo sqlite libgcrypt) makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing - json-glib) + json-glib intltool) optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin, Vimeo plugin' @@ -22,7 +22,7 @@ optdepends=('gupnp-av: uPnP plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('029ea7fdbb32ff5cc20295b9a1a943f76f39a67ed5bf08a2b33b01cf287a1227') +sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80') build() { cd $pkgname-$pkgver diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index b0acf3bc0..d63d1bde2 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 180276 2013-03-19 13:37:31Z jgc $ +# $Id: PKGBUILD 185628 2013-05-16 14:06:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.2.5 +pkgver=0.2.6 pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -depends=('gtk3' 'libxml2' 'libsoup') -makedepends=('gobject-introspection' 'gtk-doc' 'vala') +depends=('gtk3' 'libxml2' 'libsoup' 'liboauth') +makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ff281f60bc3afcb70913e61a6447b33ab259b3d89c1441c7e307fc998c050cdc') +sha256sums=('601421279753b26bee0b2b5952689f87f7c7836879f7326151a8f8139fa67036') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD index b6c52f6d7..b786e0d6b 100644 --- a/extra/gsasl/PKGBUILD +++ b/extra/gsasl/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gsasl pkgver=1.8.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" arch=("i686" "x86_64" "mips64el") url="http://josefsson.org/gsasl/" diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index c7347a34b..f3087f4bc 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 183414 2013-04-21 22:10:50Z heftig $ +# $Id: PKGBUILD 186533 2013-05-28 12:29:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.14.2 +pkgver=0.14.3 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64' 'mips64el') url="http://gupnp.org/" license=(LGPL) depends=(libsoup) -makedepends=(gobject-introspection gtk2 gtk-doc vala) -optdepends=('gtk2: gssdp-device-sniffer') +makedepends=(gobject-introspection gtk3 gtk-doc vala) +optdepends=('gtk3: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc') +sha256sums=('79dbdc5f79cc406632a783826b3dbe6acc0fbf41eb801b642bce1a02ecc3c66d') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index c14afe39f..283c3805a 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153257 2012-03-12 15:48:41Z jgc $ +# $Id: PKGBUILD 185705 2013-05-17 12:41:12Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') @@ -15,6 +15,13 @@ sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') build() { cd "${srcdir}/gst-plugins-base-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ + configure.ac + autoreconf +} + +build() { + cd "${srcdir}/gst-plugins-base-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental --disable-gnome_vfs \ --with-package-name="GStreamer Base Plugins (Parabola)" \ diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 1f755c466..e59c275db 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184391 2013-05-06 19:37:48Z foutrelis $ +# $Id: PKGBUILD 185400 2013-05-13 19:38:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=3.2.1 -pkgrel=2 +pkgver=3.2.2 +pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 mips64el) license=(GPL) @@ -22,7 +22,7 @@ optdepends=('libopenraw: read RAW files' options=('!libtool' '!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3eacbb9912923fb5da3e7a52be58c6e7470e598b06c1b7b51b76809fc4855b61') +sha256sums=('e201b9065d401144a17c2a33e4a85f0dcf457dc5cba6932dbac0197e141cdee8') build() { cd $pkgname-$pkgver diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 343fa0fe4..f4e743253 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $ +# $Id: PKGBUILD 185577 2013-05-15 08:05:37Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> @@ -6,7 +6,7 @@ pkgname=gtk-vnc pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/gtk-vnc" diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD index 7856f69d6..749a698de 100644 --- a/extra/gtk2-perl/PKGBUILD +++ b/extra/gtk2-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183485 2013-04-21 22:21:05Z heftig $ +# $Id: PKGBUILD 186383 2013-05-26 09:24:36Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=gtk2-perl pkgver=1.247 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for GTK+ 2.x" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 29025bbe6..c691ea0a7 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180158 2013-03-18 12:05:08Z jgc $ +# $Id: PKGBUILD 185341 2013-05-13 13:52:12Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.17 +pkgver=2.24.18 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415' +sha256sums=('6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 7e87b3e1e..2696f6a64 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183416 2013-04-21 22:10:54Z heftig $ +# $Id: PKGBUILD 185333 2013-05-13 12:25:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64 mips64el) @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('f43e7c7d7a0e2417225509e88f67799534c69abfbb6f615fc7a895bf15e31255' +sha256sums=('1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "gtk+-$pkgver" diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD index 514ce832c..c9c4b3225 100644 --- a/extra/gtkmm/PKGBUILD +++ b/extra/gtkmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 148776 2012-02-05 11:50:02Z ibiru $ +# $Id: PKGBUILD 185348 2013-05-13 15:46:57Z jgc $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtkmm pkgname=('gtkmm' 'gtkmm-docs') -pkgver=2.24.2 -pkgrel=2.2 +pkgver=2.24.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') license=('LGPL') options=('!libtool' '!emptydirs') url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d') +sha256sums=('c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 5093302d1..b53cddf20 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183418 2013-04-21 22:10:57Z heftig $ +# $Id: PKGBUILD 185396 2013-05-13 18:53:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl options=('!libtool' '!emptydirs') install=gucharmap.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('dc3223c7bd5dac4b979295cf7678c873046f8525f7d6f5562ab98239f563afc1') +sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index 76bcfe845..d0cf118a7 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183420 2013-04-21 22:11:00Z heftig $ +# $Id: PKGBUILD 186713 2013-05-30 17:40:28Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thijs Vermeir <thijsvermeir@gmail.com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=gupnp-av -pkgver=0.12.1 +pkgver=0.12.2 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=(gupnp) makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4') +sha256sums=('43597bdfb1c352338e706962ff7fcdbcb544c5a36f27c9c2aaa5a550b6990270') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD index f42e8dbd9..43a85b154 100644 --- a/extra/gupnp-dlna/PKGBUILD +++ b/extra/gupnp-dlna/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183421 2013-04-21 22:11:02Z heftig $ +# $Id: PKGBUILD 186714 2013-05-30 17:41:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=gupnp-dlna -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="Library to ease DLNA-related bits for applications using gupnp" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=(gst-plugins-base-libs) makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b') +sha256sums=('158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 498810474..14689e9e5 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183419 2013-04-21 22:10:59Z heftig $ +# $Id: PKGBUILD 186594 2013-05-30 00:27:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9b27b1bdd16f7f13e28e20bce85a117e577a8183f95615876a9d91f4d4a70812') +sha256sums=('ed7db7506506434d0fd272e3866d7ae985af5b9d7e9e5e120f8581ade90869f0') build() { cd $pkgname-$pkgver diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index df77560b1..47d3ffcc7 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163174 2012-07-08 10:42:54Z andyrtr $ +# $Id: PKGBUILD 185818 2013-05-19 12:13:34Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint pkgver=5.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -23,7 +23,16 @@ md5sums=('aefbec27b96dd404d9ac9811e17d58ce') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # sbindir is not properly taken over there + sed -i "s:cups_sbindir=\"\/usr\/sbin\":cups_sbindir=\"\/usr\/bin\":g" m4/stp_cups.m4 + sed -i "s:cups_sbindir=\"\${cups_prefix}\/sbin\":cups_sbindir=\"\${cups_prefix}\/bin\":" m4/stp_cups.m4 + + sed -i "s:m4local:m4extra:" Makefile.am + autoreconf -vfi + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-samples \ --enable-cups-ppds \ --enable-cups-ppds-at-top-level \ diff --git a/extra/gutenprint/gutenprint.install b/extra/gutenprint/gutenprint.install index 05e8bec38..1a042e97a 100644 --- a/extra/gutenprint/gutenprint.install +++ b/extra/gutenprint/gutenprint.install @@ -1,5 +1,5 @@ post_install() { - echo ">>please run /usr/sbin/cups-genppdupdate" + echo ">>please run /usr/bin/cups-genppdupdate" echo ">>and restart cups deamon" } diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index f5779f11b..2bcd1cf06 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 185165 2013-05-11 16:16:29Z tomegun $ +# $Id: PKGBUILD 185516 2013-05-14 16:46:51Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') -pkgver=1.16.1 -pkgrel=2 +pkgver=1.16.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac') +sha256sums=('6b0e62d27fe73844efb536689057b762fbce085984800c83395371306ec547f1') build() { cd "$pkgbase-$pkgver" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 90cdbe831..1d005d29f 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $ +# $Id: PKGBUILD 186346 2013-05-25 04:11:23Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz -pkgver=0.9.16 -pkgrel=1 +pkgver=0.9.17 +pkgrel=2 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b') +sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed') build() { cd ${pkgname}-${pkgver} diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD index a25f2411b..9b13f06b9 100644 --- a/extra/hddtemp/PKGBUILD +++ b/extra/hddtemp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163630 2012-07-17 14:24:03Z bisson $ +# $Id: PKGBUILD 186029 2013-05-20 14:50:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -9,22 +9,17 @@ pkgname=hddtemp _origver=0.3-beta15 _patchver=${_origver}-52 pkgver=${_patchver//-/.} -pkgrel=1.1 +pkgrel=2 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information" url='https://savannah.nongnu.org/projects/hddtemp/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -backup=('etc/conf.d/hddtemp') source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2" "http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz" - 'rc.d' - 'conf.d' 'service') sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b' 'b9bcdd0537c1540e55e5056445b571ea61d5a4a3' - '71159486b1505ec6acfb7585e0d8fbe78afe54ec' - 'd45e3022f614dbf8904ecb1a3e702bb71fcaa808' - '501fcf4faf8b2689d010f9cbbf39f917211f611f') + '9b02e5bed22f81ceab2b69bae788a9a3aa5c2147') options=('!libtool') @@ -35,6 +30,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --with-db-path="/usr/share/${pkgname}/hddtemp.db" @@ -48,6 +44,4 @@ package() { install -Dm644 "../${pkgname}-${_origver}/debian/hddtemp.db" "${pkgdir}/usr/share/${pkgname}/hddtemp.db" install -Dm644 '../service' "${pkgdir}/usr/lib/systemd/system/hddtemp.service" - install -Dm644 '../conf.d' "${pkgdir}/etc/conf.d/hddtemp" - install -Dm755 '../rc.d' "${pkgdir}/etc/rc.d/hddtemp" } diff --git a/extra/hddtemp/conf.d b/extra/hddtemp/conf.d deleted file mode 100644 index 6a1e18e0b..000000000 --- a/extra/hddtemp/conf.d +++ /dev/null @@ -1,2 +0,0 @@ -PARAMS="-q -l 127.0.0.1" -DRIVES="/dev/sda" diff --git a/extra/hddtemp/rc.d b/extra/hddtemp/rc.d deleted file mode 100644 index 62f090808..000000000 --- a/extra/hddtemp/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PARAMS= -DRIVES= -[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp -PID=$(pidof -o %PPID /usr/sbin/hddtemp) -case "$1" in - start) - stat_busy "Starting HDDTemp" - [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon hddtemp - stat_done - fi - ;; - stop) - stat_busy "Stopping HDDTemp" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon hddtemp - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/hddtemp/service b/extra/hddtemp/service index bc56d16b0..992b898ad 100644 --- a/extra/hddtemp/service +++ b/extra/hddtemp/service @@ -2,8 +2,7 @@ Description=Hard drive temperature monitor daemon [Service] -EnvironmentFile=/etc/conf.d/hddtemp -ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES +ExecStart=/usr/bin/hddtemp -dF /dev/sda [Install] WantedBy=multi-user.target diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index c6c9576f6..984cf0134 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $ +# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.6 -pkgrel=2 +pkgrel=4 pkgdesc="Fax Server" arch=('i686' 'x86_64' 'mips64el') install='hylafax.install' @@ -14,7 +14,6 @@ backup=(var/spool/hylafax/bin/{faxrcvd,notify} usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} var/spool/hylafax/etc/hosts.hfaxd) source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz - hylafax hylafax.cron.daily config.local faxq.service @@ -30,10 +29,9 @@ build () { package () { cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} + mkdir -p "$pkgdir"/usr/{bin,lib/fax,share/ghostscript/fonts} mkdir -p "$pkgdir"/var/{spool/hylafax,lock} make ROOT="$pkgdir" install - install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax # add missing awk file for notify-4.1 script install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \ @@ -47,15 +45,8 @@ package () { install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } md5sums=('d063d45049c8fcbabefe09d662313067' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '60f2a7e62c256ead4e9238cb31b35b90' - '832c8e8098e2dfa56040c975b554590c' - '38a00db6d9d765d130b2d8d3a98e5c24') -md5sums=('d063d45049c8fcbabefe09d662313067' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '60f2a7e62c256ead4e9238cb31b35b90' - '832c8e8098e2dfa56040c975b554590c' + 'b0b8d19a10c2145476d9fbb18c0478fe' + '5f3a89fbfb10c47755d3ca19183b8a59' + 'a10aa2ef613551a88d750f6602b5f2f7' '38a00db6d9d765d130b2d8d3a98e5c24' 'fe10ea597e786fe8c09e4104fbdf16de') diff --git a/extra/hylafax/config.local b/extra/hylafax/config.local index 4ea0f3500..ab98c83db 100644 --- a/extra/hylafax/config.local +++ b/extra/hylafax/config.local @@ -62,7 +62,7 @@ DIR_LIBDATA="/usr/lib/fax" # directory for client data DIR_LIBEXEC="/usr/lib/fax" # directory for libraries&hidden apps DIR_MAN="/usr/share/man" # directory for manual pages DIR_SPOOL="/var/spool/hylafax" # directory for spooling area -DIR_SBIN="/usr/sbin" # directory for system apps +DIR_SBIN="/usr/bin" # directory for system apps DIR_LOCKS="/var/lock" # directory for UUCP lock files FONTMAP="/usr/share/ghostscript/fonts" # directorys containing Fontmap files DIR_LOCALE="/usr/share/locale" diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service index 0760a5b85..7ab8de318 100644 --- a/extra/hylafax/faxq.service +++ b/extra/hylafax/faxq.service @@ -3,7 +3,7 @@ Description=Hyla FAX queue manager [Service] Type=forking -ExecStart=/usr/sbin/faxq +ExecStart=/usr/bin/faxq ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily index 2d1a77e5c..567dd8ed3 100644 --- a/extra/hylafax/hylafax.cron.daily +++ b/extra/hylafax/hylafax.cron.daily @@ -1,4 +1,4 @@ #!/bin/sh -/usr/sbin/faxqclean -/usr/sbin/faxcron -rcv 30 +/usr/bin/faxqclean +/usr/bin/faxcron -rcv 30 diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install index 5dacf4045..c631cdaca 100644 --- a/extra/hylafax/hylafax.install +++ b/extra/hylafax/hylafax.install @@ -1,10 +1,6 @@ print_install() { printf "\n" - echo "Add the following to /etc/inittab and run telinit q" - echo " f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0" - echo "faxgetty should now be running" - printf "\n" echo "Run faxsetup to configure and be sure to set..." echo " The device to configure is usually ttyS0" echo " The number of pages to accept to more than 25" diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index e0765fd80..e9c3a0f2b 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $ +# $Id: PKGBUILD 186326 2013-05-24 19:56:49Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=51.1 +pkgver=51.2 pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) -md5sums=('6eef33b229d0239d654983028c9c7053' +md5sums=('072e501b87065f3a0ca888f1b5165709' 'ebd5470fc969c75e52baf4af94a9ee82') build() { @@ -25,7 +25,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --sbindir=/usr/bin make } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 12adcd4be..df0d77d66 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185248 2013-05-12 14:13:52Z eric $ +# $Id: PKGBUILD 186384 2013-05-26 09:24:37Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.6 +pkgver=6.8.5.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('3c932aa3febb1e992a780e9091925bdbc0d61613' +sha1sums=('f393612e9797a6129f2cac7f83df337bb54ecf76' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 7b2777482..98b4c7b5a 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184396 2013-05-06 19:38:01Z foutrelis $ +# $Id: PKGBUILD 186340 2013-05-25 02:56:30Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=7 +pkgrel=8 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -35,6 +35,7 @@ prepare() { sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp + sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp} } build() { diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index 0d81df2b6..543f99e93 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179910 2013-03-11 19:50:39Z stephane $ +# $Id: PKGBUILD 186302 2013-05-24 12:22:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.1_20130116 +pkgver=4.1_20130314 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('fd7ea56612f145a1f9b3d961a424e9d553bab527') +sha1sums=('e2bf74c1e492b06faf3ecdf2321e64ca698c0921') build() { cd "${srcdir}"/tbb${pkgver/\./}oss diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 216d709b6..886c0ff0d 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -3,33 +3,26 @@ pkgname=irqbalance pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/irqbalance" license=('GPL') depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) -backup=(etc/conf.d/irqbalance) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz - irqbalance.conf.d - irqbalance.rc.d irqbalance.service) md5sums=('b6403fa067c96adce448a48c9993654d' - '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c' - '9e82dc471128117982a8dd0c4bd5f246') + 'a97ad17dc7df98b81acb500b27f931e5') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" - install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance - install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service } diff --git a/extra/irqbalance/irqbalance.conf.d b/extra/irqbalance/irqbalance.conf.d deleted file mode 100644 index ef1bdfd75..000000000 --- a/extra/irqbalance/irqbalance.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Settings for irqbalance daemon -# - -# one shot mode - set to 1 if you have Pentium 4 with HT -ONESHOT=0 diff --git a/extra/irqbalance/irqbalance.rc.d b/extra/irqbalance/irqbalance.rc.d deleted file mode 100644 index 987c26b51..000000000 --- a/extra/irqbalance/irqbalance.rc.d +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# source application-specific settings -ONESHOT=0 -[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance - -if [ "$ONESHOT" -ne 0 ]; then - ONESHOT_CMD="--oneshot" -fi - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` -case "$1" in - start) - stat_busy "Starting IRQ balancing" - [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD - if [ $? -gt 0 ]; then - stat_fail - else - if [ "$ONESHOT" -eq 0 ]; then - add_daemon irqbalance - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping IRQ balancing" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irqbalance - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/irqbalance/irqbalance.service b/extra/irqbalance/irqbalance.service index 372ac0aa4..c9fced094 100644 --- a/extra/irqbalance/irqbalance.service +++ b/extra/irqbalance/irqbalance.service @@ -2,7 +2,7 @@ Description=CPU Interrupt Request Balancer [Service] -ExecStart=/usr/sbin/irqbalance --foreground +ExecStart=/usr/bin/irqbalance --foreground [Install] WantedBy=multi-user.target diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD index 69f70f20f..d1dc17947 100644 --- a/extra/irssi/PKGBUILD +++ b/extra/irssi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160489 2012-06-02 10:26:29Z bluewind $ +# $Id: PKGBUILD 186385 2013-05-26 09:24:38Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=irssi pkgver=0.8.15 -pkgrel=6 +pkgrel=7 pkgdesc="Modular text mode IRC client with Perl scripting" arch=('i686' 'x86_64' 'mips64el') url="http://irssi.org/" diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD index 56d573eb5..fb0005b72 100644 --- a/extra/isapnptools/PKGBUILD +++ b/extra/isapnptools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136974 2011-09-04 11:49:36Z pierre $ +# $Id: PKGBUILD 185816 2013-05-19 12:09:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=isapnptools pkgver=1.27 -pkgrel=3 +pkgrel=4 pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine" url="http://www.roestock.demon.co.uk/isapnptools/" depends=('glibc') @@ -14,11 +14,14 @@ md5sums=('b997ba56583dc850fce9b93d658dfa0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + + ./configure --prefix=/usr \ + --sbindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff index 6cac91dd6..bb588a072 100644 --- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff @@ -1,15 +1,18 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,7 +91,7 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-19 20:01:25.676093296 +0000 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2013-05-19 20:01:54.312572109 +0000 +@@ -98,9 +98,9 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm -COMPRESS = $(UTILS_USR_BIN_PATH)compress +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio +-CPIO = $(UTILS_COMMAND_PATH)cpio ++CPIO = $(UTILS_USR_BIN_PATH)cpio CUT = $(UTILS_USR_BIN_PATH)cut -@@ -101,13 +101,13 @@ + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df +@@ -108,13 +108,13 @@ DIRNAME = $(UTILS_USR_BIN_PATH)dirname DUMP = $(UTILS_CCS_BIN_PATH)dump ECHO = $(UTILS_COMMAND_PATH)echo @@ -25,7 +28,7 @@ GUNZIP = $(UTILS_COMMAND_PATH)gunzip # GZIP is used for solaris. Linux and windows use tar czf GZIP = $(UTILS_COMMAND_PATH)gzip -@@ -140,7 +140,7 @@ +@@ -148,7 +148,7 @@ TAIL = $(UTILS_USR_BIN_PATH)tail TAR = $(UTILS_COMMAND_PATH)tar TEST = $(UTILS_USR_BIN_PATH)test diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/02_fix_corba_cmds_path.diff index 7a3db9567..8a22e3229 100644 --- a/extra/java7-openjdk/fix_corba_cmds_path.diff +++ b/extra/java7-openjdk/02_fix_corba_cmds_path.diff @@ -1,15 +1,18 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -76,7 +76,7 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig 2013-05-19 19:57:58.530784147 +0000 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2013-05-19 19:58:44.777147938 +0000 +@@ -83,9 +83,9 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm -COMPRESS = $(UTILS_USR_BIN_PATH)compress +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio +-CPIO = $(UTILS_COMMAND_PATH)cpio ++CPIO = $(UTILS_USR_BIN_PATH)cpio CUT = $(UTILS_USR_BIN_PATH)cut -@@ -125,7 +125,7 @@ + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df +@@ -131,7 +131,7 @@ TAIL = $(UTILS_USR_BIN_PATH)tail TAR = $(UTILS_COMMAND_PATH)tar TEST = $(UTILS_USR_BIN_PATH)test @@ -18,10 +21,10 @@ TR = $(UTILS_USR_BIN_PATH)tr TRUE = $(UTILS_COMMAND_PATH)true UNAME = $(UTILS_COMMAND_PATH)uname -@@ -176,7 +176,7 @@ +@@ -182,7 +182,7 @@ # others have it in /usr/bin. SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) + $(wildcard $(UTILS_USR_BIN_PATH)sort)) - NAWK = $(USRBIN_PATH)gawk + NAWK = $(UTILS_COMMAND_PATH)gawk # Intrinsic unix command, with backslash-escaped character interpretation diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 564bd8f5e..0c5e6b813 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184397 2013-05-06 19:38:04Z foutrelis $ +# $Id: PKGBUILD 186020 2013-05-20 13:53:06Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -43,8 +43,8 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz fontconfig-paths.diff - fix_corba_cmds_path.diff - openjdk7_fix_jdk_cmds_path.diff + 01_fix_openjdk_cmds_path.diff + 02_fix_corba_cmds_path.diff openjdk7_nonreparenting-wm.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh @@ -59,8 +59,8 @@ sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da' '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12' 'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' - 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' + '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9' + 'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' @@ -89,7 +89,10 @@ 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" + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ + patches/01_fix_openjdk_cmds_path.diff \ + patches/02_fix_corba_cmds_path.diff \ + patches/openjdk7_nonreparenting-wm.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" @@ -327,6 +330,9 @@ package_jdk7-openjdk() { install -m755 -d ${pkgdir}/etc/profile.d/ install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh + + # Temporarily fixing FS#35141 + chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar } package_openjdk7-src() { diff --git a/extra/java7-openjdk/jre7-openjdk-headless.install b/extra/java7-openjdk/jre7-openjdk-headless.install index 0787545b9..8fa330c19 100644 --- a/extra/java7-openjdk/jre7-openjdk-headless.install +++ b/extra/java7-openjdk/jre7-openjdk-headless.install @@ -1,11 +1,11 @@ post_install() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } post_upgrade() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 519c90f25..736e7712e 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184887 2013-05-09 09:43:00Z andrea $ +# $Id: PKGBUILD 186386 2013-05-26 09:24:39Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" arch=('i686' 'x86_64' 'mips64el') @@ -11,22 +11,22 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' - 'kdegraphics-okular' 'kdesdk-kate') + 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") sha1sums=('7db692b0a06ba421caa870fc254f03c2e3bf4e79') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlkde-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 65bf601b3..723c9b265 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184858 2013-05-09 09:42:29Z andrea $ +# $Id: PKGBUILD 186387 2013-05-26 09:24:45Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") sha1sums=('261e1c4d9a6a216d7b5b5e2962ba5266f0d62bdf') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlqt-${pkgver} \ @@ -27,6 +26,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 95240c5dc..a1ea2f5a8 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184889 2013-05-09 09:43:02Z andrea $ +# $Id: PKGBUILD 186565 2013-05-29 07:12:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64' 'mips64el') @@ -15,11 +15,17 @@ optdepends=('maxima: Maxima backend' 'octave: Octave backend' 'r: R backend') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886') +source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" + 'sage58.patch') +sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886' + 'c02051c30ece57800d693da60280b0bdb5f45697') + +prepare() { + cd cantor-${pkgver} + patch -p1 -i "${srcdir}"/sage58.patch +} build() { - cd "${srcdir}" mkdir build cd build cmake ../cantor-${pkgver} \ diff --git a/extra/kdeedu-cantor/sage58.patch b/extra/kdeedu-cantor/sage58.patch new file mode 100644 index 000000000..d17b55a99 --- /dev/null +++ b/extra/kdeedu-cantor/sage58.patch @@ -0,0 +1,123 @@ +diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp +index dec0c8f..a132295 100644 +--- a/src/backends/sage/sagecompletionobject.cpp ++++ b/src/backends/sage/sagecompletionobject.cpp +@@ -52,7 +52,7 @@ void SageCompletionObject::fetchCompletions() + + //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result + //after complete() was evaluated +- m_expression=session()->evaluateExpression("__hist_tmp__=_; __IPYTHON__.complete(\""+command()+"\");_=__hist_tmp__"); ++ m_expression=session()->evaluateExpression("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\""+command()+"\");_=__hist_tmp__"); + connect(m_expression, SIGNAL(gotResult()), this, + SLOT(extractCompletions())); + +@@ -71,11 +71,19 @@ void SageCompletionObject::extractCompletions() + kDebug()<<"something went wrong fetching tab completion"; + return; + } +- ++ + //the result looks like "['comp1', 'comp2']" parse it ++ ++ //for sage version 5.7 this looks like ++ //('s1', ['comp1','comp2']) where s1 is the string we called complete with ++ + QString txt=res->toHtml().trimmed(); ++ txt.remove("<br/>"); ++ txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed(); + txt=txt.mid(1); //remove [ +- txt.chop(1); //remove ] ++ txt.chop(2); //remove ] ++ ++ kDebug()<<"completion string: "<<txt; + + QStringList tmp=txt.split(','); + QStringList completions; +diff --git a/src/backends/sage/sageexpression.cpp b/src/backends/sage/sageexpression.cpp +index eabdda2..fbde7c1 100644 +--- a/src/backends/sage/sageexpression.cpp ++++ b/src/backends/sage/sageexpression.cpp +@@ -122,7 +122,7 @@ void SageExpression::parseOutput(const QString& text) + //reset the indices + index=index2=-1; + } +- ++ + m_outputCache+=output; + + if(m_promptCount<=0) +@@ -160,11 +160,9 @@ void SageExpression::addFileResult( const QString& path ) + { + KUrl url( path ); + KMimeType::Ptr type=KMimeType::findByUrl(url); +- kDebug()<<"MimeType: "<<type->name(); +- if(type->name().contains("image")) ++ if(m_imagePath.isEmpty()||type->name().contains("image")||path.endsWith(".png")||path.endsWith(".gif")) + { +- kDebug()<<"adding file "<<path<<" "<<url; +- m_imagePath=path; ++ m_imagePath=path; + } + } + +@@ -172,8 +170,11 @@ void SageExpression::evalFinished() + { + kDebug()<<"evaluation finished"; + kDebug()<<m_outputCache; ++ ++ //check if our image path contains a valid image that we can try to show ++ bool hasImage=!m_imagePath.isNull(); + +- if ( m_imagePath.isNull() ) //If this result contains a file, drop the text information ++ if ( !hasImage ) //If this result contains a file, drop the text information + { + Cantor::TextResult* result=0; + +@@ -219,7 +220,7 @@ void SageExpression::evalFinished() + } + else + { +- KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath); ++ KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath); + if(type->is("image/gif")) + setResult( new Cantor::AnimationResult( KUrl(m_imagePath ),i18n("Result of %1" , command() ) ) ); + else +diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp +index a535277..d8ac325 100644 +--- a/src/backends/sage/sagesession.cpp ++++ b/src/backends/sage/sagesession.cpp +@@ -38,10 +38,13 @@ const QByteArray SageSession::SageAlternativePrompt="....: "; //Text, sage outpu + static QByteArray initCmd="os.environ['PAGER'] = 'cat' \n "\ + "sage.misc.pager.EMBEDDED_MODE = True \n "\ + "sage.misc.viewer.BROWSER='' \n "\ ++ "sage.misc.viewer.viewer.png_viewer('') \n" \ + "sage.plot.plot3d.base.SHOW_DEFAULTS['viewer'] = 'tachyon' \n"\ + "sage.misc.latex.EMBEDDED_MODE = True \n "\ + "os.environ['PAGER'] = 'cat' \n "\ +- " __IPYTHON__.shell.autoindent=False \n "\ ++ "%colors nocolor \n "\ ++ "__CANTOR_IPYTHON_SHELL__=get_ipython() \n "\ ++ "__CANTOR_IPYTHON_SHELL__.autoindent=False \n "\ + "print '____TMP_DIR____', sage.misc.misc.SAGE_TMP\n"\ + "print '____END_OF_INIT____' \n "; + +@@ -277,6 +280,7 @@ void SageSession::waitForNextPrompt() + + void SageSession::fileCreated( const QString& path ) + { ++ kDebug()<<"got a file "<<path; + SageExpression* expr=m_expressionQueue.first(); + if ( expr ) + expr->addFileResult( path ); +@@ -290,9 +294,9 @@ void SageSession::setTypesettingEnabled(bool enable) + //the _ and __IP.outputcache() are needed to keep the + // _ operator working + if (enable) +- evaluateExpression("sage.misc.latex.pretty_print_default(true);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(true)", Cantor::Expression::DeleteOnFinish); + else +- evaluateExpression("sage.misc.latex.pretty_print_default(false);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(false)", Cantor::Expression::DeleteOnFinish); + } + + Cantor::CompletionObject* SageSession::completionFor(const QString& command, int index) diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index c4ed90a22..92ba11dc4 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184851 2013-05-09 09:42:22Z andrea $ +# $Id: PKGBUILD 186222 2013-05-22 07:16:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD deleted file mode 100644 index 42fce9c0d..000000000 --- a/extra/kdepim/PKGBUILD +++ /dev/null @@ -1,262 +0,0 @@ -# $Id: PKGBUILD 184967 2013-05-09 09:45:11Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdepim -pkgname=('kdepim-akonadiconsole' - 'kdepim-akregator' - 'kdepim-blogilo' - 'kdepim-console' - 'kdepim-kaddressbook' - 'kdepim-kalarm' - 'kdepim-kjots' - 'kdepim-kleopatra' - 'kdepim-kmail' - 'kdepim-knode' - 'kdepim-knotes' - 'kdepim-kontact' - 'kdepim-korganizer' - 'kdepim-kresources' - 'kdepim-ktimetracker' - 'kdepim-ktnef' - 'kdepim-libkdepim') -pkgver=4.10.3 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url='http://pim.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdepim') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' - 'kde-agent' 'nepomuk-widgets') - source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('78ca9b822f905355ec00142a7de6c08c38b97c08') - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDEPIM_BUILD_MOBILE=OFF - make -} - -package_kdepim-akonadiconsole() { - pkgdesc='Akonadi Management and Debugging Console' - depends=('kdepim-libkdepim' 'nepomuk-widgets') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/akonadiconsole - make DESTDIR="${pkgdir}" install -} - -package_kdepim-akregator() { - pkgdesc='A Feed Reader for KDE' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/akregator/" - install='kdepim-akregator.install' - cd "${srcdir}"/build/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/akregator - make DESTDIR="${pkgdir}" install -} - -package_kdepim-blogilo() { - pkgdesc='A KDE Blogging Client' - depends=('kdepim-runtime') - url="http://kde.org/applications/internet/blogilo/" - replaces=('blogilo') - conflicts=('blogilo') - install='kdepim.install' - cd "${srcdir}"/build/blogilo - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/blogilo - make DESTDIR="${pkgdir}" install -} - -package_kdepim-console() { - pkgdesc='Command line tool for accessing calendar files' - depends=('kdepim-runtime') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/console - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kabcclient - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/konsolekalendar - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kaddressbook() { - pkgdesc='Contact Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kaddressbook/" - install='kdepim.install' - cd "${srcdir}"/build/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/plugins/kaddressbook - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kalarm() { - pkgdesc='Personal Alarm Scheduler' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kalarm/" - install='kdepim.install' - cd "${srcdir}"/build/kalarm - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kalarm - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kjots() { - pkgdesc='Note Taker' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kjots/" - install='kdepim.install' - cd "${srcdir}"/build/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kjots - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kleopatra() { - pkgdesc='Certificate Manager and Unified Crypto GUI' - depends=('kdepim-libkdepim') - install=kdepim-kleopatra.install - url="http://kde.org/applications/utilities/kleopatra/" - cd "${srcdir}"/build/kleopatra - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kleopatra - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kwatchgnupg - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kmail() { - pkgdesc='Mail Client' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/kmail/" - install='kdepim-kmail.install' - conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - for i in kmail doc/kmail kmailcvt archivemailagent \ - importwizard ksendemail libksieve messagelist mailfilteragent \ - ontologies kontact/plugins/kmail; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-knode() { - pkgdesc='News Reader' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/knode/" - install='kdepim-knode.install' - cd "${srcdir}"/build/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kioslave/news - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knode - make DESTDIR="${pkgdir}" install -} - -package_kdepim-knotes() { - pkgdesc='Popup Notes' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/knotes/" - install='kdepim.install' - cd "${srcdir}"/build/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knotes - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kontact() { - pkgdesc='Personal Information Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kontact/" - install='kdepim.install' - conflcits=('kdepim-kontactinterfaces') - replaces=('kdepim-kontactinterfaces') - for i in kontact/src doc/kontact kontact/plugins/summary \ - kontact/plugins/specialdates doc/kontact-admin; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-korganizer() { - pkgdesc='Calendar and Scheduling Program' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/korganizer" - install='kdepim-korganizer.install' - for i in korganizer doc/korganizer kontact/plugins/korganizer \ - calendarviews; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-kresources() { - pkgdesc='KDE PIM resources' - depends=('kdepim-libkdepim') - url='http://pim.kde.org' - cd "${srcdir}"/build/kresources - make DESTDIR="${pkgdir}" install -} - -package_kdepim-ktimetracker() { - pkgdesc='Personal Time Tracker' - depends=('kdepim-kresources') - url="http://kde.org/applications/utilities/ktimetracker/" - install='kdepim.install' - cd "${srcdir}"/build/ktimetracker - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktimetracker - make DESTDIR="${pkgdir}" install -} - -package_kdepim-ktnef() { - pkgdesc='A viewer/extractor for TNEF files' - depends=('kdebase-runtime' 'kdepimlibs') - url="https://projects.kde.org/projects/kde/kdepim/ktnef" - install=kdepim-ktnef.install - cd "${srcdir}"/build/ktnef - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktnef - make DESTDIR="${pkgdir}" install -} - -package_kdepim-libkdepim() { - pkgdesc='Library for KDE PIM' - groups=() - depends=('kde-agent' 'kdepim-runtime') - url='http://pim.kde.org' - conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - for i in akonadi_next calendarsupport incidenceeditor-ng \ - kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ - mailcommon mailimporter messagecomposer messagecore messageviewer \ - icons strigi-analyzer templateparser plugins/messageviewer \ - plugins/ktexteditor pimcommon pimsettingexporter; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} diff --git a/extra/kdepim/kdepim-akregator.install b/extra/kdepim/kdepim-akregator.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-akregator.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdepim/kdepim-kleopatra.install b/extra/kdepim/kdepim-kleopatra.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-kleopatra.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdepim/kdepim-kmail.install b/extra/kdepim/kdepim-kmail.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-kmail.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdepim/kdepim-knode.install b/extra/kdepim/kdepim-knode.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-knode.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdepim/kdepim-korganizer.install b/extra/kdepim/kdepim-korganizer.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-korganizer.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdepim/kdepim-ktnef.install b/extra/kdepim/kdepim-ktnef.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-ktnef.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdepim/kdepim.install b/extra/kdepim/kdepim.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdepim/kdepim.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 2c9ca9a62..8eab686ca 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184847 2013-05-09 09:42:17Z andrea $ +# $Id: PKGBUILD 185544 2013-05-14 21:40:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs pkgver=4.10.3 -pkgrel=1 +pkgrel=3 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepimlibs' diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index a3f066062..bb1540cb2 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183678 2013-04-26 13:20:21Z andrea $ +# $Id: PKGBUILD 186676 2013-05-30 12:44:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.5.0 -_pkgver=4.5.0 +pkgver=1.5.1 +_pkgver=4.5.1 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) -sha1sums=('778a1711c15458952e1e4765722a0839390f636c' - 'fa282f0ace43d36a785e608c421c91437596fc79') +sha1sums=('c047724c255417b361d3ce1898555c2b9183f5b2' + '9bdb654373970f46d01359fdcae6d879c405760a') build() { mkdir build diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index acbcf2f6e..90088d2f4 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $ +# $Id: PKGBUILD 186211 2013-05-22 06:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-python -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2") -sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f') +sha1sums=('accc8950a380e663bcfe3f51e4e5a6653ff8c146') build() { mkdir build diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index a9b9f3059..0ed239bc9 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183676 2013-04-26 13:20:05Z andrea $ +# $Id: PKGBUILD 186674 2013-05-30 12:43:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.5.0 +pkgver=4.5.1 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('kdesdk-okteta: hex editor' 'qt-doc: qt documentation integration') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('21cdff814b5840d4b62b105b53c0b128e35c3c9f') +sha1sums=('e27b77bca0b4c466f66b24167ec416f20b353f6f') build() { mkdir build diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index 68ac479b1..03ef9b94b 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183674 2013-04-26 13:19:47Z andrea $ +# $Id: PKGBUILD 186672 2013-05-30 12:43:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.5.0 -_pkgver=4.5.0 +pkgver=1.5.1 +_pkgver=4.5.1 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('c5b887fdd9fe065ff8be5641859c80c020ba625e') +sha1sums=('af3e78b55c4aec97e271bc06c59186cdf77fe3d1') build() { mkdir build diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index 335458d4b..da57ba6e0 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182155 2013-04-08 13:04:10Z tpowa $ +# $Id: PKGBUILD 185799 2013-05-19 09:24:25Z tpowa $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64' 'mips64el') url="http://kernel.org/pub/linux/utils/kernel/kexec/" @@ -18,16 +18,13 @@ license=('GPL2') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-lzma + ./configure --prefix=/usr --sbindir=/usr/bin --without-lzma make } package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - - mv $pkgdir/usr/sbin $pkgdir/sbin - install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8 } md5sums=('4713026758923f5f3968905291b991ee') diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index f1de285d1..a50a798fc 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 171085 2012-11-16 14:51:57Z allan $ +# $Id: PKGBUILD 186877 2013-05-31 13:31:02Z andrea $ # Maintainer: # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Juergen Hoetzel <jason@archlinux.org> pkgname=kismet -pkgver=2011_03_R2 +pkgver=2013_03_R1b _realver="${pkgver//_/-}" -pkgrel=5.1 +pkgrel=1 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64' 'mips64el') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl' 'libusb-compat') +depends=('libpcap' 'pcre' 'bluez') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' 'wireshark-cli: mergecap, to merge multiple capture files' @@ -24,8 +24,8 @@ backup=('etc/kismet.conf' 'etc/kismet_drone.conf') install=kismet.install changelog=kismet.changelog source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz"{,.asc}) -md5sums=('8bf077e8111e6dc8c12cadefdf40aadd' - '500deff918ede6d0bc392a0419322833') +md5sums=('6cdcd78baf2e15edbe8a9de3c5493f02' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${_realver}" diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD index ff8df1217..92423728f 100644 --- a/extra/konversation/PKGBUILD +++ b/extra/konversation/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172103 2012-11-28 12:37:26Z stephane $ +# $Id: PKGBUILD 186022 2013-05-20 14:06:29Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> @@ -6,12 +6,12 @@ pkgname=konversation pkgver=1.4 -pkgrel=5 +pkgrel=6 pkgdesc="A user friendly IRC client for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://konversation.kde.org" depends=('kdebase-runtime' 'kdepimlibs') -makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') +makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng') optdepends=('python: python scripting support' 'kdebase-konsole: open a terminal in konversation' 'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC support') @@ -21,6 +21,12 @@ options=('!makeflags') source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + # libpng16 fix + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}" mkdir build diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 9ddd39c29..9369118e6 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179888 2013-03-10 21:31:07Z andrea $ +# $Id: PKGBUILD 186710 2013-05-30 17:03:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kwebkitpart -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=2 pkgdesc="A WebKit browser component for KDE" url="https://projects.kde.org/projects/extragear/base/kwebkitpart/" @@ -11,8 +11,9 @@ license=('LGPL') depends=('kdelibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install +# Generate using kde releaseme scripts source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2df1c70371b99e5f638fff702f789ba1') +md5sums=('82640f97f23ce72bed1da6527909bb5d') build() { sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 8cb92af07..5cb642dd3 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180226 2013-03-18 16:47:18Z andyrtr $ +# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.5 +pkgver=4.4.8 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a8abdc87a00174571908ffaf5cdffd45') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) +md5sums=('7140263fbe12f17f74183cf065a7d381') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libaio/PKGBUILD b/extra/libaio/PKGBUILD index 5d4dfa04c..ac29bc982 100644 --- a/community/libaio/PKGBUILD +++ b/extra/libaio/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 186545 2013-05-28 18:17:04Z tpowa $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas S Hatch <thatch45 at gmail dot com> diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index ba2ee7b36..1f4d9c706 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,46 +1,30 @@ -# $Id: PKGBUILD 167258 2012-09-29 12:58:04Z ibiru $ +# $Id: PKGBUILD 186521 2013-05-28 10:28:20Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/developers/libbluray.html" license=('LGPL2.1') -depends=('libxml2') -if [ "$CARCH" != "mips64el" ]; then -makedepends=('apache-ant' 'jdk7-openjdk') -optdepends=('java-environment: Blu-ray Disc Java support library') -fi +depends=('libxml2' 'freetype2') options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('b84fd172523facb207134bb1fee09c7f65914d22f6120fbfd6f312f0435229f3b110e8cc8ea121159929cda3760cfac4b52f84de39d0fb976f8c88d1f7e6d278') +sha512sums=('96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02') build() { cd "$pkgname-$pkgver" -if [ "$CARCH" != "mips64el" ]; then - . /etc/profile.d/jdk.sh ./configure --prefix=/usr \ - --enable-bdjava \ - --with-jdk=${JAVA_HOME} \ --disable-static -else - ./configure --prefix=/usr \ - --disable-static -fi make } package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install - #install bdj -if [ "$CARCH" != "mips64el" ]; then - install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar" -fi } # vim:set ts=2 sw=2 et: diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index e22966655..9fdf78b95 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libbsd pkgver=0.4.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64' 'mips64el') url="http://libbsd.freedesktop.org" diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index 290f72f9f..d59f1283d 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180384 2013-03-20 20:56:09Z andyrtr $ +# $Id: PKGBUILD 186945 2013-06-01 10:04:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.2.8 +pkgver=1.3.0.pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,17 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool' '!emptydirs') -md5sums=('2838ff6fdd32e69394305f97f806002b' - 'b67455e5a50d2d956d45591529575408') +md5sums=('1ccbb8624b8c2b9937727000e46b52cf' + 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver/.pl01/} ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver/.pl01/} make DESTDIR=${pkgdir} install } diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 044f5cf7c..9c9101c43 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183426 2013-04-21 22:11:10Z heftig $ +# $Id: PKGBUILD 186991 2013-06-02 19:42:55Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.3 +pkgver=0.12.4 pkgrel=2 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" @@ -13,15 +13,19 @@ options=('!libtool') depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658') +sha256sums=('631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493') build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static --disable-debug --enable-vala - make + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-debug --enable-vala + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD index 323e1f733..8c7b0a4a1 100644 --- a/extra/libdmx/PKGBUILD +++ b/extra/libdmx/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152803 2012-03-09 17:01:00Z andyrtr $ +# $Id: PKGBUILD 186576 2013-05-29 15:18:36Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdmx -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 Distributed Multihead extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('dmxproto' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('76956d4127ded2e6d1bb5746a6d1603ee23b442a') +sha256sums=('c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 022ca05c1..d7da69d70 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183612 2013-04-25 11:57:24Z jgc $ +# $Id: PKGBUILD 185754 2013-05-18 10:51:46Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.44 -pkgrel=2 +pkgver=2.4.45 +pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') license=('custom') @@ -16,7 +16,7 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2' +sha256sums=('3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208' 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD index 436af32fa..6796e20b4 100644 --- a/extra/libetpan/PKGBUILD +++ b/extra/libetpan/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 168431 2012-10-11 16:04:57Z andyrtr $ +# $Id: PKGBUILD 185576 2013-05-15 08:05:36Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libetpan pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A portable middleware for email access" arch=('i686' 'x86_64' 'mips64el') url="http://www.etpan.org/" license=("custom:etpan") -depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1') +depends=('db>=5.3.15' 'libsasl>=2.1.26' 'curl>=7.23.1' 'expat>=2.0.1-1') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('6fee60d08506e941642b8fa087e60b07') diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD index 9d16938d1..a06ca8611 100644 --- a/extra/libfs/PKGBUILD +++ b/extra/libfs/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151846 2012-03-03 13:40:06Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186578 2013-05-29 15:21:31Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libfs -pkgver=1.0.4 -pkgrel=1.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="X11 Font Services Library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('glibc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2") -sha1sums=('f114f32f60eb84d3e1d0e6f0dfe7679b07e91295') +sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107') build() { cd "${srcdir}/libFS-${pkgver}" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 0ddf4e0c7..9230c7938 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183432 2013-04-21 22:11:21Z heftig $ +# $Id: PKGBUILD 185424 2013-05-14 09:29:29Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gettext-not-xml.patch no_external_gettext.patch) -sha256sums=('4649f51a881ec375853a782ec1cd279f242baa4b6c1b9ebe09614ac65dd6081a' +sha256sums=('b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5' '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533' 'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672') diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD index 4d5dfdad5..810e82fa0 100644 --- a/extra/libical/PKGBUILD +++ b/extra/libical/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 157971 2012-04-30 07:57:27Z andrea $ +# $Id: PKGBUILD 185545 2013-05-14 21:40:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=libical -pkgver=0.48 -pkgrel=1.1 +pkgver=1.0 +pkgrel=2 pkgdesc="An open source reference implementation of the icalendar data type and serialization format" arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.net/projects/freeassociation/' license=('LGPL' 'MPL') depends=('glibc') -options=('!libtool') +makedepends=('cmake') source=("http://downloads.sourceforge.net/freeassociation/${pkgname}-${pkgver}.tar.gz") -md5sums=('e549f434d5fbf9cd156c60ed4943618f') +md5sums=('4438c31d00ec434f02867a267a92f8a1') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --enable-shared \ - --disable-static + mkdir -p build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD new file mode 100644 index 000000000..26f3c5381 --- /dev/null +++ b/extra/libiscsi/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 186551 2013-05-28 18:43:28Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=libiscsi +pkgver=1.7.0 +pkgrel=1 +depends=('glibc' 'popt') +pkgdesc="Library that provides generic access to USB device" +arch=(i686 x86_64) +url="https://github.com/sahlberg/libiscsi" +license=('LGPL') +source=(https://github.com/downloads/sahlberg/${pkgname}/${pkgname}-${pkgver}.tar.gz) +options=(!libtool) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr --disable-static --libdir=/usr/lib + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('4ba621f47d016d48ab93d5301ae5a363') diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index d70689935..e733b5295 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 180386 2013-03-20 20:56:13Z andyrtr $ +# $Id: PKGBUILD 185770 2013-05-18 14:58:09Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.2.8 +pkgver=1.3.0 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('libburn>=1.2.8' 'libisofs>=1.2.8' 'readline') +depends=('libburn>=1.3.0' 'libisofs>=1.3.0' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('1f02aa98d56c4b3e568e641a91640ecc' - '766281eec985df34f584aabd6963d71d') +md5sums=('1341e87e385cb559ee1cd2605e372dec' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index 9faf3acd4..2700c317f 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180385 2013-03-20 20:56:10Z andyrtr $ +# $Id: PKGBUILD 185768 2013-05-18 14:55:44Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.2.8 +pkgver=1.3.0 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool') -md5sums=('9d3515929b80a08daa6423b8312be8c1' - 'f30c694e856d9c44df864b30b2139000') +md5sums=('5ab9f4a57d3c815d1183cbf49ce86a9e' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 13e60a270..306bd875e 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,53 +1,42 @@ -# $Id: PKGBUILD 162914 2012-07-03 20:59:56Z eric $ +# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo -pkgver=1.2.1 -pkgrel=1.1 +pkgver=1.3.0 +pkgrel=2 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64' 'mips64el') url="http://libjpeg-turbo.virtualgl.org/" license=('GPL' 'custom') depends=('glibc') makedepends=('nasm') -provides=('libjpeg=8.0.2') -conflicts=('libjpeg') -replaces=('libjpeg') +provides=('libjpeg=8.0.2' 'turbojpeg') +conflicts=('libjpeg' 'turbojpeg') +replaces=('libjpeg' 'turbojpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361') +sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') build() { - cd "$srcdir/$pkgname-$pkgver" - - # put documentation in a reasonable directory... - sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - + cd $pkgname-$pkgver ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man make } check() { cd "$srcdir/$pkgname-$pkgver" - make test } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \ + exampledir=/usr/share/doc/libjpeg-turbo install # provide jpegint.h as it is required by various software install -m644 jpegint.h "$pkgdir/usr/include/" - # do not distributre libturbojpeg as it is unversioned - rm "$pkgdir"/usr/lib/libturbojpeg.{so,a} - rm "$pkgdir/usr/include/turbojpeg.h" - rm "$pkgdir/usr/bin/tjbench" - install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/" ln -s ../../doc/libjpeg-turbo/README \ "$pkgdir/usr/share/licenses/libjpeg-turbo/README" diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 31f48faa7..d21ade318 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 173820 2012-12-24 04:23:51Z andrea $ +# $Id: PKGBUILD 186926 2013-06-01 08:09:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.4 +pkgver=2.0.1 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') -depends=('kdepimlibs' 'qjson') +depends=('kdepimlibs') makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a26ddd6da675075f7529652f36f5c9f5') +md5sums=('a421c6b5e0b262136121e3734b29fcce') build() { mkdir build diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD index 5bc4b86c6..46af636cb 100644 --- a/extra/liblo/PKGBUILD +++ b/extra/liblo/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 150414 2012-02-17 12:41:31Z allan $ +# $Id: PKGBUILD 186897 2013-05-31 15:30:05Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=liblo -pkgver=0.26 -pkgrel=2.2 +pkgver=0.27 +pkgrel=1 pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems" arch=(i686 x86_64 'mips64el') url="http://plugin.org.uk/liblo/" license=('GPL') +depends=('glibc') options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('5351de14262560e15e7f23865293b16f') +md5sums=('e4317bab5b16003df350adfe2c181364') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD new file mode 100644 index 000000000..901429d4c --- /dev/null +++ b/extra/libmbim/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 186608 2013-05-30 04:01:37Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=libmbim +pkgver=1.0.0 +pkgrel=1 +pkgdesc="MBIM modem protocol helper library" +arch=(i686 x86_64) +url="http://cgit.freedesktop.org/libmbim/libmbim" +license=(GPL2) +depends=(glib2 bash systemd) +makedepends=(gtk-doc python) +options=('!libtool') +source=($url/snapshot/$pkgname-$pkgver.tar.xz format.patch) +sha256sums=('c3d668a5dc51700749a62fb5d50f149900e8dd4265e4d132c1d9cc4cb77eef0c' + 'fbf54d12660c132f756c59cebd448a38750e3bbc9de8a7a97ceda466440dcb41') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../format.patch +} + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --with-tests + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libmbim/format.patch b/extra/libmbim/format.patch new file mode 100644 index 000000000..4bd4c0eea --- /dev/null +++ b/extra/libmbim/format.patch @@ -0,0 +1,14 @@ +diff -u -r libmbim-1.0.0/cli/mbimcli-basic-connect.c libmbim-1.0.0-format/cli/mbimcli-basic-connect.c +--- libmbim-1.0.0/cli/mbimcli-basic-connect.c 2013-05-22 16:20:29.000000000 +0200 ++++ libmbim-1.0.0-format/cli/mbimcli-basic-connect.c 2013-05-30 05:53:49.269777442 +0200 +@@ -909,8 +909,8 @@ + "\t Network error: '%s'\n" + "\t Packet service state: '%s'\n" + "\tAvailable data classes: '%s'\n" +- "\t Uplink speed: '%lu bps'\n" +- "\t Downlink speed: '%lu bps'\n", ++ "\t Uplink speed: '%" G_GUINT64_FORMAT " bps'\n" ++ "\t Downlink speed: '%" G_GUINT64_FORMAT " bps'\n", + mbim_device_get_path_display (device), + VALIDATE_UNKNOWN (mbim_nw_error_get_string (nw_error)), + VALIDATE_UNKNOWN (mbim_packet_service_state_get_string (packet_service_state)), diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD index f7a430ee9..8aa2a1105 100644 --- a/extra/libogg/PKGBUILD +++ b/extra/libogg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $ -# Maintainer: +# $Id: PKGBUILD 186983 2013-06-02 16:07:31Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libogg -pkgver=1.3.0 -pkgrel=1.1 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.xiph.org/ogg/" @@ -13,8 +13,6 @@ depends=('glibc') options=('!libtool') source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz config_types.h) -md5sums=('84a35715170f2cd4c77a4448772b95d5' - 'a4d786b1b1955cb85b64fd16cbbee3f9') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -36,3 +34,5 @@ package() { "${pkgdir}/usr/include/ogg/config_types.h" fi } +md5sums=('ca25d8da0ddfc8c6cbbf78d847a209fe' + 'a4d786b1b1955cb85b64fd16cbbee3f9') diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index 70f9e5041..7bcc2a9a5 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ +# $Id: PKGBUILD 186388 2013-05-26 09:24:47Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libproxy pkgver=0.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index ac39bf8cd..a81628eb0 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185016 2013-05-10 07:10:14Z andyrtr $ +# $Id: PKGBUILD 186348 2013-05-25 05:24:32Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.3.3 pkgver=4.0.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.3' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -274,8 +274,8 @@ 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" "python>=3.3" "neon>=0.28.6" 'dbus-glib' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.3" + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/community/libseccomp/PKGBUILD b/extra/libseccomp/PKGBUILD index 9bdaee4fc..9bdaee4fc 100644 --- a/community/libseccomp/PKGBUILD +++ b/extra/libseccomp/PKGBUILD diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index 08e987e47..cf529d757 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,33 +1,55 @@ -# $Id: PKGBUILD 167697 2012-10-03 05:10:48Z eric $ +# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff pkgver=4.0.3 -pkgrel=1.1 +pkgrel=2 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64' 'mips64el') url="http://www.remotesensing.org/libtiff/" license=('custom') -depends=('libjpeg' 'zlib' 'xz') -makedepends=('freeglut') +depends=('gcc-libs' 'libjpeg' 'zlib' 'xz') +makedepends=('freeglut' 'glu' 'mesa') optdepends=('freeglut: for using tiffgt') options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz + tiff-3.9.7-CVE-2012-4447.patch + tiff-3.9.7-CVE-2012-4564.patch + tiff-4.0.3-CVE-2013-1960.patch + tiff-4.0.3-CVE-2013-1961.patch + tiff-4.0.3-libjpeg-turbo.patch + tiff-4.0.3-tiff2pdf-colors.patch) +sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' + '41be661638282dae0d07bd2788414cb6650f8981' + '6cb3d480908132335c05c769b5a51f951413725d' + '5903355afdd0bb27ea3746339e2196720f9fac9d' + '29a91870cca5d4cd9ca1c464f8074088eddc3fb8' + '02d57835df50d3f84587571ec52b36f5af838de2' + '23443ad0bc130d70860b6cc6d19b69584ae7a6cc') + +prepare() { + cd tiff-${pkgver} + patch -p0 -i "${srcdir}/tiff-4.0.3-tiff2pdf-colors.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4447.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4564.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" +} build() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/tiff-${pkgver}" -# make check + cd tiff-${pkgver} + make check } package() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch new file mode 100644 index 000000000..f23e98466 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch @@ -0,0 +1,37 @@ +Upstream patch for CVE-2012-4447. This also covers an out-of-bounds-read +possibility in the same file, which wasn't given a separate CVE. + + +diff -Naur tiff-3.9.4.orig/libtiff/tif_pixarlog.c tiff-3.9.4/libtiff/tif_pixarlog.c +--- tiff-3.9.4.orig/libtiff/tif_pixarlog.c 2010-06-08 14:50:42.000000000 -0400 ++++ tiff-3.9.4/libtiff/tif_pixarlog.c 2012-12-10 15:50:14.421538317 -0500 +@@ -641,6 +641,20 @@ + return bytes; + } + ++static tsize_t ++add_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 + m2; ++ ++ /* if either input is zero, assume overflow already occurred */ ++ if (m1 == 0 || m2 == 0) ++ bytes = 0; ++ else if (bytes <= m1 || bytes <= m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + static int + PixarLogSetupDecode(TIFF* tif) + { +@@ -661,6 +675,8 @@ + td->td_samplesperpixel : 1); + tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth), + td->td_rowsperstrip), sizeof(uint16)); ++ /* add one more stride in case input ends mid-stride */ ++ tbuf_size = add_ms(tbuf_size, sizeof(uint16) * sp->stride); + if (tbuf_size == 0) + return (0); + sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size); diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch new file mode 100644 index 000000000..98a6e6c44 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch @@ -0,0 +1,77 @@ +Upstream patch for CVE-2012-4564. + + +diff -Naur tiff-3.9.4.orig/tools/ppm2tiff.c tiff-3.9.4/tools/ppm2tiff.c +--- tiff-3.9.4.orig/tools/ppm2tiff.c 2010-06-08 14:50:44.000000000 -0400 ++++ tiff-3.9.4/tools/ppm2tiff.c 2012-12-10 16:16:05.154045877 -0500 +@@ -68,6 +68,17 @@ + exit(-2); + } + ++static tsize_t ++multiply_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 * m2; ++ ++ if (m1 && bytes / m1 != m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + int + main(int argc, char* argv[]) + { +@@ -85,6 +96,7 @@ + int c; + extern int optind; + extern char* optarg; ++ tsize_t scanline_size; + + if (argc < 2) { + fprintf(stderr, "%s: Too few arguments\n", argv[0]); +@@ -217,7 +229,8 @@ + } + switch (bpp) { + case 1: +- linebytes = (spp * w + (8 - 1)) / 8; ++ /* if round-up overflows, result will be zero, OK */ ++ linebytes = (multiply_ms(spp, w) + (8 - 1)) / 8; + if (rowsperstrip == (uint32) -1) { + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, h); + } else { +@@ -226,15 +239,31 @@ + } + break; + case 8: +- linebytes = spp * w; ++ linebytes = multiply_ms(spp, w); + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, + TIFFDefaultStripSize(out, rowsperstrip)); + break; + } +- if (TIFFScanlineSize(out) > linebytes) ++ if (linebytes == 0) { ++ fprintf(stderr, "%s: scanline size overflow\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ scanline_size = TIFFScanlineSize(out); ++ if (scanline_size == 0) { ++ /* overflow - TIFFScanlineSize already printed a message */ ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ if (scanline_size < linebytes) + buf = (unsigned char *)_TIFFmalloc(linebytes); + else +- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); ++ buf = (unsigned char *)_TIFFmalloc(scanline_size); ++ if (buf == NULL) { ++ fprintf(stderr, "%s: Not enough memory\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } + if (resolution > 0) { + TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution); + TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution); diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch new file mode 100644 index 000000000..1c8dfb7bc --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch @@ -0,0 +1,145 @@ +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:04:49.057090227 -0400 +@@ -3341,33 +3341,56 @@ + uint32 height){ + + tsize_t i=0; +- uint16 ri =0; +- uint16 v_samp=1; +- uint16 h_samp=1; +- int j=0; +- +- i++; +- +- while(i<(*striplength)){ ++ ++ while (i < *striplength) { ++ tsize_t datalen; ++ uint16 ri; ++ uint16 v_samp; ++ uint16 h_samp; ++ int j; ++ int ncomp; ++ ++ /* marker header: one or more FFs */ ++ if (strip[i] != 0xff) ++ return(0); ++ i++; ++ while (i < *striplength && strip[i] == 0xff) ++ i++; ++ if (i >= *striplength) ++ return(0); ++ /* SOI is the only pre-SOS marker without a length word */ ++ if (strip[i] == 0xd8) ++ datalen = 0; ++ else { ++ if ((*striplength - i) <= 2) ++ return(0); ++ datalen = (strip[i+1] << 8) | strip[i+2]; ++ if (datalen < 2 || datalen >= (*striplength - i)) ++ return(0); ++ } + switch( strip[i] ){ +- case 0xd8: +- /* SOI - start of image */ ++ case 0xd8: /* SOI - start of image */ + _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); + *bufferoffset+=2; +- i+=2; + break; +- case 0xc0: +- case 0xc1: +- case 0xc3: +- case 0xc9: +- case 0xca: ++ case 0xc0: /* SOF0 */ ++ case 0xc1: /* SOF1 */ ++ case 0xc3: /* SOF3 */ ++ case 0xc9: /* SOF9 */ ++ case 0xca: /* SOF10 */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- for(j=0;j<buffer[*bufferoffset+9];j++){ +- if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) +- h_samp = (buffer[*bufferoffset+11+(2*j)]>>4); +- if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) +- v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f); ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ ncomp = buffer[*bufferoffset+9]; ++ if (ncomp < 1 || ncomp > 4) ++ return(0); ++ v_samp=1; ++ h_samp=1; ++ for(j=0;j<ncomp;j++){ ++ uint16 samp = buffer[*bufferoffset+11+(3*j)]; ++ if( (samp>>4) > h_samp) ++ h_samp = (samp>>4); ++ if( (samp & 0x0f) > v_samp) ++ v_samp = (samp & 0x0f); + } + v_samp*=8; + h_samp*=8; +@@ -3381,45 +3404,43 @@ + (unsigned char) ((height>>8) & 0xff); + buffer[*bufferoffset+6]= + (unsigned char) (height & 0xff); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; +- ++ *bufferoffset+=datalen+2; ++ /* insert a DRI marker */ + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]=0xdd; + buffer[(*bufferoffset)++]=0x00; + buffer[(*bufferoffset)++]=0x04; + buffer[(*bufferoffset)++]=(ri >> 8) & 0xff; + buffer[(*bufferoffset)++]= ri & 0xff; +- } else { +- i+=strip[i+2]+2; + } + break; +- case 0xc4: +- case 0xdb: +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ case 0xc4: /* DHT */ ++ case 0xdb: /* DQT */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + break; +- case 0xda: ++ case 0xda: /* SOS */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + } else { + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]= + (unsigned char)(0xd0 | ((no-1)%8)); +- i+=strip[i+2]+2; + } +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1); +- *bufferoffset+=(*striplength)-i-1; ++ i += datalen + 1; ++ /* copy remainder of strip */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i); ++ *bufferoffset+= *striplength - i; + return(1); + default: +- i+=strip[i+2]+2; ++ /* ignore any other marker */ ++ break; + } ++ i += datalen + 1; + } +- + ++ /* failed to find SOS marker */ + return(0); + } + #endif diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch new file mode 100644 index 000000000..0ea9b52e3 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch @@ -0,0 +1,759 @@ +diff -Naur tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c tiff-4.0.3/contrib/dbs/xtiff/xtiff.c +--- tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c 2010-06-08 14:55:15.000000000 -0400 ++++ tiff-4.0.3/contrib/dbs/xtiff/xtiff.c 2013-05-02 12:02:42.782287939 -0400 +@@ -512,9 +512,9 @@ + Arg args[1]; + + if (tfMultiPage) +- sprintf(buffer, "%s - page %d", fileName, tfDirectory); ++ snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory); + else +- strcpy(buffer, fileName); ++ snprintf(buffer, sizeof(buffer), "%s", fileName); + XtSetArg(args[0], XtNlabel, buffer); + XtSetValues(labelWidget, args, 1); + } +diff -Naur tiff-4.0.3.orig/libtiff/tif_codec.c tiff-4.0.3/libtiff/tif_codec.c +--- tiff-4.0.3.orig/libtiff/tif_codec.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/libtiff/tif_codec.c 2013-05-02 12:02:42.783287946 -0400 +@@ -108,7 +108,8 @@ + const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); + char compression_code[20]; + +- sprintf( compression_code, "%d", tif->tif_dir.td_compression ); ++ snprintf(compression_code, sizeof(compression_code), "%d", ++ tif->tif_dir.td_compression ); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s compression support is not configured", + c ? c->name : compression_code ); +diff -Naur tiff-4.0.3.orig/libtiff/tif_dirinfo.c tiff-4.0.3/libtiff/tif_dirinfo.c +--- tiff-4.0.3.orig/libtiff/tif_dirinfo.c 2012-08-19 12:56:34.000000000 -0400 ++++ tiff-4.0.3/libtiff/tif_dirinfo.c 2013-05-02 12:02:42.784287953 -0400 +@@ -711,7 +711,7 @@ + * note that this name is a special sign to TIFFClose() and + * _TIFFSetupFields() to free the field + */ +- sprintf(fld->field_name, "Tag %d", (int) tag); ++ snprintf(fld->field_name, 32, "Tag %d", (int) tag); + + return fld; + } +diff -Naur tiff-4.0.3.orig/tools/rgb2ycbcr.c tiff-4.0.3/tools/rgb2ycbcr.c +--- tiff-4.0.3.orig/tools/rgb2ycbcr.c 2011-05-31 13:03:16.000000000 -0400 ++++ tiff-4.0.3/tools/rgb2ycbcr.c 2013-05-02 12:02:42.785287961 -0400 +@@ -332,7 +332,8 @@ + TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + { char buf[2048]; + char *cp = strrchr(TIFFFileName(in), '/'); +- sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in)); ++ snprintf(buf, sizeof(buf), "YCbCr conversion of %s", ++ cp ? cp+1 : TIFFFileName(in)); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf); + } + TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion()); +diff -Naur tiff-4.0.3.orig/tools/tiff2bw.c tiff-4.0.3/tools/tiff2bw.c +--- tiff-4.0.3.orig/tools/tiff2bw.c 2010-07-08 12:10:24.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2bw.c 2013-05-02 12:02:42.785287961 -0400 +@@ -205,7 +205,7 @@ + } + } + TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); +- sprintf(thing, "B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw"); + outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:02:42.788287983 -0400 +@@ -3609,7 +3609,9 @@ + char buffer[16]; + int buflen=0; + +- buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff); ++ buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ", ++ t2p->pdf_majorversion&0xff, ++ t2p->pdf_minorversion&0xff); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7); + +@@ -3623,10 +3625,10 @@ + tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen ); + written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7); + +@@ -3665,13 +3667,13 @@ + written += t2pWriteFile(output, (tdata_t) "/", 1); + for (i=0;i<namelen;i++){ + if ( ((unsigned char)name[i]) < 0x21){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; + } + if ( ((unsigned char)name[i]) > 0x7E){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; +@@ -3679,57 +3681,57 @@ + if (nextchar==0){ + switch (name[i]){ + case 0x23: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x25: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x28: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x29: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x2F: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3C: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3E: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; +@@ -3844,14 +3846,14 @@ + tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/Length ", 8); + if(len!=0){ + written += t2p_write_pdf_stream_length(len, output); + } else { +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + } +@@ -3892,10 +3894,10 @@ + tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)len); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n", 1); + +@@ -3909,7 +3911,7 @@ + tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output) + { + tsize_t written = 0; +- char buffer[16]; ++ char buffer[32]; + int buflen = 0; + + written += t2pWriteFile(output, +@@ -3948,7 +3950,6 @@ + written += t2p_write_pdf_string(t2p->pdf_datetime, output); + } + written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11); +- _TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer)); + snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION); + written += t2p_write_pdf_string(buffer, output); + written += t2pWriteFile(output, (tdata_t) "\n", 1); +@@ -4089,7 +4090,7 @@ + { + tsize_t written=0; + tdir_t i=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + int page=0; +@@ -4097,7 +4098,7 @@ + (tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26); + page = t2p->pdf_pages+1; + for (i=0;i<t2p->tiff_pagecount;i++){ +- buflen=sprintf(buffer, "%d", page); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", page); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + if ( ((i+1)%8)==0 ) { +@@ -4112,8 +4113,7 @@ + } + } + written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%d", t2p->tiff_pagecount); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6); + +@@ -4128,28 +4128,28 @@ + + unsigned int i=0; + tsize_t written=0; +- char buffer[16]; ++ char buffer[256]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "] \n", 3); + written += t2pWriteFile(output, (tdata_t) "/Contents ", 10); +- buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15); +@@ -4157,15 +4157,13 @@ + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){ + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen = sprintf(buffer, "%u", i+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", i+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4177,12 +4175,10 @@ + } else { + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4191,9 +4187,7 @@ + if(t2p->tiff_transferfunctioncount != 0) { + written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13); + t2pWriteFile(output, (tdata_t) "/GS1 ", 5); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4566,7 +4560,7 @@ + if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){ + box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4581,7 +4575,7 @@ + } + } else { + box=t2p->pdf_imagebox; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4606,59 +4600,48 @@ + TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); + written += t2pWriteFile(output, + (tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", + 42); +- buflen=sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + if(tile != 0){ + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen=sprintf(buffer, "%lu", (unsigned long)tile); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length); + } else { + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13); + written += t2p_write_pdf_xobject_cs(t2p, output); +@@ -4702,11 +4685,10 @@ + t2p->pdf_colorspace ^= T2P_CS_PALETTE; + written += t2p_write_pdf_xobject_cs(t2p, output); + t2p->pdf_colorspace |= T2P_CS_PALETTE; +- buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7); + return(written); +@@ -4740,10 +4722,10 @@ + X_W /= Y_W; + Z_W /= Y_W; + Y_W = 1.0F; +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Range ", 7); +- buflen=sprintf(buffer, "[%d %d %d %d] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", + t2p->pdf_labrange[0], + t2p->pdf_labrange[1], + t2p->pdf_labrange[2], +@@ -4759,26 +4741,26 @@ + tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25); + if(t2p->tiff_transferfunctioncount == 1){ +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + } else { + written += t2pWriteFile(output, (tdata_t) "[ ", 2); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 2)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4800,7 +4782,7 @@ + written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17); + written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19); + written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18); +- buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); ++ buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19); + written += t2p_write_pdf_stream_dict(((tsize_t)1)<<(t2p->tiff_bitspersample+1), 0, output); +@@ -4827,7 +4809,7 @@ + tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[128]; ++ char buffer[256]; + int buflen=0; + + float X_W=0.0; +@@ -4895,16 +4877,16 @@ + written += t2pWriteFile(output, (tdata_t) "<< \n", 4); + if(t2p->pdf_colorspace & T2P_CS_CALGRAY){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12); + } + if(t2p->pdf_colorspace & T2P_CS_CALRGB){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", + X_R, Y_R, Z_R, + X_G, Y_G, Z_G, + X_B, Y_B, Z_B); +@@ -4923,11 +4905,11 @@ + tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7); + +@@ -4937,11 +4919,11 @@ + tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/N ", 3); +- buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11); + t2p->pdf_colorspace ^= T2P_CS_ICCBASED; +@@ -5006,7 +4988,7 @@ + tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + if(t2p->pdf_compression==T2P_COMPRESS_NONE){ +@@ -5021,41 +5003,33 @@ + written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9); + if(tile==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_length); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } +@@ -5082,21 +5056,17 @@ + if(t2p->pdf_compressionquality%100){ + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); + written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Columns ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen = sprintf(buffer, "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Colors ", 9); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) ">>\n", 3); + } +@@ -5116,16 +5086,16 @@ + tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[21]; ++ char buffer[64]; + int buflen=0; + uint32 i=0; + + written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22); + for (i=0;i<t2p->pdf_xrefcount;i++){ +- sprintf(buffer, "%.10lu 00000 n \n", ++ snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n", + (unsigned long)t2p->pdf_xrefoffsets[i]); + written += t2pWriteFile(output, (tdata_t) buffer, 20); + } +@@ -5149,17 +5119,14 @@ + snprintf(t2p->pdf_fileid + i, 9, "%.8X", rand()); + + written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17); +- buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11); + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); +@@ -5167,9 +5134,8 @@ + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); + written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7); + + return(written); +diff -Naur tiff-4.0.3.orig/tools/tiff2ps.c tiff-4.0.3/tools/tiff2ps.c +--- tiff-4.0.3.orig/tools/tiff2ps.c 2011-05-31 13:10:18.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2ps.c 2013-05-02 12:02:42.789287990 -0400 +@@ -1781,8 +1781,8 @@ + imageOp = "imagemask"; + + (void)strcpy(im_x, "0"); +- (void)sprintf(im_y, "%lu", (long) h); +- (void)sprintf(im_h, "%lu", (long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu", (long) h); ++ (void)snprintf(im_h, sizeof(im_h), "%lu", (long) h); + tile_width = w; + tile_height = h; + if (TIFFIsTiled(tif)) { +@@ -1803,7 +1803,7 @@ + } + if (tile_height < h) { + fputs("/im_y 0 def\n", fd); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } else { + repeat_count = tf_numberstrips; +@@ -1815,7 +1815,7 @@ + fprintf(fd, "/im_h %lu def\n", + (unsigned long) tile_height); + (void)strcpy(im_h, "im_h"); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } + +diff -Naur tiff-4.0.3.orig/tools/tiffcrop.c tiff-4.0.3/tools/tiffcrop.c +--- tiff-4.0.3.orig/tools/tiffcrop.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/tools/tiffcrop.c 2013-05-02 12:02:42.791288005 -0400 +@@ -2077,7 +2077,7 @@ + return 1; + } + +- sprintf (filenum, "-%03d%s", findex, export_ext); ++ snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext); + filenum[14] = '\0'; + strncat (exportname, filenum, 15); + } +@@ -2230,8 +2230,8 @@ + + /* dump.infilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s", ++ dump.infilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL) + { +@@ -2249,8 +2249,8 @@ + + /* dump.outfilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s", ++ dump.outfilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL) + { +diff -Naur tiff-4.0.3.orig/tools/tiffdither.c tiff-4.0.3/tools/tiffdither.c +--- tiff-4.0.3.orig/tools/tiffdither.c 2010-03-10 13:56:50.000000000 -0500 ++++ tiff-4.0.3/tools/tiffdither.c 2013-05-02 12:02:42.792288013 -0400 +@@ -260,7 +260,7 @@ + TIFFSetField(out, TIFFTAG_FILLORDER, fillorder); + else + CopyField(TIFFTAG_FILLORDER, shortv); +- sprintf(thing, "Dithered B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + CopyField(TIFFTAG_PHOTOMETRIC, shortv); + CopyField(TIFFTAG_ORIENTATION, shortv); diff --git a/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch new file mode 100644 index 000000000..92cff7ea4 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch @@ -0,0 +1,122 @@ +Back-port upstream patch to avoid assuming quite so much about what libjpeg +will return. Needed because libjpeg-turbo with the jpeg8 API broke the +expectations of the previous coding. + + +diff -Naur tiff-4.0.3.orig/test/raw_decode.c tiff-4.0.3/test/raw_decode.c +--- tiff-4.0.3.orig/test/raw_decode.c 2012-07-06 13:05:16.000000000 -0400 ++++ tiff-4.0.3/test/raw_decode.c 2012-12-19 13:04:37.609738276 -0500 +@@ -71,33 +71,54 @@ + return 1; + } + +-static int check_rgb_pixel( int pixel, int red, int green, int blue, unsigned char *buffer ) { ++static int check_rgb_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ unsigned char *buffer ) { + unsigned char *rgb = buffer + 3 * pixel; + +- if( rgb[0] == red && rgb[1] == green && rgb[2] == blue ) { ++ if( rgb[0] >= min_red && rgb[0] <= max_red && ++ rgb[1] >= min_green && rgb[1] <= max_green && ++ rgb[2] >= min_blue && rgb[2] <= max_blue ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d\n", red, green, blue ); +- fprintf( stderr, " Got: %3d %3d %3d\n", rgb[0], rgb[1], rgb[2] ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d)\n", ++ rgb[0], min_red, max_red, ++ rgb[1], min_green, max_green, ++ rgb[2], min_blue, max_blue ); + return 1; + } + +-static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, uint32 *buffer ) { ++static int check_rgba_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ int min_alpha, int max_alpha, ++ uint32 *buffer ) { + /* RGBA images are upside down - adjust for normal ordering */ + int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128; + uint32 rgba = buffer[adjusted_pixel]; + +- if( TIFFGetR(rgba) == (uint32) red && TIFFGetG(rgba) == (uint32) green && +- TIFFGetB(rgba) == (uint32) blue && TIFFGetA(rgba) == (uint32) alpha ) { ++ if( TIFFGetR(rgba) >= (uint32) min_red && ++ TIFFGetR(rgba) <= (uint32) max_red && ++ TIFFGetG(rgba) >= (uint32) min_green && ++ TIFFGetG(rgba) <= (uint32) max_green && ++ TIFFGetB(rgba) >= (uint32) min_blue && ++ TIFFGetB(rgba) <= (uint32) max_blue && ++ TIFFGetA(rgba) >= (uint32) min_alpha && ++ TIFFGetA(rgba) <= (uint32) max_alpha ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d %3d\n", red, green, blue, alpha ); +- fprintf( stderr, " Got: %3d %3d %3d %3d\n", +- TIFFGetR(rgba), TIFFGetG(rgba), TIFFGetB(rgba), TIFFGetA(rgba) ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d), A=%d (expected %d..%d)\n", ++ TIFFGetR(rgba), min_red, max_red, ++ TIFFGetG(rgba), min_green, max_green, ++ TIFFGetB(rgba), min_blue, max_blue, ++ TIFFGetA(rgba), min_alpha, max_alpha ); + return 1; + } + +@@ -191,15 +212,17 @@ + return 1; + } + +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgb_pixel( 0, 18, 0, 41, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 0, buffer ); +- pixel_status |= check_rgb_pixel( 512, 5, 34, 196, buffer ); +-#else +- pixel_status |= check_rgb_pixel( 0, 15, 0, 18, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 2, buffer ); +- pixel_status |= check_rgb_pixel( 512, 6, 36, 182, buffer ); +-#endif ++ /* ++ * JPEG decoding is inherently inexact, so we can't test for exact ++ * pixel values. (Well, if we knew exactly which libjpeg version ++ * we were using, and with what settings, we could expect specific ++ * values ... but it's not worth the trouble to keep track of.) ++ * Hence, use ranges of expected values. The ranges may need to be ++ * widened over time as more versions of libjpeg appear. ++ */ ++ pixel_status |= check_rgb_pixel( 0, 15, 18, 0, 0, 18, 41, buffer ); ++ pixel_status |= check_rgb_pixel( 64, 0, 0, 0, 0, 0, 2, buffer ); ++ pixel_status |= check_rgb_pixel( 512, 5, 6, 34, 36, 182, 196, buffer ); + + free( buffer ); + +@@ -224,15 +247,12 @@ + * accomplish it from the YCbCr subsampled buffer ourselves in which + * case the results may be subtly different but similar. + */ +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgba_pixel( 0, 18, 0, 41, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 5, 34, 196, 255, rgba_buffer ); +-#else +- pixel_status |= check_rgba_pixel( 0, 15, 0, 18, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 2, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 6, 36, 182, 255, rgba_buffer ); +-#endif ++ pixel_status |= check_rgba_pixel( 0, 15, 18, 0, 0, 18, 41, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 0, 0, 2, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 512, 5, 6, 34, 36, 182, 196, 255, 255, ++ rgba_buffer ); + + free( rgba_buffer ); + TIFFClose(tif); diff --git a/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch new file mode 100644 index 000000000..a503444b1 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/145055 + +http://build.opensuse.org/package/view_file?file=tiff-4.0.2-tiff2pdf-colors.patch&package=tiff&project=openSUSE%3AFactory + +--- tools/tiff2pdf.c ++++ tools/tiff2pdf.c +@@ -4991,7 +4991,7 @@ + + if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR) { + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); +- written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 0 >>\n", 24); ++ written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 1 >>\n", 24); + } + break; + #endif diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 728f89d57..b00864a6e 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181124 2013-03-31 19:16:50Z stephane $ +# $Id: PKGBUILD 186514 2013-05-28 09:58:04Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.9 -pkgrel=2 +pkgver=0.16.10 +pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('4335c8b275f041d6d34a493b21f2d7234ffca34b') +sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42') build() { cd $pkgname-$pkgver diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 9384d2a88..4a107f84c 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183268 2013-04-20 07:13:33Z andyrtr $ +# $Id: PKGBUILD 186454 2013-05-26 18:05:27Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Robert McCathie <archaur at rmcc dot com dot au> pkgname=libwps -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libwpd>=0.9.6') makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('78196c097db366fac66841d032b1ddac') +md5sums=('46eb0e7f213ad61bd5dee0c494132cb0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD index be159570b..939afbe5b 100644 --- a/extra/libxau/PKGBUILD +++ b/extra/libxau/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 152650 2012-03-07 19:44:52Z andyrtr $ +# $Id: PKGBUILD 186350 2013-05-25 08:48:08Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxau -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 authorisation library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +14,7 @@ makedepends=('pkgconfig') license=('custom') options=('!libtool') source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) -sha1sums=('29c47207fd246425b906f525b2220235ce4cd0f6') +sha256sums=('fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2') build() { cd "${srcdir}/libXau-${pkgver}" diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index c646844a3..f2e695ec7 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177994 2013-02-12 20:05:14Z andyrtr $ +# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.9 -pkgrel=3 +pkgver=1.9.1 +pkgrel=1 pkgdesc="X11 client-side library" arch=('i686' 'x86_64' 'mips64el') url="http://xcb.freedesktop.org/" @@ -14,8 +14,8 @@ options=('!libtool') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' - 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') +sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f' + '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD index e4e6e420f..c78fcd474 100644 --- a/extra/libxcursor/PKGBUILD +++ b/extra/libxcursor/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 152769 2012-03-09 16:04:11Z andyrtr $ +# $Id: PKGBUILD 186698 2013-05-30 14:35:12Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcursor -pkgver=1.1.13 -pkgrel=1.1 +pkgver=1.1.14 +pkgrel=1 pkgdesc="X cursor management library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +14,7 @@ depends=('libxfixes' 'libxrender') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('4e461d9e4324689ca8a84706926a8c0fe9470e47') +sha256sums=('9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df') build() { cd "${srcdir}/libXcursor-${pkgver}" diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD index 206746699..fc784a468 100644 --- a/extra/libxext/PKGBUILD +++ b/extra/libxext/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152773 2012-03-09 16:10:15Z andyrtr $ +# $Id: PKGBUILD 186939 2013-06-01 09:47:26Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxext -pkgver=1.3.1 -pkgrel=1.1 +pkgver=1.3.2 +pkgrel=1 pkgdesc="X11 miscellaneous extensions library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2") -sha1sums=('764ac472ae19a0faade193717a9e0938d3430aaa') +sha256sums=('f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0') build() { cd "${srcdir}/libXext-${pkgver}" diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD index 8801230ba..c4fc9f965 100644 --- a/extra/libxfixes/PKGBUILD +++ b/extra/libxfixes/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186580 2013-05-29 15:23:58Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfixes -pkgver=5.0 -pkgrel=2.1 +pkgver=5.0.1 +pkgrel=1 pkgdesc="X11 miscellaneous 'fixes' extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'fixesproto>=5.0') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2") -sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0') +sha256sums=('63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767') build() { cd "${srcdir}/libXfixes-${pkgver}" diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD index 90e9f0e21..c5468dacf 100644 --- a/extra/libxinerama/PKGBUILD +++ b/extra/libxinerama/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $ +# $Id: PKGBUILD 186881 2013-05-31 14:01:07Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxinerama -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 Xinerama extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +14,7 @@ depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") -sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd') +sha256sums=('7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2') build() { cd "${srcdir}/libXinerama-${pkgver}" diff --git a/extra/libxp/PKGBUILD b/extra/libxp/PKGBUILD index d199ed32c..cbb27982b 100644 --- a/extra/libxp/PKGBUILD +++ b/extra/libxp/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151429 2012-02-26 10:49:41Z pierre $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186883 2013-05-31 14:02:47Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxp -pkgver=1.0.1 -pkgrel=3.1 +pkgver=1.0.2 +pkgrel=1 pkgdesc="X11 X Print Library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -13,7 +14,7 @@ makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2") license=('custom') -sha1sums=('9c76823c7cfcb43f097963d0c930dcc4e38807a8') +sha256sums=('952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5') build() { cd "${srcdir}/libXp-${pkgver}" diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD index 0bfb732dc..1dff6ef33 100644 --- a/extra/libxrandr/PKGBUILD +++ b/extra/libxrandr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165113 2012-08-11 08:21:35Z andyrtr $ +# $Id: PKGBUILD 186941 2013-06-01 09:48:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxrandr -pkgver=1.4.0 -pkgrel=1.1 +pkgver=1.4.1 +pkgrel=1 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -14,7 +14,7 @@ depends=('libxext' 'libxrender' 'randrproto>=1.4.0') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3') +sha256sums=('d914a0490fd0a2ea6c3194505b5b28c56e2a277d8f4648b0275ee0ee370fb905') build() { cd "${srcdir}/libXrandr-${pkgver}" diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD index c252f8a3f..f7bbb1b36 100644 --- a/extra/libxres/PKGBUILD +++ b/extra/libxres/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152788 2012-03-09 16:26:13Z andyrtr $ +# $Id: PKGBUILD 186885 2013-05-31 14:04:26Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxres -pkgver=1.0.6 -pkgrel=1.1 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X11 Resource extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org" @@ -12,7 +13,7 @@ depends=('libxext') makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2") -sha1sums=('31a9b7d4f7a978de36c6f1c867dced29bfe7ef0f') +sha256sums=('26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5') build() { cd "${srcdir}/libXres-${pkgver}" diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD index 1c9bd18a0..c0b6a26ec 100644 --- a/extra/libxt/PKGBUILD +++ b/extra/libxt/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186887 2013-05-31 14:06:19Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxt -pkgver=1.1.3 -pkgrel=1.1 +pkgver=1.1.4 +pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") -sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') +sha256sums=('843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57') build() { cd "${srcdir}/libXt-${pkgver}" diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD index b690e1d00..3921bb8f1 100644 --- a/extra/libxtst/PKGBUILD +++ b/extra/libxtst/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 152793 2012-03-09 16:30:31Z andyrtr $ +# $Id: PKGBUILD 186893 2013-05-31 14:14:53Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxtst -pkgver=1.2.1 -pkgrel=1.1 +pkgver=1.2.2 +pkgrel=1 pkgdesc="X11 Testing -- Resource extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libxext' 'libxi' 'recordproto' 'inputproto') +depends=('libxext' 'libxi' 'recordproto' 'inputproto' 'libxfixes') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2") -sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2') +sha256sums=('ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9') build() { cd "${srcdir}/libXtst-${pkgver}" diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD index 367067e7c..fb2886ffd 100644 --- a/extra/libxv/PKGBUILD +++ b/extra/libxv/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152795 2012-03-09 16:32:25Z andyrtr $ +# $Id: PKGBUILD 186943 2013-06-01 09:51:55Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxv -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 Video extension library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('libxext' 'videoproto') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2") -sha1sums=('49c87e0ccb999966b7b1b4e72cb927f05e0835bd') +sha256sums=('4f00eb5347390909cea4e53a69425839d2a6a44e0e0613321d59e7e4aeaf73d7') build() { cd "${srcdir}/libXv-${pkgver}" diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD index 5eebaf323..2af625e53 100644 --- a/extra/libxxf86dga/PKGBUILD +++ b/extra/libxxf86dga/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152799 2012-03-09 16:36:28Z andyrtr $ +# $Id: PKGBUILD 186889 2013-05-31 14:07:54Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxxf86dga -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="X11 Direct Graphics Access extension library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +14,7 @@ depends=('libxext' 'xf86dgaproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2) -sha1sums=('5af5d7d2f239b31035ae5b9d3e3718c833af8b56') +sha256sums=('8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e') build() { cd "${srcdir}/libXxf86dga-${pkgver}" diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD index 94dfbf043..19b6d3bb4 100644 --- a/extra/libxxf86vm/PKGBUILD +++ b/extra/libxxf86vm/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152801 2012-03-09 16:38:21Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186891 2013-05-31 14:09:38Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxxf86vm -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686' 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('libxext' 'xf86vidmodeproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f') +sha256sums=('da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8') build() { cd "${srcdir}/libXxf86vm-${pkgver}" diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index 1e87777ff..ea2478447 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,32 +1,39 @@ -# $Id: PKGBUILD 181125 2013-03-31 19:16:53Z stephane $ +# $Id: PKGBUILD 186068 2013-05-20 21:46:39Z foutrelis $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq pkgver=1.7.1 -pkgrel=3 -pkgdesc="Advanced graphical ICQ clone and more for Unix" +pkgrel=4 +pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" license=('GPL') depends=('boost-libs' 'gpgme' 'libxss' 'qt4') -makedepends=('cmake' 'boost') +makedepends=('cmake' 'boost' 'optipng') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir {,plugins/qt4-gui/}build + + # Fix invalid PNG images to work with libpng 1.6 + # https://github.com/licq-im/licq/pull/32 + optipng -quiet -force -fix plugins/qt4-gui/share/skins/Mirabilis/*.png +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" # licq - mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=/usr .. make # qt4-gui - cd ../plugins/qt4-gui - mkdir build - cd build + cd ../plugins/qt4-gui/build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. make } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index b2de0df03..4d4a02319 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184020 2013-05-01 05:23:57Z giovanni $ +# $Id: PKGBUILD 186968 2013-06-01 19:28:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.04.30 +pkgver=2013.05.30 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -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=('95533d91bd196e42fd748076dc244b09') +md5sums=('c3f776e18b3aa5f1cafc7a551fcf8059') build() { cd ${srcdir}/live diff --git a/community/llvm-amdgpu-snapshot/PKGBUILD b/extra/llvm-amdgpu-snapshot/PKGBUILD index 65dd5a138..cdac9521c 100644 --- a/community/llvm-amdgpu-snapshot/PKGBUILD +++ b/extra/llvm-amdgpu-snapshot/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 87738 2013-04-05 20:58:51Z lcarlier $ +# $Id: PKGBUILD 186322 2013-05-24 18:14:34Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Roberto Alsina <ralsina@kde.org> @@ -6,22 +7,26 @@ # Contributor: Anders Bergh <anders@archlinuxppc.org> # Contributor: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com> -pkgname=llvm-amdgpu-snapshot +pkgbase=llvm-amdgpu-snapshot +pkgname=('llvm-amdgpu-snapshot' 'llvm-amdgpu-lib-snapshot') pkgver=20130403 -pkgrel=1 +pkgrel=3 pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support' arch=('i686' 'x86_64') url="http://llvm.org" license=('custom:University of Illinois/NCSA Open Source License') -depends=('libffi' 'python2' 'ocaml') -conflicts=('llvm') -source=(ftp://ftp.archlinux.org/other/community/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) +makedepends=('libffi' 'python2' 'ocaml') +source=(ftp://ftp.archlinux.org/other/packages/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) md5sums=('4baa7b8da9eff4811952b6f855c141ca') -build() { +prepare() { cd "$srcdir"/llvm-c* sed -i 's/python$/python2/' utils/llvm-build/llvm-build +} + +build() { + cd "$srcdir"/llvm-c* # Apply strip option to configure _optimized_switch="enable" @@ -47,16 +52,37 @@ build() { make REQUIRES_RTTI=1 } -package() { +package_llvm-amdgpu-snapshot() { + depends=("llvm-amdgpu-lib-snapshot=${pkgver}" 'python2') + conflicts=('llvm') + cd "$srcdir"/llvm-c* make DESTDIR="$pkgdir" install # Remove useless files rm -r "$pkgdir"/usr/{docs,lib/ocaml} + # moved to llvm-amdgpu-lib-snapshot + rm "$pkgdir"/usr/lib/libLLVM-3.2svn.so # Fix permissions of static libs chmod -x "$pkgdir"/usr/lib/lib*.a install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } +package_llvm-amdgpu-lib-snapshot() { + depends=('libffi' 'gcc-libs') + + cd "$srcdir"/llvm-c* + + make DESTDIR="$pkgdir" install + + mv -v "$pkgdir"/usr/lib/libLLVM-3.2svn.so "$pkgdir"/ + + # Remove useless files + rm -r "$pkgdir"/usr/{bin,include,docs,lib/*} + + mv "$pkgdir"/libLLVM-3.2svn.so "$pkgdir"/usr/lib/ + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 06f0fe0a9..a68e230c5 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $ +# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors -pkgver=3.3.3 -pkgrel=3 +pkgver=3.3.4 +pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/" @@ -16,7 +16,7 @@ options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ healthd healthd.conf fancontrol.service sensord.service healthd.service \ linux_3.0.patch lm_sensors-fancontrol.patch) -sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' +sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8' 'SKIP' '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' @@ -24,7 +24,7 @@ sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' 'cea1ff07374a784cc4be1d28dc6c80641fcae99d' 'd72ec328e9303acef86342483b6f8537de6117d9' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' - 'd3e419b4019451fb039ae3d3b8e0ec55121b9f17') + 'b0bc977348610d6a008d75a43f65800251c4c9f7') prepare() { cd ${pkgname}-${pkgver} diff --git a/extra/lm_sensors/lm_sensors-fancontrol.patch b/extra/lm_sensors/lm_sensors-fancontrol.patch index e58891695..c42d7b870 100644 --- a/extra/lm_sensors/lm_sensors-fancontrol.patch +++ b/extra/lm_sensors/lm_sensors-fancontrol.patch @@ -4,8 +4,8 @@ cd $DIR # Check for configuration change --if [ -z "$DEVPATH" -o -z "$DEVNAME" ] -+if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ] +-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ] ++if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]] then echo "Configuration is too old, please run pwmconfig again" >&2 exit 1 diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 2a10ef5b1..81e62cbbc 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $ +# $Id: PKGBUILD 186282 2013-05-23 19:15:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.30 -pkgrel=2 +pkgver=5.5.31 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' @@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f' +sha256sums=('70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') @@ -106,7 +106,7 @@ package_mariadb() { pkgdesc='Fast SQL database server, drop-in replacement for MySQL' backup=('etc/mysql/my.cnf') install=mariadb.install - depends=('mariadb-clients') + depends=('mariadb-clients' 'inetutils') conflicts=('mysql' 'mytop') provides=("mysql=$pkgver" 'mytop') optdepends=('perl-dbd-mysql: mytop dependency' diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 7341c2243..f8407e622 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184144 2013-05-02 17:00:09Z giovanni $ +# $Id: PKGBUILD 185603 2013-05-15 19:30:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('d012d8bb5f85369d3b6a630a80667170' +md5sums=('db34e6085b71c33ba250e689b1535101' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 83648b26f..013152b1c 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184295 2013-05-05 17:57:33Z bpiotrowski $ +# $Id: PKGBUILD 186351 2013-05-25 08:49:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.2 +pkgver=9.1.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -19,7 +19,7 @@ options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing LICENSE) -md5sums=('df2aab86ff4a510ce5b0d074caa0a59f' +md5sums=('952ccd03547ed72333b64e1746cf8ada' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -43,6 +43,7 @@ build() { --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-llvm-shared-libs \ --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ @@ -70,7 +71,7 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=("mesa-libgl=${pkgver}") + depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ @@ -99,7 +100,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" - depends=("mesa-libgl=${pkgver}") + depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ @@ -116,7 +117,7 @@ package_nouveau-dri() { package_svga-dri() { pkgdesc="Gallium3D VMware guest GL driver" - depends=('gcc-libs' 'libdrm' 'expat' 'libffi') + depends=('gcc-libs' 'libdrm' 'expat' 'libffi' 'llvm-amdgpu-lib-snapshot') install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -135,7 +136,7 @@ package_mesa() { provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - [ "$CARCH" != "mips64el" ] && depends+=('libvdpau') + [ "$CARCH" != "mips64el" ] && depends+=('libvdpau' 'llvm-amdgpu-lib-snapshot') mv -v ${srcdir}/fakeinstall/* ${pkgdir} # rename libgl.so to not conflict with blobs - may break gl.pc ? diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD index fd87ef8c8..efdeaf7fc 100644 --- a/extra/metalog/PKGBUILD +++ b/extra/metalog/PKGBUILD @@ -1,36 +1,30 @@ -# $Id: PKGBUILD 167973 2012-10-04 13:24:41Z juergen $ +# $Id: PKGBUILD 186745 2013-05-31 01:44:03Z eric $ # Maintainer: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=metalog pkgver=3.0 -pkgrel=0 -pkgdesc="Metalog is a modern replacement for syslogd and klogd" +pkgrel=2 +pkgdesc="A modern replacement for syslogd and klogd" url="http://metalog.sourceforge.net" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('pcre') provides=('logger') -backup=('etc/metalog.conf' 'etc/conf.d/metalog') -source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog' 'metalog.confd' 'metalog.service') +backup=('etc/metalog.conf') +source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog.service') md5sums=('6fe404e49764fa24108fd090417bacb5' - '9e73301a7f0be291749ee30638527cb9' - '86bccd5a02996921e29eff8a0394d11f' - 'f005e6970c25bfdaf0596791e9135f98') + '42b8138e8868ecdf0616f73efca7b339') build() { - cd $srcdir/$pkgname-3 - ./configure --prefix=/usr --sysconfdir=/etc + cd $pkgname-3 + ./configure --prefix=/usr --sysconfdir=/etc --sbin=/usr/bin make } package() { - cd $srcdir/$pkgname-3 - make DESTDIR=$pkgdir install - install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog - install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog - install -D -m644 metalog.conf $pkgdir/etc/metalog.conf - - install -d "${pkgdir}"/usr/lib/systemd/system - install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/ + cd $pkgname-3 + make DESTDIR="$pkgdir" install + install -D -m644 metalog.conf "$pkgdir/etc/metalog.conf" + install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/metalog.service } diff --git a/extra/metalog/metalog b/extra/metalog/metalog deleted file mode 100644 index 211002401..000000000 --- a/extra/metalog/metalog +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/metalog ] && . /etc/conf.d/metalog - -. /etc/rc.conf -. /etc/rc.d/functions - -if [ -f /var/run/metalog.pid ]; then - PID=$(cat /var/run/metalog.pid) 2>/dev/null -fi - -case "$1" in - start) - stat_busy "Starting Metalog" - [ -z "$PID" ] && /usr/sbin/metalog -B $METALOG_OPTS 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon metalog - stat_done - fi - ;; - stop) - stat_busy "Stopping Metalog" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon metalog - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/metalog/metalog.confd b/extra/metalog/metalog.confd deleted file mode 100644 index 3d76ffab3..000000000 --- a/extra/metalog/metalog.confd +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters to be passed to metalog -# - -# NOTE: Since v.0.7, metalog disables buffering by default. -# Add '-a' if you want buffering. - -METALOG_OPTS="" diff --git a/extra/metalog/metalog.service b/extra/metalog/metalog.service index 5982c8804..82a81ea98 100644 --- a/extra/metalog/metalog.service +++ b/extra/metalog/metalog.service @@ -2,7 +2,7 @@ Description=System Logger Daemon [Service] -ExecStart=/usr/sbin/metalog +ExecStart=/usr/bin/metalog [Install] WantedBy=multi-user.target diff --git a/community/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD index dde4a06f8..ed7751ba4 100644 --- a/community/misdnuser/PKGBUILD +++ b/extra/misdnuser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83164 2013-01-27 16:21:34Z pierre $ +# $Id: PKGBUILD 186032 2013-05-20 17:17:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=misdnuser pkgver=2.0.17_20120917 -pkgrel=1 +pkgrel=2 pkgdesc="Tools and library for mISDN" arch=('i686' 'x86_64') url="http://www.misdn.org" @@ -12,10 +12,16 @@ depends=('isdn4k-utils' 'spandsp') backup=('etc/capi20.conf') options=('!makeflags' '!libtool' '!strip') source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz - misdncapid.rc mISDNcapid.service c2faxrecv-mISDNcapid.service - mISDNcapid.conf) + mISDNcapid.conf + fix-compile-gcc48.patch) + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + # fix gcc48 compile error + patch -Np1 -i ${srcdir}/fix-compile-gcc48.patch +} build() { # only enable for debugging! @@ -23,14 +29,13 @@ build() { #export CXXFLAGS+=" -g -O0" cd ${srcdir}/${pkgname}-${pkgver} make - ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp make } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -D -m 755 ${srcdir}/misdncapid.rc ${pkgdir}/etc/rc.d/misdncapid # fix udev rule mkdir -p ${pkgdir}/usr/lib/udev/rules.d mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d @@ -44,7 +49,7 @@ package() { install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf } md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8' - '2009563b144de037ecb20f8d727a772e' - '8f305ee6e35fa12a8bec0632bfe7a076' + 'bfd47480a54b41394ba5cc3f53587130' '32ead7f063e007c784aa883d441f33c2' - '42c3b46880a68c3883ee1ed00af34b45') + '42c3b46880a68c3883ee1ed00af34b45' + 'b291e9a04378decec33c420a62a5a4b7') diff --git a/community/misdnuser/c2faxrecv-mISDNcapid.service b/extra/misdnuser/c2faxrecv-mISDNcapid.service index 7a98ca435..7a98ca435 100644 --- a/community/misdnuser/c2faxrecv-mISDNcapid.service +++ b/extra/misdnuser/c2faxrecv-mISDNcapid.service diff --git a/extra/misdnuser/fix-compile-gcc48.patch b/extra/misdnuser/fix-compile-gcc48.patch new file mode 100644 index 000000000..61f52d22e --- /dev/null +++ b/extra/misdnuser/fix-compile-gcc48.patch @@ -0,0 +1,15 @@ +X-Git-Url: http://misdn.eu/?p=projects%2FmISDNuser.git;a=blobdiff_plain;f=lib%2Flayer3%2Fq931.c;h=75716fe121a48a3c62fb785af85d856a688889bf;hp=705caf3e167bb5c50828c464151fcfe49af89e64;hb=ec4ac2763f737dc9100f9f4f9e91f4d7064a77b2;hpb=1dc4c24d27ed9c46e2fdbf7fb4b178e549a58e8d + +diff --git a/lib/layer3/q931.c b/lib/layer3/q931.c +index 705caf3..75716fe 100644 +--- a/lib/layer3/q931.c ++++ b/lib/layer3/q931.c +@@ -357,7 +357,7 @@ mi_encode_hlc(struct l3_msg *l3m, int hlc, int ehlc) + ie[1] = hlc & 0x7f; + + if (ehlc < 0) +- ie[1] | 0x80; ++ ie[1] |= 0x80; + else { + l = 3; + ie[2] = 0x80 | (ehlc & 0x7f); diff --git a/community/misdnuser/mISDNcapid.conf b/extra/misdnuser/mISDNcapid.conf index 7607e262d..7607e262d 100644 --- a/community/misdnuser/mISDNcapid.conf +++ b/extra/misdnuser/mISDNcapid.conf diff --git a/community/misdnuser/mISDNcapid.service b/extra/misdnuser/mISDNcapid.service index 94f38478a..53871dd95 100644 --- a/community/misdnuser/mISDNcapid.service +++ b/extra/misdnuser/mISDNcapid.service @@ -3,7 +3,7 @@ Description=mISDN CAPI daemon [Service] Type=forking -ExecStart=/usr/sbin/mISDNcapid +ExecStart=/usr/bin/mISDNcapid ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index d35ca0723..65437b6f4 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160911 2012-06-06 19:20:20Z foutrelis $ +# $Id: PKGBUILD 186389 2013-05-26 09:24:48Z bluewind $ # Maintainer: # Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl -pkgver=2.0.7 +pkgver=2.0.8 pkgrel=1 pkgdesc="Apache module that embeds the Perl interpreter within the server" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,12 @@ url="http://perl.apache.org/" license=('APACHE') depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') options=('!emptydirs') -source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz +source=(http://apache.org/dist/perl/$pkgname-$pkgver.tar.gz mod_perl-2.0.6-nolfs.patch) -sha256sums=('53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6' +sha256sums=('35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6' '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Patch from openSUSE to fix segfaults on i686 (FS#25008): @@ -25,6 +25,10 @@ build() { # FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl # structures to be invalid if only the apache flags are used patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 4830eb61f..1a1200a8e 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184799 2013-05-08 17:55:32Z bpiotrowski $ +# $Id: PKGBUILD 186332 2013-05-24 20:45:34Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=2.10.9 +pkgver=3.0.7 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) @@ -16,14 +16,13 @@ provides=('monodoc') conflicts=('monodoc') source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d) -md5sums=('bbbff9d3d0c36b904437ada36a27eb9e' +md5sums=('76ebec9c97347aac13d9f28fc58b347d' 'b9ef8a65fea497acf176cca16c1e2402') build() { cd "${srcdir}"/${pkgname}-${pkgver} # build mono - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-libgdiplus=installed + ./configure --prefix=/usr --sysconfdir=/etc make # build jay diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 7aaeb4c1f..e1eba8ade 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178505 2013-02-24 19:40:36Z daniel $ +# $Id: PKGBUILD 186330 2013-05-24 20:45:12Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=4.0 +pkgver=4.0.8 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" @@ -14,12 +14,12 @@ arch=('i686' 'x86_64') url="http://www.monodevelop.com" license=('GPL') depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('rsync') +makedepends=('rsync' 'git') options=(!makeflags) install=monodevelop.install -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz monodevelop-core-addins.pc.in.patch) -md5sums=('811e09cbddc262d138fed1e119a52df7' +md5sums=('84a03fabcd3399807c7bf2c2027c87bf' '8466d032735130e37d4091a793a7966c') build() { @@ -30,13 +30,16 @@ build() { # fix location for MonoDevelop.Gettext.dll - breaks gdb build # patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch - ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb + ./configure --prefix=/usr --profile stable LD_PRELOAD="" make } package() { cd $srcdir/$pkgname-$pkgver + LD_PRELOAD="" make DESTDIR=$pkgdir install + # delete conflicting files + find $pkgdir/usr/share/mime/ -type f -exec rm {} \; rm -r $MONO_SHARED_DIR } diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 0671606be..15855b9e2 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181379 2013-04-04 01:34:05Z eric $ +# $Id: PKGBUILD 186257 2013-05-23 01:22:39Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.15.3 +pkgver=1.15.4 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64' 'mips64el') @@ -13,22 +13,20 @@ makedepends=('sdl' 'jack' 'libpulse') optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') -conflicts=('mpg321') -provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('915eb8782106a62b103a1171364571d69cb64e25' - '90614c85da88f965d9aa3165c111b6eeba711903') +sha1sums=('f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --enable-int-quality --with-module-suffix=.so \ --with-audio="alsa oss sdl jack pulse" make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay" } diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 8df27fa48..8b2870dc0 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185211 2013-05-12 07:33:11Z eric $ +# $Id: PKGBUILD 185614 2013-05-16 03:14:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') pkgver=1.4.31 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" @@ -48,6 +48,7 @@ package_msmtp-mta() { provides=('smtp-forwarder') conflicts=('smtp-forwarder') - install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}"/usr/{s,}bin ln -s msmtp "${pkgdir}/usr/bin/sendmail" + ln -s ../bin/msmtp "${pkgdir}/usr/sbin/sendmail" } diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD index c1af1911b..dd19ab8f1 100644 --- a/extra/mtr/PKGBUILD +++ b/extra/mtr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $ +# $Id: PKGBUILD 186756 2013-05-31 04:03:04Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mtr pkgname=(mtr mtr-gtk) pkgver=0.84 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('ncurses' 'gtk2') @@ -16,11 +16,11 @@ md5sums=('df61096ae1b18b27f915feeb907ae48c') build() { cp -r $pkgbase-$pkgver $pkgbase-cli cd mtr-cli - ./configure --prefix=/usr --without-gtk + ./configure --prefix=/usr --without-gtk --sbindir=/usr/bin make cd "$srcdir/$pkgbase-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index c83d61c7f..86a7acdba 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167418 2012-10-02 02:04:08Z bisson $ +# $Id: PKGBUILD 185574 2013-05-15 08:05:34Z bpiotrowski $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=mutt pkgver=1.5.21 -pkgrel=8.1 +pkgrel=9 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 1c9518299..6df2b9bed 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183445 2013-04-21 22:11:45Z heftig $ +# $Id: PKGBUILD 186664 2013-05-30 12:25:27Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.1 -pkgrel=1 +pkgver=3.8.2 +pkgrel=2 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) license=('GPL') @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a41a992620e7e51b6a34709db26a215e86f03927e828b4db03e9111d925ef52f') +sha256sums=('2dddb1f699a94e9d294c36127e0642f5afa1fa8853cb1b47187ece16457fce65') build() { cd "$pkgname-$pkgver" @@ -24,6 +24,10 @@ build() { --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static \ --disable-schemas-compile --enable-compile-warnings=minimum + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 4b376fdc5..039094166 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182744 2013-04-14 04:22:21Z eric $ +# $Id: PKGBUILD 186390 2013-05-26 09:24:49Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.2 -pkgrel=4 +pkgrel=7 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://www.net-snmp.org/" @@ -16,10 +16,11 @@ optdepends=('perl-term-readkey: for snmpcheck application' 'python2: for the python modules') options=('!libtool' '!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.service libnl32.patch) + snmpd.service snmptrapd.service libnl32.patch) sha1sums=('c493027907f32400648244d81117a126aecd27ee' 'SKIP' - '2ad00f89ecb8ec97adfbae7adfbfa3499319e5d7' + '84e32c54d32e6b608747054e04a3ddfe6d6638cc' + '0244e91c7baa0abebfb5c0560e8ce04c966c5992' '74a9848b95f63378eb1753fc309d2b74de5afb0f') prepare() { @@ -32,7 +33,7 @@ prepare() { build() { cd ${pkgname}-${pkgver} PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc --sbindir=/usr/bin \ --mandir=/usr/share/man \ --enable-ucd-snmp-compatibility \ --enable-ipv6 \ @@ -52,5 +53,6 @@ package() { sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" + install -D -m644 "${srcdir}/snmptrapd.service" "${pkgdir}/usr/lib/systemd/system/snmptrapd.service" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/net-snmp/snmpd.service b/extra/net-snmp/snmpd.service index 3e5dbc534..e9f713cab 100644 --- a/extra/net-snmp/snmpd.service +++ b/extra/net-snmp/snmpd.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/run/snmpd.pid -ExecStart=/usr/sbin/snmpd -p /run/snmpd.pid +ExecStart=/usr/bin/snmpd -p /run/snmpd.pid ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/net-snmp/snmptrapd.service b/extra/net-snmp/snmptrapd.service new file mode 100644 index 000000000..50eee7ac8 --- /dev/null +++ b/extra/net-snmp/snmptrapd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) TRAP Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/snmptrapd.pid +ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/netkit-bsd-finger/PKGBUILD b/extra/netkit-bsd-finger/PKGBUILD index 8b42c46c5..ae56aeda5 100644 --- a/extra/netkit-bsd-finger/PKGBUILD +++ b/extra/netkit-bsd-finger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150721 2012-02-21 07:25:55Z andrea $ +# $Id: PKGBUILD 185297 2013-05-13 03:44:34Z eric $ # Maintainer: # Contributor: dorphell <dorphell@archlinux.org> pkgname=netkit-bsd-finger pkgver=0.17 -pkgrel=7.1 +pkgrel=8 pkgdesc="BSD-finger ported to Linux" arch=('i686' 'x86_64' 'mips64el') url='ftp://ftp.uk.linux.org/pub/linux/Networking/netkit' @@ -15,27 +15,29 @@ source=("ftp://ftp.archlinux.org/other/${pkgname}/bsd-finger-${pkgver}.tar.gz" 'finger.xinetd' 'LICENSE' 'fix-manpage-typo.patch') md5sums=('52bf281aac8814bf56cdc92f7661ee75' - 'a8682004dc8dee356065162bde892b47' + 'a71333c0f3a6ac2ca9e37a6425abfc52' '5fc568418a0379fc3a358ed1c2523b44' '9c4ad79a8df81ade6d1938955f1debbd') -build() { - cd ${srcdir}/bsd-finger-${pkgver} - +prepare() { + cd bsd-finger-${pkgver} # FS#28232 patch -p1 -i "${srcdir}"/fix-manpage-typo.patch - - ./configure --prefix=/usr sed -i 's@include <sys/time.h>@include <time.h>@' finger/lprint.c sed -i 's@include <sys/time.h>@include <time.h>@' finger/sprint.c +} + +build() { + cd bsd-finger-${pkgver} + ./configure --prefix=/usr make } package() { - cd ${srcdir}/bsd-finger-${pkgver} - install -d ${pkgdir}/usr/{bin,sbin} ${pkgdir}/usr/share/man/{man1,man8} - make INSTALLROOT=${pkgdir} MANDIR=/usr/share/man install + cd bsd-finger-${pkgver} + install -d "${pkgdir}"/usr/{bin,share/man/{man1,man8}} + make INSTALLROOT="${pkgdir}" SBINDIR=/usr/bin MANDIR=/usr/share/man install - install -D -m644 ${srcdir}/finger.xinetd ${pkgdir}/etc/xinetd.d/finger - install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 "${srcdir}/finger.xinetd" "${pkgdir}/etc/xinetd.d/finger" + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/netkit-bsd-finger/finger.xinetd b/extra/netkit-bsd-finger/finger.xinetd index cc9a8b15d..b2c5fce44 100644 --- a/extra/netkit-bsd-finger/finger.xinetd +++ b/extra/netkit-bsd-finger/finger.xinetd @@ -3,6 +3,6 @@ service finger socket_type = stream wait = no user = nobody - server = /usr/sbin/in.fingerd + server = /usr/bin/in.fingerd disable = yes } diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index 4ee5fc2bf..f8fad946a 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183668 2013-04-26 12:45:09Z andyrtr $ +# $Id: PKGBUILD 186700 2013-05-30 14:40:21Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.7 +pkgver=2.7.1 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,10 @@ url="http://www.lysator.liu.se/~nisse/nettle/" license=('GPL2') install=$pkgname.install depends=('gmp') -source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('2caa1bd667c35db71becb93c5d89737f') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('003d5147911317931dd453520eb234a5' + 'SKIP') + build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index e6745b3d3..84be26b9f 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179572 2013-03-07 11:54:29Z foutrelis $ +# $Id: PKGBUILD 185909 2013-05-19 18:47:29Z dreisner $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc pkgver=0.9.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,8 +13,15 @@ makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz + "vpnc-paths.patch") +sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1' + '0b07abc21823b316bfd9a9faf7bf34ded35d66e904d081c5e285f8dc8ce30a54') + +prepare() { + cd NetworkManager-vpnc-${pkgver} + patch -Np1 <"$srcdir/vpnc-paths.patch" +} build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager-vpnc/vpnc-paths.patch b/extra/networkmanager-vpnc/vpnc-paths.patch new file mode 100644 index 000000000..eccdf65b2 --- /dev/null +++ b/extra/networkmanager-vpnc/vpnc-paths.patch @@ -0,0 +1,10 @@ +--- a/src/nm-vpnc-service.c 2013-05-19 14:21:35.465816746 -0400 ++++ b/src/nm-vpnc-service.c 2013-05-19 14:23:57.554908088 -0400 +@@ -54,6 +54,7 @@ + + static const char *vpnc_binary_paths[] = + { ++ "/usr/bin/vpnc", + "/usr/sbin/vpnc", + "/sbin/vpnc", + "/usr/local/sbin/vpnc", diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD index e78410587..aaa1795b7 100644 --- a/extra/ntfs-3g_ntfsprogs/PKGBUILD +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179546 2013-03-06 15:52:21Z eric $ +# $Id: PKGBUILD 185299 2013-05-13 04:23:22Z eric $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bchler <thomas.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=ntfs-3g_ntfsprogs pkgname=ntfs-3g pkgver=2013.1.13 -pkgrel=2 +pkgrel=3 pkgdesc="NTFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.tuxera.com/community/ntfs-3g-download/" @@ -19,18 +19,22 @@ options=('!libtool') source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz) sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818') -build() { - cd "$srcdir/$pkgbase-$pkgver" +prepare() { + cd $pkgbase-$pkgver sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in +} + +build() { + cd $pkgbase-$pkgver ./configure --prefix=/usr \ --with-fuse=external --disable-static \ --enable-posix-acls --disable-ldconfig \ - --mandir=/usr/share/man + --mandir=/usr/share/man --sbin=/usr/bin make } package_ntfs-3g() { - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs" } diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 500501846..17a50e340 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180312 2013-03-20 02:35:33Z eric $ +# $Id: PKGBUILD 186962 2013-06-01 15:32:06Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,14 +6,21 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=5 +pkgrel=6 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.muiline.com/obex-data-server" license=('GPL') depends=('dbus-glib' 'openobex' 'imagemagick') -source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") -md5sums=('961ca5db6fe9c97024e133cc6203cc4d') +source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz" + "obex-data-server-openobex17.patch") +md5sums=('961ca5db6fe9c97024e133cc6203cc4d' + '4199b3f0178d2b58eb36ee36ed1d07d5') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/obex-data-server-openobex17.patch" +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/obex-data-server/obex-data-server-openobex17.patch b/extra/obex-data-server/obex-data-server-openobex17.patch new file mode 100644 index 000000000..047c46c50 --- /dev/null +++ b/extra/obex-data-server/obex-data-server-openobex17.patch @@ -0,0 +1,12 @@ +diff -Naur obex-data-server-0.4.6-orig/src/ods-obex.c obex-data-server-0.4.6/src/ods-obex.c +--- obex-data-server-0.4.6-orig/src/ods-obex.c 2013-05-29 16:01:54.051692334 -0400 ++++ obex-data-server-0.4.6/src/ods-obex.c 2013-05-29 16:03:23.200697099 -0400 +@@ -412,7 +412,7 @@ + goto err; + } + +- interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); ++ interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); + if (intf_num >= interfaces_num) { + g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); + goto err; diff --git a/extra/obexftp/PKGBUILD b/extra/obexftp/PKGBUILD index 3c3426120..420eeadb4 100644 --- a/extra/obexftp/PKGBUILD +++ b/extra/obexftp/PKGBUILD @@ -1,35 +1,42 @@ -# $Id: PKGBUILD 143919 2011-11-30 20:53:04Z giovanni $ +# $Id: PKGBUILD 186963 2013-06-01 15:32:07Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=obexftp -pkgver=0.23 -pkgrel=5 +pkgver=0.24 +pkgrel=1 pkgdesc="A tool for transfer files to/from any OBEX enabled device" arch=('i686' 'x86_64' 'mips64el') url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" license=('GPL') -depends=('openobex' 'python2') -makedepends=('pkg-config') -options=('!libtool') -source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f20762061b68bc921e80be4aebc349eb') +depends=('openobex') +makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse' 'swig' 'ruby' 'tk') +optdepends=('ruby: ruby bindings' + 'tk: TCL/Tk bindings') +options=('!makeflags' '!libtool' '!docs') +source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz") +md5sums=('31a50dbbd09c63cbb5399772aaff7936') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/" - ./configure --prefix=/usr \ - --disable-ruby \ - --enable-python - make + mkdir build + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SBINDIR=bin \ + -DENABLE_PERL=YES \ + -DENABLE_PYTHON=YES \ + -DENABLE_RUBY=YES \ + -DENABLE_TCL=YES + make doc } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/build" make DESTDIR="${pkgdir}" install - - # remove nasty files - # mv ${pkgdir}/usr/lib/perl5/site_perl/5.10.0 ${pkgdir}/usr/lib/perl5/site_perl/current - rm -f ${pkgdir}/usr/lib/perl5/core_perl/perllocal.pod } diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index e21601d8d..7bb35ecce 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178113 2013-02-16 16:08:30Z ronald $ +# $Id: PKGBUILD 186980 2013-06-02 10:21:27Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') @@ -15,24 +15,21 @@ makedepends=('gcc-fortran' 'texlive-core') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting') source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} - octave-gethelp.patch) + mex-gcc-4.8.patch) options=('!emptydirs') install=octave.install -sha1sums=('e8bd0c0b33ab9714ddb524f2258546c3536f0628' - 'de009a9e6803de6b831cbd836cbc85c291de8a3c' - 'd39d54763ac86114029f8bc5d60763d2adce27bb') +sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' + 'SKIP' + '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log - patch -Np0 -i "${srcdir}/octave-gethelp.patch" + # https://savannah.gnu.org/bugs/?38746 + patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch" autoreconf -vfi - # http://www.nabble.com/Random-rounding-errors-td16010966.html - FFLAGS="-O -ffloat-store" \ - ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-shared --disable-static \ --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html diff --git a/extra/octave/mex-gcc-4.8.patch b/extra/octave/mex-gcc-4.8.patch new file mode 100644 index 000000000..99d501879 --- /dev/null +++ b/extra/octave/mex-gcc-4.8.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Clemens Buchacher <drizzd@aon.at> +# Date 1369937542 14400 +# Thu May 30 14:12:22 2013 -0400 +# Node ID 122d3f62e179ba044d47e58510905719220d8706 +# Parent e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73 +do not include C++ header in extern "C" context (bug #38746) + +* mex.h: Include mexproto.h outside of extern "C" block. + +diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h +--- a/src/mex.h Mon May 27 21:41:57 2013 +0200 ++++ b/src/mex.h Thu May 30 14:12:22 2013 -0400 +@@ -64,6 +64,8 @@ + + #define mxMAXNAME 64 + ++#include "mexproto.h" ++ + #if defined (__cplusplus) + extern "C" { + #endif +@@ -74,8 +76,6 @@ + void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]); + #endif + +-#include "mexproto.h" +- + /* V4 floating point routines renamed in V5. */ + #define mexIsNaN mxIsNaN + #define mexIsFinite mxIsFinite diff --git a/extra/octave/octave-gethelp.patch b/extra/octave/octave-gethelp.patch deleted file mode 100644 index c0e693abc..000000000 --- a/extra/octave/octave-gethelp.patch +++ /dev/null @@ -1,13 +0,0 @@ -Help parallel compilation -patch by Sebastien Fabbro ---- scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 -+++ scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 -@@ -316,7 +316,7 @@ - - gethelp_SOURCES = gethelp.cc - --.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile -+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp - @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) - if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ - cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index e80bd360c..22c6d4233 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 167256 2012-09-29 12:54:29Z ibiru $ +# $Id: PKGBUILD 186524 2013-05-28 10:31:58Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=4.07 +pkgver=5.00 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.infradead.org/openconnect.html" -depends=('libxml2' 'openssl' 'libproxy' 'vpnc') -makedepends=('intltool') +depends=('libxml2' 'gnutls' 'libproxy' 'vpnc') +makedepends=('intltool' 'python2') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('61f26e7936d8b26c0f7e8119b7ef84b2') +md5sums=('b3677a4b15f8c530615f4c42dadce275') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static make } diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD index 79ccb6b62..4c9edf088 100644 --- a/extra/openobex/PKGBUILD +++ b/extra/openobex/PKGBUILD @@ -1,34 +1,46 @@ -# $Id: PKGBUILD 150568 2012-02-18 15:04:06Z pierre $ -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> +# $Id: PKGBUILD 186964 2013-06-01 15:32:09Z eric $ +# Maintainer: +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=openobex -pkgver=1.5 -pkgrel=3.1 +pkgver=1.7 +pkgrel=5 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') -depends=('bluez' 'libusb-compat') -options=('!libtool') -source=("http://mirror.anl.gov/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fce1b82eafb74bde54fe117372393ba8') +depends=('bluez' 'libusbx') +makedepends=('cmake') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) +md5sums=('11031f6f0b876bb6259bd27106491528') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + mkdir build + + cd ${pkgname}-${pkgver}-Source - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" + # Fix path to obex-check-device in udev rule + # https://bugs.archlinux.org/task/35547 + sed -i 's:/sbin/:/bin/:' udev/openobex.rules.in +} - ./configure --prefix=/usr \ - --enable-apps \ - --enable-irda \ - --enable-bluetooth \ - --enable-usb - make +build() { + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SBINDIR=bin + make all openobex-apps } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd build make DESTDIR="${pkgdir}" install + cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" + install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" } diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD index 9c2b9cd4a..987fb71c8 100644 --- a/extra/openslp/PKGBUILD +++ b/extra/openslp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $ +# $Id: PKGBUILD 185723 2013-05-17 17:27:12Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openslp pkgver=1.2.1 -pkgrel=5 +pkgrel=7 pkgdesc="Open-source implementation of Service Location Protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.openslp.org" @@ -11,16 +11,16 @@ license=('BSD') depends=('bash' 'openssl') backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae openslp.service) md5sums=('ff9999d1b44017281dd00ed2c4d32330' - '4f6889a5944894b8be2c01404a9566d2' - '296dc3c8f75e7a1823fcb9dd97ea0971') + '90eea4426492287ebfc01b2056a3ef9d') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static \ --enable-slpv1 \ --enable-slpv2-security # service would fail to start without this @@ -31,6 +31,5 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service } diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service index e17eb3b1d..a3c306aa2 100644 --- a/extra/openslp/openslp.service +++ b/extra/openslp/openslp.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi +ExecStart=/usr/bin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/openslp/rc.slpd b/extra/openslp/rc.slpd deleted file mode 100755 index 4330c3760..000000000 --- a/extra/openslp/rc.slpd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/slpd` -case "$1" in - start) - stat_busy "Starting SLPD" - [ -z "$PID" ] && /usr/sbin/slpd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/slpd.pid - add_daemon slpd - stat_done - fi - ;; - stop) - stat_busy "Stopping SLPD" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/slpd.pid - rm_daemon slpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD index 5b2adb494..a8cbc854b 100644 --- a/extra/orage/PKGBUILD +++ b/extra/orage/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178517 2013-02-24 22:19:59Z eric $ +# $Id: PKGBUILD 185546 2013-05-14 21:40:26Z andrea $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=orage pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A simple calendar application with reminders for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -19,7 +19,7 @@ source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pk sha1sums=('8b9facb0393385e4d639dd6a886c216729672958') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -31,6 +31,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 28f73b367..db2a26652 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,51 +1,41 @@ -# $Id: PKGBUILD 157748 2012-04-29 05:59:42Z allan $ +# $Id: PKGBUILD 185305 2013-05-13 05:48:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> pkgname=ossp pkgver=1.3.2 -pkgrel=14 +pkgrel=15 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/osspd" license=(GPL2) depends=('fuse>=2.8.0') -makedepends=(libpulse alsa-lib) +makedepends=(libpulse alsa-lib git) optdepends=("libpulse: PulseAudio backend" "alsa-lib: ALSA backend") -backup=(etc/conf.d/osspd) -source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz" - osspd.rc.d osspd.conf.d osspd.service osspd.modules-load) -md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' - 'c58d5107a299fb26ae2099fa4b5ca6a1' - '5a5a3db1bb3c98d48d4794613cf12ef0' - '98dc2b2f55f69e3d2fb37f32742d30d4' +source=('ossp::git://git.code.sf.net/p/osspd/code#commit=097dc7b' + osspd.service osspd.modules-load) +md5sums=('SKIP' + 'd084bd24e3dff167541dd3ff860cdebf' '36c01e144db7cf253df12d8ad9dac942') -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + cd $pkgname + sed -i 's|/sbin|/bin|g' Makefile + sed -i 's|GROUP="audio"|SUBSYSTEM=="cuse", MODE="0666"|' 98-osscuse.rules +} - # Many implicit libraries. - export LDFLAGS="$LDFLAGS -lrt -lpthread" +build() { + cd $pkgname make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/usr/lib/udev/rules.d install - # Make compatible with udev ACLs - sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \ - -i "$pkgdir/usr/lib/udev/rules.d/98-osscuse.rules" - - install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" - - # initscripts - install -Dm755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd" - install -Dm644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd" - - # systemd install -Dm644 "$srcdir/osspd.service" "$pkgdir/usr/lib/systemd/system/osspd.service" install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf" + + install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" } diff --git a/extra/ossp/osspd.conf.d b/extra/ossp/osspd.conf.d deleted file mode 100644 index 05d0d06c6..000000000 --- a/extra/ossp/osspd.conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# Define the audio backend to use here. -# Leave undefined to autodetect. - -# Use Pulseaudio slave -#DSP_SLAVE=/usr/sbin/ossp-padsp - -# Use ALSA slave -#DSP_SLAVE=/usr/sbin/ossp-alsap - -# vim:set ft=sh: diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d deleted file mode 100755 index edb7a1b27..000000000 --- a/extra/ossp/osspd.rc.d +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/osspd - - -if [[ -z "$DSP_SLAVE" ]]; then - # Autodetect - if [[ -x /usr/bin/pulseaudio ]]; then - DSP_SLAVE="/usr/sbin/ossp-padsp" - else - DSP_SLAVE="/usr/sbin/ossp-alsap" - fi -fi - -PID=`pidof -o %PPID /usr/sbin/osspd` -case "$1" in - start) - stat_busy "Starting OSS userspace bridge" - if [ -z "$PID" ]; then - modprobe -a cuse snd-seq-oss &>/dev/null - udevadm settle --quiet - /usr/sbin/osspd --dsp-slave="$DSP_SLAVE" - fi - if [ -n "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon osspd - stat_done - fi - ;; - stop) - stat_busy "Stopping OSS userspace bridge" - [ -n "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon osspd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -# vim:set ft=sh: diff --git a/extra/ossp/osspd.service b/extra/ossp/osspd.service index f0a5f3306..0d67c9213 100644 --- a/extra/ossp/osspd.service +++ b/extra/ossp/osspd.service @@ -2,7 +2,7 @@ Description=OSS Userspace Bridge [Service] -ExecStart=/usr/sbin/osspd -f +ExecStart=/usr/bin/osspd -f [Install] WantedBy=multi-user.target diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index 322688170..bf82523f9 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183540 2013-04-22 20:14:05Z andrea $ +# $Id: PKGBUILD 186908 2013-05-31 18:38:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk2 -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('37b24d69d386eca5b4382424002ed762') +md5sums=('10a78d31de95168eae861d9c5b4be9ed') build() { mkdir build diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index 6fe117199..23a43e728 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183542 2013-04-22 20:16:28Z andrea $ +# $Id: PKGBUILD 186910 2013-05-31 18:41:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=oxygen-gtk3 -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('63ae9752dd39a3310d20d973dd6ea247') +md5sums=('6c6db0188d3780173af1994f34db8a71') build() { mkdir build diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index ff27d987f..96efe63a1 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183529 2013-04-22 13:10:36Z heftig $ +# $Id: PKGBUILD 186511 2013-05-28 09:43:54Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64 mips64el) @@ -11,7 +11,7 @@ license=('BSD') depends=('glibc' 'libtasn1') options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('e4ef21592dbd126b62e1a6d4ad65ce5c' +md5sums=('7bb1703f38fb778054bf57477c78dc8f' 'SKIP') build() { diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD index d8e794ad3..32599db1e 100644 --- a/extra/pango-perl/PKGBUILD +++ b/extra/pango-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183483 2013-04-21 22:21:03Z heftig $ +# $Id: PKGBUILD 186391 2013-05-26 09:24:50Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango-perl pkgver=1.224 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for Pango" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -25,7 +25,7 @@ check() { make test } -package() { +package() { cd "${srcdir}/Pango-${pkgver}" make install DESTDIR="${pkgdir}" } diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index ed37014b7..d2577e193 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183451 2013-04-21 22:11:56Z heftig $ +# $Id: PKGBUILD 185364 2013-05-13 17:48:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.34.0 +pkgver=1.34.1 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27') +sha256sums=('1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c') build() { cd ${pkgname}-${pkgver} diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index 71c85b1dc..ecf78462b 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $ +# $Id: PKGBUILD 185834 2013-05-19 14:21:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.1 -pkgrel=1.2 +pkgrel=2 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -20,6 +20,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-debug \ --disable-rpath make diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch deleted file mode 100644 index c9feea142..000000000 --- a/extra/parted/linux.c.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 -+++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 -@@ -601,17 +601,17 @@ - static int kver = -1; - - struct utsname uts; -- int major; -- int minor; -- int teeny; -+ int major = 0; -+ int minor = 0; -+ int teeny = 0; - - if (kver != -1) - return kver; - - if (uname (&uts)) - return kver = 0; -- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) -- return kver = 0; -+ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); -+ assert (n == 2 || n == 3); - - return kver = KERNEL_VERSION (major, minor, teeny); - } diff --git a/extra/parted/parted.install b/extra/parted/parted.install index 5e00699e8..752a6871b 100644 --- a/extra/parted/parted.install +++ b/extra/parted/parted.install @@ -8,7 +8,7 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } pre_remove() { diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD index 3484ea0de..d3d154910 100644 --- a/extra/perl-async-interrupt/PKGBUILD +++ b/extra/perl-async-interrupt/PKGBUILD @@ -1,10 +1,10 @@ # Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 160503 2012-06-02 10:26:54Z bluewind $ +# $Id: PKGBUILD 186392 2013-05-26 09:24:51Z bluewind $ pkgname=perl-async-interrupt _ver=1.1 pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc='allow C/XS libraries to interrupt perl asynchronously' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) @@ -14,11 +14,10 @@ url=https://metacpan.org/release/Async-Interrupt source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz") md5sums=(18f19b1537ecf5d6195a6a243110e64b) sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e) -_dir="$srcdir/Async-Interrupt-$_ver" build() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT /usr/bin/perl Makefile.PL @@ -27,7 +26,7 @@ build() check() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test @@ -35,7 +34,7 @@ check() package() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" make install INSTALLDIRS=vendor DESTDIR="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete ) diff --git a/extra/perl-bit-vector/Bit-Vector-destroy.patch b/extra/perl-bit-vector/Bit-Vector-destroy.patch new file mode 100644 index 000000000..580f4cf21 --- /dev/null +++ b/extra/perl-bit-vector/Bit-Vector-destroy.patch @@ -0,0 +1,27 @@ +From 0646f34fc3eeb47627822df860986cf7bee4ebed Mon Sep 17 00:00:00 2001 +From: Gisle Aas <gisle@activestate.com> +Date: Thu, 28 Mar 2013 00:41:07 -0700 +Subject: [PATCH] eval { 1->method } triggers different error in 5.17.11 + +--- + t/02_____destroy.t | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/t/02_____destroy.t b/t/02_____destroy.t +index 41e3aa3..adcf995 100644 +--- a/t/02_____destroy.t ++++ b/t/02_____destroy.t +@@ -17,7 +17,9 @@ if (ref($set) eq '') + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { $set->DESTROY(); }; +-if ($@ =~ /Can't call method "DESTROY" without a package or object reference/) ++if ($@ =~ /Can't call method "DESTROY" without a package or object reference/ || ++ $@ =~ /Can't locate object method "DESTROY" via package "1"/ ++) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { Bit::Vector::DESTROY($set); }; +-- +1.7.0.5 + diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD index 648a65b45..e0852fbc8 100644 --- a/extra/perl-bit-vector/PKGBUILD +++ b/extra/perl-bit-vector/PKGBUILD @@ -1,19 +1,29 @@ -# $Id: PKGBUILD 160505 2012-06-02 10:26:56Z bluewind $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 186393 2013-05-26 09:24:52Z bluewind $ +# Maintainer: +# Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> pkgname=perl-bit-vector _cpanname=Bit-Vector pkgver=7.2 -pkgrel=2 +pkgrel=3 pkgdesc='Efficient bit vector, set of integers and "big int" math library' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_cpanname}/" depends=('perl-carp-clan' 'perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('bc6ae34738b8f889290bf50099ff8aed') +source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz + Bit-Vector-destroy.patch) +md5sums=('bc6ae34738b8f889290bf50099ff8aed' + 'c86a55b84cb05dd04004ee8f56ee2ee3') + +prepare() { + cd "${srcdir}/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=84250 + patch -Np1 -i "${srcdir}/Bit-Vector-destroy.patch" +} build() { cd "${srcdir}/${_cpanname}-$pkgver" diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 88c9d0eed..788ff4ddb 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 160507 2012-06-02 10:27:00Z bluewind $ +# $Id: PKGBUILD 186394 2013-05-26 09:24:54Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=5 +pkgver=2.15 +pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64 'mips64el') license=(GPL2) depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") -md5sums=('1699fde3e86f2a036f135ae606d456bf') +source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") +md5sums=('f1cc338445e60dfd22f5a3a302fc22ca') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-crypt-openssl-bignum/PKGBUILD b/extra/perl-crypt-openssl-bignum/PKGBUILD index 845e348c4..08a00553e 100644 --- a/extra/perl-crypt-openssl-bignum/PKGBUILD +++ b/extra/perl-crypt-openssl-bignum/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-bignum pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="OpenSSL's multiprecision integer arithmetic " arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD index 54091888d..37b05c472 100644 --- a/extra/perl-crypt-openssl-random/PKGBUILD +++ b/extra/perl-crypt-openssl-random/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-random pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" diff --git a/extra/perl-crypt-openssl-rsa/PKGBUILD b/extra/perl-crypt-openssl-rsa/PKGBUILD index e8ebbf7c6..f1c0e7f21 100644 --- a/extra/perl-crypt-openssl-rsa/PKGBUILD +++ b/extra/perl-crypt-openssl-rsa/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-rsa pkgver=0.28 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to OpenSSL RSA methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD index fd7e53650..e14a7078a 100644 --- a/extra/perl-crypt-ssleay/PKGBUILD +++ b/extra/perl-crypt-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164793 2012-08-06 08:07:22Z giovanni $ +# $Id: PKGBUILD 186398 2013-05-26 09:25:03Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay pkgver=0.64 -pkgrel=1 +pkgrel=2 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-SSLeay" diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index 825ab0b59..dd12529d5 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 180686 2013-03-25 19:15:37Z bpiotrowski $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186399 2013-05-26 09:25:04Z bluewind $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql -pkgver=4.022 -pkgrel=3 +pkgver=4.023 +pkgrel=2 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') @@ -14,10 +15,10 @@ depends=('libmariadbclient' 'perl-dbi') makedepends=('mariadb') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('20fb571245e3b9ac275b8329025c4bf6') +md5sums=('6ee956cf33ddce6441b36b6c1c983528') build() { - cd "${srcdir}/${_realname}-${pkgver}" + cd $_realname-$pkgver # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql @@ -25,7 +26,7 @@ build() { } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd $_realname-$pkgver mkdir -p /tmp/mysql_test mysql_install_db \ --basedir=/usr \ @@ -40,6 +41,6 @@ check() { } package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" + cd $_realname-$pkgver + make install DESTDIR="$pkgdir" } diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index 99ae66f19..be6f51b14 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163611 2012-07-17 02:14:42Z eric $ +# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $ # Maintainer: # Contributor: Tom Killian <tomk@runbox.com> # Contributor: francois at archlinux dot org @@ -6,12 +6,12 @@ pkgname=perl-dbd-sqlite _cpanname=DBD-SQLite pkgver=1.37 -pkgrel=1 +pkgrel=2 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.61' 'sqlite') +depends=('perl-dbi' 'sqlite') options=('!emptydirs') source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) md5sums=('b8ac1c584befa63cd5ffc391b2366e84') diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index a93b49575..c67d5c757 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,10 +1,8 @@ -# $Id: PKGBUILD 182702 2013-04-12 23:53:53Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Matt Thompson <mattt@defunct.ca> +# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ +# Maintainer: pkgname=perl-dbi -_realname=DBI -pkgver=1.625 +pkgver=1.627 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64' 'mips64el') @@ -12,25 +10,21 @@ license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('b0521be412faff4ec8d511cd5f3f6a31') +source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) +md5sums=('aab49be51b0f4867a1894145b023d2c5') build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. + cd DBI-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make install DESTDIR="${pkgdir}" } - -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD index c7ee8a74e..9cf565b89 100644 --- a/extra/perl-digest-nilsimsa/PKGBUILD +++ b/extra/perl-digest-nilsimsa/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 160523 2012-06-02 10:27:26Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186402 2013-05-26 09:25:08Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-nilsimsa _realname=Digest-Nilsimsa pkgver=0.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl version of Nilsimsa code" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +14,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') replaces=('digest-nilsimsa') provides=('digest-nilsimsa') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD index 33ae605ee..558c61a5a 100644 --- a/extra/perl-digest-sha1/PKGBUILD +++ b/extra/perl-digest-sha1/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 160525 2012-06-02 10:27:28Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186403 2013-05-26 09:25:09Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.13 -pkgrel=3 +pkgrel=4 pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) replaces=('digest-sha1') provides=('digest-sha1') diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 920638e82..b92bc726c 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $ +# $Id: PKGBUILD 186404 2013-05-26 09:25:10Z bluewind $ pkgname=perl-ev pkgver=4.15 -pkgrel=1 +pkgrel=2 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index 377ffc4c9..59b50fd0e 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160531 2012-06-02 10:27:39Z bluewind $ +# $Id: PKGBUILD 186405 2013-05-26 09:25:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi pkgver=0.74 -pkgrel=3 +pkgrel=4 pkgdesc="Fast CGI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/FCGI" diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD index 65a819282..2f37e901d 100644 --- a/extra/perl-guard/PKGBUILD +++ b/extra/perl-guard/PKGBUILD @@ -1,19 +1,17 @@ # Packager: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 180339 2013-03-20 16:34:29Z eric $ +# $Id: PKGBUILD 186406 2013-05-26 09:25:16Z bluewind $ pkgname=perl-guard pkgver=1.022 -pkgrel=2 +pkgrel=3 pkgdesc="safe cleanup blocks" arch=(i686 x86_64 'mips64el') -license=(custom:unknown) -options=(!emptydirs) +url="https://metacpan.org/release/Guard" +license=('GPL' 'PerlArtistic') depends=('perl') -url=https://metacpan.org/release/Guard +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz") -md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c) -sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e) -_distdir="${srcdir}/Guard-${pkgver}" +md5sums=('8d1d8b942fd5d0240f47906a6d6fac8c') build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -22,7 +20,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -30,13 +28,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 4abb00e0e..5e27b6c91 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $ +# $Id: PKGBUILD 186407 2013-05-26 09:25:18Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis -# Contributor: Firmicus <francois.archlinux.org> +# Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser -_realname=HTML-Parser -pkgver=3.70 -pkgrel=1 +pkgver=3.71 +pkgrel=2 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/HTML-Parser/" depends=('perl-html-tagset' 'perl') checkdepends=('perl-test-pod') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('efe7699f5ece3a230d730a3682359c08') +source=(http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-${pkgver}.tar.gz) +md5sums=('9128a45893097dfa3bf03301b19c5efe') build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. + cd HTML-Parser-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index ac9570fc9..b70a97e93 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186408 2013-05-26 09:25:20Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=perl-libintl-perl _realname=libintl-perl pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD index 6e0eefa61..e905a45c0 100644 --- a/extra/perl-list-moreutils/PKGBUILD +++ b/extra/perl-list-moreutils/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 180362 2013-03-20 17:38:22Z eric $ +# $Id: PKGBUILD 186409 2013-05-26 09:25:22Z bluewind $ # Maintainer : Justin "juster" Davis <jrcd83@gmail.com> # Generator : pbjam 0.01 pkgname=perl-list-moreutils pkgver=0.33 -pkgrel=3 +pkgrel=4 pkgdesc="Provide the stuff missing in List::Util" arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.5.30') +depends=('perl') url=http://search.cpan.org/dist/List-MoreUtils source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz") md5sums=(8a33c84028cc2ff3e92c92434b326c0f) sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5) -_distdir="${srcdir}/List-MoreUtils-${pkgver}" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -23,7 +22,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -31,13 +30,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD index e18856ef2..af9dcf2ac 100644 --- a/extra/perl-locale-gettext/PKGBUILD +++ b/extra/perl-locale-gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160541 2012-06-02 10:27:56Z bluewind $ +# $Id: PKGBUILD 186410 2013-05-26 09:25:23Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Paul Mattal <paul@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=9 +pkgrel=10 pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index a5ef861ff..acee27788 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175933 2013-01-25 04:57:21Z eric $ +# $Id: PKGBUILD 186412 2013-05-26 09:25:29Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-dns _realname=Net-DNS pkgver=0.72 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Interface to the DNS resolver." arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index f12fdac29..115fcee5f 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182685 2013-04-12 16:53:38Z giovanni $ +# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay pkgver=1.54 -pkgrel=1 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index 5b7c530b3..c69974650 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175931 2013-01-25 04:44:59Z eric $ +# $Id: PKGBUILD 186411 2013-05-26 09:25:25Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-netaddr-ip _realname=NetAddr-IP pkgver=4.066 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64 'mips64el') license=('PerlArtistic' 'GPL') diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index 4b54e3721..1e38d7bb1 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168746 2012-10-15 12:11:10Z heftig $ +# $Id: PKGBUILD 186414 2013-05-26 09:25:36Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=perl-sdl pkgver=2.540 -pkgrel=3 +pkgrel=4 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64 'mips64el') license=(LGPL) diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD index d43eba51f..a852c7849 100644 --- a/extra/perl-socket6/PKGBUILD +++ b/extra/perl-socket6/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180365 2013-03-20 17:57:40Z eric $ +# $Id: PKGBUILD 186415 2013-05-26 09:25:40Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Generator : CPANPLUS::Dist::Arch 1.18 pkgname='perl-socket6' pkgver='0.23' -pkgrel='2' +pkgrel='3' pkgdesc="getaddrinfo/getnameinfo support module" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') @@ -15,7 +15,6 @@ url='http://search.cpan.org/dist/Socket6' source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') md5sums=('2c02adb13c449d48d232bb704ddbd492') sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') -_distdir="${srcdir}/Socket6-0.23" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -24,21 +23,21 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" /usr/bin/perl Makefile.PL make ) } check() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index 072f8604c..3dedbd70f 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 165152 2012-08-11 20:28:19Z eric $ -# Maintainer: Firmicus <francois.archlinux.org> +# $Id: PKGBUILD 186416 2013-05-26 09:25:42Z bluewind $ +# Maintainer: +# Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> # Contributor: FJ <joostef@gmail.com> pkgname=perl-template-toolkit _realname=Template-Toolkit pkgver=2.24 -pkgrel=1 +pkgrel=2 pkgdesc="Perl template processing system" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl-appconfig' 'perl>=5.10.0') -options=(!emptydirs) +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) md5sums=('c25fdab1beebf8818c2e624bc9f9d212') @@ -25,7 +26,10 @@ build() { check() { cd "${srcdir}/${_realname}-${pkgver}" - make test + + # Failing test can be ignored as it doesn't indicate a problem in main code + # https://rt.cpan.org/Public/Bug/Display.html?id=84778 + make test || true } package() { diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD index d80103978..1de6a2f95 100644 --- a/extra/perl-term-readkey/PKGBUILD +++ b/extra/perl-term-readkey/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 160555 2012-06-02 10:28:20Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186417 2013-05-26 09:25:44Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Francois Charette <francois.archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-term-readkey _realname=TermReadKey pkgver=2.30.02 -pkgrel=2 +pkgrel=3 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD index 733bdbfcb..02af30a9e 100644 --- a/extra/perl-text-iconv/PKGBUILD +++ b/extra/perl-text-iconv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160557 2012-06-02 10:28:23Z bluewind $ -# Maintainer: +# $Id: PKGBUILD 186418 2013-05-26 09:25:46Z bluewind $ +# Maintainer: # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-text-iconv _realname=Text-Iconv pkgver=1.7 -pkgrel=7 +pkgrel=8 pkgdesc="Interface to iconv codeset conversion" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_realname}/" diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch new file mode 100644 index 000000000..5b65557c1 --- /dev/null +++ b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch @@ -0,0 +1,32 @@ +From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001 +From: Father Chrysostomos via RT <bug-Tk@rt.cpan.org> +Date: Mon, 6 Aug 2012 17:42:14 -0400 +Subject: [PATCH] Fix compilation under threaded bleadperl + + Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 > + +CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.) +--- + tkGlue.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tkGlue.c b/tkGlue.c +index 1b7c025..9079302 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -4154,11 +4154,7 @@ int type; + SV *x = NULL; + int prefix = '?'; + name = SvPV(sv,na); +-#ifdef USE_ITHREADS +- CopSTASHPV(PL_curcop) = NULL; +-#else +- CopSTASH(PL_curcop) = NULL; +-#endif ++ CopSTASH_set(PL_curcop, NULL); + switch (type) + { + case TK_CONFIG_SCALARVAR: +-- +1.8.2.3 + diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch new file mode 100644 index 000000000..95067501f --- /dev/null +++ b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch @@ -0,0 +1,47 @@ +From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001 +From: Slaven Rezic <slaven@rezic.de> +Date: Sat, 23 Mar 2013 14:00:58 +0100 +Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an + expression + +--- + IO/IO.xs | 6 +----- + tkGlue.c | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/IO/IO.xs b/IO/IO.xs +index 8ae2a57..42f7515 100644 +--- a/IO/IO.xs ++++ b/IO/IO.xs +@@ -207,11 +207,7 @@ int offset + info.count = 0; + info.error = 0; + info.eof = 0; +- if (!SvUPGRADE(buf, SVt_PV)) +- { +- RETVAL = &PL_sv_undef; +- return; +- } ++ (void)SvUPGRADE(buf, SVt_PV); + SvPOK_only(buf); /* validate pointer */ + Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info); + do +diff --git a/tkGlue.c b/tkGlue.c +index dd3d283..cdc53ad 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -3830,10 +3830,7 @@ ClientData clientData; + return EXPIRE((interp, "Cannot trace readonly variable")); + } + } +- if (!SvUPGRADE(sv, SVt_PVMG)) +- { +- return EXPIRE((interp, "Trace SvUPGRADE failed")); +- } ++ (void)SvUPGRADE(sv, SVt_PVMG); + + if (SvTYPE(sv) == SVt_PVAV) + { +-- +1.8.2.3 + diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 7fabe3a9c..41ac2a372 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 184418 2013-05-06 19:39:04Z foutrelis $ -# Maintainer: François Charette <francois ατ archlinux δοτ org> +# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $ +# Maintainer: +# Contributor: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=4 +pkgrel=5 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" @@ -15,8 +16,22 @@ depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('13275e85f99ee467a86d9598a437abff') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz + 0001-Fix-compilation-under-threaded-bleadperl.patch + 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch) +md5sums=('13275e85f99ee467a86d9598a437abff' + '361c34978746310e5c31b7a47c016b22' + '46448cdac9d7159f15f2d4b2719d171b') + +prepare() { + cd "$srcdir/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=78824 + patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch" + + # https://rt.cpan.org/Public/Bug/Display.html?id=82677 + patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch" +} build() { cd "$srcdir/${_cpanname}-$pkgver" diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD index 2fcc86d9f..6f55b09ef 100644 --- a/extra/perl-xml-parser/PKGBUILD +++ b/extra/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160565 2012-06-02 10:28:38Z bluewind $ +# $Id: PKGBUILD 186420 2013-05-26 09:25:49Z bluewind $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=perl-xml-parser _realname=XML-Parser pkgver=2.41 -pkgrel=3 +pkgrel=4 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 0b4acc826..14940a564 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $ +# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck pkgver=1.25 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 384229473..aa0950a3b 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184818 2013-05-09 07:44:41Z pierre $ +# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.15 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' @@ -38,24 +38,21 @@ md5sums=('145ea5e845e910443ff1eddb3dbcf56a' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - 'f8b206cb8fecb05cb1ded8bee45633ff' + '4af4d94f3db58437eef8db87d16a5fab' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - # adjust paths patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # workaround for pkg-config 0.28 - sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure } build() { local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/php \ --localstatedir=/var \ --with-layout=GNU \ @@ -243,7 +240,7 @@ package_php-fpm() { backup=('etc/php/php-fpm.conf') install='php-fpm.install' - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index fc5ead6f3..1ae62051f 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=forking PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 2e6cea0c8..9b34b6938 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178040 2013-02-14 01:37:10Z foutrelis $ +# $Id: PKGBUILD 186422 2013-05-26 09:25:53Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.7 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index ae6e6d545..92622c22a 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185125 2013-05-11 09:39:44Z andyrtr $ +# $Id: PKGBUILD 186354 2013-05-25 09:05:56Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,13 +7,13 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.1 +_dcpkgver=2.2.2 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=1 -pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" +pkgrel=3 +pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" license=('LGPL') @@ -31,6 +31,7 @@ build() { ./configure --prefix=/usr \ --with-dovecot=/usr/lib/dovecot \ + --with-moduledir=/usr/lib/dovecot/modules \ --disable-static make } diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD index 1e8d62fab..179b54d38 100644 --- a/extra/pkgfile/PKGBUILD +++ b/extra/pkgfile/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pkgfile pkgver=8 -pkgrel=2 +pkgrel=2.1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/pkgfile" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 378e331cb..9711c7064 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184422 2013-05-06 19:39:13Z foutrelis $ +# $Id: PKGBUILD 186342 2013-05-25 02:56:35Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.3 -pkgrel=3 +pkgver=0.22.4 +pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('be915388eaad6865cee5a156c8119ec1' +md5sums=('49d55921ce795778c7231fe9f2fe923b' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index e99b5b627..2b245e213 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $ +# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.10.0 -pkgrel=4 +pkgrel=5 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -13,11 +13,11 @@ arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'libsasl' 'libldap' 'db' 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' 'service' 'rc.d') -sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' +sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 0b32a5ba3..07109de00 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181849 2013-04-04 14:34:55Z dan $ +# $Id: PKGBUILD 186424 2013-05-26 09:25:57Z bluewind $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade pkgver=9.1.9 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 3a602a88d..d4e739b6c 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181847 2013-04-04 14:20:11Z dan $ +# $Id: PKGBUILD 186423 2013-05-26 09:25:56Z bluewind $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.2.4 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD index 896725a0c..9c99a90ac 100644 --- a/extra/ptlib/PKGBUILD +++ b/extra/ptlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178389 2013-02-21 05:32:58Z heftig $ +# $Id: PKGBUILD 185571 2013-05-15 08:05:30Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=ptlib pkgver=2.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Portable Windows Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.opalvoip.org" diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 644b3b6ab..9e1f2fe63 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183322 2013-04-21 22:06:41Z heftig $ +# $Id: PKGBUILD 185354 2013-05-13 17:22:22Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 arch=(i686 x86_64 mips64el) url="https://live.gnome.org/PyGObject" @@ -11,7 +11,7 @@ license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb') +sha256sums=('caa6507edb8cca56e781bf927d88ce99581e1df9978b59a3360cfb74bd9c15f5') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index a0d9d737b..e03fa8012 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 168340 2012-10-08 23:42:19Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $ +# Maintainer: +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> -pkgbase=python-geoip pkgname=('python2-geoip') -pkgver=1.2.7 -pkgrel=2 +pkgbase=python-geoip +pkgver=1.2.8 +pkgrel=1 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64' 'mips64el') -url="http://www.maxmind.com/app/python" +url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" license=('LGPL') depends=('python2' 'geoip') -source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) -md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') +source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz) +sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73') + +build() { + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py build +} package_python2-geoip() { - cd "${srcdir}/GeoIP-Python-${pkgver}" - python2 setup.py build install --root="${pkgdir}" + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py install --root="$pkgdir" -O1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/python-m2crypto/PKGBUILD b/extra/python-m2crypto/PKGBUILD deleted file mode 100644 index 3d3243c01..000000000 --- a/extra/python-m2crypto/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-m2crypto -pkgver=0.21.1 -pkgrel=1.1 -pkgdesc="A crypto and SSL toolkit for Python" -arch=('i686' 'x86_64' 'mips64el') -url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" -license=('BSD') -depends=('python2' 'openssl') -makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") -md5sums=('f93d8462ff7646397a9f77a2fe602d17') - -build() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py build -} - -package() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 - - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/python-m2crypto/openssl1.patch b/extra/python-m2crypto/openssl1.patch deleted file mode 100644 index 59dba554d..000000000 --- a/extra/python-m2crypto/openssl1.patch +++ /dev/null @@ -1,531 +0,0 @@ -Index: tests/test_ssl.py -=================================================================== ---- tests/test_ssl.py (revision 698) -+++ tests/test_ssl.py (working copy) -@@ -405,8 +405,11 @@ - try: - ctx = SSL.Context('sslv23', weak_crypto=1) - s = SSL.Connection(ctx) -- s.connect(self.srv_addr) -- self.failUnlessEqual(s.get_version(), 'SSLv2') -+ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL -+ s.connect(self.srv_addr) -+ self.failUnlessEqual(s.get_version(), 'SSLv2') -+ else: -+ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr) - s.close() - finally: - self.stop_server(pid) -Index: tests/test_x509.py -=================================================================== ---- tests/test_x509.py (revision 698) -+++ tests/test_x509.py (working copy) -@@ -142,7 +142,7 @@ - cn.set_data("Hello There!") - assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text() - -- assert n.as_hash() == 1697185131 -+ self.assertEquals(n.as_hash(), 1697185131) - - self.assertRaises(IndexError, lambda: n[100]) - self.assert_(n[10]) -Index: tests/test_smime.py -=================================================================== ---- tests/test_smime.py (revision 698) -+++ tests/test_smime.py (working copy) -@@ -6,7 +6,7 @@ - """ - - import unittest --from M2Crypto import SMIME, BIO, Rand, X509, EVP -+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err - - class SMIMETestCase(unittest.TestCase): - cleartext = 'some text to manipulate' -@@ -213,7 +213,7 @@ - - self.filenameSmime = 'tests/sig.p7s' - f = BIO.openfile(self.filenameSmime, 'wb') -- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1 -+ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error() - f.close() - - def test_write_pkcs7_der(self): -Index: SWIG/_evp.i -=================================================================== ---- SWIG/_evp.i (revision 695) -+++ SWIG/_evp.i (working copy) -@@ -180,7 +180,7 @@ - - PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter, - keylen, key); -- ret = PyString_FromStringAndSize(key, keylen); -+ ret = PyString_FromStringAndSize((char*)key, keylen); - OPENSSL_cleanse(key, keylen); - return ret; - } -@@ -339,7 +339,7 @@ - klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, - (unsigned char *)dbuf, dlen, iter, - key, NULL); /* Since we are not returning IV no need to derive it */ -- ret = PyString_FromStringAndSize(key, klen); -+ ret = PyString_FromStringAndSize((char*)key, klen); - return ret; - } - -@@ -435,7 +435,7 @@ - PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- ret = PyString_FromStringAndSize(sigbuf, siglen); -+ ret = PyString_FromStringAndSize((char*)sigbuf, siglen); - OPENSSL_cleanse(sigbuf, siglen); - OPENSSL_free(sigbuf); - return ret; -@@ -513,7 +513,7 @@ - PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed"); - return NULL; - } -- der = PyString_FromStringAndSize(pp, len); -+ der = PyString_FromStringAndSize((char*)pp, len); - OPENSSL_free(pp); - return der; - } -Index: SWIG/_ssl.i -=================================================================== ---- SWIG/_ssl.i (revision 695) -+++ SWIG/_ssl.i (working copy) -@@ -17,13 +17,17 @@ - %apply Pointer NONNULL { SSL_CTX * }; - %apply Pointer NONNULL { SSL * }; - %apply Pointer NONNULL { SSL_CIPHER * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { BIO * }; - %apply Pointer NONNULL { DH * }; - %apply Pointer NONNULL { RSA * }; - %apply Pointer NONNULL { EVP_PKEY *}; - %apply Pointer NONNULL { PyObject *pyfunc }; - -+%rename(ssl_get_ciphers) SSL_get_ciphers; -+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl); -+ - %rename(ssl_get_version) SSL_get_version; - extern const char *SSL_get_version(CONST SSL *); - %rename(ssl_get_error) SSL_get_error; -@@ -668,29 +672,25 @@ - return SSL_CIPHER_get_bits(c, NULL); - } - --STACK *ssl_get_ciphers(SSL *ssl) { -- return (STACK *)SSL_get_ciphers(ssl); -+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) { -+ return sk_SSL_CIPHER_num(stack); - } - --int sk_ssl_cipher_num(STACK *stack) { -- return sk_num(stack); -+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) { -+ return sk_SSL_CIPHER_value(stack, idx); - } - --SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) { -- return (SSL_CIPHER *)sk_value(stack, idx); -+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) { -+ return SSL_get_peer_cert_chain(ssl); - } - --STACK *ssl_get_peer_cert_chain(SSL *ssl) { -- return (STACK *)SSL_get_peer_cert_chain(ssl); -+int sk_x509_num(STACK_OF(X509) *stack) { -+ return sk_X509_num(stack); - } - --int sk_x509_num(STACK *stack) { -- return sk_num(stack); -+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) { -+ return sk_X509_value(stack, idx); - } -- --X509 *sk_x509_value(STACK *stack, int idx) { -- return (X509 *)sk_value(stack, idx); --} - %} - - %threadallow i2d_ssl_session; -Index: SWIG/_x509.i -=================================================================== ---- SWIG/_x509.i (revision 695) -+++ SWIG/_x509.i (working copy) -@@ -148,8 +148,15 @@ - extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long); - %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp; - extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+%rename(x509_name_hash) X509_NAME_hash_old; -+extern unsigned long X509_NAME_hash_old(X509_NAME *); -+#else - %rename(x509_name_hash) X509_NAME_hash; - extern unsigned long X509_NAME_hash(X509_NAME *); -+#endif -+ - %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID; - extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int); - -@@ -171,7 +178,7 @@ - if (PyString_Check($input)) { - Py_ssize_t len; - -- $1 = PyString_AsString($input); -+ $1 = (unsigned char *)PyString_AsString($input); - len = PyString_Size($input); - if (len > INT_MAX) { - PyErr_SetString(PyExc_ValueError, "object too large"); -@@ -184,7 +191,7 @@ - } - } - %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data; --extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int); -+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int); - %typemap(in) (CONST unsigned char *, int); - - %rename(x509_req_new) X509_REQ_new; -@@ -230,7 +237,7 @@ - %rename(x509_store_ctx_free) X509_STORE_CTX_free; - extern void X509_STORE_CTX_free(X509_STORE_CTX *); - %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain; --extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); -+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); - - %rename(x509_extension_get_critical) X509_EXTENSION_get_critical; - extern int X509_EXTENSION_get_critical(X509_EXTENSION *); -@@ -348,7 +355,7 @@ - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - } - else { -- ret = PyString_FromStringAndSize(buf, len); -+ ret = PyString_FromStringAndSize((char*)buf, len); - OPENSSL_free(buf); - } - return ret; -@@ -435,12 +442,12 @@ - } - - int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) { -- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0); -+ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0); - } - - /* x509_name_add_entry_by_txt */ - int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) { -- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set); -+ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set); - } - - PyObject *x509_name_get_der(X509_NAME *name) -@@ -450,23 +457,23 @@ - } - - /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */ --STACK *sk_x509_new_null(void) { -- return (STACK *)sk_X509_new_null(); -+STACK_OF(X509) *sk_x509_new_null(void) { -+ return sk_X509_new_null(); - } - - /* sk_X509_free() is a macro. */ --void sk_x509_free(STACK *stack) { -- sk_X509_free((STACK_OF(X509) *)stack); -+void sk_x509_free(STACK_OF(X509) *stack) { -+ sk_X509_free(stack); - } - - /* sk_X509_push() is a macro. */ --int sk_x509_push(STACK *stack, X509 *x509) { -- return sk_X509_push((STACK_OF(X509) *)stack, x509); -+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) { -+ return sk_X509_push(stack, x509); - } - - /* sk_X509_pop() is a macro. */ --X509 *sk_x509_pop(STACK *stack) { -- return sk_X509_pop((STACK_OF(X509) *)stack); -+X509 *sk_x509_pop(STACK_OF(X509) *stack) { -+ return sk_X509_pop(stack); - } - - int x509_store_load_locations(X509_STORE *store, const char *file) { -@@ -493,21 +500,29 @@ - return X509_REQ_set_version(x, version); - } - --int x509_req_add_extensions(X509_REQ *req, STACK *exts) { -- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts); -+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) { -+ return X509_REQ_add_extensions(req, exts); - } - --X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len); -+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -+ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len); - } - --LHASH * --x509v3_lhash(){ -- return lh_new(NULL,NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+LHASH_OF(CONF_VALUE) -+#else -+LHASH -+#endif -+*x509v3_lhash() { -+ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */ - } - - X509V3_CTX * --x509v3_set_conf_lhash(LHASH * lhash){ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) { -+#else -+x509v3_set_conf_lhash(LHASH * lhash) { -+#endif - X509V3_CTX * ctx; - if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) { - PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash"); -@@ -517,11 +532,20 @@ - return ctx; - } - --X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+X509_EXTENSION * -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) { -+#else -+x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+#endif - X509_EXTENSION * ext = NULL; - ext = X509V3_EXT_conf(conf, ctx, name, value); - PyMem_Free(ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ lh_CONF_VALUE_free(conf); -+#else - lh_free(conf); -+#endif - return ext; - } - -@@ -543,33 +567,33 @@ - } - - /* sk_X509_EXTENSION_new_null is a macro. */ --STACK *sk_x509_extension_new_null(void) { -- return (STACK *)sk_X509_EXTENSION_new_null(); -+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) { -+ return sk_X509_EXTENSION_new_null(); - } - - /* sk_X509_EXTENSION_free() is a macro. */ --void sk_x509_extension_free(STACK *stack) { -- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack); -+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) { -+ sk_X509_EXTENSION_free(stack); - } - - /* sk_X509_EXTENSION_push() is a macro. */ --int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) { -- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext); -+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) { -+ return sk_X509_EXTENSION_push(stack, x509_ext); - } - - /* sk_X509_EXTENSION_pop() is a macro. */ --X509_EXTENSION *sk_x509_extension_pop(STACK *stack) { -- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack); -+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_pop(stack); - } - - /* sk_X509_EXTENSION_num() is a macro. */ --int sk_x509_extension_num(STACK *stack) { -- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack); -+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_num(stack); - } - - /* sk_X509_EXTENSION_value() is a macro. */ --X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) { -- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i); -+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) { -+ return sk_X509_EXTENSION_value(stack, i); - } - - /* X509_STORE_CTX_get_app_data is a macro. */ -@@ -590,7 +614,7 @@ - #define I2DTYPE int (*)() - #endif - --STACK * -+STACK_OF(X509) * - make_stack_from_der_sequence(PyObject * pyEncodedString){ - STACK_OF(X509) *certs; - Py_ssize_t encoded_string_len; -@@ -606,7 +630,7 @@ - return NULL; - } - -- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); -+ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); - if (!certs) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -@@ -616,13 +640,13 @@ - } - - PyObject * --get_der_encoding_stack(STACK * stack){ -+get_der_encoding_stack(STACK_OF(X509) *stack){ - PyObject * encodedString; - - unsigned char * encoding; - int len; - -- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); -+ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); - if (!encoding) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -Index: SWIG/_aes.i -=================================================================== ---- SWIG/_aes.i (revision 695) -+++ SWIG/_aes.i (working copy) -@@ -76,7 +76,7 @@ - AES_encrypt((const unsigned char *)in, out, key); - else - AES_decrypt((const unsigned char *)in, out, key); -- return PyString_FromStringAndSize(out, outlen); -+ return PyString_FromStringAndSize((char*)out, outlen); - } - - int AES_type_check(AES_KEY *key) { -Index: SWIG/_util.i -=================================================================== ---- SWIG/_util.i (revision 695) -+++ SWIG/_util.i (working copy) -@@ -48,7 +48,7 @@ - PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- obj = PyString_FromStringAndSize(ret, len); -+ obj = PyString_FromStringAndSize((char*)ret, len); - OPENSSL_free(ret); - return obj; - } -Index: SWIG/_m2crypto.i -=================================================================== ---- SWIG/_m2crypto.i (revision 695) -+++ SWIG/_m2crypto.i (working copy) -@@ -38,6 +38,19 @@ - #define CONST098 - #endif - -+/* Bring in STACK_OF macro definition */ -+%include <openssl/safestack.h> -+ -+/* Bring in LHASH_OF macro definition */ -+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes -+ XXX stdio.h etc. which we fail to include. So we have to (re)define -+ XXX LHASH_OF here instead. -+%include <openssl/lhash.h> -+*/ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define LHASH_OF(type) struct lhash_st_##type -+#endif -+ - %include constraints.i - %include _threads.i - %include _lib.i -Index: SWIG/_rand.i -=================================================================== ---- SWIG/_rand.i (revision 695) -+++ SWIG/_rand.i (working copy) -@@ -87,7 +87,7 @@ - Py_INCREF(Py_None); - return Py_None; - } else { -- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n)); -+ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n)); - PyMem_Free(blob); - PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret)); - return tuple; -Index: SWIG/_pkcs7.i -=================================================================== ---- SWIG/_pkcs7.i (revision 695) -+++ SWIG/_pkcs7.i (working copy) -@@ -12,7 +12,7 @@ - %apply Pointer NONNULL { EVP_CIPHER * }; - %apply Pointer NONNULL { EVP_PKEY * }; - %apply Pointer NONNULL { PKCS7 * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { X509 * }; - - %rename(pkcs7_new) PKCS7_new; -@@ -54,8 +54,8 @@ - - %threadallow pkcs7_encrypt; - %inline %{ --PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags); -+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -+ return PKCS7_encrypt(stack, bio, cipher, flags); - } - - PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) { -@@ -96,14 +96,14 @@ - - %threadallow pkcs7_sign1; - %inline %{ --PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) { -- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags); -+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) { -+ return PKCS7_sign(x509, pkey, stack, bio, flags); - } - %} - - %threadallow pkcs7_verify1; - %inline %{ --PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) { -+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) { - int outlen; - char *outbuf; - BIO *bio; -@@ -113,7 +113,7 @@ - PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1"); - return NULL; - } -- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) { -+ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) { - PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error())); - BIO_free(bio); - return NULL; -@@ -131,7 +131,7 @@ - return ret; - } - --PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) { -+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) { - return pkcs7_verify1(pkcs7, stack, store, NULL, flags); - } - %} -@@ -229,7 +229,7 @@ - } - - /* return STACK_OF(X509)* */ --STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) { -+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) { - return PKCS7_get0_signers(p7, certs, flags); - } - diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 5ebc686fd..d991489df 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $ +# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" @@ -18,8 +18,10 @@ optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + python-3.3.2-CVE-2013-2099.patch) +sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad' + 'b7a386b2e2f0811b344898500860ec31ba81ed4d') build() { cd "${srcdir}/Python-${pkgver}" @@ -33,12 +35,14 @@ build() { rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* - if [ "$CARCH" != "mips64el" ]; then extraconf=--with-valgrind else extraconf="" fi + + patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch + ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -55,8 +59,7 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ - test_urllib test_uuid test_pydoc test_logging + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging } package() { diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch new file mode 100644 index 000000000..8162d8e54 --- /dev/null +++ b/extra/python/python-3.3.2-CVE-2013-2099.patch @@ -0,0 +1,50 @@ + +# HG changeset patch +# User Antoine Pitrou <solipsis@pitrou.net> +# Date 1368892602 -7200 +# Node ID c627638753e2d25a98950585b259104a025937a9 +# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d +Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099). + +diff --git a/Lib/ssl.py b/Lib/ssl.py +--- a/Lib/ssl.py ++++ b/Lib/ssl.py +@@ -129,9 +129,16 @@ class CertificateError(ValueError): + pass + + +-def _dnsname_to_pat(dn): ++def _dnsname_to_pat(dn, max_wildcards=1): + pats = [] + for frag in dn.split(r'.'): ++ if frag.count('*') > max_wildcards: ++ # Issue #17980: avoid denials of service by refusing more ++ # than one wildcard per fragment. A survery of established ++ # policy among SSL implementations showed it to be a ++ # reasonable choice. ++ raise CertificateError( ++ "too many wildcards in certificate DNS name: " + repr(dn)) + if frag == '*': + # When '*' is a fragment by itself, it matches a non-empty dotless + # fragment. +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase + self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') + self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') + ++ # Issue #17980: avoid denials of service by refusing more than one ++ # wildcard per fragment. ++ cert = {'subject': ((('commonName', 'a*b.com'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b.co*'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b*.com'),),)} ++ with self.assertRaises(ssl.CertificateError) as cm: ++ ssl.match_hostname(cert, 'axxbxxc.com') ++ self.assertIn("too many wildcards", str(cm.exception)) ++ + def test_server_side(self): + # server_hostname doesn't work for server sockets + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 11562e06f..440e51d2f 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182151 2013-04-08 10:27:26Z stephane $ +# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.4 +pkgver=2.7.5 pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" @@ -17,7 +17,7 @@ optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e') +sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf') build() { cd "${srcdir}/Python-${pkgver}" diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 4c039e8f4..2c9cdb73d 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184424 2013-05-06 19:39:18Z foutrelis $ +# $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD index c402efc78..47e3f011c 100644 --- a/extra/qtchooser/PKGBUILD +++ b/extra/qtchooser/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 182622 2013-04-11 12:14:29Z andrea $ +# $Id: PKGBUILD 185512 2013-05-14 12:30:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtchooser pkgver=26 -pkgrel=3 +pkgrel=4 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system' arch=('i686' 'x86_64' 'mips64el') url='http://qt.gitorious.org/qt/qtchooser' license=('GPL') depends=('gcc-libs') source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz" - {3,4,5}.conf) + {3,4,5}.conf + 'give-home-configs-precedence.patch') md5sums=('a188a5cb63113130e0d05fe4d5bf4e95' '7c5da2b7911d1c4fabc63d6ef00f0020' 'aa4d49b269e1b806f5eea170801f0aa6' - 'cf83f09a9a5a44d898b93f624d74dd11') + 'cf83f09a9a5a44d898b93f624d74dd11' + '13478e4685804c9f79e824b4220bbc2c') + +prepare() { + cd ${pkgname}-${pkgver}-g97962d2 + + patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch +} build() { cd ${pkgname}-${pkgver}-g97962d2 diff --git a/extra/qtchooser/give-home-configs-precedence.patch b/extra/qtchooser/give-home-configs-precedence.patch new file mode 100644 index 000000000..d9575e937 --- /dev/null +++ b/extra/qtchooser/give-home-configs-precedence.patch @@ -0,0 +1,35 @@ +From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001 +From: Andrea Scarpino <andrea@archlinux.org> +Date: Mon, 15 Apr 2013 23:19:39 +0200 +Subject: [PATCH] Give home configurations precedence over system ones + +Change-Id: Ib0c4cf47c0ff5f716949cc5653ba27dad3558489 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- + src/qtchooser/main.cpp | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp +index da54b16..514503d 100644 +--- a/src/qtchooser/main.cpp ++++ b/src/qtchooser/main.cpp +@@ -272,12 +272,13 @@ vector<string> ToolWrapper::searchPaths() const + { + vector<string> paths; + +- // search the XDG config location directories +- paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); +- + string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config"); + paths.push_back(localDir); + ++ // search the XDG config location directories ++ vector<string> xdgPaths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); ++ paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end()); ++ + for (vector<string>::iterator it = paths.begin(); it != paths.end(); ++it) + *it += "/qtchooser/"; + +-- +1.7.1 + diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index fb728058e..7925e4a87 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178310 2013-02-19 23:15:41Z eric $ +# $Id: PKGBUILD 185732 2013-05-18 02:31:12Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.3.3 +pkgver=5.3.4 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') @@ -13,19 +13,25 @@ makedepends=('gsfonts' 'sqlite') options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ - drracket.desktop) -sha1sums=('96995fe20b332c4644dd51668851193b16976071' - 'a20808f6b250225704856f82a544681a962a299d') + drracket.desktop racket-libpng16.patch) +sha1sums=('7e37738e34c73a25bc7d51aeb53cf3dc5b0d533d' + 'a20808f6b250225704856f82a544681a962a299d' + '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/racket-libpng16.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}/src" - [ "$CARCH" == "x86_64" ] && export CFLAGS+="-fPIC" + cd ${pkgname}-${pkgver}/src + [ "$CARCH" == "x86_64" ] && export CFLAGS+=" -fPIC" ./configure --prefix=/usr --enable-shared make } package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" + cd ${pkgname}-${pkgver}/src make DESTDIR="${pkgdir}" install install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drracket.xpm" diff --git a/extra/racket/racket-libpng16.patch b/extra/racket/racket-libpng16.patch new file mode 100644 index 000000000..8e4b605f2 --- /dev/null +++ b/extra/racket/racket-libpng16.patch @@ -0,0 +1,52 @@ +From 5629a6156a5720e51a277849f75b3135cb93664f Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Wed, 15 May 2013 20:28:05 -0600 +Subject: [PATCH] support libpng16 + +--- + collects/racket/draw/unsafe/png.rkt | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt +index 596fcb4..a6b028d 100644 +--- a/collects/racket/draw/unsafe/png.rkt ++++ b/collects/racket/draw/unsafe/png.rkt +@@ -10,11 +10,15 @@ + [(unix) + ;; Most Linux distros supply "libpng12", while other Unix + ;; variants often have just "libpng", etc. +- (ffi-lib "libpng15" '("15" "") +- #:fail (lambda () +- (ffi-lib "libpng12" '("0" "") +- #:fail (lambda () +- (ffi-lib "libpng")))))] ++ (let loop ([alts '(("libpng16" ("16" "")) ++ ("libpng15" ("15" "")) ++ ("libpng12" ("0" "")) ++ ("libpng"))]) ++ (cond ++ [(null? alts) #f] ++ [else (apply ffi-lib (car alts) ++ #:fail (lambda () ++ (loop (cdr alts))))]))] + [(macosx) (ffi-lib "libpng15.15.dylib")] + [(windows) + (ffi-lib "zlib1.dll") +@@ -29,9 +33,12 @@ + ;; assume that other versions are also ok + (define PNG_LIBPNG_VER_STRING (string->bytes/latin-1 + (let ([v (png_access_version_number)]) +- (format "~s.~s" ++ (format "~s.~s~a" + (quotient v 10000) +- (quotient (remainder v 10000) 100))))) ++ (quotient (remainder v 10000) 100) ++ (if (zero? (remainder v 100)) ++ "" ++ (format ".~a" (remainder v 100))))))) + + (define _png_structp (_cpointer 'png_structp)) + (define _png_infop (_cpointer 'png_infop)) +-- +1.8.1.6 + diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index f8c9c8f52..13e2dc00b 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $ +# $Id: PKGBUILD 186425 2013-05-26 09:26:01Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=razor pkgver=2.85 -pkgrel=1 +pkgrel=2 pkgdesc="A distributed, collaborative, spam detection and filtering network" arch=('i686' 'x86_64' 'mips64el') url="http://razor.sourceforge.net" diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index b28e1b2ed..1f8a9b70a 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184432 2013-05-06 19:39:40Z foutrelis $ +# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.7 -pkgrel=6 +pkgrel=7 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index debe6ffc0..b0aeb467b 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,41 +1,47 @@ -# $Id: PKGBUILD 165071 2012-08-09 23:24:40Z heftig $ +# $Id: PKGBUILD 185307 2013-05-13 06:17:53Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=rtkit pkgver=0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64' 'mips64el') url="http://git.0pointer.de/?p=rtkit.git" license=(GPL 'custom:BSD') -depends=(dbus polkit) +depends=(dbus polkit systemd) install=rtkit.install -source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz) -md5sums=('a96c33b9827de66033d2311f82d79a5d') +source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz + libsystemd.patch) +md5sums=('a96c33b9827de66033d2311f82d79a5d' + '35089c0a284005f4abcf45168415857e') -build() { +prepare() { cd $pkgname-$pkgver + patch -Np1 -i ../libsystemd.patch + autoreconf -fi +} +build() { + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib/$pkgname \ --with-systemdsystemunitdir=/usr/lib/systemd/system - make + + ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - # DBus configuration - mkdir -p "$pkgdir/usr/share/dbus-1/interfaces" - ./rtkit-daemon --introspect \ - > "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml" + install -Dm644 org.freedesktop.RealtimeKit1.xml \ + "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml" - # Client license install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" sed -ne '4,25p' rtkit.c >"$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/extra/rtkit/libsystemd.patch b/extra/rtkit/libsystemd.patch new file mode 100644 index 000000000..51398a76a --- /dev/null +++ b/extra/rtkit/libsystemd.patch @@ -0,0 +1,57 @@ +diff -u -r rtkit-0.11/configure.ac rtkit-0.11-sd/configure.ac +--- rtkit-0.11/configure.ac 2012-05-15 15:25:40.000000000 +0200 ++++ rtkit-0.11-sd/configure.ac 2013-05-13 08:12:17.616825455 +0200 +@@ -115,6 +115,7 @@ + AC_SEARCH_LIBS([cap_init], [cap]) + + PKG_CHECK_MODULES(DBUS, dbus-1) ++PKG_CHECK_MODULES(LIBSYSTEMD_DAEMON, libsystemd-daemon) + + AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), +diff -u -r rtkit-0.11/Makefile.am rtkit-0.11-sd/Makefile.am +--- rtkit-0.11/Makefile.am 2012-05-15 15:38:05.000000000 +0200 ++++ rtkit-0.11-sd/Makefile.am 2013-05-13 08:12:18.086822253 +0200 +@@ -56,13 +56,14 @@ + endif + + rtkit_daemon_SOURCES = \ +- rtkit-daemon.c rtkit.h \ +- sd-daemon.c sd-daemon.h ++ rtkit-daemon.c rtkit.h + rtkit_daemon_LDADD = \ +- $(DBUS_LIBS) ++ $(DBUS_LIBS) \ ++ $(LIBSYSTEMD_DAEMON_LIBS) + rtkit_daemon_CFLAGS = \ + $(AM_CFLAGS) \ +- $(DBUS_CFLAGS) ++ $(DBUS_CFLAGS) \ ++ $(LIBSYSTEMD_DAEMON_CFLAGS) + + rtkitctl_SOURCES = \ + rtkitctl.c rtkit.h +@@ -93,7 +94,3 @@ + + DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) +- +-update-systemd: +- curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > sd-daemon.c +- curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > sd-daemon.h +diff -u -r rtkit-0.11/rtkit-daemon.c rtkit-0.11-sd/rtkit-daemon.c +--- rtkit-0.11/rtkit-daemon.c 2012-05-15 15:25:40.000000000 +0200 ++++ rtkit-0.11-sd/rtkit-daemon.c 2013-05-13 08:13:07.933149359 +0200 +@@ -50,9 +50,9 @@ + #include <dirent.h> + #include <syslog.h> + #include <grp.h> ++#include <systemd/sd-daemon.h> + + #include "rtkit.h" +-#include "sd-daemon.h" + + #ifndef __linux__ + #error "This stuff only works on Linux!" +Only in rtkit-0.11: sd-daemon.c +Only in rtkit-0.11: sd-daemon.h diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 870f3733d..048fa5b79 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley <jrutley@gmail.com> pkgname=('ruby' 'ruby-docs') -pkgver=2.0.0_p0 +pkgver=2.0.0_p195 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a' +md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index cfcdf94b6..4e3f4dccc 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183456 2013-04-21 22:12:05Z heftig $ +# $Id: PKGBUILD 185316 2013-05-13 09:39:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3f71bec31be373707dd0edd88aeea49c74429f258fc5a7e01bb979563349c64d') +sha256sums=('26dea444e69f68cec822e58080162d056528a518b9b155503016a19dda0b48a4') build() { cd $pkgname-$pkgver diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 82d460c35..f45b52785 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,18 +10,18 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.5 +pkgver=4.0.6 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.5 -pkgrel=2 +_realver=4.0.6 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' - 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd @@ -67,6 +67,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a cd ${srcdir}/samba-${_realver} ./configure --enable-fhs \ --prefix=/usr \ + --sbindir=/usr/bin \ --libdir=/usr/lib \ --localstatedir=/var \ --with-configdir=/etc/samba \ @@ -196,12 +197,12 @@ install=samba.install find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" - find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \ + find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" # Make admin scripts look in the right place for the samba python module - for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \ - sbin/samba_upgradedns bin/samba-tool + for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \ + bin/samba_upgradedns bin/samba-tool do sed -i "/^sys\.path\.insert/ a\ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ @@ -244,18 +245,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } - -md5sums=('58ec2fec08872b72f8fd526f2da20a9e' +md5sums=('db9dc684f167a602c18acc19d3e7e401' '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' + 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' - '5602ba59bc60502c99e6d5a5ae16aecf' + 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' - 'd0b18dd7f5fafc8d25cb3a7c37c6d920' + 'c0c561c47de24d33dd48aae79823810b' 'a78b9aa93eb14b0ac445897395693225' - '90845b89f2321cb19c0b13f385f1782a' - '70186fa43510bf99e3afd5951e814fbf' + 'e8ebc966b5684a557284dd435daaab7f' + '70afd2db60a2e8eff7615dbdecd887ac' '6db11f3dd2112a4b7a73007b189bef3f' - 'b0de262f9c62acd162e873658f33d063' - '64a52bc798033aeabfae3410bd559aa4' + 'fd6be0cf1e5b3f0c3599fdb95455d19f' + '081c20b9d994d69ce5c37dcf96f10572' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 4f86c4db9..34c66d5d6 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/sbin/nmbd -D +ExecStart=/usr/bin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/samba b/extra/samba/samba deleted file mode 100755 index 6098ee0cb..000000000 --- a/extra/samba/samba +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba - -[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) - -case "$1" in - start) - rc=0 - stat_busy "Starting Samba Server" - if [ ! -x /var/log/samba ] ; then - install -m755 -d /var/log/samba - fi - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] && /usr/sbin/$d -D - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon samba - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping Samba Server" - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] || kill $PID &> /dev/null - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - rm /run/samba/smbd.pid &>/dev/null - rm /run/samba/nmbd.pid &>/dev/null - rm /run/samba/winbindd.pid &>/dev/null - rm_daemon samba - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/samba/samba.service b/extra/samba/samba.service index e423a7d2d..562d42562 100644 --- a/extra/samba/samba.service +++ b/extra/samba/samba.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/var/run/samba.pid LimitNOFILE=16384 EnvironmentFile=-/etc/conf.d/samba -ExecStart=/usr/sbin/samba $SAMBAOPTIONS +ExecStart=/usr/bin/samba $SAMBAOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index 12c08474a..de34c2a5f 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/bin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service index e1f71be3f..071eb5788 100644 --- a/extra/samba/smbd@.service +++ b/extra/samba/smbd@.service @@ -2,6 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -ExecStart=/usr/sbin/smbd -F +ExecStart=/usr/bin/smbd -F ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd index 2e62a82b2..b083ad860 100644 --- a/extra/samba/swat.xinetd +++ b/extra/samba/swat.xinetd @@ -3,7 +3,7 @@ service swat socket_type = stream wait = no user = root - server = /usr/sbin/swat + server = /usr/bin/swat log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service index a036b2c03..ebbc31c47 100644 --- a/extra/samba/swat@.service +++ b/extra/samba/swat@.service @@ -3,5 +3,5 @@ Description=SWAT Samba Web Admin Tool After=local-fs.target [Service] -ExecStart=/usr/sbin/swat +ExecStart=/usr/bin/swat StandardInput=socket diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 02e3014b1..20bac9a83 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/sbin/winbindd -D +ExecStart=/usr/bin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index a8fc7e654..494ff622e 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $ +# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,12 +6,12 @@ pkgname=sane pkgver=1.0.23 -pkgrel=4 +pkgrel=6 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') +depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz @@ -34,13 +34,14 @@ prepare() { build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - ./configure --prefix=/usr \ + ./configure --prefix=/usr --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ --enable-avahi \ --enable-pthread \ --disable-rpath \ + --enable-libusb_1_0 \ --disable-locking make } @@ -69,8 +70,8 @@ package () { "${pkgdir}/usr/lib/systemd/system/saned@.service" } md5sums=('e226a89c54173efea80e91e9a5eb6573' - '5f519030392d599e2ad348159ec4c96f' + 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' - 'e44bd4c994a52d6f472463d1eb0a03be' + '3f9fe36b0c4ff0b01b53b1cffa5d9700' 'e65dbefb7c3d69955fb6eb3ace14aa12' '44e77692c52db15b0f530a1d9a8e1296') diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd index 67f08a656..311ca6202 100644 --- a/extra/sane/sane.xinetd +++ b/extra/sane/sane.xinetd @@ -5,7 +5,7 @@ service sane-port wait = no user = nobody group = scanner - server = /usr/sbin/saned + server = /usr/bin/saned # disabled by default! disable = yes } diff --git a/extra/sane/saned.service b/extra/sane/saned.service index 69e833e7e..6b2a3f7a7 100644 --- a/extra/sane/saned.service +++ b/extra/sane/saned.service @@ -3,6 +3,6 @@ Description=Scanner Service [Service] Group=scanner -ExecStart=/usr/sbin/saned +ExecStart=/usr/bin/saned StandardInput=socket StandardError=syslog diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index d232dfb91..78426f80f 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184249 2013-05-05 00:06:28Z bisson $ +# $Id: PKGBUILD 185781 2013-05-18 17:19:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim pkgver=1.4.14 -pkgrel=2 +pkgrel=3 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('LGPL') @@ -19,6 +19,10 @@ sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b') install=install +prepare() { + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ @@ -32,5 +36,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - find "${pkgdir}" -name *.png -exec optipng {} \; # libpng-1.6 has higher standards } diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 79e2e11ef..bcc7c7431 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183457 2013-04-21 22:12:07Z heftig $ +# $Id: PKGBUILD 185473 2013-05-14 11:01:28Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') @@ -19,7 +19,7 @@ groups=(gnome-extra) install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('c1a1d97618a37a79e19902e00f3a0de7cfb947b52eb9282ea09e5f9f73151e7a' +sha256sums=('b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 261ca4b05..676484541 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183306 2013-04-21 10:49:31Z giovanni $ +# $Id: PKGBUILD 185826 2013-05-19 13:29:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> @@ -6,7 +6,7 @@ pkgname=smartmontools pkgver=6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') @@ -24,6 +24,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --enable-drivedb \ --with-libcap-ng=yes \ diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 32516b6d8..e81a10f01 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179497 2013-03-05 17:07:36Z giovanni $ +# $Id: PKGBUILD 186369 2013-05-26 07:53:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('438ea64ed1296de6618677758257445b') +md5sums=('1b15d7f0f4ad89b0fe730629ec53c2ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 53c93d271..894ad7771 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180122 2013-03-17 18:38:44Z schiv $ +# $Id: PKGBUILD 186867 2013-05-31 11:57:47Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: see .contrib pkgname=snd -pkgver=13.5 +pkgver=13.7 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('bc8915f28110744237330e8b93638bd3') +md5sums=('220b0155bace73d4442374a837c2f5fd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index b15e23f42..fd25d6b87 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159299 2012-05-21 08:16:43Z bisson $ +# $Id: PKGBUILD 186472 2013-05-27 06:47:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat -pkgver=1.7.2.1 +pkgver=1.7.2.2 pkgrel=1 pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' @@ -12,11 +12,10 @@ license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('readline' 'openssl') source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('6e3328cc409550b2367efa8028fe4436e84eb490') +sha1sums=('588294c17373d52a8ac877dcd599ef26f14b110b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -26,6 +25,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index ca5e880db..8a2413b2f 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 182667 2013-04-12 14:07:12Z andyrtr $ +# $Id: PKGBUILD 186040 2013-05-20 18:16:41Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3071602 +_amalgamationver=3071700 _docver=${_amalgamationver} #_docver=3071601 -pkgver=3.7.16.2 +pkgver=3.7.17 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -sha1sums=('85bf857cf86f34831d55d7ba97606dba581b8d62' +sha1sums=('e31958e56b1d7bef9433b1ff2e875c8c290d37f4' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index c7eb2b598..a5a36561f 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $ +# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.7.9 -pkgrel=1 +pkgrel=6 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf' 'systemd') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' +makedepends=('krb5' 'apache' 'python2' 'perl>=5.18' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') [ "$CARCH" = "mips64el" ] && \ makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' @@ -22,22 +22,18 @@ url="http://subversion.apache.org/" provides=('svn') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -sha1sums=('453757bae78a800997559f2232483ab99238ec1e' - '5ce5adc5f5cae5a2d569a89b5e4498623feae84a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' - '9f6790d842cf3e0228b007483a43e39a42724068' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - +md5sums=('8d532025771a67c06c23f299699f056f' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 @@ -93,8 +89,7 @@ package() { ## svnserve ... - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + # xinetd install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn # ... systemd diff --git a/extra/subversion/svnserve b/extra/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/extra/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 2a4cc6fce..3c54082b4 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179615 2013-03-08 18:57:03Z dreisner $ +# $Id: PKGBUILD 185556 2013-05-15 00:48:48Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -14,8 +14,7 @@ depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd') makedepends=('flex' 'pkg-config' 'python2') optdepends=('logrotate: for rotating log files') options=('!libtool') -backup=('etc/syslog-ng/modules.conf' - 'etc/syslog-ng/scl.conf' +backup=('etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') install=$pkgname.install @@ -33,6 +32,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc/syslog-ng \ --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ --localstatedir=/var/lib/syslog-ng \ --datadir=/usr/share/syslog-ng \ --with-pidfile-dir=/run \ @@ -50,4 +50,6 @@ package() { install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + + sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service" } diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index b16987670..8cfeadcbc 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 185094 2013-05-11 04:02:37Z eric $ +# $Id: PKGBUILD 186929 2013-06-01 08:46:45Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer pkgver=1.4.1 -pkgrel=1 +pkgrel=3 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' - 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') +depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib' + 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') @@ -34,10 +34,11 @@ build() { --sysconfdir=/etc \ --with-udev-rules - make + make udevhelperdir=/usr/lib/udev } package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \ + udevrulesdir=/usr/lib/udev/rules.d install } diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD index 171c06763..c7a65c864 100644 --- a/extra/tcpdump/PKGBUILD +++ b/extra/tcpdump/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184005 2013-04-30 18:42:55Z giovanni $ +# $Id: PKGBUILD 185812 2013-05-19 11:54:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=tcpdump pkgver=4.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for network monitoring and data acquisition" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org" @@ -13,7 +13,7 @@ depends=('libpcap' 'openssl') source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz" 'tcpdump_duplicate_executable.patch') md5sums=('6f75aabcffd012f73bd7c331bb5d8232' - '96c116e5ed51759a029bb6c236d63178') + '01379e4a12a208ce951c6c2abe80300f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,6 +22,7 @@ build() { patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-ipv6 make } diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch index bb3e60f1a..f3efb6d40 100644 --- a/extra/tcpdump/tcpdump_duplicate_executable.patch +++ b/extra/tcpdump/tcpdump_duplicate_executable.patch @@ -1,6 +1,6 @@ ---- a/Makefile.in 2012-06-12 18:56:20.000000000 +0200 -+++ b/Makefile.in 2012-06-13 08:41:09.000000000 +0200 -@@ -409,7 +409,6 @@ +--- a/Makefile.in 2013-03-24 22:49:18.000000000 +0100 ++++ b/Makefile.in 2013-05-19 13:44:29.000000000 +0200 +@@ -326,7 +326,6 @@ [ -d $(DESTDIR)$(sbindir) ] || \ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index 93507bbfc..8a726cd20 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183634 2013-04-25 18:08:44Z ioni $ +# $Id: PKGBUILD 186515 2013-05-28 09:58:49Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('telepathy-glib') makedepends=('libxslt' 'python2') install=telepathy-idle.install source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('56f960ed1d9ed0c01e0b9f7eb68dbebe') +md5sums=('afabda908a798aac3a427f4564af113a') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index fd9e78d72..614224917 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $ +# $Id: PKGBUILD 186175 2013-05-21 22:00:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc') +sha1sums=('fc71170f6f7f417b9cd0f4da3cb54ff70e66406e') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index dc8ab8ad2..63c7defc4 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $ +# $Id: PKGBUILD 186177 2013-05-21 22:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e') +sha1sums=('996fabdc858bb48be7b5c277f0a88c0fb357ee8c') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 6acf90197..b23052552 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $ +# $Id: PKGBUILD 186179 2013-05-21 22:01:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a') +sha1sums=('a27fb07682fb2ce7dde15a40688c12b3d8f2299d') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index 540a69f78..d07c8f6ba 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $ +# $Id: PKGBUILD 186195 2013-05-21 22:02:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709') +sha1sums=('06fb5a5353f973e254c894be33de79b28089cbc5') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index a47e7f087..adcb867d8 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $ +# $Id: PKGBUILD 186182 2013-05-21 22:01:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de') +sha1sums=('fe971a74ab966faea0680b6231c545754b9e00cf') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 391ed90b7..2c4a547d6 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $ +# $Id: PKGBUILD 186184 2013-05-21 22:01:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821') +sha1sums=('98c21256a81b18955628b3c645e36391c1ffca4a') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index 1d228d835..88b275e56 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $ +# $Id: PKGBUILD 186186 2013-05-21 22:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07') +sha1sums=('b0273d52657a31ba56168a4e4db2f56f6c81e2fd') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 431f0701d..67901433b 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $ +# $Id: PKGBUILD 186188 2013-05-21 22:02:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214') +sha1sums=('79bb46d90a3a981cadb2cc2f84832ef91e11deeb') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 02605f9dc..b1664d516 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $ +# $Id: PKGBUILD 186190 2013-05-21 22:02:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930') +sha1sums=('1aa1b8597acff39f0549ed9f716d733de4d77b63') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 888539576..d7cd51288 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $ +# $Id: PKGBUILD 186192 2013-05-21 22:02:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00') +sha1sums=('51734ea448b6a3338a28fc9e9fc7d371453ed9a6') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index bce31e164..0c73a3158 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $ +# $Id: PKGBUILD 186213 2013-05-22 06:19:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.1 +pkgver=0.6.2.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') -source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b') +source=("http://download.kde.org/stable/kde-telepathy/0.6.2/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15') build() { mkdir build diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD index 85c4cc481..031a5f0fd 100644 --- a/extra/telepathy-logger-qt/PKGBUILD +++ b/extra/telepathy-logger-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182024 2013-04-05 09:11:10Z andrea $ +# $Id: PKGBUILD 186224 2013-05-22 07:20:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: George Brooke <george+arch.aur@george-brooke.co.uk> pkgname=telepathy-logger-qt -pkgver=0.6.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="Qt bindings for telepathy logger" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-log license=('GPL') depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer') makedepends=('automoc4' 'cmake' 'python2' 'doxygen' 'boost') -source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('3e58f7a25ad192d9a62b52784492b317b77a5ffa') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('a61650a06e5b8f6d452d6120ee402567439ef687') build() { mkdir build diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index ccf3a5f7f..578888af4 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169980 2012-10-30 23:00:04Z heftig $ +# $Id: PKGBUILD 186517 2013-05-28 10:02:46Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.14.0 +pkgver=5.14.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('libxslt' 'python2') install=telepathy-mission-control.install options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('483fa8860891815a540ecf1bb9155122') +md5sums=('e06fb0399ec435e59c74d79a2ace8a2d') build() { cd "$pkgname-$pkgver" diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD index 439ac4a14..ca202c1bc 100644 --- a/extra/tftp-hpa/PKGBUILD +++ b/extra/tftp-hpa/PKGBUILD @@ -1,46 +1,42 @@ -# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $ +# $Id: PKGBUILD 186770 2013-05-31 05:42:13Z eric $ # Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Jose Javier <jojapa@terra.es> pkgname=tftp-hpa pkgver=5.2 -pkgrel=3 +pkgrel=4 pkgdesc="Official tftp server" arch=('i686' 'x86_64' 'mips64el') url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/" license=('BSD') depends=('readline>=6.0.00') conflicts=('netkit-tftp') -backup=('etc/conf.d/tftpd') source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz - tftpd.rc - tftpd.conf LICENSE tftpd.service tftpd.socket tftp-hpa-0.49-fortify-strcpy-crash.patch) md5sums=('3de3038e7c2bf6fc5d496825893ac8e7' - '83fbb6f52205d95951a3c059e5351ca2' - 'f41f484f94e91175e9183e872a2bff3b' '6ce21e27b6fdc1a1adf85c81e42aeecf' - '165b98f814f74568635a720e674d7f18' + 'ffeac33192eac4c526657b6789cace21' 'a23369ea33be8b4a5427ec2cfc5373dd' '22e8629ef19bc276a102c5d4d284c1bd') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} # fix #28103 patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch - ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --without-tcpwrappers make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make INSTALLROOT="${pkgdir}" install - install -d "${pkgdir}/etc/rc.d" install -d "${pkgdir}/srv/tftp" - install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" - install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service" install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf deleted file mode 100644 index a4329f608..000000000 --- a/extra/tftp-hpa/tftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to TFTPD -# -TFTPD_ARGS="-l -s /srv/tftp/" diff --git a/extra/tftp-hpa/tftpd.rc b/extra/tftp-hpa/tftpd.rc deleted file mode 100755 index 0222d1693..000000000 --- a/extra/tftp-hpa/tftpd.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -TFTPD_ARGS= -[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd - -PID=$(pidof -o %PPID /usr/sbin/in.tftpd) -case "$1" in - start) - stat_busy "Starting TFTPD" - [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon tftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping TFTPD" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon tftpd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service index 62562343d..293e0370b 100644 --- a/extra/tftp-hpa/tftpd.service +++ b/extra/tftp-hpa/tftpd.service @@ -2,7 +2,7 @@ Description=hpa's original TFTP daemon [Service] -ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/ +ExecStart=/usr/bin/in.tftpd -s /srv/tftp/ StandardInput=socket StandardOutput=inherit StandardError=journal diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD index 431c3b4d0..20de4c0ba 100644 --- a/extra/thinkfinger/PKGBUILD +++ b/extra/thinkfinger/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158572 2012-05-04 23:57:24Z allan $ +# $Id: PKGBUILD 185609 2013-05-15 22:56:59Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: François Charette <francois.archlinux.org> # Contributor: Damir Perisa <damir.archlinux.org> @@ -6,13 +6,12 @@ pkgname=thinkfinger pkgver=0.3 -pkgrel=6 +pkgrel=7 pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads" url="http://thinkfinger.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=("GPL") depends=('pam' 'libusb-compat') -install=thinkfinger.install options=('!libtool' 'emptydirs') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'thinkfinger-uinput-hack.patch' @@ -22,7 +21,7 @@ md5sums=('588565233bcbea5ff0a7f5314361c380' '93c80f342329a5bd40f5f324fe670225') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # Patch from Ubuntu: see http://bugs.archlinux.org/task/12580 patch -p0 -i "${srcdir}"/thinkfinger-uinput-hack.patch @@ -30,12 +29,13 @@ build() { patch -p1 -i "${srcdir}"/gcc46.patch ./configure --prefix=/usr \ - --with-birdir=/etc/pam_thinkfinger + --sbindir=/usr/bin \ + --with-birdir=/etc/pam_thinkfinger make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # create dir to store fingerprints install -d $pkgdir/etc/pam_thinkfinger diff --git a/extra/thinkfinger/thinkfinger.install b/extra/thinkfinger/thinkfinger.install deleted file mode 100644 index bb1f6dde0..000000000 --- a/extra/thinkfinger/thinkfinger.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "==> To use thinkfinger, add 'uinput' to the MODULES=() in /etc/rc.conf." - echo " More Infos: http://wiki.archlinux.org/index.php/Thinkfinger" -} diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index 29f155d28..05b159ff6 100644 --- a/extra/tomboy/PKGBUILD +++ b/extra/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183462 2013-04-21 22:12:14Z heftig $ +# $Id: PKGBUILD 185355 2013-05-13 17:25:26Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tomboy -pkgver=1.14.0 +pkgver=1.14.1 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') options=('!libtool' '!emptydirs' '!makeflags') install=tomboy.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('14c1e7f2c7d67d8603a7de95830c3b159779909e8a74c5a6ca9e08a2508fea18') +sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 1a687c454..8fdb6f0a2 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183463 2013-04-21 22:12:16Z heftig $ +# $Id: PKGBUILD 185506 2013-05-14 12:10:02Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=3.4.4 +pkgver=3.4.5 pkgrel=1 url="http://www.gnome.org" pkgdesc="Totem playlist parser library" @@ -13,7 +13,7 @@ depends=('gmime' 'libsoup' 'libarchive' 'libquvi') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) -sha256sums=('b821e812da3f3e42d2f831296b4031c60a615d29857781971578ce2c0c807457') +sha256sums=('a573e078692b48895cb5b041385b2760d63e2ee496c8d499eccfa942e7c79f89') build() { cd totem-pl-parser-$pkgver diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index e68efbb37..29125de86 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,25 +1,35 @@ -# $Id: PKGBUILD 183323 2013-04-21 22:06:42Z heftig $ +# $Id: PKGBUILD 186680 2013-05-30 12:54:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.8.0 -pkgrel=1 +pkgver=3.8.2 +pkgrel=2 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') license=(GPL2 custom) depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst - clutter-gtk python2-gobject gst-plugins-bad) -makedepends=(intltool libnautilus-extension vala grilo pylint dbus-glib libzeitgeist itstool docbook-xsl) + clutter-gtk python-gobject python-xdg gst-plugins-bad) +makedepends=(intltool libnautilus-extension vala grilo dbus-glib libzeitgeist + itstool docbook-xsl python-pylint) [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - browser-plugins.ini) -sha256sums=('74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039' - 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') + browser-plugins.ini bugreport.patch) +sha256sums=('eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01' + 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e' + '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167') + + +prepare() { + cd "$pkgbase-$pkgver" + + # Make compatible with Python 3 and Gstreamer 1.0 + patch -Np1 -i ../bugreport.patch +} build() { cd "$pkgbase-$pkgver" @@ -30,6 +40,10 @@ build() { --disable-static \ --enable-python \ --enable-nautilus + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } @@ -40,7 +54,6 @@ package_totem() { 'gst-libav: Extra media codecs' 'lirc-utils: Infrared Remote Control plugin' 'grilo-plugins: Browse sidebar (remote media)' - 'pyxdg: opensubtitles plugin' 'libzeitgeist: Zeitgeist plugin') cd "$pkgbase-$pkgver" @@ -49,9 +62,6 @@ package_totem() { rm -r "$pkgdir/usr/lib/mozilla" rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" - sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ - $pkgdir/usr/lib/totem/totem/totem-bugreport.py - install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING" } @@ -65,7 +75,7 @@ package_totem-plugin() { plugindir=/usr/lib/mozilla/plugins \ xptdir=/usr/lib/mozilla/plugins \ DESTDIR="$pkgdir" install - + install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" diff --git a/extra/totem/bugreport.patch b/extra/totem/bugreport.patch new file mode 100644 index 000000000..13bcfe2e5 --- /dev/null +++ b/extra/totem/bugreport.patch @@ -0,0 +1,22 @@ +diff -u -r totem-3.8.2/data/totem-bugreport.py totem-3.8.2-bugreport/data/totem-bugreport.py +--- totem-3.8.2/data/totem-bugreport.py 2013-03-13 16:34:44.000000000 +0100 ++++ totem-3.8.2-bugreport/data/totem-bugreport.py 2013-05-14 13:54:04.243699665 +0200 +@@ -4,7 +4,7 @@ + from gi.repository import Gtk + + # Get the GStreamer version +-if os.system ('gst-typefind-0.10 --version') == 0: ++if os.system ('gst-typefind-1.0 --version') == 0: + # List the formats of the last files played + last_visited = 0 + recent_manager = Gtk.RecentManager.get_default () +@@ -15,7 +15,7 @@ + last = recent.get_uri_display () + + if last != None: +- file_handle = os.popen ('gst-typefind-0.10 "%s"' % (last)) ++ file_handle = os.popen ('gst-typefind-1.0 "%s"' % (last)) + parts = file_handle.read ().split (' ') + date = datetime.fromtimestamp (last_visited) +- print 'Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ()) ++ print('Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ())) diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index a95b9c42d..b01553131 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 179032 2013-03-01 18:56:31Z andrea $ +# $Id: PKGBUILD 186895 2013-05-31 15:05:32Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.77 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz - transmissiond transmissiond.conf transmission.systemd + transmission.systemd transmission.tmpfiles) md5sums=('60c0e77a1852656215f7102a437b2a3d' - '7d6186ee2a852ae3d44980f05063e194' - 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' '23f2320361ad54373c3a4551ef634fe8') @@ -30,7 +28,6 @@ build() { package_transmission-cli() { pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" depends=('curl' 'libevent') - backup=('etc/conf.d/transmissiond') install=transmission-cli.install cd $pkgbase-$pkgver @@ -40,8 +37,6 @@ package_transmission-cli() { make -C "$dir" DESTDIR="$pkgdir" install done - install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" - install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond deleted file mode 100644 index ea3d770f9..000000000 --- a/extra/transmission/transmissiond +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/transmissiond - -PID=`pidof -o %PPID /usr/bin/transmission-daemon` -case "$1" in - start) - stat_busy "Starting Transmission Daemon" - [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon transmissiond - stat_done - fi - ;; - stop) - stat_busy "Stopping Transmission Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon transmissiond - stat_done - fi - ;; - restart) - $0 stop - while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done - $0 start - ;; - reload) - stat_busy "Reloading config" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/extra/transmission/transmissiond.conf b/extra/transmission/transmissiond.conf deleted file mode 100644 index 45a9fd51d..000000000 --- a/extra/transmission/transmissiond.conf +++ /dev/null @@ -1,4 +0,0 @@ -# example configuration file - -# TRANS_USER="transmission" -# TRANS_ARGS="" diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index a2d47808f..f8c5ecf60 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184356 2013-05-06 19:20:44Z eric $ +# $Id: PKGBUILD 186289 2013-05-23 22:11:35Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon -pkgver=6.0.4 +pkgver=6.0.5 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('b20a43a8cba901c2145778b3d653eef6' +md5sums=('afbcf89264e9c96dccf4104bab52a9c0' 'SKIP') build() { diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 0d52af9fc..d2ec948de 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172088 2012-11-27 19:16:47Z dreisner $ +# $Id: PKGBUILD 186141 2013-05-21 09:11:20Z tpowa $ # Maintainer: Tom Gundersen <teg@jklm.no> pkgname=udisks pkgver=1.0.4 -pkgrel=6 +pkgrel=8 pkgdesc="Disk Management Service" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -21,6 +21,9 @@ build() { patch -p1 < ../drop-pci-db.patch make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules } package() { @@ -32,6 +35,10 @@ package() { mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ rm -r "${pkgdir}"/lib + # move umount helper to /usr/bin + mv "${pkgdir}"/sbin/umount.udisks "${pkgdir}"/usr/bin/ + rm -r "${pkgdir}"/sbin + install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" echo "SystemdService=udisks.service" \ >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index fd8ac016a..becc1ec6c 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $ +# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -22,6 +22,9 @@ build() { --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules } package() { diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index 096446ee9..b537013c9 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164737 2012-08-04 10:47:06Z schiv $ +# $Id: PKGBUILD 185824 2013-05-19 13:06:56Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk -pkgver=2.4 -pkgrel=1.1 +pkgver=2.5 +_dir=690 +pkgrel=1 pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64' 'mips64el') url="http://www.vamp-plugins.org/" license=('BSD') depends=('gcc-libs' 'libsndfile') -#options=('!libtool') -source=("http://code.soundsoftware.ac.uk/attachments/download/517/$pkgname-$pkgver.tar.gz") -md5sums=('4bd75ca4515c141cd8776bdb59066261') +options=('!libtool') +source=("http://code.soundsoftware.ac.uk/attachments/download/$_dir/$pkgname-$pkgver.tar.gz") +md5sums=('199872997f74951f6769b982bf0d0646') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 1c4c944fb..0905938e4 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165520 2012-08-22 17:11:02Z dreisner $ +# $Id: PKGBUILD 185368 2013-05-13 17:51:30Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade @@ -6,37 +6,34 @@ pkgname=varnish pkgver=3.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64' 'mips64el') url="http://www.varnish-cache.org/" license=('BSD') depends=('gcc' 'libedit' 'pcre') -backup=('etc/conf.d/varnish' - 'etc/varnish/default.vcl') +backup=('etc/varnish/default.vcl') install=$pkgname.install options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" - "$pkgname.conf.d" - "rc.$pkgname" varnish-vcl-reload varnish.service) md5sums=('714310c83fdbd2061d897dacd3f63d8b' - '3b563d2d9bd74a819fdb116d69d022f0' - '40b4c83b3ad225ed2f4bd7e677fe41a2' '03196dee7fc68e75069393d52c370762' - '1adf5282d111a9e00e99786045451016') + 'a59b17d8e3066abcf3dd7755a2212dd4') build() { cd "$pkgname-$pkgver" - # disable JIT compilation for now, as it's crashy on VCL reload + # disable JIT compilation, as it's crashy crashy (bug in PCRE) + # this is flagged out and disabled by default in $nextrelease of Varnish. sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var/lib + --localstatedir=/var/lib \ + --sbindir=/usr/bin make } @@ -44,14 +41,7 @@ build() { package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - # reload helper install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin" - - # sysvinit - install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" - - # systemd install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service" # license diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish deleted file mode 100644 index 352f07dbd..000000000 --- a/extra/varnish/rc.varnish +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/varnish - -pidfile=/run/varnish.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting Varnish Reverse Proxy" - if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then - add_daemon varnish - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping Varnish Reverse Proxy" - if [[ $PID ]] && kill $PID &>/dev/null; then - rm_daemon varnish - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac diff --git a/extra/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d deleted file mode 100644 index 4cf40c4fc..000000000 --- a/extra/varnish/varnish.conf.d +++ /dev/null @@ -1,11 +0,0 @@ -# -# Command line options to varnishd -# - -VARNISH_CFG="/etc/varnish/default.vcl" - -VARNISHD_OPTS="-a 0.0.0.0:80 \ - -f $VARNISH_CFG \ - -T localhost:6082 \ - -s malloc,64M - -u nobody -g nobody" diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service index d5b0aa66d..851e32140 100644 --- a/extra/varnish/varnish.service +++ b/extra/varnish/varnish.service @@ -3,7 +3,7 @@ Description=Web Application Accelerator After=network.target [Service] -ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F +ExecStart=/usr/bin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F ExecReload=/usr/bin/varnish-vcl-reload [Install] diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 929e8686c..392586b3d 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169040 2012-10-17 10:21:21Z allan $ +# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=vde2 pkgver=2.3.2 -pkgrel=2.1 +pkgrel=4 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" license=("GPL" "LGPL" "CUSTOM") @@ -15,24 +15,20 @@ source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 dhcpd.conf.sample iptables.rules.sample vde-config.sample - vde-connection.sample - vde.conf - vde.rc) + vde-connection.sample) install=vde2.install options=(!libtool !makeflags) build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ --enable-experimental make } package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install - install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde - install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc sbindir=$pkgdir/usr/bin libexecdir=$pkgdir/usr/lib/vde2 install install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample @@ -40,11 +36,13 @@ package() { # install slirp license install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde } - md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' '7d9bc56d2e561d849e915000d1c0f269' 'a920123fc620bcedbccb703a8d1bdc55' 'cb8ace28e8efd4dad128be4be71b3b07' - '63033c33565e2030541c5e05e9d9b063' - 'a22730f051f4840da4a3162a88ff8156' - '6c7dc01bc2f039f0ff1682ee70d3d1da') + '63033c33565e2030541c5e05e9d9b063') +md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' + '7d9bc56d2e561d849e915000d1c0f269' + 'a920123fc620bcedbccb703a8d1bdc55' + 'f47d3372382dc9d67c1174d2796729fe' + '63033c33565e2030541c5e05e9d9b063') diff --git a/extra/vde2/vde-config.sample b/extra/vde2/vde-config.sample index c5a5b7d88..f7e0660a4 100644 --- a/extra/vde2/vde-config.sample +++ b/extra/vde2/vde-config.sample @@ -6,7 +6,7 @@ VDE_NUMPORTS="32" # Number of ports (default 32) VDE_HUB="no" # [yes|no] Make the switch act as a hub VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol VDE_MAC="" # Set the Switch MAC address -VDE_PRIOTIRY="" # Set the priority for FST (MAC extension) +VDE_PRIORITY="" # Set the priority for FST (MAC extension) VDE_HASHSIZE="" # Hash table size # Options from datasock module @@ -32,4 +32,4 @@ SLIRP="no" # [yes|no] enable/disable SLIRP daemon support SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) # other options to parse to slirpvde -SLIRP_OPTIONS=""
\ No newline at end of file +SLIRP_OPTIONS="" diff --git a/extra/vde2/vde.conf b/extra/vde2/vde.conf deleted file mode 100644 index bc61dceda..000000000 --- a/extra/vde2/vde.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Set options for a vde daemon script -# -# Array for your vde config files, eg.: "internal-net external-net" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-config.sample -VDE_CONFIG="" - -# Array for your dpipe connections, eg.: "connect-switches" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-connection.sample -VDE_CONNECTION=""
\ No newline at end of file diff --git a/extra/vde2/vde.rc b/extra/vde2/vde.rc deleted file mode 100755 index b368f9955..000000000 --- a/extra/vde2/vde.rc +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/vde - -case "$1" in - start) - # bring up all defined profiles - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - stat_busy "Starting vde_switch $i" - # get options from profile - [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS" - [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x" - [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F" - [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC" - [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY" - [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH" - [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP" - [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK" - [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE" - [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP" - [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS" - vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null - [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK" - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - if [ "$SLIRP" = "yes" ]; then - stat_busy "Starting slirpvde for $i" - [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D" - [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK" - [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS" - [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP" - slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - unset OPTIONS - unset SP_OPTIONS - fi - done - for i in $VDE_CONNECTION; do - # connect specified vde_switches - if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then - stat_busy "Connecting VDE switches $i together..." - while read j; do - switch="$(echo $j | grep ^vde_plug)" - [ -n "$switch" ] && (dpipe $switch &) - done </etc/vde/$i - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - done - add_daemon vde - ;; - stop) - # kill vde_plug if switches are connected - [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1 - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - if [ "$SLIRP" = "yes" ]; then - stat_busy "Stopping slirpvde for $i" - kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/slirpvde-$i.pid &> /dev/null - fi - stat_busy "Stopping vde_switch $i" - kill $(cat /var/run/vde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/vde-$i.pid &> /dev/null - stat_busy "Removing $i vde sockets" - rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - unset OPTIONS - unset SP_OPTIONS - [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out - rm_daemon vde - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/vde2/vde2.install b/extra/vde2/vde2.install index 74e1710ff..bf538e01f 100644 --- a/extra/vde2/vde2.install +++ b/extra/vde2/vde2.install @@ -1,5 +1,4 @@ post_install() { - echo "Change /etc/conf.d/vde to your needs." echo "vde config files should be placed in /etc/vde, sample files are provided." echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'." echo "Merge those examples, if needed to the according config files." diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 43b3b8dce..7128a15fa 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -10,7 +10,7 @@ _patchlevel=918 __hgrev=c61da758a9a2 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 01c484075..029ea78ef 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183466 2013-04-21 22:12:20Z heftig $ +# $Id: PKGBUILD 185450 2013-05-14 10:15:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('64f9bcd08f33e5e767565909792094ad78d7b400f16dc24e0a5699c7e87da000') +sha256sums=('eda05e6abfd3d575f8b954c1e442d28639ae13b67fc285ef585b8cd78da014e8') build() { cd $pkgname-$pkgver diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 0b5a3ed0e..89e79b0ef 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184445 2013-05-06 19:40:05Z foutrelis $ +# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.6 -pkgrel=2 +pkgver=2.0.7 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -13,10 +13,9 @@ license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms') + 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' + 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' @@ -47,7 +46,6 @@ optdepends+=('libcaca: for colored ASCII art video output' 'xosd: for xosd support' 'aalib: for ASCII art plugin' 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' 'smbclient: for SMB access plugin' 'libcdio: for audio CD playback support' 'ttf-freefont: for subtitle font ' @@ -61,7 +59,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('b45be633c71dca04ca7d6c3d64dd728b') +md5sums=('3b0e465b0990097b65abaf3e25589957') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index 3cb20ae21..b9f449d4a 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 164259 2012-07-29 01:13:10Z dreisner $ +# $Id: PKGBUILD 185907 2013-05-19 18:45:48Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=vpnc _vpncver=0.5.3 -_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6 -pkgver=$_vpncver.svn516 -pkgrel=3 +_git=d2c5a77f3f0ea6ad80fc59158127d63ede81a6cb +pkgver=$_vpncver.svn527 +pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" license=('GPL') @@ -17,8 +17,8 @@ source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" "http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script" 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('2118c5ccc464250c0892be57dbfabdf7' - '6293c15ef6e7a3365ed7add5e336b806' +md5sums=('db1908bc5cf2b70334c9f74a597a4623' + '70198474faf36a84beaa11136f6c4d9c' 'a3f4e0cc682f437e310a1c86ae198e45') mktarball() { @@ -52,7 +52,7 @@ build() { package() { cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" PREFIX=/usr install + make DESTDIR="$pkgdir" PREFIX=/usr SBINDIR=/usr/bin install install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf install -Dm755 "$srcdir"/vpnc-script "$pkgdir"/etc/vpnc/vpnc-script diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index b9073b50d..29bb4fc41 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183325 2013-04-21 22:06:44Z heftig $ +# $Id: PKGBUILD 185394 2013-05-13 18:51:37Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.4 +pkgver=0.34.5 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('477de8f0b8473e1cb27c9488e278df44d16fc384d1753c5c3961e3f0417860bd') +sha256sums=('8847fb75b620a94ba62c2ffd9e1653396978106f294574ba24a19ced259a7351') build() { cd "vte-$pkgver" diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index aaf6b12e2..e95bccc34 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184446 2013-05-06 19:40:06Z foutrelis $ +# $Id: PKGBUILD 185357 2013-05-13 17:34:56Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=webkitgtk pkgname=('webkitgtk3') -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') @@ -12,7 +12,7 @@ makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'g options=('!libtool' '!emptydirs') source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz 0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch) -sha256sums=('6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb' +sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2' '7b4c1419342bafcca642d7a41abe92713810401591906b081fe476169cb9a3aa') prepare() { @@ -47,11 +47,7 @@ build() { extra="--disable-fast-malloc --disable-optimizations" fi - # Suppress a *lot* of gcc 4.8 warnings - export CPPFLAGS="$CPPFLAGS -Wno-unused-local-typedefs" - - ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 \ - --enable-introspection $extra + ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 --enable-introspection $extra make all stamp-po } diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index d67f26041..cc5c661b3 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,30 +1,24 @@ -# $Id: PKGBUILD 180587 2013-03-23 23:09:44Z td123 $ +# $Id: PKGBUILD 186429 2013-05-26 09:26:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.4.0 -pkgrel=3 +pkgver=0.4.1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" license=('GPL') depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile') +makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') -source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2" - 'ruby-2.0.0-crash-fix.diff') -md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b' - '8bafb0ec603af018e2d66155640685b4') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('071d6f1cd21c892cae126af21095c43f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix: https://bugs.archlinux.org/task/34342 - # original commit: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=4fdbb83a079f24a742633fd4d02084911580c19c - patch -Np1 -i ${srcdir}/ruby-2.0.0-crash-fix.diff - mkdir build cd build cmake .. -DPREFIX=/usr \ diff --git a/extra/weechat/ruby-2.0.0-crash-fix.diff b/extra/weechat/ruby-2.0.0-crash-fix.diff deleted file mode 100644 index bfc816ade..000000000 --- a/extra/weechat/ruby-2.0.0-crash-fix.diff +++ /dev/null @@ -1,76 +0,0 @@ -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=blobdiff_plain;f=src%2Fplugins%2Fruby%2Fweechat-ruby-api.c;h=101caec961829de03f8097edc63f497eab99aaa3;hp=bbc2fbcbe3c5290a8a975c4676a85a8c7e0998b7;hb=4fdbb83a079f24a742633fd4d02084911580c19c;hpb=55e58811b3df451db4f95b1035a39f5659788989 - -diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c -index bbc2fbc..101caec 100644 ---- a/src/plugins/ruby/weechat-ruby-api.c -+++ b/src/plugins/ruby/weechat-ruby-api.c -@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, - VALUE description, VALUE string_values, - VALUE min, VALUE max, VALUE default_value, - VALUE value, VALUE null_value_allowed, -- VALUE function_check_value, -- VALUE data_check_value, -- VALUE function_change, -- VALUE data_change, -- VALUE function_delete, -- VALUE data_delete) -+ VALUE callbacks) - { - char *c_config_file, *c_section, *c_name, *c_type, *c_description; - char *c_string_values, *c_default_value, *c_value; - char *c_function_check_value, *c_data_check_value, *c_function_change; - char *c_data_change, *c_function_delete, *c_data_delete, *result; - int c_min, c_max, c_null_value_allowed; -- VALUE return_value; -+ VALUE function_check_value, data_check_value, function_change, data_change; -+ VALUE function_delete, data_delete, return_value; - - API_FUNC(1, "config_new_option", API_RETURN_EMPTY); - if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type) - || NIL_P (description) || NIL_P (string_values) || NIL_P (min) - || NIL_P (max) || NIL_P (default_value) || NIL_P (value) -- || NIL_P (null_value_allowed) || NIL_P (function_check_value) -- || NIL_P (data_check_value) || NIL_P (function_change) -- || NIL_P (data_change) || NIL_P (function_delete) -- || NIL_P (data_delete)) -+ || NIL_P (null_value_allowed) || NIL_P (callbacks)) - API_WRONG_ARGS(API_RETURN_EMPTY); - - Check_Type (config_file, T_STRING); -@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, - Check_Type (default_value, T_STRING); - Check_Type (value, T_STRING); - Check_Type (null_value_allowed, T_FIXNUM); -- Check_Type (function_check_value, T_STRING); -- Check_Type (data_check_value, T_STRING); -- Check_Type (function_change, T_STRING); -- Check_Type (data_change, T_STRING); -- Check_Type (function_delete, T_STRING); -- Check_Type (data_delete, T_STRING); -+ Check_Type (callbacks, T_ARRAY); -+ -+ /* -+ * due to a Ruby limitation (15 arguments max by function), we receive the -+ * the callbacks in an array of 6 strings (3 callbacks + 3 data) -+ */ -+ if (RARRAY_LEN(callbacks) != 6) -+ API_WRONG_ARGS(API_RETURN_EMPTY); -+ -+ function_check_value = rb_ary_entry (callbacks, 0); -+ data_check_value = rb_ary_entry (callbacks, 1); -+ function_change = rb_ary_entry (callbacks, 2); -+ data_change = rb_ary_entry (callbacks, 3); -+ function_delete = rb_ary_entry (callbacks, 4); -+ data_delete = rb_ary_entry (callbacks, 5); - - c_config_file = StringValuePtr (config_file); - c_section = StringValuePtr (section); -@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat) - API_DEF_FUNC(config_new, 3); - API_DEF_FUNC(config_new_section, 14); - API_DEF_FUNC(config_search_section, 2); -- API_DEF_FUNC(config_new_option, 17); -+ API_DEF_FUNC(config_new_option, 12); - API_DEF_FUNC(config_search_option, 3); - API_DEF_FUNC(config_string_to_boolean, 1); - API_DEF_FUNC(config_option_reset, 2); diff --git a/extra/wireshark/01_patch-automake-1.13.diff b/extra/wireshark/01_patch-automake-1.13.diff deleted file mode 100644 index cf03fa060..000000000 --- a/extra/wireshark/01_patch-automake-1.13.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:27.140322526 +0100 -+++ configure.in 2013-02-02 22:11:42.863854681 +0100 -@@ -1960,7 +1960,7 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 94d554263..4e7d51f14 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182116 2013-04-07 20:47:05Z guillaume $ +# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.6 -pkgrel=2 +pkgver=1.8.7 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -12,17 +12,13 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_patch-automake-1.13.diff 02_enable-version.diff) -sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea' - '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80' +sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842' 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') build() { cd "${srcdir}/${pkgbase}-${pkgver}" -# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 - patch -p0 < ${srcdir}/01_patch-automake-1.13.diff patch -p0 < ${srcdir}/02_enable-version.diff ./autogen.sh diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 69adcc4bc..001bd0c58 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -1,14 +1,14 @@ post_install() { /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" } post_upgrade() { /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 44e9d531f..298458759 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $ +# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,8 +7,8 @@ # Contributor: Milan Knížek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.0.1 -pkgrel=1 +pkgver=4.0.0.2 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') url="http://www.x2go.org/" @@ -19,13 +19,20 @@ makedepends=('man2html') options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') -source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('85dc2a2d52e82eead744a51007155ff9' - 'b09799f9203150dc1277a56058be48a8') +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz + x2goserver.service + revert.patch) +md5sums=('6b8cecfdd31a8877203f50d3666c265f' + 'f76081c01e40b6206895d194dc949707' + 'c487c31e7c0aa9a73323313007497764') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # revert an upstream commit that breaks sessions showing up + # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f + patch -Rp1 -i ${srcdir}/revert.patch + # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -43,15 +50,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 PREFIX=/usr DESTDIR="$pkgdir" install + make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install # systemd service file - only runs x2gocleansessions install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - #install -dm 755 $pkgdir/var/lib/x2go install -dm 770 $pkgdir/var/lib/x2go - install -dm 755 $pkgdir/var/spool/x2go + install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start install -dm755 $pkgdir/lib/modules-load.d diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch new file mode 100644 index 000000000..023bbd18c --- /dev/null +++ b/extra/x2goserver/revert.patch @@ -0,0 +1,152 @@ +From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Date: Sun, 19 May 2013 00:41:32 +0200 +Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. + Hard-code path to x2gosqlitewrapper.pl during build via + defining a macro in the Makefile. Thanks to Richard + Weinberger for spotting this!!! + +--- + Makefile | 2 +- + debian/changelog | 3 +++ + debian/rules | 4 +-- + x2goserver/Makefile | 4 +-- + x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- + 5 files changed, 12 insertions(+), 55 deletions(-) + +diff --git a/Makefile b/Makefile +index 3be40f9..588084f 100755 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + LIBDIR=$(PREFIX)/lib/x2go + SHAREDIR=$(PREFIX)/share/x2go +diff --git a/debian/changelog b/debian/changelog +index 470a502..2cf2dde 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + * New upstream version (4.0.0.2): + - Use make_path from File::Path in x2godbadmin to create user directory if + not present. (Fixes: #200). ++ - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to ++ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. ++ Thanks to Richard Weinberger for spotting this!!! + /debian/control: + + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: + #163). +diff --git a/debian/rules b/debian/rules +index b32e08d..5bb94b2 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -1,10 +1,10 @@ + #!/usr/bin/make -f + + %: +- dh $@ ++ PREFIX=/usr dh $@ + + override_dh_auto_install: +- make -f Makefile build-arch ++ PREFIX=/usr make -f Makefile build-arch + + override_dh_auto_clean: + rm -fv x2gosqlitewrapper +diff --git a/x2goserver/Makefile b/x2goserver/Makefile +index 4287478..e9d56e6 100755 +--- a/x2goserver/Makefile ++++ b/x2goserver/Makefile +@@ -15,7 +15,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + BINDIR=$(PREFIX)/bin + SBINDIR=$(PREFIX)/sbin +@@ -41,7 +41,7 @@ build: build-arch build-indep + build-arch: build_setgidwrappers + + build_setgidwrappers: +- $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c + + build-indep: build_man2html + +diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c +index a134efc..ad95eff 100644 +--- a/x2goserver/x2gosqlitewrapper.c ++++ b/x2goserver/x2gosqlitewrapper.c +@@ -21,58 +21,12 @@ + * + */ + +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +-#include <libgen.h> +-#include <errno.h> +- + int main( int argc, char *argv[] ) { +- char * x2gosqlitewrapper = NULL; +- size_t path_max; +- +-/* +- The following snippet is taken from the realpath manpage +-*/ +-#ifdef PATH_MAX +- path_max = PATH_MAX; +-#else +- path_max = pathconf (".", _PC_PATH_MAX); +- if (path_max <= 0){ +- path_max = 4096; +- } +-#endif +- { +- // allocate dynamic buffer in stack: this needs C99 or gnu?? +- char buffer[path_max]; +- ssize_t rvrl; +- int rvap; +- +- // resolve link of /proc/self/exe to find out where we are +- rvrl = readlink("/proc/self/exe", buffer, path_max); +- if(rvrl == -1){ +- perror("readlink(\"/proc/self/exe\",buffer,path_max)"); +- exit(EXIT_FAILURE); +- } +- if(rvrl >= path_max){ +- fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); +- exit(EXIT_FAILURE); +- } +- +- // derive the full path of x2gosqlitewrapper.pl from path of this binary +- rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); +- if(rvap == -1){ +- fprintf(stderr, "Failed to allocate memory calling asprintf\n"); +- exit(EXIT_FAILURE); +- } +- +- // execute the script, running with user-rights of this binary +- execv(x2gosqlitewrapper, argv); + +- } ++ char x2gosqlitewrapper[] = TRUSTED_BINARY; + +- // ...fail +- fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); +- return EXIT_FAILURE; ++ argv[0] = "x2gosqlitewrapper.pl"; ++ // execute the script, running with user-rights of this binary ++ execv(x2gosqlitewrapper, argv); + + } +-- +1.7.9.5 + diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install index cac06dac8..223eaac62 100644 --- a/extra/x2goserver/x2goserver.install +++ b/extra/x2goserver/x2goserver.install @@ -39,7 +39,7 @@ post_install() { # fix permissions - see INSTALL file chown -R x2goprint:x2goprint /var/spool/x2go chmod 0770 /var/spool/x2go - + chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper chmod 2755 /usr/lib/x2go/x2gosqlitewrapper diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service index 393d841c5..f06d39499 100644 --- a/extra/x2goserver/x2goserver.service +++ b/extra/x2goserver/x2goserver.service @@ -3,7 +3,7 @@ Description=x2go - remote desktop server After=syslog.target network.target [Service] -ExecStart=/usr/sbin/x2gocleansessions +ExecStart=/usr/bin/x2gocleansessions PIDFile=/run/x2goserver.pid [Install] diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index a79ae614a..842037d8b 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182039 2013-04-05 19:13:38Z andyrtr $ +# $Id: PKGBUILD 185760 2013-05-18 11:02:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=(!libtool) backup=('etc/X11/xorg.conf.d/50-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 add_tapbuttons.diff) -sha256sums=('d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e' +sha256sums=('db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e' '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 19c5ed42f..2f0f13e72 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182343 2013-04-08 15:23:26Z andyrtr $ +# $Id: PKGBUILD 186484 2013-05-27 13:17:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.6 +pkgver=2.21.8 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9') +sha256sums=('4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 4a2d01826..5d38408b6 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180937 2013-03-28 18:10:47Z andyrtr $ +# $Id: PKGBUILD 186307 2013-05-24 13:57:21Z andyrtr $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) @@ -16,7 +16,7 @@ replaces=('openchrome' 'xf86-video-via') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('e5be9a8200410b3e3e66349bab4c8acd1ead4402') +sha1sums=('1f7b23d4ed53417eda5c6730486b36812f469295') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD index 9dcac1ab6..5d68de766 100644 --- a/extra/xfce4-dict/PKGBUILD +++ b/extra/xfce4-dict/PKGBUILD @@ -1,41 +1,41 @@ -# $Id: PKGBUILD 157851 2012-04-30 04:20:17Z foutrelis $ +# $Id: PKGBUILD 186157 2013-05-21 10:21:01Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-dict -pkgver=0.6.0 -pkgrel=3 +pkgver=0.7.0 +pkgrel=1 pkgdesc="A dictionary plugin for the Xfce panel" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://goodies.xfce.org/projects/applications/xfce4-dict" +license=('GPL2') groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg') +depends=('xfce4-panel' 'librsvg' 'hicolor-icon-theme') makedepends=('intltool') provides=('xfce4-dict-plugin') conflicts=('xfce4-dict-plugin') replaces=('xfce4-dict-plugin') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2) -md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.7/$pkgname-$pkgver.tar.bz2) +sha256sums=('407fc0f02adf6ea85dec6993db1e222b548afcdd63a9e35ed2d70a42c9738e58') build() { - cd ${srcdir}/xfce4-dict-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - # Work around DSO linking issue - LDFLAGS+=' -Wl,--copy-dt-needed-entries' - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/xfce4-dict-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-dict/xfce4-dict.install b/extra/xfce4-dict/xfce4-dict.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-dict/xfce4-dict.install +++ b/extra/xfce4-dict/xfce4-dict.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD index eca650431..8571f0b4c 100644 --- a/extra/xfce4-xkb-plugin/PKGBUILD +++ b/extra/xfce4-xkb-plugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168753 2012-10-15 14:42:49Z foutrelis $ +# $Id: PKGBUILD 185421 2013-05-14 08:06:15Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-xkb-plugin -pkgver=0.5.4.3 -pkgrel=3 +pkgver=0.5.5 +pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" @@ -14,17 +14,12 @@ groups=('xfce4-goodies') depends=('xfce4-panel' 'libxklavier' 'librsvg') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2 - xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch) -sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d' - 'f5e6e5964df897045ed8c3443f632033689409459acdc54c0351264edc11b4ce') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) +sha256sums=('c97306298b0c804d4797c431bb9b698f123c0437ec845930bf938dc5d24ea8c9') build() { cd "$srcdir/$pkgname-$pkgver" - # https://bugs.archlinux.org/task/31880 - patch -Np1 -i "$srcdir/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch deleted file mode 100644 index 16f684b12..000000000 --- a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ac73bc9de624d322b318c2eda0ace7f0bee97a64 Mon Sep 17 00:00:00 2001 -From: Igor Slepchin <igor.slepchin@gmail.com> -Date: Thu, 19 Jul 2012 05:59:40 +0000 -Subject: Fix memory corruption. - -g_free(c) in the original code was freeing memory at the pointer -that was incremented a few times since the allocation. - -This is similar to ubuntu bug #899290 and fedora bug 589898. ---- -diff --git a/panel-plugin/xkb-util.c b/panel-plugin/xkb-util.c -index d0d0230..324928f 100644 ---- a/panel-plugin/xkb-util.c -+++ b/panel-plugin/xkb-util.c -@@ -66,11 +66,10 @@ xkb_util_get_layout_string (const gchar *group_name, const gchar *variant) - gchar* - xkb_util_normalize_group_name (const gchar* group_name) - { -- gchar *c; -+ const gchar *c; - gchar *result; - gint cut_length; - gint index_of_na = -1; -- gint index_tmp = -1; - - if (!group_name) - return NULL; -@@ -78,27 +77,19 @@ xkb_util_normalize_group_name (const gchar* group_name) - if (strlen (group_name) <= 3) - return g_strdup (group_name); - -- c = g_strdup (group_name); -- -- while (*c) -+ for (c = group_name; *c; c++) - { -- index_tmp++; -- - if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z'))) - { -- index_of_na = index_tmp; -+ index_of_na = group_name - c; - break; - } -- -- c++; - } - - cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3; - - result = g_strndup (group_name, cut_length); - -- g_free (c); -- - return result; - } - --- -cgit v0.9.0.3 diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index ff934d36a..ad711b53a 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160585 2012-06-02 10:29:16Z bluewind $ +# $Id: PKGBUILD 186431 2013-05-26 09:26:17Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfconf pkgver=4.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -13,8 +13,8 @@ groups=('xfce4') # http://www.xfce.org/documentation/requirements # keep dbus, see also http://bugs.archlinux.org/task/14536 depends=('libxfce4util' 'dbus-glib' 'dbus') -makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' - 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') +makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'glib-perl' + 'intltool' 'gtk-doc' 'chrpath') options=('!libtool' '!emptydirs') source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576') diff --git a/extra/xine-lib/0001-fix-non-x86-build.patch b/extra/xine-lib/0001-fix-non-x86-build.patch deleted file mode 100644 index 73cdf2c8d..000000000 --- a/extra/xine-lib/0001-fix-non-x86-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -# HG changeset patch -# User Petri Hintukainen <phintuka@users.sourceforge.net> -# Date 1339310702 -10800 -# Node ID b0df4b6003ad2b7454059c2d82ef7f8f29e48e9e -# Parent 52a99e60c2c9aa7e03be894b4396f229f881025c -Fix building on non-x86 systems - -diff --git a/src/post/deinterlace/plugins/greedy2frame_template.c b/src/post/deinterlace/plugins/greedy2frame_template.c ---- a/src/post/deinterlace/plugins/greedy2frame_template.c -+++ b/src/post/deinterlace/plugins/greedy2frame_template.c -@@ -85,6 +85,7 @@ - */ - - -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - #if !defined(MASKS_DEFINED) - #define MASKS_DEFINED - static const mmx_t Mask = { uq: 0x7f7f7f7f7f7f7f7fll }; -@@ -92,6 +93,7 @@ static const mmx_t Mask = { uq: 0x7f7f7f - static const mmx_t GreedyTwoFrameThreshold = { ub: {TP, TP, TP, TP} }; - #undef TP - #endif -+#endif - - #if defined(IS_MMXEXT) - static void DeinterlaceGreedy2Frame_MMXEXT(uint8_t *output, int outstride, -diff --git a/src/post/deinterlace/plugins/greedy2frame_template_sse2.c b/src/post/deinterlace/plugins/greedy2frame_template_sse2.c ---- a/src/post/deinterlace/plugins/greedy2frame_template_sse2.c -+++ b/src/post/deinterlace/plugins/greedy2frame_template_sse2.c -@@ -84,11 +84,12 @@ - ** B0 | | B1 | | - */ - -- -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - static const sse_t Mask128 = { uq: { 0x7f7f7f7f7f7f7f7fll, 0x7f7f7f7f7f7f7f7fll} }; - #define TP GREEDYTWOFRAMETHRESHOLD, GREEDYTWOFRAMETHRESHOLD2 - static const sse_t GreedyTwoFrameThreshold128 = { ub: {TP, TP, TP, TP, TP, TP, TP, TP} }; - #undef TP -+#endif - - static void DeinterlaceGreedy2Frame_SSE2(uint8_t *output, int outstride, - deinterlace_frame_data_t *data, diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 7d0726930..46c21bb73 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180316 2013-03-20 02:35:37Z eric $ +# $Id: PKGBUILD 186598 2013-05-30 03:34:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.2.2 -pkgrel=8 +pkgver=1.2.3 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" @@ -31,29 +31,22 @@ optdepends+=('wavpack: for using the wavpack plugin' \ 'gnome-vfs: for using the gnome-vfs plugin') [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz - xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch - 0001-fix-non-x86-build.patch) -sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c' - '45500eca2aa40c133e1a6e8b23dbadc4b921b11f' - '5f1a34c7bafa7ea96c0e4e14fbf6e31e53fe41e0') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h) +sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57' + '08ed9947ef919c71c87151baa8fc0ce7d8f72050') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix audio decoding with newest FFmpeg - # https://bugs.archlinux.org/task/33818 - patch -Np1 -i "$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch" - - patch -Np1 -i ${srcdir}/0001-fix-non-x86-build.patch +prepare() { + cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/ +} +build() { + cd ${pkgname}-${pkgver} [ "$CARCH" = "mips64el" ] || extraconf=--enable-vdpau - - ./configure --prefix=/usr --with-wavpack --disable-optimizations $extra + ./configure --prefix=/usr --with-wavpack --disable-optimizations $extraconf make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/xine-lib/accel_vaapi.h b/extra/xine-lib/accel_vaapi.h new file mode 100644 index 000000000..666b23fd6 --- /dev/null +++ b/extra/xine-lib/accel_vaapi.h @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2008 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + * + * + * Common acceleration definitions for vdpau + * + * + */ + +#ifndef HAVE_XINE_ACCEL_VAAPI_H +#define HAVE_XINE_ACCEL_VAAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <va/va_x11.h> +#include <pthread.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <avcodec.h> +#else +# include <libavcodec/avcodec.h> +#endif + +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) +# define AVVIDEO 2 +#else +# define AVVIDEO 1 +# define pp_context pp_context_t +# define pp_mode pp_mode_t +#endif + +#define NUM_OUTPUT_SURFACES 22 + +#define SURFACE_FREE 0 +#define SURFACE_ALOC 1 +#define SURFACE_RELEASE 2 +#define SURFACE_RENDER 3 +#define SURFACE_RENDER_RELEASE 5 + +struct vaapi_equalizer { + VADisplayAttribute brightness; + VADisplayAttribute contrast; + VADisplayAttribute hue; + VADisplayAttribute saturation; +}; + +typedef struct ff_vaapi_context_s ff_vaapi_context_t; + +struct ff_vaapi_context_s { + VADisplay va_display; + VAContextID va_context_id; + VAConfigID va_config_id; + int width; + int height; + int sw_width; + int sw_height; + int va_profile; + unsigned int va_colorspace; + VAImage va_subpic_image; + VASubpictureID va_subpic_id; + int va_subpic_width; + int va_subpic_height; + int is_bound; + void *gl_surface; + unsigned int soft_head; + unsigned int valid_context; + unsigned int va_head; + unsigned int va_soft_head; + vo_driver_t *driver; + unsigned int last_sub_image_fmt; + VASurfaceID last_sub_surface_id; + struct vaapi_equalizer va_equalizer; + VAImageFormat *va_image_formats; + int va_num_image_formats; + VAImageFormat *va_subpic_formats; + int va_num_subpic_formats; +}; + +typedef struct ff_vaapi_surface_s ff_vaapi_surface_t; +typedef struct vaapi_accel_s vaapi_accel_t; + +struct ff_vaapi_surface_s { + unsigned int index; + vaapi_accel_t *accel; + VASurfaceID va_surface_id; + unsigned int status; +}; + +struct vaapi_accel_s { + unsigned int index; + vo_frame_t *vo_frame; + +#if AVVIDEO > 1 + int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, AVPacket *avpkt); +#else + int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, uint8_t *buf, int buf_size); +#endif + VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender); + int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec); + ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen); + int (*guarded_render)(vo_frame_t *frame_gen); + ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen); + void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); + void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); +}; + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch deleted file mode 100644 index 255f56d0d..000000000 --- a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch +++ /dev/null @@ -1,277 +0,0 @@ -From 679582503c8ba2f91a82e44c4a2938550306fd07 Mon Sep 17 00:00:00 2001 -From: Torsten Jager <t.jager@gmx.de> -Date: Thu, 21 Feb 2013 22:35:00 +0200 -Subject: [PATCH 3/5] ffmpeg_audio_decoder: support new av_decode_audio4 () - ---- - src/combined/ffmpeg/ff_audio_decoder.c | 153 +++++++++++++++++++++++++++------ - src/combined/ffmpeg/ffmpeg_compat.h | 4 +- - 2 files changed, 131 insertions(+), 26 deletions(-) - -diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c -index 4e64378..34a7a9e 100644 ---- a/src/combined/ffmpeg/ff_audio_decoder.c -+++ b/src/combined/ffmpeg/ff_audio_decoder.c -@@ -71,7 +71,9 @@ typedef struct ff_audio_decoder_s { - int decoder_ok; - - AVCodecParserContext *parser_context; -- -+#if AVAUDIO > 3 -+ AVFrame *av_frame; -+#endif - } ff_audio_decoder_t; - - -@@ -150,6 +152,9 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ - return; - } - -+ /* Try to make the following true */ -+ this->context->request_sample_fmt = AV_SAMPLE_FMT_S16; -+ - /* Current ffmpeg audio decoders usually use 16 bits/sample - * buf->decoder_info[2] can't be used as it doesn't refer to the output - * bits/sample for some codecs (e.g. MS ADPCM) */ -@@ -358,25 +363,19 @@ static void ff_audio_output_close(ff_audio_decoder_t *this) - this->audio_channels = 0; - } - --static int ff_audio_decode(xine_t *xine, -- AVCodecContext *ctx, -- AVCodecParserContext *parser_ctx, -- int16_t *decode_buffer, int *decode_buffer_size, -- uint8_t *buf, int size) --{ -+static int ff_audio_decode (ff_audio_decoder_t *this, -+ int16_t *decode_buffer, int *decode_buffer_size, uint8_t *buf, int size) { - int consumed; - int parser_consumed = 0; - - #if AVPARSE > 1 -- if (parser_ctx) { -+ if (this->parser_context) { - uint8_t *outbuf; - int outsize; - - do { -- int ret = av_parser_parse2(parser_ctx, ctx, -- &outbuf, &outsize, -- buf, size, -- 0, 0, 0); -+ int ret = av_parser_parse2 (this->parser_context, this->context, -+ &outbuf, &outsize, buf, size, 0, 0, 0); - parser_consumed += ret; - buf += ret; - size -= ret; -@@ -385,7 +384,7 @@ static int ff_audio_decode(xine_t *xine, - /* nothing to decode ? */ - if (outsize <= 0) { - *decode_buffer_size = 0; -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: not enough data to decode\n"); - return parser_consumed; - } -@@ -402,21 +401,115 @@ static int ff_audio_decode(xine_t *xine, - avpkt.data = buf; - avpkt.size = size; - avpkt.flags = AV_PKT_FLAG_KEY; -- consumed = avcodec_decode_audio3 (ctx, -- decode_buffer, decode_buffer_size, -- &avpkt); -+# if AVAUDIO > 3 -+ int got_frame; -+ if (!this->av_frame) -+ this->av_frame = avcodec_alloc_frame (); -+ -+ consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); -+ if ((consumed >= 0) && got_frame) { -+ int16_t *q = decode_buffer; -+ int samples = this->av_frame->nb_samples; -+ int channels = this->context->channels; -+ int bytes, i, j; -+ /* limit buffer */ -+ if (channels > 12) -+ channels = 12; -+ if (*decode_buffer_size < samples * channels * 2) -+ samples = *decode_buffer_size / (channels * 2); -+ bytes = samples * channels * 2; -+ *decode_buffer_size = bytes; -+ /* convert to packed int16_t. I guess there is something -+ in libavfilter but also another dependency... */ -+ switch (this->context->sample_fmt) { -+ case AV_SAMPLE_FMT_U8P: -+ if (channels > 1) { -+ uint8_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (uint8_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = ((uint16_t)(*p[j]++) << 8) ^ 0x8000; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_U8: -+ { -+ uint8_t *p = (uint8_t *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) -+ *q++ = ((uint16_t)(*p++) << 8) ^ 0x8000; -+ } -+ break; -+ case AV_SAMPLE_FMT_S16P: -+ if (channels > 1) { -+ int16_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (int16_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = *p[j]++; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_S16: -+ xine_fast_memcpy (q, this->av_frame->extended_data[0], bytes); -+ break; -+ case AV_SAMPLE_FMT_S32P: -+ if (channels > 1) { -+ int32_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (int32_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = *p[j]++ >> 16; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_S32: -+ { -+ int32_t *p = (int32_t *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) -+ *q++ = *p++ >> 16; -+ } -+ break; -+ case AV_SAMPLE_FMT_FLTP: /* the most popular one */ -+ if (channels > 1) { -+ float *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (float *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) { -+ int v = *p[j]++ * (float)0x7fff; -+ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; -+ } -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_FLT: -+ { -+ float *p = (float *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) { -+ int v = *p++ * (float)0x7fff; -+ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; -+ } -+ } -+ break; -+ default: ; -+ } -+ } else *decode_buffer_size = 0; -+# else -+ consumed = avcodec_decode_audio3 (this->context, decode_buffer, decode_buffer_size, &avpkt); -+# endif - #else -- consumed = avcodec_decode_audio2 (ctx, -- decode_buffer, decode_buffer_size, -- buf, size); -+ consumed = avcodec_decode_audio2 (this->context, decode_buffer, decode_buffer_size, buf, size); - #endif - - if (consumed < 0) { -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: error decompressing audio frame (%d)\n", consumed); - } else if (parser_consumed && consumed != size) { - -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: decoder didn't consume all data\n"); - } - -@@ -469,8 +562,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; - - bytes_consumed = -- ff_audio_decode(this->stream->xine, this->context, -- this->parser_context, -+ ff_audio_decode(this, - (int16_t *)this->decode_buffer, &decode_buffer_size, - &this->buf[offset], this->size); - -@@ -539,6 +631,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - } - - /* fill up this buffer */ -+#if AVAUDIO < 4 - if (codec_type == BUF_AUDIO_WMAPRO) { - /* the above codecs output float samples, not 16-bit integers */ - int bytes_per_sample = sizeof(float); -@@ -558,7 +651,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - bytes_to_send = bytes_to_send * 2 / bytes_per_sample; - xine_fast_memcpy(audio_buffer->mem, int_buffer, bytes_to_send); - free(int_buffer); -- } else { -+ } else -+#endif -+ { - if ((decode_buffer_size - out) > audio_buffer->mem_size) - bytes_to_send = audio_buffer->mem_size; - else -@@ -595,6 +690,9 @@ static void ff_audio_reset (audio_decoder_t *this_gen) { - - /* try to reset the wma decoder */ - if( this->decoder_ok ) { -+#if AVAUDIO > 3 -+ avcodec_free_frame (&this->av_frame); -+#endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); - if (avcodec_open (this->context, this->codec) < 0) -@@ -626,6 +724,9 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) { - } - - if( this->context && this->decoder_ok ) { -+#if AVAUDIO > 3 -+ avcodec_free_frame (&this->av_frame); -+#endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); - pthread_mutex_unlock (&ffmpeg_lock); -@@ -668,7 +769,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, - - this->context = avcodec_alloc_context(); - this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE); -- -+#if AVAUDIO > 3 -+ this->av_frame = NULL; -+#endif - return &this->audio_decoder; - } - -diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h -index 0acead8..b567dc1 100644 ---- a/src/combined/ffmpeg/ffmpeg_compat.h -+++ b/src/combined/ffmpeg/ffmpeg_compat.h -@@ -94,7 +94,9 @@ - #endif - - /* avcodec_decode_audio() */ --#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+#if LIBAVCODEC_VERSION_MAJOR >= 54 -+# define AVAUDIO 4 -+#elif LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) - # define AVAUDIO 3 - #else - # define AVAUDIO 2 --- -1.8.1.5 - diff --git a/extra/xorg-appres/PKGBUILD b/extra/xorg-appres/PKGBUILD index a96168194..6f566cd17 100644 --- a/extra/xorg-appres/PKGBUILD +++ b/extra/xorg-appres/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 150960 2012-02-24 10:08:12Z pierre $ +# $Id: PKGBUILD 185747 2013-05-18 10:41:38Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-appres -pkgver=1.0.3 -pkgrel=3.1 +pkgver=1.0.4 +pkgrel=1 pkgdesc="List X application resource database" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libxt') makedepends=('xorg-util-macros') conflicts=('xorg-res-utils') source=("http://xorg.freedesktop.org/archive/individual/app/appres-${pkgver}.tar.bz2") -sha1sums=('7303f12fae8cce92da2dbd88c9d31d816dc5da06') +sha256sums=('9f614e9427cd9641a4a801ed5055700afa410674c0b7aa186b86078f11b83e8d') build() { cd "${srcdir}/appres-${pkgver}" diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD index 6c589a7ee..dc1b608d5 100644 --- a/extra/xorg-xdpyinfo/PKGBUILD +++ b/extra/xorg-xdpyinfo/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 176903 2013-02-02 07:12:27Z andyrtr $ +# $Id: PKGBUILD 186272 2013-05-23 15:31:13Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdpyinfo -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Display information utility for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2) -sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f') +sha256sums=('aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94') build() { cd "${srcdir}/xdpyinfo-${pkgver}" diff --git a/extra/xorg-xfontsel/PKGBUILD b/extra/xorg-xfontsel/PKGBUILD index cfdc6122c..ba9194ebf 100644 --- a/extra/xorg-xfontsel/PKGBUILD +++ b/extra/xorg-xfontsel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154158 2012-03-23 20:07:28Z andyrtr $ +# $Id: PKGBUILD 185743 2013-05-18 09:28:36Z bisson $ # Contributor: Jan de Groot <jgc@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xorg-xfontsel -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc='Point and click selection of X11 font names' url='http://xorg.freedesktop.org/' @@ -12,7 +12,7 @@ license=('custom') makedepends=('xorg-util-macros') depends=('libxaw' 'libxmu' 'libxt' 'libx11') source=("http://xorg.freedesktop.org/archive/individual/app/xfontsel-${pkgver}.tar.bz2") -sha1sums=('8e3da9d050ad71531bfeb98d5f1071c7b392b3bd') +sha1sums=('fbd8fa8a1c87d8da2e71def964e97bca1d4c4adf') build() { cd "${srcdir}/xfontsel-${pkgver}" diff --git a/extra/xorg-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD new file mode 100644 index 000000000..a2a623685 --- /dev/null +++ b/extra/xorg-xlsfonts/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 156352 2012-04-17 16:02:26Z andyrtr $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xorg-xlsfonts +pkgver=1.0.4 +pkgrel=1 +pkgdesc='List available X fonts' +url='http://xorg.freedesktop.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('libx11') +makedepends=('xorg-util-macros') +source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2") +sha1sums=('6fc23537797bb1ae4945efd8c01e675edf4a4c3f') + +build() { + cd "${srcdir}/xlsfonts-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xlsfonts-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/extra/xorg-xrefresh/PKGBUILD b/extra/xorg-xrefresh/PKGBUILD index 7113113bf..66bf9a086 100644 --- a/extra/xorg-xrefresh/PKGBUILD +++ b/extra/xorg-xrefresh/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151005 2012-02-24 13:07:46Z allan $ +# $Id: PKGBUILD 185750 2013-05-18 10:45:33Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xrefresh -pkgver=1.0.4 -pkgrel=3.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Refresh all or part of an X screen" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xrefresh-${pkgver}.tar.bz2) -sha1sums=('5e85ee14ea9a357c1d4372bbc068a8d452a134aa') +sha256sums=('3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6') build() { cd "${srcdir}/xrefresh-${pkgver}" diff --git a/extra/xorg-xwininfo/PKGBUILD b/extra/xorg-xwininfo/PKGBUILD index d790d29d8..6e0f703a5 100644 --- a/extra/xorg-xwininfo/PKGBUILD +++ b/extra/xorg-xwininfo/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 130758 2011-07-07 22:32:22Z andyrtr $ +# $Id: PKGBUILD 185752 2013-05-18 10:48:20Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xwininfo -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Command-line utility to print information about windows on an X server" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libxcb') makedepends=('xorg-util-macros' 'libx11') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwininfo-${pkgver}.tar.bz2) -sha1sums=('c90b3c289f95474aa8eb6cf1bf4caf3b9dbf82d3') +sha256sums=('218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8') build() { cd "${srcdir}/xwininfo-${pkgver}" diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD index 7f8e8f99b..dd25f19b9 100644 --- a/extra/xsane/PKGBUILD +++ b/extra/xsane/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184456 2013-05-06 19:40:28Z foutrelis $ +# $Id: PKGBUILD 185793 2013-05-19 08:52:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=xsane pkgname=('xsane' 'xsane-gimp') pkgver=0.998 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64 mips64el) url="http://www.xsane.org" license=('GPL2') @@ -15,11 +15,15 @@ source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' '15541ff0ddc10acfa2059cf99d5478eb') -build() { - cd "$srcdir/$pkgbase-$pkgver" +prepare() { + cd "$srcdir/$pkgname-$pkgver" # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora - patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" + patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c +} + +build() { + cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr \ --mandir=/usr/share/man \ @@ -29,7 +33,7 @@ build() { # build again with gimp enabled make clean - ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp + ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --disable-gimp make } @@ -49,9 +53,10 @@ package_xsane-gimp() { install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp" ## For making Gimp Plugin available - /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" - cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" - /bin/ln -s ../../../../bin/xsane-gimp xsane + mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" + ln -sf /usr/bin/xsane-gimp $pkgdir/usr/lib/gimp/2.0/plug-ins/xsane + #cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" + #/bin/ln -s ../../../../bin/xsane-gimp xsane # http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup # when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 2133e855a..05f9129a2 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183672 2013-04-26 12:52:31Z andyrtr $ +# $Id: PKGBUILD 186582 2013-05-29 15:27:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=292 +pkgver=293 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('d6e7d1bd31b23fb58ca213c912f32009' +md5sums=('f9dc37486d5f1e550b6dc2e26a8a0439' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index ea101c1b6..8045f9ab8 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184457 2013-05-06 19:40:30Z foutrelis $ +# $Id: PKGBUILD 185530 2013-05-14 19:12:24Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=20.0 -pkgrel=2 +pkgver=21.0 +pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -16,10 +16,10 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ shared-libs.patch) options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('1b8a1907919eb805f390a05216f2d8d0' - 'f26710bcf3e65699a0646c47155cb147' - '27271ce647a83906ef7a24605e840d61' - '52e52f840a49eb1d14be1c0065b03a93') +sha256sums=('c3623bc243bd57c7267eacac658993f5f635f639235bea9ed8fce9b52e59be64' + '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' + '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') prepare() { cd "$srcdir/mozilla-release" diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index b91266562..7900d1dd2 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183469 2013-04-21 22:12:25Z heftig $ +# $Id: PKGBUILD 185459 2013-05-14 10:26:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f4a02dad614bfc04b6a998440123633145f4011c3a1d35415492d2ff76c1707f') +sha256sums=('73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e') build() { cd $pkgname-$pkgver diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index 27fb1b8fe..c1fedbfc3 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184214 2013-05-03 22:54:48Z tomegun $ +# $Id: PKGBUILD 185611 2013-05-15 22:57:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,13 +6,13 @@ pkgname=ypbind-mt pkgver=1.37.1 -pkgrel=4 +pkgrel=5 pkgdesc='Linux NIS daemon' url='http://www.linux-nis.org/nis/ypbind-mt/' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') makedepends=('networkmanager') -depends=('rpcbind' 'openslp' 'yp-tools') +depends=('rpcbind' 'openslp' 'yp-tools' 'systemd') backup=('etc/yp.conf') source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'ypbind.service') @@ -22,7 +22,8 @@ build() { ./configure \ --prefix=/usr \ - --build=$CHOST + --build=$CHOST \ + --sbindir=/usr/bin make } @@ -37,4 +38,4 @@ package() { install -d -m755 "${pkgdir}"/var/yp/binding } md5sums=('8af8d35e7b9a7fcc3a1576697a04bd82' - '9083debd16fc49c6645372caa25969b5') + '5ea205756731c2978cca4934141424bd') diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service index 08e4fe14e..bb13f1d66 100644 --- a/extra/ypbind-mt/ypbind.service +++ b/extra/ypbind-mt/ypbind.service @@ -7,7 +7,7 @@ Before=systemd-user-sessions.service [Service] Type=forking PIDFile=/run/ypbind.pid -ExecStart=/usr/sbin/ypbind +ExecStart=/usr/bin/ypbind # Terrible hack, upstream ypbind should sort something out # Wait for at most 10 seconds for a NIS master to become available ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done" diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD index 3e20855a7..1b84a81ac 100644 --- a/extra/ypserv/PKGBUILD +++ b/extra/ypserv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184215 2013-05-03 22:54:49Z tomegun $ +# $Id: PKGBUILD 185612 2013-05-15 22:57:02Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=ypserv pkgver=2.31 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64' 'mips64el') url='http://www.linux-nis.org/nis/ypserv/' @@ -21,7 +21,7 @@ source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.b build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -37,6 +37,6 @@ package() { install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service } md5sums=('4537b8f0e917edca8f57b70b9cbc37f3' - 'c80e253756446d59a90c4c21b1cb8740' - '7cba3dd3544436c3c1f05e36c0018e92' - '3398271c3e0a054e64b06b99aa2dc63d') + '0639cc2e8f667272335649eeede77206' + '9ff147310a5b83749357b6587cccdf34' + '89b8b608c81fd01bb81cdb551854833f') diff --git a/extra/ypserv/yppasswdd.service b/extra/ypserv/yppasswdd.service index 9a7068b6c..371a7d481 100644 --- a/extra/ypserv/yppasswdd.service +++ b/extra/ypserv/yppasswdd.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/yppasswdd.pid -ExecStart=/usr/sbin/rpc.yppasswdd +ExecStart=/usr/bin/rpc.yppasswdd [Install] WantedBy=multi-user.target diff --git a/extra/ypserv/ypserv.service b/extra/ypserv/ypserv.service index 024a92e5a..8aa6b2a24 100644 --- a/extra/ypserv/ypserv.service +++ b/extra/ypserv/ypserv.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/ypserv.pid -ExecStart=/usr/sbin/ypserv +ExecStart=/usr/bin/ypserv [Install] WantedBy=multi-user.target diff --git a/extra/ypserv/ypxfrd.service b/extra/ypserv/ypxfrd.service index 322ef559f..c7bb6ed87 100644 --- a/extra/ypserv/ypxfrd.service +++ b/extra/ypserv/ypxfrd.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/ypxfrd.pid -ExecStart=/usr/sbin/rpc.ypxfrd +ExecStart=/usr/bin/rpc.ypxfrd [Install] WantedBy=multi-user.target diff --git a/java-ugly/maven/PKGBUILD b/java-ugly/maven/PKGBUILD index 2bd99940e..3f8e5071d 100755 --- a/java-ugly/maven/PKGBUILD +++ b/java-ugly/maven/PKGBUILD @@ -2,51 +2,72 @@ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> -_pkgname=maven -pkgname=maven-libre -pkgver=3.0.4 +pkgname=maven +pkgver=3.0.5 +pkgdesc="A Java project management and project comprehension tool" +url="http://maven.apache.org" +license=('Apache') -provides=("$_pkgname=$pkgver") -replaces=("$_pkgname") -conflicts=("$_pkgname") +replaces=('maven-libre') +conflicts=('maven-libre') pkgrel=1 -pkgdesc="A Java project management and project comprehension tool" arch=('any') -url="http://maven.apache.org" -license=('Apache') -depends=('java-environment') -makedepends=('apache-ant') +options=(!emptydirs) +conflicts=('maven') +depends=('java-environment' 'sh') +makedepends=('apache-ant' 'jh' 'imake' + java-antlr2 + java-asm3 +) backup=('etc/maven/settings.xml') _mirror=http://archive.apache.org/dist -source=($_mirror/maven/source/apache-maven-$pkgver-src.tar.gz +source=($_mirror/maven/maven-${pkgver%%.*}/$pkgver/source/apache-maven-$pkgver-src.tar.gz maven.sh maven.csh) -_M2_LOCALREPO="/usr/share/maven/repository" - -# FIXME: This also does tasks for package() -build() { - cd $srcdir/apache-maven-$pkgver - +_setup_env() { + unset _JAVA_OPTIONS . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - export MAVEN_OPTS=-Xmx512m export M2_HOME="$pkgdir"/opt/maven export PATH="$PATH:$M2_HOME/bin" + _M2_LOCALREPO=$(jh mvn-localrepo) + ant_args=( + -Dmaven.repo.local="$srcdir"/maven.repo.local + ) +} - # FIXME: Downloads many deps from Internet. They should be - # packaged separately and added to depends=() - install -d "$pkgdir`dirname $_M2_LOCALREPO`" - cp -r $_M2_LOCALREPO "$pkgdir$_M2_LOCALREPO" - install -d "$pkgdir"/opt - ant -Dmaven.repo.local="$pkgdir$_M2_LOCALREPO" - rm "$pkgdir"/opt/maven/*.txt +prepare() { + if type mvn &>/dev/null; then + error "maven cannot be built while an existing version is installed" + return 1 + fi } -package() { - install -d "$pkgdir$_M2_LOCALREPO" +build() ( + _setup_env + install -d "$srcdir"/maven.repo.local + lndir "$_M2_LOCALREPO" "$srcdir"/maven.repo.local + + cd "$srcdir"/apache-maven-$pkgver + + # FIXME: downloads makedepends from the Internet. Add them to makedepends=() + ant "${ant_args[@]}" maven-assembly 2>&1|tee "$srcdir"/ant-log.txt + + < "$srcdir"/ant-log.txt \ + sed -nr 's/.*Download(ed|ing):\s*//p' | \ + sed 's/ .*//' | \ + sed -r -e 's|^http://repo.maven.apache.org/maven2/||' -e 's/\.(jar|pom)$//' | \ + sort -u > "$srcdir"/downloaded-artifacts.txt +) + +package() ( + _setup_env + cd "$srcdir"/apache-maven-$pkgver + ant "${ant_args[@]}" extract-assembly + #rm "$pkgdir"/opt/maven/*.txt # Install config file in /etc # Unlike the other directories, we symlink from the system to /opt/maven @@ -69,8 +90,18 @@ package() { # Link jar files to appropriate place in /usr/share install -d "$pkgdir"/usr/share/java ln -s /opt/maven/lib "$pkgdir"/usr/share/java/maven -} -md5sums=('17ca94d5be05a78c6ab12425b7a0ee10' + # Install the local repo + mkdir -p "$pkgdir"${_M2_LOCALREPO%/*} + cp -a "$srcdir"/maven.repo.local "$pkgdir"$_M2_LOCALREPO + # Remove extra artifacts + find "$pkgdir"$_M2_LOCALREPO -type l -delete + find "$pkgdir"$_M2_LOCALREPO -name _maven.repositories -delete + cat "$srcdir"/downloaded-artifacts.txt | while read artifact; do + rm -f "$pkgdir"$_M2_LOCALREPO/$artifact* + done +) + +md5sums=('b88becd8fe5a9665191e05945942db64' '58820067a4d7384477daa134023d9b57' 'e2bbdeffed100cd51d05b2ba8ebd6321') diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD new file mode 100644 index 000000000..4269d30c7 --- /dev/null +++ b/java/antlr2/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: George Giorgidze <giorgidze (at) gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> + +pkgbase=antlr2 +pkgname=(antlr2 antlr2-{java,python2,cxx,sharp}) +pkgver=2.7.7 +url="http://www.antlr2.org/" +license=('custom:Public Domain') + +pkgrel=3 +arch=('i686' 'x86_64') +makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh') +source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz" + "http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom" + 'runantlr2.sh' 'gcc4.4.patch' 'mono.patch') + +build() { + cd "${srcdir}/antlr-${pkgver}" + + patch -Np1 -i "${srcdir}"/gcc4.4.patch + patch -Np1 -i "${srcdir}"/mono.patch + + ./configure --prefix=/usr --disable-examples + make -j1 + + cd lib/csharp + nant release +} + +_install_license() { + install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_antlr2() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)" + depends=('sh' 'antlr2-java') + + install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2 + _install_license +} + +package_antlr2-java() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)" + depends=('java-runtime') + + provides=("java-antlr2=$pkgver") + conflicts=("java-antlr2") + replaces=("java-antlr2") + + DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \ + "$srcdir"/antlr-${pkgver}.pom \ + "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \ + antlr2.jar + + _install_license +} + +package_antlr2-python2() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)" + depends=('antlr2' 'python2') + + provides=("python2-antlr2=$pkgver") + conflicts=("python2-antlr2") + replaces=("python2-antlr2") + + cd "$srcdir"/antlr-${pkgver}/lib/python + python2 setup.py install --root="${pkgdir}" --optimize=1 + + _install_license +} + +package_antlr2-cxx() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)" + depends=('java-runtime') + + cd "$srcdir"/antlr-${pkgver}/lib/cpp + make -j1 prefix="${pkgdir}/usr" install + + _install_license +} + +package_antlr2-sharp() { + pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)" + depends=('antlr2' 'mono') + + cd "$srcdir"/antlr-${pkgver}/lib/csharp + install -d "$pkgdir"/usr/share + make -j1 prefix="${pkgdir}/usr" install + + _install_license +} + +md5sums=('01cc9a2a454dd33dcd8c856ec89af090' + '78af3de823003f6d8dded39c70bc30ae' + 'e4aa827cf78f97c4e5fae086831192d6' + '158677e4c0f357afbb56656231a54815' + '0d1960d27ff81f2fea0dd35a8290216f') diff --git a/java/antlr2/gcc4.4.patch b/java/antlr2/gcc4.4.patch new file mode 100644 index 000000000..15e25fb00 --- /dev/null +++ b/java/antlr2/gcc4.4.patch @@ -0,0 +1,12 @@ +diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp ++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +@@ -10,6 +10,8 @@ + + #include <antlr/config.hpp> + ++#include <cstdio> ++#include <cstring> + #include <map> + + #ifdef HAS_NOT_CCTYPE_H diff --git a/java/antlr2/mono.patch b/java/antlr2/mono.patch new file mode 100644 index 000000000..59c78d811 --- /dev/null +++ b/java/antlr2/mono.patch @@ -0,0 +1,31 @@ +diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build +--- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build 2006-11-01 16:37:17.000000000 -0500 ++++ antlr-2.7.7/lib/csharp/antlr.runtime.build 2013-05-14 20:07:32.000000000 -0400 +@@ -25,6 +25,9 @@ + + <!-- Use script task to get this from AssemblyInfo.cs using a regular expression --> + <script language="C#"> ++ <imports> ++ <import namespace="System.Text.RegularExpressions" /> ++ </imports> + <code><![CDATA[ + public static void ScriptMain(Project project) { + string assemblyInfoFileName = Path.Combine(project.BaseDirectory, "antlr.runtime/AssemblyInfo.cs"); +@@ -122,7 +125,7 @@ + </csc> + + <!-- copy the antlr.runtime assembly to the astframe build folder --> +- <copy file="${compile.dir}\${project.FileName}.dll" tofile="${astframe.compile.dir}\${project.FileName}.dll" /> ++ <copy file="${compile.dir}/${project.FileName}.dll" tofile="${astframe.compile.dir}/${project.FileName}.dll" /> + + <!-- compile antlr.astframe.dll --> + <csc target="library" output="${astframe.compile.dir}/${astframe.FileName}.dll" debug="${debug}" doc="${astframe.build.dir}/${astframe.FileName}.xml"> +@@ -134,7 +137,7 @@ + <include name="System.dll" /> + <include name="System.Drawing.dll" /> + <include name="System.Windows.Forms.dll" /> +- <include name="${astframe.compile.dir}\${project.FileName}.dll" /> ++ <include name="${astframe.compile.dir}/${project.FileName}.dll" /> + </references> + <arg value="/nowarn:1591"/> + </csc> diff --git a/java/antlr2/runantlr2.sh b/java/antlr2/runantlr2.sh new file mode 100644 index 000000000..716f6f887 --- /dev/null +++ b/java/antlr2/runantlr2.sh @@ -0,0 +1,5 @@ +#!/bin/sh +echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable +export CLASSPATH +CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar +java antlr.Tool $* diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD index 3541c20ab..71bc0f303 100644 --- a/java/java-asm2/PKGBUILD +++ b/java/java-asm2/PKGBUILD @@ -5,8 +5,7 @@ pkgver=2.2.3 #### -pkgrel=5 -_checksource_ignore=('test/conform/org/objectweb/asm/signature/signatures.txt') +pkgrel=6 mksource() { cd "$srcdir/$_pkgname-$pkgver" @@ -15,4 +14,5 @@ mksource() { mkdir -p test/lib } -md5sums=('7a92c87bf067925685cf68dcc0dd8998') +mkmd5sums=('7a92c87bf067925685cf68dcc0dd8998') +md5sums=('c2119ab39618cb49ca4e4ad74344b488') diff --git a/java/java-asm2/PKGBUILD-bootstrap b/java/java-asm2/PKGBUILD-bootstrap index 9e896a90e..cbe29bb34 100644 --- a/java/java-asm2/PKGBUILD-bootstrap +++ b/java/java-asm2/PKGBUILD-bootstrap @@ -7,6 +7,7 @@ makedepends=(jh) source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver-bin.zip") +unset mksource _distdir="$_pkgname-$pkgver" provides+=("$pkgname=$pkgver") diff --git a/java/java-asm2/common.sh b/java/java-asm2/common.sh index 6a664c9ff..ef4547696 100644 --- a/java/java-asm2/common.sh +++ b/java/java-asm2/common.sh @@ -13,21 +13,21 @@ makedepends=( java-ow-util-ant-tasks jh ) -source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") +source=("libre://$pkgname-$pkgver.tar.gz") +mksource=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") _distdir="$_pkgname-$pkgver/output/dist" _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' build() { cd "$srcdir/$_pkgname-$pkgver" - eval `jh mksource ${_checksource_ignore[@]}` echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties ant dist # This will make package() easier: cd "$srcdir/$_distdir/lib" - ln -s all/* . + ln -sf all/* . } package() { @@ -48,12 +48,18 @@ package() { # Install Maven artifacts export DESTDIR=$pkgdir - for artifact in $(ls *.jar|sed 's/-[0-9.]*\.jar$//'); do - jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom} - # Symlink them to /usr/share/java - ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \ + for artifact in $(printf '%s\n' *.pom|sed 's/-[0-9.]*\.pom$//'); do + if [[ -f $artifact-$pkgver.jar ]]; then + # This artifact has a jar file + jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{pom,jar} + # Symlink them to /usr/share/java + ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \ "$pkgdir"/usr/share/java/$_pkgname/ - ln -s $_pkgname/$artifact-$pkgver.jar \ + ln -s $_pkgname/$artifact-$pkgver.jar \ "$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar + else + # This artifact is just a pom + jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.pom + fi done } diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD index e85896b72..345c83edf 100644 --- a/java/java-asm3/PKGBUILD +++ b/java/java-asm3/PKGBUILD @@ -5,8 +5,7 @@ pkgver=3.3.1 #### -pkgrel=5 -_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz) +pkgrel=6 mksource() { cd "$srcdir/$_pkgname-$pkgver" @@ -14,4 +13,5 @@ mksource() { rm examples/jasmin/test/jasmin.jar } -md5sums=('433024df8176f09922646316e415631c') +mkmd5sums=('433024df8176f09922646316e415631c') +md5sums=('c49fb45629cf8670b7f46b95013141cd') diff --git a/java/java-ow-util-ant-tasks/PKGBUILD b/java/java-ow-util-ant-tasks/PKGBUILD index f1add43ea..71c5fae94 100644 --- a/java/java-ow-util-ant-tasks/PKGBUILD +++ b/java/java-ow-util-ant-tasks/PKGBUILD @@ -2,14 +2,29 @@ pkgname=java-ow-util-ant-tasks pkgver=1.3.2 -pkgrel=1 pkgdesc="ObjectWeb utility Ant tasks library" -arch=('any') url="http://forge.ow2.org/projects/monolog" license=('LGPL') + +pkgrel=3 +arch=('any') depends=('java-environment') makedepends=('apache-ant' 'xalan-java' 'java-asm2') -source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src.tar.xz") + +source=("libre://$pkgname-$pkgver.tar.gz") +md5sums=('f64b2aeac98508ac322a6509ba754425') + +mksource=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip") +mknoextract=("ow_util_ant_tasks_$pkgver.zip") +mkmd5sums=('cd602bf75a0feab480fa97739955b84e') +mksource() { + cd "$srcdir" + mkdir $pkgname-$pkgver + cd $pkgname-$pkgver + bsdtar xf ../ow_util_ant_tasks_$pkgver.zip + rm -rf output + rm externals/* +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,4 +39,3 @@ package() { install -m644 "output/lib/ow_util_ant_tasks.jar" "$pkgdir"/usr/share/java } -md5sums=('339b3eb4b2960473a42f5f781afbeca6') diff --git a/java/java-ow-util-ant-tasks/SRCBUILD b/java/java-ow-util-ant-tasks/SRCBUILD deleted file mode 100644 index 01241907d..000000000 --- a/java/java-ow-util-ant-tasks/SRCBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=java-ow-util-ant-tasks -pkgver=1.3.2 -pkgrel=1 -pkgdesc="ObjectWeb utility Ant tasks library" -arch=('any') -url="http://forge.ow2.org/projects/monolog" -license=('LGPL') -source=("http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_$pkgver.zip") -noextract=("ow_util_ant_tasks_$pkgver.zip") - -build() { - cd "$srcdir" - mkdir $pkgname-$pkgver - cd $pkgname-$pkgver - bsdtar xf "$srcdir"/ow_util_ant_tasks_$pkgver.zip - rm -rf output - rm externals/* -} - - -package() { - PKGEXT=${SRCEXT} - PKGDEST=${SRCDEST} - cp -a "$srcdir/$pkgname-$pkgver" "$pkgdir/" -} - -md5sums=('cd602bf75a0feab480fa97739955b84e') diff --git a/java/jh/PKGBUILD b/java/jh/PKGBUILD index e8a59f9c4..4c1dee6f3 100644 --- a/java/jh/PKGBUILD +++ b/java/jh/PKGBUILD @@ -1,26 +1,27 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=jh -pkgver=0.3.3 +pkgver=0.5 pkgdesc="Java helpers for PKGBUILDs" -url="https://gitorious.org/parabola/jh" -license=('Public Domain') +url="https://projects.parabolagnulinux.org/packages/jh.git/" +license=('custom:WTFPL') pkgrel=1 arch=(any) -depends=(xmlstarlet) -makedepends=('pacman>4.0.3') optdepends=("maven: for configurable maven local repository location") -source=("git://gitorious.org/parabola/jh.git#tag=v$pkgver") +source=("https://projects.parabolagnulinux.org/packages/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2") build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd "$srcdir/$pkgname" + depends=(xmlstarlet) + + cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums=('SKIP') +md5sums=('5fe2279fbada213eb8df38875450c4d2') diff --git a/java/nant/PKGBUILD b/java/nant/PKGBUILD new file mode 100644 index 000000000..02d9908a6 --- /dev/null +++ b/java/nant/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +pkgname=nant +pkgver=0.92 +pkgrel=1 +pkgdesc="A free .NET build tool" +arch=('i686' 'x86_64') +url="http://nant.sourceforge.net" +license=("GPL2") +depends=('mono-basic') +makedepends=('pkgconfig') +source=("http://downloads.sourceforge.net/nant/$pkgname-$pkgver-src.tar.gz") + +package() { + cd "$srcdir"/$pkgname-$pkgver + make -j1 install prefix=/usr DESTDIR="$pkgdir" +} + +md5sums=('d680b47f9b2ce197cec0fac7d7d60950') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index a1e90b3b6..ca6fbb0fa 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.8 -pkgver=${_basekernel}.11 +_basekernel=3.9 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('5c7787be882c343e41fb49136ff60aec' - 'c0ccd5624a61eaae1a00a349e90b5a26' - '6294513cfa9830d48ad1915ff7053a98' +md5sums=('120df29f88622dabf7015a22c7cc8e25' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '7985f1e2cdb6838cf89bd85c0229db6a' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add freedo as boot logo @@ -288,7 +288,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } pkgname=("${pkgbase}" "${pkgbase}-headers") diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 11b5bb531..dd3549ac6 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.5-1 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -41,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE-PAE" @@ -120,6 +118,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -216,14 +215,18 @@ CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y @@ -248,8 +251,9 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_REL=y -CONFIG_GENERIC_SIGALTSTACK=y CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -322,6 +326,8 @@ CONFIG_SMP=y CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -404,6 +410,9 @@ CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_MICROCODE_INTEL_LIB=y +CONFIG_MICROCODE_INTEL_EARLY=y +CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set @@ -425,6 +434,7 @@ CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_BALLOON_COMPACTION=y @@ -527,9 +537,9 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m @@ -570,6 +580,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # +CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -816,6 +827,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -888,9 +900,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # Xtables matches # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -988,7 +1002,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1065,7 +1078,7 @@ CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # -# DCCP CCIDs Configuration (EXPERIMENTAL) +# DCCP CCIDs Configuration # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y @@ -1101,8 +1114,10 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_TAG_DSA=y @@ -1110,6 +1125,7 @@ CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m @@ -1126,7 +1142,6 @@ CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m @@ -1195,6 +1210,8 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1381,6 +1398,8 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m # # Device Drivers @@ -1397,6 +1416,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set @@ -1419,6 +1439,7 @@ CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_OF_PARTS=m CONFIG_MTD_AR7_PARTS=m @@ -1582,7 +1603,6 @@ CONFIG_ISAPNP=y CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_CPQ_DA=m @@ -1611,6 +1631,7 @@ CONFIG_ATA_OVER_ETH=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m # # Misc devices @@ -1626,6 +1647,7 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1647,6 +1669,7 @@ CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1674,6 +1697,8 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1769,6 +1794,7 @@ CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1851,6 +1877,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -1956,7 +1983,6 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1968,6 +1994,9 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -2094,7 +2123,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m CONFIG_3C515=m CONFIG_PCMCIA_3C574=m @@ -2110,7 +2138,6 @@ CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_LANCE=m CONFIG_PCNET32=m -CONFIG_DEPCA=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2130,6 +2157,7 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2146,7 +2174,6 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y -CONFIG_EWRK3=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 @@ -2160,8 +2187,6 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m CONFIG_NET_VENDOR_DLINK=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DL2K=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -2172,9 +2197,7 @@ CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_AT1700=m CONFIG_PCMCIA_FMVJ18X=m -CONFIG_ETH16I=m CONFIG_NET_VENDOR_HP=y CONFIG_HP100=m CONFIG_NET_VENDOR_INTEL=y @@ -2182,6 +2205,7 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m @@ -2190,14 +2214,6 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m -CONFIG_NI52=m -CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y @@ -2226,12 +2242,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_8390=y -CONFIG_EL2=m -CONFIG_AC3200=m CONFIG_PCMCIA_AXNET=m -CONFIG_E2100=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m CONFIG_PCMCIA_PCNET=m @@ -2250,7 +2261,6 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_RACAL=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2263,7 +2273,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -CONFIG_SEEQ8005=m CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m CONFIG_NET_VENDOR_SIS=y @@ -2365,6 +2374,7 @@ CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m @@ -2497,6 +2507,7 @@ CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m +CONFIG_IWLMVM=m # # Debugging Options @@ -2551,6 +2562,7 @@ CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m @@ -2558,13 +2570,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m @@ -2575,7 +2587,7 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m # CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m -CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_WILINK_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m @@ -2794,6 +2806,7 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -2803,6 +2816,7 @@ CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_INPORT=m # CONFIG_MOUSE_ATIXL is not set CONFIG_MOUSE_LOGIBM=m @@ -2972,6 +2986,7 @@ CONFIG_GAMEPORT_FM801=m # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -3003,9 +3018,11 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 @@ -3034,6 +3051,8 @@ CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3079,6 +3098,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_I2C=m @@ -3106,6 +3126,7 @@ CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m @@ -3208,6 +3229,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y @@ -3223,6 +3245,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set # # I2C GPIO expanders: @@ -3287,6 +3310,7 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_AVS=y @@ -3365,6 +3389,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m @@ -3399,6 +3424,7 @@ CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3431,10 +3457,12 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_FAIR_SHARE=y -CONFIG_STEP_WISE=y -# CONFIG_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3443,6 +3471,7 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3603,8 +3632,10 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set @@ -3705,7 +3736,6 @@ CONFIG_USB_SN9C102=m # # Analog TV USB devices # -CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y @@ -3719,6 +3749,8 @@ CONFIG_VIDEO_STK1160_AC97=y # # Analog/digital TV USB devices # +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3835,7 +3867,6 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -3856,6 +3887,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m # CONFIG_V4L_TEST_DRIVERS is not set # @@ -3879,6 +3911,7 @@ CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m @@ -3900,18 +3933,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # # common driver options # +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # # Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_VIDEO_IR_I2C=m # @@ -3953,11 +3987,6 @@ CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_CX25840=m # -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# # Video encoders # CONFIG_VIDEO_SAA7127=m @@ -4057,6 +4086,7 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m CONFIG_DVB_TDA10071=m @@ -4168,20 +4198,21 @@ CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -4197,9 +4228,11 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_STUB_POULSBO=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_OF_DISPLAY_TIMING is not set +# CONFIG_OF_VIDEOMODE is not set +CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m @@ -4268,6 +4301,7 @@ CONFIG_FB_VOODOO1=m # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -4286,6 +4320,8 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_LD9040 is not set # CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4462,6 +4498,7 @@ CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y @@ -4478,6 +4515,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4595,6 +4633,7 @@ CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4603,6 +4642,7 @@ CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y CONFIG_HID_TIVO=m CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m @@ -4793,6 +4833,7 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m @@ -4824,10 +4865,13 @@ CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m # # USB Physical Layer drivers # +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set CONFIG_USB_ISP1301=m CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m @@ -4859,6 +4903,8 @@ CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4871,7 +4917,7 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m @@ -4955,12 +5001,14 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m # CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_PWM is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -5014,6 +5062,7 @@ CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set @@ -5063,6 +5112,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -5088,6 +5138,11 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -5096,9 +5151,12 @@ CONFIG_DMADEVICES=y # CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y # # DMA Clients @@ -5122,7 +5180,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # @@ -5208,6 +5269,7 @@ CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5300,7 +5362,6 @@ CONFIG_RTS5139=m # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DUMP_PCM is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5308,7 +5369,6 @@ CONFIG_VT6656=m CONFIG_DX_SEP=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -# CONFIG_ZCACHE is not set CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m @@ -5384,18 +5444,18 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m -CONFIG_ZCACHE2=y CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m -CONFIG_SB105X=m CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5448,6 +5508,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y @@ -5457,13 +5518,13 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # -# Remoteproc drivers (EXPERIMENTAL) +# Remoteproc drivers # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # -# Rpmsg drivers (EXPERIMENTAL) +# Rpmsg drivers # CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set @@ -5473,11 +5534,11 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y +CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m @@ -5548,7 +5609,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -5613,6 +5674,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m @@ -5672,7 +5734,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m @@ -5681,6 +5743,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5694,8 +5757,9 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y @@ -5824,8 +5888,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -5847,6 +5909,12 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -5869,6 +5937,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y @@ -5876,7 +5945,6 @@ CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5889,6 +5957,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5898,6 +5967,7 @@ CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -6045,6 +6115,8 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -6200,3 +6272,4 @@ CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_MPILIB=m CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 76fa87eb8..a5e974c9b 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.11-1-LIBRE-PAE +KERNEL_VERSION=3.9.4-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 77ebe521f..d93b6247b 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_releasever=10 -_rtpatchver=rt6 +_releasever=13 +_rtpatchver=rt9 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,8 +33,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5c7787be882c343e41fb49136ff60aec' - '1a05d0c781ac02fed58ad405a8b8355a' - '23d715c891ecfb436cb2a4c4ea5286af' + '2242024493dcb72a8777e11198f5e743' + '2b8fc5a819ee9bdf79aec69e07565cae' '5ed195b8c44e1e00c1885077566e1f81' 'f97a0be3b9252e788a0cf67e93cb5c6f' '82496e68851d1960543a07ba51cdb44a' @@ -42,7 +42,7 @@ md5sums=('5c7787be882c343e41fb49136ff60aec' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'c1a8440ffdae7c352d77bc4002cb6d3d') + '0bb62b946f06edc2f5b0249b7fc773e4') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 4b78a3997..374862298 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.8.10-1-rt6-LIBRE-RT +KERNEL_VERSION=3.8.13-1-rt9-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 2d2ba5338..7ae0ec08c 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 183701 2013-04-27 10:47:26Z tpowa $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name -_basekernel=3.8 -pkgver=${_basekernel}.11 +_basekernel=3.9 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('5c7787be882c343e41fb49136ff60aec' - 'c0ccd5624a61eaae1a00a349e90b5a26' - '2708b6f03f827e2c94ecbd050df4286d' +md5sums=('120df29f88622dabf7015a22c7cc8e25' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '8cc2a43c771d0fbb652c8264c746c007' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c') @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add freedo as boot logo @@ -288,7 +288,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} } pkgname=("${pkgbase}" "${pkgbase}-headers") diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 3464a1814..dd2c45fd8 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.5-1 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -41,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_HAVE_IRQ_WORK=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE-XEN" @@ -120,6 +118,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_TREE_PREEMPT_RCU=y CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_FANOUT_EXACT is not set @@ -216,14 +215,18 @@ CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y @@ -248,8 +251,9 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_REL=y -CONFIG_GENERIC_SIGALTSTACK=y CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -322,6 +326,8 @@ CONFIG_SMP=y CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -409,6 +415,9 @@ CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_MICROCODE_INTEL_LIB=y +CONFIG_MICROCODE_INTEL_EARLY=y +CONFIG_MICROCODE_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set @@ -430,6 +439,7 @@ CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_BALLOON_COMPACTION=y @@ -532,9 +542,9 @@ CONFIG_ACPI_THERMAL=m CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m +CONFIG_ACPI_PCI_SLOT=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m @@ -575,6 +585,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # x86 CPU frequency scaling drivers # +CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -823,6 +834,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CT_PROTO_DCCP=m CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m @@ -895,9 +907,11 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # Xtables matches # CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m @@ -995,7 +1009,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -1072,7 +1085,7 @@ CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m # -# DCCP CCIDs Configuration (EXPERIMENTAL) +# DCCP CCIDs Configuration # # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y @@ -1108,8 +1121,10 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_TAG_DSA=y @@ -1117,6 +1132,7 @@ CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m @@ -1133,7 +1149,6 @@ CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP_DECAP=y # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_WAN_ROUTER is not set CONFIG_PHONET=m CONFIG_IEEE802154=m CONFIG_IEEE802154_6LOWPAN=m @@ -1202,6 +1217,8 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -1388,6 +1405,8 @@ CONFIG_NFC_HCI=m # CONFIG_NFC_PN533=m CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m # # Device Drivers @@ -1404,6 +1423,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y @@ -1426,6 +1446,7 @@ CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_OF_PARTS=m CONFIG_MTD_AR7_PARTS=m @@ -1589,7 +1610,6 @@ CONFIG_ISAPNP=y CONFIG_PNPACPI=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_CPQ_DA=m @@ -1620,6 +1640,7 @@ CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m # # Misc devices @@ -1635,6 +1656,7 @@ CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_CS5535_MFGPT=m CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 @@ -1656,6 +1678,7 @@ CONFIG_BMP085_I2C=m # CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1683,6 +1706,8 @@ CONFIG_SENSORS_LIS3_I2C=m # CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1778,6 +1803,7 @@ CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT3SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_LOGGING=y CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_FLASHPOINT is not set @@ -1860,6 +1886,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -1965,7 +1992,6 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1977,6 +2003,9 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m CONFIG_DM_MIRROR=m CONFIG_DM_RAID=m CONFIG_DM_LOG_USERSPACE=m @@ -2102,7 +2131,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m CONFIG_ETHERNET=y CONFIG_MDIO=m CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m CONFIG_EL3=m CONFIG_3C515=m CONFIG_PCMCIA_3C574=m @@ -2118,7 +2146,6 @@ CONFIG_NET_VENDOR_AMD=y CONFIG_AMD8111_ETH=m CONFIG_LANCE=m CONFIG_PCNET32=m -CONFIG_DEPCA=m CONFIG_PCMCIA_NMCLAN=m CONFIG_NI65=m CONFIG_NET_VENDOR_ATHEROS=y @@ -2138,6 +2165,7 @@ CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y CONFIG_NET_VENDOR_BROCADE=y CONFIG_BNA=m CONFIG_NET_CALXEDA_XGMAC=m @@ -2154,7 +2182,6 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y -CONFIG_EWRK3=m CONFIG_NET_TULIP=y CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 @@ -2168,8 +2195,6 @@ CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m CONFIG_NET_VENDOR_DLINK=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DL2K=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -2180,9 +2205,7 @@ CONFIG_S2IO=m CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_NET_VENDOR_FUJITSU=y -CONFIG_AT1700=m CONFIG_PCMCIA_FMVJ18X=m -CONFIG_ETH16I=m CONFIG_NET_VENDOR_HP=y CONFIG_HP100=m CONFIG_NET_VENDOR_INTEL=y @@ -2190,6 +2213,7 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGB_HWMON=y CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m @@ -2198,14 +2222,6 @@ CONFIG_IXGBE_HWMON=y CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m CONFIG_NET_VENDOR_I825XX=y -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_APRICOT=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_LP486E=m -CONFIG_NI52=m -CONFIG_ZNET=m CONFIG_IP1000=m CONFIG_JME=m CONFIG_NET_VENDOR_MARVELL=y @@ -2234,12 +2250,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NATSEMI=m CONFIG_NS83820=m CONFIG_NET_VENDOR_8390=y -CONFIG_EL2=m -CONFIG_AC3200=m CONFIG_PCMCIA_AXNET=m -CONFIG_E2100=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m CONFIG_NE2000=m CONFIG_NE2K_PCI=m CONFIG_PCMCIA_PCNET=m @@ -2258,7 +2269,6 @@ CONFIG_QLA3XXX=m CONFIG_QLCNIC=m CONFIG_QLGE=m CONFIG_NETXEN_NIC=m -CONFIG_NET_VENDOR_RACAL=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m CONFIG_8139CP=m @@ -2271,7 +2281,6 @@ CONFIG_R8169=m CONFIG_NET_VENDOR_RDC=y CONFIG_R6040=m CONFIG_NET_VENDOR_SEEQ=y -CONFIG_SEEQ8005=m CONFIG_NET_VENDOR_SILAN=y CONFIG_SC92031=m CONFIG_NET_VENDOR_SIS=y @@ -2373,6 +2382,7 @@ CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m @@ -2505,6 +2515,7 @@ CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m CONFIG_IWLDVM=m +CONFIG_IWLMVM=m # # Debugging Options @@ -2559,6 +2570,7 @@ CONFIG_RT2800USB_RT35XX=y CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_UNKNOWN=y CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_MMIO=m CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB=m @@ -2566,13 +2578,13 @@ CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m CONFIG_RTL8192DE=m CONFIG_RTL8723AE=m CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -# CONFIG_RTLWIFI_DEBUG is not set CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m @@ -2583,7 +2595,7 @@ CONFIG_WL18XX=m CONFIG_WLCORE=m # CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m -CONFIG_WL12XX_PLATFORM_DATA=y +CONFIG_WILINK_PLATFORM_DATA=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=m @@ -2804,6 +2816,7 @@ CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y @@ -2813,6 +2826,7 @@ CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_INPORT=m # CONFIG_MOUSE_ATIXL is not set CONFIG_MOUSE_LOGIBM=m @@ -2983,6 +2997,7 @@ CONFIG_GAMEPORT_FM801=m # # Character devices # +CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y @@ -3014,9 +3029,11 @@ CONFIG_TRACE_SINK=m # Serial drivers # CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_NR_UARTS=32 @@ -3045,6 +3062,8 @@ CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m @@ -3092,6 +3111,7 @@ CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_ATMEL=m CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_I2C=m @@ -3119,6 +3139,7 @@ CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m @@ -3221,6 +3242,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y @@ -3236,6 +3258,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set # # I2C GPIO expanders: @@ -3300,6 +3323,7 @@ CONFIG_BATTERY_OLPC=m # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_AVS=y @@ -3378,6 +3402,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m @@ -3412,6 +3437,7 @@ CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m # CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP102=m @@ -3444,10 +3470,12 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -CONFIG_FAIR_SHARE=y -CONFIG_STEP_WISE=y -# CONFIG_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set # CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -3456,6 +3484,7 @@ CONFIG_WATCHDOG_CORE=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m CONFIG_ACQUIRE_WDT=m CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m @@ -3617,8 +3646,10 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set CONFIG_DVB_CORE=m CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set @@ -3719,7 +3750,6 @@ CONFIG_USB_SN9C102=m # # Analog TV USB devices # -CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y @@ -3733,6 +3763,8 @@ CONFIG_VIDEO_STK1160_AC97=y # # Analog/digital TV USB devices # +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m @@ -3849,7 +3881,6 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_CORE=m @@ -3870,6 +3901,7 @@ CONFIG_DVB_DDBRIDGE=m # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m # CONFIG_V4L_TEST_DRIVERS is not set # @@ -3893,6 +3925,7 @@ CONFIG_RADIO_SHARK2=m CONFIG_I2C_SI4713=m CONFIG_RADIO_SI4713=m CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m CONFIG_RADIO_TEA5764=m CONFIG_RADIO_SAA7706H=m CONFIG_RADIO_TEF6862=m @@ -3914,18 +3947,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y # # common driver options # +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y # # Media ancillary drivers (tuners, sensors, i2c, frontends) # -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_TVEEPROM=m +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_VIDEO_IR_I2C=m # @@ -3967,11 +4001,6 @@ CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_CX25840=m # -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# # Video encoders # CONFIG_VIDEO_SAA7127=m @@ -4071,6 +4100,7 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m CONFIG_DVB_DS3000=m CONFIG_DVB_MB86A16=m CONFIG_DVB_TDA10071=m @@ -4182,20 +4212,22 @@ CONFIG_DRM_USB=m CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_DRM_NOUVEAU_BACKLIGHT=y - -# -# I2C encoder or helper chips -# -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -4211,9 +4243,11 @@ CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m CONFIG_DRM_CIRRUS_QEMU=m -CONFIG_STUB_POULSBO=m CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_OF_DISPLAY_TIMING is not set +# CONFIG_OF_VIDEOMODE is not set +CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m @@ -4282,6 +4316,7 @@ CONFIG_FB_VOODOO1=m # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set @@ -4301,6 +4336,8 @@ CONFIG_LCD_PLATFORM=m # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_LD9040 is not set # CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4477,6 +4514,7 @@ CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y @@ -4493,6 +4531,7 @@ CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4610,6 +4649,7 @@ CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4618,6 +4658,7 @@ CONFIG_HID_SMARTJOYPLUS=m CONFIG_SMARTJOYPLUS_FF=y CONFIG_HID_TIVO=m CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m @@ -4808,6 +4849,7 @@ CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m @@ -4839,10 +4881,13 @@ CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m # # USB Physical Layer drivers # +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set CONFIG_USB_ISP1301=m CONFIG_USB_RCAR_PHY=m CONFIG_USB_ATM=m @@ -4874,6 +4919,8 @@ CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_DUMMY_HCD=m CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m # CONFIG_GADGET_UAC1 is not set @@ -4886,9 +4933,10 @@ CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y -# CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_MASS_STORAGE=m CONFIG_USB_GADGET_TARGET=m CONFIG_USB_G_SERIAL=m +CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m # CONFIG_USB_CDC_COMPOSITE is not set @@ -4970,12 +5018,14 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA9532_GPIO is not set # CONFIG_LEDS_GPIO is not set CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m # CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_PWM is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -5029,6 +5079,7 @@ CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set @@ -5078,6 +5129,7 @@ CONFIG_RTC_DRV_RV3029C2=m # CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_DS3234 is not set # CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set # # Platform RTC drivers @@ -5103,6 +5155,11 @@ CONFIG_RTC_DRV_PCF50633=m # CONFIG_RTC_DRV_MC13XXX=m CONFIG_RTC_DRV_SNVS=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -5111,9 +5168,12 @@ CONFIG_DMADEVICES=y # CONFIG_INTEL_MID_DMAC=m CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set CONFIG_TIMB_DMA=m CONFIG_PCH_DMA=m CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y # # DMA Clients @@ -5137,7 +5197,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # @@ -5246,6 +5309,7 @@ CONFIG_COMEDI_MULTIQ3=m CONFIG_COMEDI_POC=m CONFIG_COMEDI_PCI_DRIVERS=y CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=m CONFIG_COMEDI_ADDI_APCI_035=m CONFIG_COMEDI_ADDI_APCI_1032=m CONFIG_COMEDI_ADDI_APCI_1500=m @@ -5338,7 +5402,6 @@ CONFIG_RTS5139=m # CONFIG_TRANZPORT is not set CONFIG_IDE_PHISON=m CONFIG_LINE6_USB=m -# CONFIG_LINE6_USB_DUMP_PCM is not set # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m @@ -5346,7 +5409,6 @@ CONFIG_VT6656=m CONFIG_DX_SEP=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -# CONFIG_ZCACHE is not set CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m @@ -5422,18 +5484,18 @@ CONFIG_WIMAX_GDM72XX_USB=y # CONFIG_WIMAX_GDM72XX_SDIO is not set CONFIG_WIMAX_GDM72XX_USB_PM=y CONFIG_CSR_WIFI=m -CONFIG_ZCACHE2=y CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m CONFIG_DGRP=m -CONFIG_SB105X=m CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_LAPTOP=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m @@ -5486,6 +5548,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y @@ -5495,13 +5558,13 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # -# Remoteproc drivers (EXPERIMENTAL) +# Remoteproc drivers # CONFIG_REMOTEPROC=m CONFIG_STE_MODEM_RPROC=m # -# Rpmsg drivers (EXPERIMENTAL) +# Rpmsg drivers # CONFIG_VIRT_DRIVERS=y # CONFIG_PM_DEVFREQ is not set @@ -5511,11 +5574,11 @@ CONFIG_EXTCON=m # Extcon Device Drivers # CONFIG_EXTCON_GPIO=m -CONFIG_EXTCON_ARIZONA=m CONFIG_MEMORY=y # CONFIG_IIO is not set # CONFIG_VME_BUS is not set CONFIG_PWM=y +CONFIG_IRQCHIP=y CONFIG_IPACK_BUS=m CONFIG_BOARD_TPCI200=m CONFIG_SERIAL_IPOCTAL=m @@ -5586,7 +5649,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -5651,6 +5714,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m @@ -5710,7 +5774,7 @@ CONFIG_NFS_V2=m CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m -# CONFIG_NFS_SWAP is not set +CONFIG_NFS_SWAP=y CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m @@ -5719,6 +5783,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5732,8 +5797,9 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y @@ -5862,8 +5928,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_LOCK_ALLOC is not set # CONFIG_PROVE_LOCKING is not set -# CONFIG_PROVE_RCU_DELAY is not set -# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set @@ -5885,6 +5949,12 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set @@ -5907,6 +5977,7 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y @@ -5914,7 +5985,6 @@ CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y -CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y @@ -5927,6 +5997,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -5936,6 +6007,7 @@ CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set @@ -6083,6 +6155,8 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -6238,3 +6312,4 @@ CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_MPILIB=m CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index dbbd5e8fd..2bde797ef 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.11-1-LIBRE-XEN +KERNEL_VERSION=3.9.4-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD index 4974e0dad..430ab93d5 100644 --- a/libre-testing/libretools/PKGBUILD +++ b/libre-testing/libretools/PKGBUILD @@ -6,11 +6,11 @@ pkgbase=libretools pkgname=(libretools libretools-mips64el) pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" -license=('GPL3+' 'GPL2') +license=('GPL3' 'GPL2') -pkgver=20130507 -_libretools_commit=4ce4e426012375a9b44df012a143139645880c0d -_devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c +pkgver=20130528.2 +_libretools_commit=e5c22aaf01484e7fa5926952bbcacd56228dbb64 +_devtools_commit=d197eacf8b7aba0796a0f6ac6ac1667564bd614e _packages_url=https://projects.parabolagnulinux.org/packages source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 @@ -19,6 +19,7 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta pkgrel=1 arch=('any') makedepends=(emacs) # emacs --batch is used during the build to process text +checkdepends=(sh-roundup) build() { cd "$srcdir" @@ -27,10 +28,23 @@ build() { make build-libretools build-libretools-mips64el build-doc } +check() { + cd "$srcdir/$pkgbase-$_libretools_commit" + + # some tests require 'sudo'; trick those into passing + mkdir "$srcdir/bin" + ln -s $(which true) "$srcdir/bin/sudo" + _PATH=$PATH + export PATH="$srcdir/bin:$PATH" + + make check + + export PATH=$_PATH +} + package_libretools() { backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install - groups=(base-devel) replaces=(chroottools) depends=( @@ -40,7 +54,7 @@ package_libretools() { rsync # `librerelease` and `makechrootpkg.sh` subversion # `diff-unfree` tokyocabinet # `treepkg` - wget # `aur` and `pkgbuild-check-nonfree` + wget # `aur` and `lib/blacklist.sh` ) optdepends=('namcap: to check package files') @@ -57,5 +71,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('84fc56b35cca1a05a434d31218dbb891' - 'c5cd04723119762701db766cb8f6e5ef') +md5sums=('47ff5308a56dd8ae2cf18b82a99b0021' + '05b987e6b39c963154489ac6d01d0965') diff --git a/libre-testing/ronn/PKGBUILD b/libre-testing/ronn/PKGBUILD new file mode 100644 index 000000000..4bd097048 --- /dev/null +++ b/libre-testing/ronn/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +_gemname=ronn +pkgname=$_gemname +pkgver=0.7.3 +pkgdesc="The opposite of roff; manual authoring tool" +url="http://rtomayko.github.io/ronn/" +license=('custom:MIT') + +provides=(ruby-$_gemname=$pkgver) + +pkgrel=4 +arch=('any') +depends=('ruby' 'ruby-hpricot' 'ruby-rdiscount' 'ruby-mustache') +makedepends=('rubygems') +source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('c5aa4ef58d35d0cc635b769281e03225') + +package() { + cd "$srcdir" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/ruby-hpricot/PKGBUILD b/libre-testing/ruby-hpricot/PKGBUILD new file mode 100644 index 000000000..ad9aefc36 --- /dev/null +++ b/libre-testing/ruby-hpricot/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +_gemname=hpricot +pkgname=ruby-$_gemname +pkgver=0.8.6 +pkgdesc="_why's old HTML parser" +url="http://github.com/hpricot/hpricot" +license=('custom:MIT') + +pkgrel=1 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem) +noextract=(${_gemname}-${pkgver}.gem) +md5sums=('b0f1f02448037f4f6243c33d5f818fa4') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} diff --git a/libre-testing/ruby-mustache/PKGBUILD b/libre-testing/ruby-mustache/PKGBUILD new file mode 100644 index 000000000..d7090cc0d --- /dev/null +++ b/libre-testing/ruby-mustache/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): David Campbell <davekong@archlinux.us> + +_gemname=mustache +pkgname=ruby-$_gemname +pkgver=0.99.4 +pkgdesc="A framework-agnostic way to render logic-free views." +url="http://mustache.github.io/" +license=('custom:MIT') + +pkgrel=3 +arch=('any') +depends=('ruby>=2') +makedepends=('rubygems') +source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem") +md5sums=('650194ec2c166feb087377647414b9dc') +noextract=($_gemname-$pkgver.gem) + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre-testing/ruby-rdiscount/PKGBUILD new file mode 100644 index 000000000..76e4b58bd --- /dev/null +++ b/libre-testing/ruby-rdiscount/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net +# Maintainer (AUR): Alexsandr Pavlov <kidoz at mail dot ru> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com> + +_gemname=rdiscount +pkgname=ruby-$_gemname +pkgver=1.6.5 +pkgdesc="C implementation of John Gruber's Markdown." +url="http://dafoster.net/projects/rdiscount/" + +# About the license: It is a 4-clause BSD license with the 3rd clause modified +# to mention documentation instead of advertising. Not to be confused with +# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license +# (dropping the 3rd clause). Because of the way it is modified, it doesn't have +# the problems normally associated with the 4-clause BSD license. +license=('custom:modified-BSD4') + +pkgrel=2 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('2de321f1ba826f80b84fe45c0d013fcf') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre-testing/sh-roundup/PKGBUILD new file mode 100644 index 000000000..7c17669d3 --- /dev/null +++ b/libre-testing/sh-roundup/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +pkgname=sh-roundup +pkgver=0.0.5.git17 +_gitver='commit=695ae7609353a360556e1f465ac81ce447235179' + +pkgdesc='A unit testing framework for POSIX shell' +license=("custom:MIT") +url="http://bmizerany.github.io/roundup/" + +pkgrel=1 +arch=('any') +depends=(sh) +makedepends=(ronn) + +source=("libre://$pkgname-$pkgver.tar.gz" 'makefile-fix.patch') +md5sums=('8b1f85316d178eb9e809e168f52d0f2d' + '9efcd83d666c1e84302fe611610c60fa') + +mksource=("git://github.com/bmizerany/roundup.git#${_gitver}") +mkmd5sums=('SKIP') +mksource() { + cd "$srcdir" + rm -rf $pkgname-* + mv roundup $pkgname-$pkgver +} + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -i ../makefile-fix.patch Makefile +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix="$pkgdir"/usr + make -j1 build man +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 install install-man + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + diff --git a/libre-testing/sh-roundup/makefile-fix.patch b/libre-testing/sh-roundup/makefile-fix.patch new file mode 100644 index 000000000..b97bebf23 --- /dev/null +++ b/libre-testing/sh-roundup/makefile-fix.patch @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -79,7 +79,7 @@ + chmod 0755 $(bindir)/roundup + + install-man: man +- -for i in {1..9} ; do cp *.$$i $(mandir)/man$$i 2>/dev/null ; done ++ shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done + + .PHONY: pages + pages : doc diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 18122256a..248da54c7 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -40,7 +40,6 @@ build() { # Replace non-free fonts support to liberation fonts patch -Np1 -i "${srcdir}/liberation-fonts.patch" - patch -Np1 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch" libtoolize --force autoreconf diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 31997eb35..2dc83cb5e 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -5,9 +5,9 @@ _pkgname=bbswitch pkgname=bbswitch-libre -pkgver=0.6 +pkgver=0.7 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=7 +pkgrel=1 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") @@ -19,7 +19,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=bbswitch.install source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") -md5sums=('c5496e3225c8e70d02a24bfd8a50faf6') +md5sums=('b9df5ea40109ef9766448a0577c798e6') build() { cd ${srcdir}/${_pkgname}-${pkgver} diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 077b09949..f226b76fd 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -10,10 +10,11 @@ else pkgname=blender-libre _spndesc='' fi -epoch=7 -pkgver=2.67 +epoch=8 +pkgver=2.67a +_jpgver=1.5 _pyver=3.3 -pkgrel=2 +pkgrel=1 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc" arch=( i686 @@ -58,7 +59,7 @@ conflicts=${_pkgname%-$_pkgflag} replaces=${_pkgname%-$_pkgflag} install=$_pkgname.install source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz -sha512sums=678ff15b4c7aa5695ac31189c2532d959867dfd003d101a52fc8e294b2d7bc5a4699844db9fa6cc6f5e825aa5ba2da37cec0dc56bfd2686957eca075bf935f44 +sha512sums=1336ed00ab51c581ab5b8ef6ace04b3684290b287745de3260e4072e3527501bf62472057c4c521533678b2529b7d0c2dca93d0ca3854e29d82443a78d5c4061 prepare() { mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build @@ -73,6 +74,7 @@ build() { -DCMAKE_BUILD_TYPE=Release\ -DCMAKE_INSTALL_PREFIX=/usr\ -DOPENIMAGEIO_ROOT_DIR=/usr\ + -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\ -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\ -DPYTHON_LIBPATH=/usr/lib\ -DPYTHON_LIBRARY=python${_pyver}m\ @@ -85,7 +87,7 @@ build() { -DWITH_CYCLES_OSL=ON\ -DWITH_FFTW3=ON\ -DWITH_GAMEENGINE=ON\ - -DWITH_IMAGE_REDCODE=OFF\ + -DWITH_IMAGE_REDCODE=ON\ -DWITH_INSTALL_PORTABLE=OFF\ -DWITH_JACK=ON\ -DWITH_MOD_OCEANSIM=ON\ diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index d5128f90f..f7dfe3489 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90259 2013-05-10 15:53:35Z jelle $ +# $Id: PKGBUILD 91579 2013-05-24 14:55:19Z dwallace $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.30 +pkgver=0.9.32 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,13 +30,13 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('4b0e4aeb0ebac5d5319a97cbd5163deb' +md5sums=('3b1c89a84872df900b9cfb706027df67' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') -build() { - cd "${srcdir}/${_pkgname}" +prepare(){ + cd "${srcdir}/${_pkgname}" #rm -rf src/{cherrypy,pyPdf} rm -rf src/cherrypy rm -rf resources/${pkgname}-portable.* @@ -47,7 +47,10 @@ build() { sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ $(find . -regex ".*.py\|.*.recipe") +} +build() { + cd "${srcdir}/${_pkgname}" # Remove nonfree fonts cd resources/fonts; \ rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \ diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index f2138e86a..8ea0dbba7 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90185 2013-05-08 10:46:15Z tpowa $ +# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=44 +pkgrel=45 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 1a132ff27..2db7dbbc5 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90344 2013-05-11 16:51:20Z fyan $ +# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.1.1 +pkgver=3.2.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -18,7 +18,7 @@ makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=("https://github.com/ckolivas/$_pkgname/archive/v$pkgver.tar.gz" +source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-${pkgver}.tar.bz2" "${pkgname%-$_pkgflag}.conf.d" "${pkgname%-$_pkgflag}.service") backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") @@ -34,7 +34,7 @@ build() { # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - ./autogen.sh + #./autogen.sh ./configure --prefix=/usr --enable-scrypt --disable-adl make @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('f95db6ab14fe35ed19c1af152c6eb979787e966afad250252053bf11abe8293dfe857a7a2abfd9e33b60a190b310193a03151eb67a9db255a2a929660278ad62' +sha512sums=('e96b874fd53c771535098c1077200b5ab88aa628383f7af56f861c952a534283942ce34647f279bf4229bfc3a0114f81a7ae3deca4e8e7931d7551fdb75c68c0' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index ee7019130..2a0ce65ce 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -2,88 +2,70 @@ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgbase=claws-mail pkgname=claws-mail-libre -pkgflag=-libre -pkgver=3.9.0 -pkgrel=2 +_pkgflag=libre +_pkgname=${pkgname%-$_pkgflag} +pkgver=3.9.1 +pkgrel=3 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support' -arch=( - i686 - x86_64 - mips64el -) -license=GPL3 -url="http://www.$pkgbase.org" -depends=( - db - dbus-glib - desktop-file-utils - enchant - gnutls - gpgme - gtk2 - hicolor-icon-theme - 'libetpan>=1.1' - libsm - startup-notification -) -makedepends=( - bogofilter - compface - spamassassin -) -[ "$CARCH" != "mips64el" ] && makedepends+=(valgrind) -optdepends=( - 'python2: needed for some tools' - 'perl: needed for some tools' - 'spamassassin: adds support for spamfiltering' - 'bogofilter: adds support for spamfiltering' -) -provides=( - claws - $pkgbase=$pkgver -) -conflicts=( - $pkgbase -) -replaces=( - $pkgbase - sylpheed-claws -) -options=( - '!libtool' -) -install=$pkgbase.install -source=( - http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$pkgbase-$pkgver.tar.bz2 -) -md5sums=( - 4c5ac7b21f0ed17d0f6404124c2229a4 -) +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3') +url="http://www.$_pkgname.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' + 'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('compface' 'spamassassin' 'bogofilter' + # dependencies for plugins + 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') + #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') +optdepends=('python2: needed for some tools and python plugin' + 'perl: needed for some tools and perl plugin' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin and various other plugins' + 'libytnef: for tnef_parse plugin' + 'webkitgtk2: for the fancy webkit html plugin' + 'libsoup: for the fancy webkit html plugin' + 'libgdata: for gdata plugin' + 'poppler-glib: for pdf viewer plugin' + 'ghostscript: for pdf viewer plugin') +replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins") +conflicts=("$_pkgname" "$_pkgname-extra-plugins") +provides=("$_pkgname=$pkgver" 'claws') +options=(!libtool) +install=$_pkgname.install +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc}) +md5sums=('8adc734912ff1b83545cb12850100473' + 'SKIP') build() { - cd $srcdir/$pkgbase-$pkgver + cd $srcdir/$_pkgname-$pkgver + # fixes for python2 + export PYTHON="/usr/bin/python2" sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + sed -i 's:python -c:python2 -c:g' configure - ./configure --prefix=/usr\ - --disable-dillo-viewer-plugin\ - --disable-static\ - --enable-bogofilter-plugin\ - --enable-crash-dialog\ - --enable-enchant\ - --enable-gnutls\ - --enable-jpilot\ - --enable-ldap\ - --enable-pgpmime-plugin\ - --enable-spamassassin-plugin - + ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --enable-jpilot \ + #--help make } package() { - cd $srcdir/$pkgbase-$pkgver + cd $srcdir/$_pkgname-$pkgver make DESTDIR=$pkgdir install # build and install extra tools @@ -91,6 +73,6 @@ package() { make # all executables and .conf files ; only top directory find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do - install -D -m755 $i $pkgdir/usr/lib/$pkgbase/tools/$i + install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i done } diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index fc3ed3b1f..d29becae5 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 183882 2013-04-29 10:46:59Z foutrelis $ +# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.34 -pkgrel=3 +pkgrel=4 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.22.3' 'qpdf>=4.0.0') +depends=('lcms2' 'poppler>=0.22.4' 'qpdf>=4.0.0') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' @@ -20,7 +20,7 @@ options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77' - '4c9f97eae201798000483c4e7109e690') + '9ef68d7c2a84713fd421f4e87dec0a6e') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") @@ -29,6 +29,7 @@ build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-rcdir=no \ --enable-avahi \ --with-browseremoteprotocols=DNSSD,CUPS \ diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service index 144956c7f..07b342d62 100644 --- a/libre/cups-filters-libre/cups-browsed.service +++ b/libre/cups-filters-libre/cups-browsed.service @@ -4,7 +4,7 @@ After=cups.service avahi-daemon.service Wants=cups.service avahi-daemon.service [Service] -ExecStart=/usr/sbin/cups-browsed +ExecStart=/usr/bin/cups-browsed [Install] WantedBy=multi-user.target diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index d5ee231f1..e01981433 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 178905 2013-02-28 18:13:09Z ioni $ +# $Id: PKGBUILD 185397 2013-05-13 19:05:20Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.6.3 -pkgrel=2.2 -pkgdesc="Archive manipulator for GNOME (with unar recommendation included and nonfree unace recommendation removed)" +pkgver=3.8.2 +pkgrel=1 +pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify') -makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'itstool' 'docbook-xsl') +makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'libnautilus-extension' 'itstool' 'docbook-xsl') optdepends=('unar: the free RAR uncompression utility' 'zip: creates PKZIP-compatible .zip files' 'p7zip: 7zip compression utility' @@ -23,7 +23,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz) -sha256sums=('6d99d7be243d442484ba46505df5e52ffb4e46ea5cd754daba865eccc22c8402') +sha256sums=('b251b146d7966d770c98546e2152dbc17785ef3b8cf460f692829d0ac1cbe79e') build() { cd $_pkgname-$pkgver diff --git a/libre/gendesk-libre/PKGBUILD b/libre/gendesk-libre/PKGBUILD index 6d7fb3814..b2f5c7cea 100644 --- a/libre/gendesk-libre/PKGBUILD +++ b/libre/gendesk-libre/PKGBUILD @@ -2,18 +2,18 @@ _pkgname=gendesk pkgname=gendesk-libre -pkgver=0.4.4 -pkgrel=1.1 -pkgdesc="Utility to generate .desktop files and download icons" +pkgver=0.5.2 +pkgrel=1 +pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686' 'mips64el') -url="https://gitorious.org/ovruni/gendesk/" +url='https://gitorious.org/ovruni/gendesk/' license=('MIT') makedepends=('curl' 'openssl') provides=("$_pkgname=$pkgver") replaces=("$_pkgname") conflicts=("$_pkgname") source=("http://gnu.org.pe/software/$_pkgname/$_pkgname-$pkgver.tar.xz") -md5sums=('2f192713eb588006086ae4e0471e9450') +md5sums=('416e81aaa4d8963e229b6341a5c4db1a') build() { cd "$srcdir/$_pkgname-$pkgver" diff --git a/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch new file mode 100644 index 000000000..e043633af --- /dev/null +++ b/libre/grub/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch @@ -0,0 +1,50 @@ +From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@ubuntu.com> +Date: Fri, 28 Dec 2012 06:43:35 +0000 +Subject: [PATCH 069/364] Backport gnulib fixes for C11. Fixes Savannah bug + #37738. + +* grub-core/gnulib/stdio.in.h (gets): Warn on use only if +HAVE_RAW_DECL_GETS. +* m4/stdio_h.m4 (gl_STDIO_H): Check for gets. +--- + ChangeLog | 8 ++++++++ + grub-core/gnulib/stdio.in.h | 6 ++++-- + m4/stdio_h.m4 | 2 +- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h +index 80b9dbf..a8b00c6 100644 +--- a/grub-core/gnulib/stdio.in.h ++++ b/grub-core/gnulib/stdio.in.h +@@ -138,10 +138,12 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " + #endif + + /* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ ++ so any use of gets warrants an unconditional warning; besides, C11 ++ removed it. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 +index f5650cd..8458bec 100644 +--- a/m4/stdio_h.m4 ++++ b/m4/stdio_h.m4 +@@ -37,7 +37,7 @@ AC_DEFUN([gl_STDIO_H], + dnl corresponding gnulib module is not in use, and which is not + dnl guaranteed by C89. + gl_WARN_ON_USE_PREPARE([[#include <stdio.h> +- ]], [dprintf fpurge fseeko ftello getdelim getline popen renameat ++ ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat + snprintf tmpfile vdprintf vsnprintf]) + ]) + +-- +1.8.1.4 + diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index b94aed44c..3969d713a 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,7 +9,7 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=1.2 +pkgrel=2 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') @@ -24,33 +24,22 @@ source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" 'grub.default' 'grub.cfg' '20_memtest86+' - 'grub_bzr_export.sh') + 'grub_bzr_export.sh' + '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch' + 'grub-2.00-fix-docs.patch') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' - '89290031b974780c6df76893836d2477d4add895' - 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' - 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' - 'c631ec04d458c60a3ceffe60d2d1806d54554d9c' - '06b926320cb2add6c157d59d46e553b89dd3aa03' - 'fb69af1ff6c0b7fdf7ce7d42d0f048edc1a50a45' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' - '0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc') _build_grub-common_and_bios() { - ## fix outdated gnulib on the source - sed 's|#undef gets|#undef gets\n#if 0|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h" - sed 's|use fgets instead");|use fgets instead");\n#endif|' -i "${srcdir}/grub-${pkgver}/grub-core/gnulib/stdio.in.h" - ## copy the source for building the common/bios package cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}" cd "${srcdir}/grub_bios-${pkgver}" - ## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs + ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo @@ -76,7 +65,13 @@ _build_grub-common_and_bios() { ## Requires python2 # sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh" - ## start the actual build process + # fix compiling with gcc48 + patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch + + #fix docs compiling + patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch + + ## start the actual build process cd "${srcdir}/grub_bios-${pkgver}" ./autogen.sh echo @@ -94,7 +89,7 @@ _build_grub-common_and_bios() { --enable-grub-mount \ --prefix="/usr" \ --bindir="/usr/bin" \ - --sbindir="/usr/sbin" \ + --sbindir="/usr/bin" \ --mandir="/usr/share/man" \ --infodir="/usr/share/info" \ --datarootdir="/usr/share" \ @@ -122,6 +117,12 @@ _build_grub-efi-i386() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_efi-${pkgver}/grub-extras" + # fix compiling with gcc48 + patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch + + #fix docs compiling + patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch + cd "${srcdir}/grub_efi-${pkgver}" ./autogen.sh echo @@ -139,7 +140,7 @@ _build_grub-efi-i386() { --enable-grub-mount \ --prefix="/usr" \ --bindir="/usr/bin" \ - --sbindir="/usr/sbin" \ + --sbindir="/usr/bin" \ --mandir="/usr/share/man" \ --infodir="/usr/share/info" \ --datarootdir="/usr/share" \ @@ -252,3 +253,14 @@ package_grub-efi-i386() { rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true } +md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' + '704ea9f250b6137f05fa0197fd07053a' + '77f7d5f8ce395663cd7fff4d37099957' + 'a80e2b1d3bab778c3b6117d5a698992f' + 'c776aaf2cc35488a7c531b59e697470d' + '52d374e0194e3f2e39ff7c92ecd58a6c' + '255eafb440b8c285b20431366c2d2d27' + '9b6358d3de5c4bb95a041ab7c44a21ec' + 'f343ed2340ebc86c427873641bb72419' + 'ab751d1d8cd3fd47e5ee24d71ecc31ed' + '342dd18472a24e5fd252458b24f39a29') diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch new file mode 100644 index 000000000..0aa481154 --- /dev/null +++ b/libre/grub/grub-2.00-fix-docs.patch @@ -0,0 +1,21 @@ +From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com +Date: Tue, 12 Mar 2013 15:23:02 -0400 +Subject: [PATCH] Fix docs + +I think the doc generation tools got stricter, so fix up the .texi file +to work. + +diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi +--- a/docs/grub-dev.texi ++++ b/docs/grub-dev.texi +@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0, + + @node Bitmap API + @section Bitmap API +-@itemize + @subsection grub_video_bitmap_create ++@itemize + @item Prototype: + @example + grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format) diff --git a/libre/grub/grub.cfg b/libre/grub/grub.cfg index 7f583e102..0d91ff6bc 100644 --- a/libre/grub/grub.cfg +++ b/libre/grub/grub.cfg @@ -78,7 +78,7 @@ set timeout=5 ### END /etc/grub.d/00_header ### ### BEGIN /etc/grub.d/10_linux ### -menuentry 'Parabola GNU/Linux-libre, with Linux-libre core repo kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { +menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { load_video set gfxpayload=keep insmod gzio @@ -95,7 +95,7 @@ menuentry 'Parabola GNU/Linux-libre, with Linux-libre core repo kernel' --class echo 'Loading initial ramdisk ...' initrd /boot/initramfs-linux-libre.img } -menuentry 'Parabola GNU/Linux-libre, with Linux libre repo kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { +menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { load_video set gfxpayload=keep insmod gzio diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 8ce0f23cf..1195912e8 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,29 +1,30 @@ -# $Id$ +# $Id: PKGBUILD 186011 2013-05-20 13:11:55Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: Mantas Mikulėnas <grawity@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname="gummiboot" -pkgver="29" -pkgrel="1.1" -pkgdesc="Simple text-mode UEFI Boot Manager, Parabola rebranded" +pkgver="31" +pkgrel="1" +pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" arch=('x86_64' 'i686' 'mips64el') license=('LGPL2.1') -makedepends=('gnu-efi-libs' 'docbook-xsl') +makedepends=('gnu-efi-libs' 'docbook-xsl' 'git') depends=('util-linux') conflicts=('gummiboot-efi') provides=('gummiboot-efi') replaces=('gummiboot-efi') options=('!strip') -source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz" +source=("git://anongit.freedesktop.org/${pkgname}#tag=${pkgver}" 'loader.conf' 'parabola.conf') install="gummiboot.install" build() { - cd "${srcdir}/${pkgname}-${pkgver}/" + cd ${srcdir}/${pkgname} ./autogen.sh ./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib @@ -36,9 +37,10 @@ package() { install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf" install -D -m0644 "${srcdir}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf" - cd "${srcdir}/${pkgname}-${pkgver}/" + cd ${srcdir}/${pkgname} + make DESTDIR="${pkgdir}" install } -md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2' +md5sums=('SKIP' '3d700d13aec5ab1b78a921eaf22e5bfa' - '9f770584795496c0e3409679eaf7be3b') + '36ee74767ac8734dede1cbd0f4f275d7') diff --git a/libre/gummiboot/gummiboot.install b/libre/gummiboot/gummiboot.install index 770087361..20861d4c8 100644 --- a/libre/gummiboot/gummiboot.install +++ b/libre/gummiboot/gummiboot.install @@ -1,5 +1,7 @@ post_install() { - echo ":: Run '/usr/bin/gummiboot install' to enable gummiboot" + mkdir -p /boot/EFI/gummiboot + /usr/bin/gummiboot update + echo ":: Run '/usr/bin/gummiboot install' to make gummiboot your default bootloader" } post_upgrade() { diff --git a/libre/gummiboot/parabola.conf b/libre/gummiboot/parabola.conf index bbb6dddfa..111072ea2 100644 --- a/libre/gummiboot/parabola.conf +++ b/libre/gummiboot/parabola.conf @@ -1,4 +1,4 @@ -## This is just an exmaple config file. +## This is just an example config file. ## Please edit the paths and kernel parameters according to your system. title Parabola GNU/Linux-libre diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index bab6e70c5..a377c189c 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: TingPing <tingping@tingping.se> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.5 -pkgrel=4 -pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)" +pkgrel=5 +pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') url="http://www.hexchat.org/" license=('GPL') @@ -34,7 +34,7 @@ build() { # Rebrand to Parabola sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c -# Remove non-free browser references +# Remove nonfree browser references patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index b51d1c6d8..2503fe028 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182674 2013-04-12 14:26:14Z andyrtr $ +# $Id: PKGBUILD 185808 2013-05-19 10:16:28Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.4 -pkgrel=1 +pkgver=3.13.5 +pkgrel=2 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" @@ -31,11 +31,13 @@ options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} cups-1.6-buildfix.diff - hp-mkuri.patch) -md5sums=('e5c247161e2fd7685e0520e968393d19' + hp-mkuri.patch + hplip_typo.patch) +md5sums=('f0c406f06f191a120f7d283b69ff10e8' 'SKIP' 'ef64578c6cb3ce252dbdcb0f1c2f4a47' - '0bd7779fdbc4d7a9386df04dce2cb8d4') + '0bd7779fdbc4d7a9386df04dce2cb8d4' + 'b3dd33a538ed8a3774f3c22f13e0a549') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -45,6 +47,9 @@ build() { # fix linking libnotify, FS#34283 patch -Np0 -i ${srcdir}/hp-mkuri.patch + + # fix typo preventing FW to load + patch -Np0 -i ${srcdir}/hplip_typo.patch export PYTHON=python2 @@ -99,7 +104,4 @@ package() { chmod 775 "$pkgdir"/var/log/hp{,/tmp} # remove rc script rm -rf "$pkgdir"/etc/init.d - - # fix broken udev rule - FS#34282 - sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules } diff --git a/libre/hplip-libre/hplip_typo.patch b/libre/hplip-libre/hplip_typo.patch new file mode 100644 index 000000000..8d22f51ea --- /dev/null +++ b/libre/hplip-libre/hplip_typo.patch @@ -0,0 +1,11 @@ +--- config_usb_printer.py 2013-05-19 02:23:17.506716304 +0300 ++++ config_usb_printer.py.new 2013-05-19 02:23:30.140049848 +0300 +@@ -257,7 +257,7 @@ + # ******************************* RUNNING FIRMWARE DOWNLOAD TO DEVICE FOR SUPPORTED PRINTER'S + fw_download_req = mq.get('fw-download', False) + if fw_download_req: +- fw_cmd = utlis.which('hp-firmware', True) ++ fw_cmd = utils.which('hp-firmware', True) + if fw_cmd: + fw_cmd += " -y3 -s %s"%param + log.debug(fw_cmd) diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 1b444d1e6..9508d8e15 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-adblock-plus pkgname=icecat-adblock-plus -pkgver=2.2.3 -_addons_file=192004 -pkgrel=2.1 +pkgver=2.2.4 +_addons_file=206960 +pkgrel=2 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -16,7 +16,7 @@ provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') +md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1-2 -d.` @@ -25,7 +25,7 @@ package() { cd $srcdir [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} [ -n ${emid} ] || return 1 install -d $dstdir # sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 61840c4df..1a0e3ddd0 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=icecat-noscript pkgver=2.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -23,7 +23,7 @@ package() { cd $srcdir local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid} install -d $dstdir # sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf cp -R * $dstdir diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index f3135dc8b..d9c2c7481 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=icedove-l10n _pkgver=17.0.5 -pkgver=17.0.5.1 +pkgver=17.0.5.2 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -14,7 +14,7 @@ pkgname=($(for lang in ${_langpacks[@]} pkgrel=1 pkgdesc="Language packs for Debian Icedove." arch=('any') -url="http://packages.debian.org/experimental/icedove" +url="http://packages.debian.org/sid/icedove" license=('MPL' 'GPL') depends=("icedove-libre>=$pkgver") makedepends=('unzip' 'zip') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index c1fb0c776..8473cadd8 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -1,23 +1,23 @@ # Maintainer : Márcio Silva <coadde@lavabit.com> # Maintainer : André Silva <emulatorman@lavabit.com> -# We're getting this from Debian Experimental +# We're getting this from Debian Sid _debname=icedove _debver=17.0.5 -_debrel=1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -url="http://packages.debian.org/experimental/${_pkgname}" +url="http://packages.debian.org/sid/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -34,9 +34,9 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" Icedove-branding.patch) options=(!emptydirs) md5sums=('0c68298c17757257da79b6bb39e3fd10' - 'eb2a5e1877d87a16e10388f533c081a6' + '2086f544ef90570d7629374aeac22aa6' '5cf95ea94f69cdd36604890cfbf7b954' - '3bf8aefb861095caa45649c118163454' + 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' '126b1446212396c33220936c01d9592d' @@ -73,13 +73,13 @@ prepare() { patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$free_url" + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" grep -Erl "${moz_url}" \ --exclude='*.'{patch,orig,rej} \ --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g" + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" fi done @@ -88,6 +88,9 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix virtualenv path + sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure } build() { @@ -120,5 +123,5 @@ package() { ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins" # We don't want the development stuff - rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl} + rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl} } diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch new file mode 100644 index 000000000..a6f23bdcd --- /dev/null +++ b/libre/icedove-libre/libre.patch @@ -0,0 +1,49 @@ +diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js +--- comm-esr17.orig/mail/app/profile/all-thunderbird.js 2013-05-18 18:46:27.290732014 -0300 ++++ comm-esr17/mail/app/profile/all-thunderbird.js 2013-05-18 18:10:57.239376924 -0300 +@@ -160,11 +160,11 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%"); +-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain"); ++pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain"); ++pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain"); ++pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain"); ++pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -189,7 +189,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/"); ++pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + +@@ -390,7 +390,7 @@ + + pref("spellchecker.dictionary", ""); + // Dictionary download preference +-pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/"); ++pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain"); + + // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular + // mail application without any user intervention. Possible values are: +@@ -747,9 +747,7 @@ + #endif + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService. +-php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS= +-%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%"); + + // By default we show an infobar message when pages require plugins the user has + // not installed, or are outdated. diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt index 32c94b018..fc13e32fb 100644 --- a/libre/icedove-libre/replace-urls.txt +++ b/libre/icedove-libre/replace-urls.txt @@ -2,24 +2,24 @@ # These are whitespace-separated EREs, comments are lines starting with '#' https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php -"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain" +"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" # hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 58f72b6da..019d1edd2 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-adblock-plus pkgname=iceweasel-adblock-plus -pkgver=2.2.3 -_addons_file=192004 -pkgrel=2.1 +pkgver=2.2.4 +_addons_file=206960 +pkgrel=2 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" @@ -16,7 +16,7 @@ provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) -md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') +md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1-2 -d.` @@ -25,7 +25,7 @@ package() { cd $srcdir [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid} [ -n ${emid} ] || return 1 install -d $dstdir # sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 625995ecd..298d740cc 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=20.0 +_debver=21.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -37,7 +37,7 @@ do source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") done -_path="/usr/lib/iceweasel/extensions" +_path="/usr/lib/iceweasel/browser/extensions/" build() { cd "${srcdir}" @@ -75,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { done md5sums=('e88728730ecf9f0f145de5f70e362b15' - 'd1651c29cc6f62fab7aa8d399018fdfd' - '326c4e887c068f9ecc9c52041a8de0f4' - 'c34b9f5b54fe0ee01d4dec85e0be3582' - '2b47d281bbe9a46f7a5c1c7a916082a7' - '0c8060587becaf417c6184c6259f0269' - '9bbbff12bfd00c5b458f844f5e457e82' - 'd52c93c34062735809dfcd0047092f54' - 'f92175163b97d52c59f77613a1e7068a' - '6e4590b2f46ab6d673ea66f1ebe49d0e' - '57c52240c1097a4d4e8d688a243612da' - 'd159050304d9eee50c90fb24a6767a81' - '10cc3fc8a12811eb6c250eacda07331d' - '8ee75c270325ac2aaefcf21f05cabee3' - 'cf8a6e7c49642ce1e25a0b5f1148d7b0' - '8df2b6c9ff9fc809a6b760e7d1c547bd' - 'a3bd9cf2ead7ea2fadc05de54f5471d9' - 'b5deda5efa7bfee9d40ca24ad3b32fc5' - '07c17a2b2ee81e5e92fa40599a11c77c' - 'e07a84d04a90835ca3ca382841e3d1ac' - '9e8c323c92a448e1e0fea0acf16b139c' - '7ca09907a2c13997ce81e0898525c0ab' - 'ea968fd0b22338398433e155199a69cf' - '5907528876f8bf63caa9a1ba30618e27' - 'df46e9156d67d63f8c461d85082c143d' - '354dea9cca6f0c52eeaf6fccb0a722a2' - '0f66a3864af8dd5416d604444a7caccd' - 'a628720aad8c316a67e9dbc6925c0117' - '838d83ee766ccc23b413cc78feaaf66e' - '5338d8017e52d6a2c2bfa9f0456d06a5' - '35e1af40baf6be70d2ab1aee7e685d87' - 'a59464ff5e836aeaed88c14868969ddf' - '87697f71946a0b1e60fe6364a03511d0' - '5f2831e8b4bc47c96a96b3d54e7567ea' - '32a9e0a3b117323d72fbcadb61fffc46' - '06b942c5ed0827353a66058e20aa1566' - '9077b7c5c7f00a9987c094beb18a8477' - 'cb5e678ea288eb77cdc72cd775b139fc' - 'd81b1b70ad5257c9db2c3bc600060564' - '70fe86d4dd3f18398f27a79914a5d5a7' - '9b4d5ba6ba647a7612fd2599c2123efa' - '405bc14439cd1cc6b2272179697870fa' - '4ec5178099d4d573b43379e751824b2a' - '8462e327c292c8777859dd9def1bf99a' - 'a5310b15b7c4563d6d14a1d992a366e4' - '82dbf25ae893b17fd80f622334b40be9' - '639ebfb70a105e5ab8abc27cbc0fc6f4' - '931c9cec0b02245faf84178a0ee6bba6' - 'abf3a17fe5a518a229d98b3165c7ea54' - 'f7ce85e60cefbafb9d0a5509163ab2fa' - '7ce7984f91bde4a100d1cb235ff9d934' - 'bf2a48221ae4bc2b8dce548801936ce6' - '403ce2a839e42fdb0d59c94d44d7d761' - 'fc70c7291c83014f14a73c63f6c7a96f' - 'a055ac9a1d9f4d6c851d5bfc469bcf69' - 'ebcf54da830e668474212f18783eb917' - 'bbceb1e048430dc4681db49ef3b9fed6' - '379590483064e6cea3af18025a418aa9' - 'ed754da9e0fd5e8425121f48ae62d37c' - 'd89ef20360750693b95678f301fb2664' - '5535b58bf3002c06c6b118d5eaed10fa' - '4aa12ddad5b1b998d2b4c5ae08fdcea6' - '8efc40ce477c9bd375e371e92571de8b' - '144cab65088ad01e5821b62c059deeb5' - '0aaf40e7427b958ac5808406cd7d2310' - '233e98ecfd0a0e73fd4ecdb2dc5eb434' - '68dc8ea77bfcf20aad06d63770a88108' - '10a92a0b94522f42aab595a2fa299df0' - '120c822b8e91bc77e66df5675f68b218' - '7eb3b611964f801695f55375c303bac2' - '200f29098852065284c153dc7f405016' - 'f65badaccceee09063f83342b17b62c8' - 'cde4af8ad6fe0368c972a7b4cbbcbf2b' - '6ab7c6e0ce48680fead7295604067ccd' - 'b207abe2bc1fb8ccd0c55185b943e341' - '338860a47735330619099b35c0a6660b' - '5a4de6eb0bca5b337c62feb1fd9bb35e' - 'a01d5c370b2263cc07e1706e423959c8' - 'a1e0594303fb257f6cb94c20bf990fdd' - '934033c448d6f4b2b78503d2b7864c16' - '71ca1bca582ed7199d9e27022ce0b740' - '4c081b33ab71b2e8153628f0a0832ad7' - '713a2606488f49cf31dc1ea01a45ad00' - 'b1a1f959f8c639c5435e2ed707f275c0' - 'fc2f8e28db037c5b2ed0549233199751' - '30dee9ddc86d54cff05ab97771f3f2e9' - '57a1db9470741338eb452045e1b15221' - 'd43034023b5289d5a1dcc4e6fe83c7cd' - 'ea15b25281abc80308b4253253c30936') + '59b4b2a362eece9edabb2fdc0f548ea2' + '24df894af578b902d16d4bc91759e926' + '489f555d46d08e3cb37eb5cb16203a3b' + '3b71f901014bd3fdcfc53d19a13cff10' + 'fc4a5af84dcf6b055b11b8d2ac9868ac' + '7d03e2d5c2660942d5fbb5078b71c8cc' + 'd12132ce5c0a4a881363dfebbf23fbee' + '09a5cf2d291f052433bdf834fe1f5100' + 'a8eb8983f0c63c1383f18f894f2292ee' + 'ef6fbffbad81223386c30c06da584f65' + 'f4b80fc31cea5e0aa3c03eab9f36765f' + 'c7ba7f36e104046ab22f37202c5e291e' + 'e884fe1127ef15376f4d72047e2ee924' + 'b235bed0eb4f872d5478a58c00341458' + '577498e39c9dd00ea2fb72146b3b5eac' + 'c611cfc16c7c7b5b6c877fd88b40c10e' + '5c6e2f317aba37bc701e4aab4720fcd7' + 'f9f7db03d1fcf2337902eba79289934c' + 'e601dc8a1bdd9204ca3a4db5e4fe0df1' + 'c2075468a1fea47efb7c65000fe73652' + 'fcf2f689a8d06c7c2c6bb49f57037d55' + 'f0c8d22cc820bb7177326bb069a38f5e' + '9dd2dc6c155ec3a61e26fba4baa980bc' + '41eff39b7c819c78fcac10f8064a2627' + 'c3f9a5f5305fece3f165d5d946805180' + 'd424c55b8a0242e500916f5bfdc60319' + 'f5d41bf99c08a27c4f4a2d370e6414f2' + '420a3b3194938ecc31e05899bd0c52e4' + '19e23ac8f3e187c1b7112e1a252adacb' + 'f1c9f646c5b70f591497cc36b7312aae' + 'b246026367f3c5416397566bd5980e5b' + '24e4bf6cc17e3fd724387e157e6a49b1' + '60af06bc25f259311284d83cb6b2ba02' + 'c5d8d2fecb6b0d2172ea1b4a4bdb2d68' + '58c93fd5ad320935666f0e10a2111f0a' + '7777c5b6bfa40c3ece5b48ef18d12938' + '47725d7fa7594f5739725096ae999dd1' + 'c2f34c4fbd2eaf0a9c7e8d97ac49ae43' + '7900a33d5694744af6c1b3a6b8a5f2df' + '97a95a5c30d8ba542a4c5457a831259d' + '02a3052bf3af409c56cdca72c23f2669' + 'a617e607fe3f952b6a152707c5c895e4' + '8d93b0550a30af8377e6198d67fb740e' + '938c22bdb193a8be3cf317deded8a49e' + 'f343106f50810e14ae1264933d5495fb' + 'a58187d70e895b90ea7667b08e0df6e4' + 'a014309f9621a15a7f86e759d5a42aa5' + '8a4c8bea9c508ad4ca395eb5d31e3105' + '6e728d930ca539a022d1d5cc5d8cc9c8' + '6c10afb3a86a1305ec4fdfde5702908e' + '3f749b1b19d5534442eb9daf5f9ddba1' + 'd8876e6f3ee24768a602128963f80e1c' + '6b7213d8c4d625ff0293e7a7c8eb4254' + '3d2b5b760c369ce1ff764205b196f0e5' + 'c09eec3566a2352f1dd2f2ad0e7cbf6c' + '5e560da497a4e448413bfd343d23493d' + 'faf5235cb19f5d1ee1d8868eb9399d8a' + '1dc06a576d7c87059125fa51e8677500' + 'ea7c6eb5df30fbf3b7b4737025492fd9' + 'f50c41542503959ddcc0ce200c2f8ec4' + '1a633a935016e3570327b52b66bb0dca' + '59bcc03566d356ac027655453775efa4' + '2d8644f035fe7d4e77a0f5eb196ddb0b' + 'a5cf6b19492d3e969187fe847d4ee990' + 'e3167e646b7c556e0d43565a13b066f9' + 'b1ce311e588dd120d04c2d94597ae100' + '129a07881b89c3f3ab14971dec88007f' + '37bc634c1f82bd9a01ea7e817e100d71' + 'd9b39409aa83bcae7aa22c54ebcd48b0' + '582926879e8d10d52448f373cd3fbd33' + 'cf6bafb6e3ee659c27579b43038f704c' + '083f69fd4f64fd436d7fdfe8a7747b41' + '6f65d6a154fa2c7d72045b4b34fc8890' + '1a060b1b08d6fa8413995003c62b220f' + '84194eba8c736cd8036975a8423758c0' + '30f15d767b3e867df514175680a78a8d' + '32946289930406ed3ccd1c174e464210' + '05547b17ebd589408a9633aeb4fede40' + 'f53c078d1ed0e90f2d68f098b34279f2' + 'a11cf418be9247856f3179f85fe57c9a' + '39d47c6e738749b1c01d06a1b112c368' + '63adbbe9ac9dde80d2c3ae0c861f1d33' + '82d6b78bf72083a5e01652c02e152680' + '725a322b12f522591a5fba5aa32031bb' + '98c7ed17e8fbe4478032a31ad2c2aa07' + 'a7c33685d88af8a90a14c874538fa53a' + '9b43e2e557c82a20509f34a54cc42e0f' + '84e12ebfd749a04adc5b3ace348a06f1') 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 4ca4fc704..d89e4d1ae 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 @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 7665de2..4588f4a 100644
+index b08f8ce..446ee74 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3699,7 +3699,7 @@ XREMain::XRE_mainRun()
+@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index c35b83600..eebf10e57 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=20.0 +_debver=21.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=5 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -30,7 +30,7 @@ license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') -options=(!emptydirs) +options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) @@ -52,17 +52,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" shared-libs.patch replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('22daa24b6490c654f131550cbf20fad3' - '0c70ab52f35701558081df3d360361a2' - 'a65f285d20e11e650f7220b9c7f2bbf2' +md5sums=('0a7c51bb494463c327af918bae6c4ee4' + 'c17121a4ffd40f463e16d7828445d96e' + 'e1e903ca91997f18b428c54ef604f27d' '383e8e2a97a8b13fe56d153adb6878b6' - 'ea7fec9c58670aae945c0f472471cdff' + '2930f3bffe0d7a6b9845f8c006821bc2' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' - '3bf8aefb861095caa45649c118163454' - 'd0e1f2625cd9f7234abdeb55aee00529') + 'a8fc4658d45b6bf9350023e5c3f34e56' + '85e67561e0e491cd538ce018dfc2d948') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -80,20 +80,20 @@ prepare() { # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true - quilt push -a + quilt push -av patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/shared-libs.patch" # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url free_url; do + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$free_url" + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" grep -Erl "${moz_url}" \ --exclude='*.'{patch,orig,rej} \ --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${free_url}<g" + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" fi done @@ -151,11 +151,8 @@ build() { export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS if $_pgo; then - # Enable PGO export DISPLAY=:99 Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & _fail=0 @@ -171,9 +168,9 @@ build() { package() { cd "$srcdir/$DEBIAN_BUILD" - make -j1 -f client.mk DESTDIR="$pkgdir" install + make -f client.mk DESTDIR="$pkgdir" install - install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js" # I don't even know why we're hitting the objdir, and ConnOS didn't _brandingdir=debian/branding @@ -188,11 +185,13 @@ package() { install -d "$pkgdir/usr/share/applications" install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" - rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} + rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" + + rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins} + ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/browser/plugins" + ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins" # We don't want the development stuff rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 6862f2c0e..3bb39d215 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,26 +1,25 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-03-26 19:17:35.000000000 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2013-04-03 16:10:57.681396937 -0300 -@@ -1176,12 +1176,9 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300 +@@ -1203,12 +1203,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -// Default social providers --pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); +-pref("social.manifest.facebook", "{\"builtin\": \"true\",\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAACNNJREFUeNrtm3tw1NUVxz/399hHHkgCaCBGEFEEREVFYFQcSoOKdkZay4z+4dDpYIsjHWx1WoTMhFi1gzBSpVgVGbU4U1sHfPESKODwEEnRYDFAICEIeZIQshs2u/v73ds/drMsyW7YLEkl2Z6Z32yy+9v7u+fc7znne8+5KzgvAjDunzlv0M13PjDZ6c4cARj0WhEoaZ1tOn3yq9XLf/tNU0O1D5Ad7wq/OpxpaXOL1j5uZAwuaGlVgwNBhULRm0XXBG6HZrlNa9uRrzfM+3DlgjIgGMsA7rl/XDdHOnNf9vosTfVuvTsaQhdkZ4iykh2rHtqydvkxwI58BhjTfv7MmP55E9/1nLNdfU15ACkVvoAaMCRvRPa+re9+DgTaPjMAx+DrJv3M67Mz+6LybWLb4NfTHhxzx31DDhZvOtqGAgNwWbjGICV9XQJB0e/KobcOP1i8qTzaAEYgaDtNU/V5A9hSaUFLuQEt2gVQSgml+j4CUAIppYgK/m0GkCjZ9xGAUNAu0LUhgJRAAAIVzwBSqVRQH4hlAClRKZAFhOgEASoFECBR8QwgUyQGdJT/B8HzCEiBNKhUJzEgBYIgQsTJAkohe9oFZHgHKvQoHtZ9K3tewfiixXABLdoFeuSSEmkF+PH4QTz7+M3o+ENptzvGtS36uSwmjMpAYF10XCllHCYoe84FlLS555Zs5jx6J6ahY+iCl98pJiDNS1hwSZop+cm91zJmxEBefGsPlu1AxKC67V3gf5oGlZSMuz6Dp2fdhWnoAEwaN5T5hsYLb+4hKB1dcgelFDpB8ifk8thDt3DO5+fZxRvxBV0IjQR0EB3KfD1GhJS0GZnnYuGcKTgdF9ZWx4/No/BJjUUrdtJqm4iL+K5SCmSAiWMHMevhcQzNzaa6ron5SzfQ7HeiaSKx+au4m6HupcJKSYZdZVI4dypuV2yo3zoql0VP3cOiFV/Q4jdiGkGhQFqMGpbJL346kbE3DEYIQWNTC39Ysp4Gr4HQtZDyiRhA0NlmSHZbRM7pr1H0m6lckeHqdGXG3jCYoqfupeC17bT49fNRXIFSNrkDTGbNGM9dtw1D10M1DI/Xx3NLP6OqETRdDy1eglPT4rqA7K56gCIrXfHCvHwGZqUnBMtR113FS/N+xHPLtuJpDa1mVobg0emjmX7vqEjsUErhaw1Q8Mo6yk4F0A1HeOW7kIlFx/u7jworRabLpmhuPjmD+iG7YNDrrhnIS09P5cW/buOeO67lkftvJt3tDE06PE7Qsnh++QYOHPOim86wcVUS0+whJug0ghTMmcK1V2eH8m2UHP++nrwhAyIwjiXDcrN5vXAGhqGhFBeMYUvJ0re2sPfgGTTDGUZrEogVopMgmGQWUCgMEWTBE5MZPSLngnGqas/w9j92s31fJfmThvPM7HyMMKRj+qgmOiBHSsnr73/B5r1V6A53KD4k3bFS8dNgckFQoWPxu1kTGDc6N7JqzR4ff/+smE+2H8FSLkx3FluLawhaG3n2iXwcppGoV/Hemt18tK0c3UwLIfUS2nVafBeQJNUXkAF+/dht3H37cKSUBC2bTTv+w98++YazPg1dT0NoIUhruoMd+2sJrtjI7381rQM3iCVrN33N++tL0c30xFNdp0GQeFRYQhcRIO0gv5xxE/fdfSO2bfNVSTmrPtxLZW0A3XSh6VporaLG1XQHu0pOU/TaOhY8+QAuZ3w6vHnnQd74536EkZ50wOsSE0zcugolbWZOG8GM/LGUVdSw6sM97D/UgGa60QxXzMJDZAq6yb7SJgr//CkLn5pOmsvR4Z5dxUdZ9t6XoKfFjNyXkqZjuoBUCpGgCyhp8eDdQ5k++UaWrdrMlr2VSFxoZlpE8YtNWGgGXx9ppnDZpxTMfTCS8gAOlJ5g8ds7kCItTIi6j6FqMVxAC2sV2RB1ekmLCTcNpH+myeyFH7BxT1Voopoe4RKJXQqhmxw45mXh0o/xeH0opThcXs2iv2wmoFyhAnbC4yX+3PgISMDShrA5XHGa3d9UITRniIeTfHASmsGhEz7mL/mI2TPv4sU3t+KzHAnu7JKpCosOkcSIICAB5hZE0OiRCM0Iwb0b6LPQdI5W+Zn/yucoYYayRk+16eK1xqRMDAHtA0r3lep0lNAjO8kfpCpMqpTF4xZEUqA7rIlOCiKpgADVWXc4FQwgEfHPB5AiByTixIDUCYJx+wJoqdIcJV5VOAWygEZcF7BToT2upFDKtuz2BrAtf8v3mju972cBJX2exso6ok6N64BhOtM11xXXPBz6v6340PcuO+DZfaJkzWqgqY3L64Bqaaz0ZV45Mkc308dG2kd97FLSaq4v317gazr5HeCLRoACFTxbfeBw+oDhWYYj4/rw+30H+rb/VMPxXQsbKnbuABqJOi4vogyRiRB5/XNvvz3zytFTDEf61eF9b0dCKTS36c4afymTsgLeQ9Ly13X/aYnzE1Uy6PV7679trNy1xe+tKwPqAH/0Vla0qw65gH7AFeG/Y3Uy9P45o0bm3PTIaplM6lTK9jWf/OBUyQcrpdXaTIyfsXQb9QcLaAn7vJd2vxY5XxBpo8pwDmgFGsLKx1oeh8OVmUUSLXUlrWZPzbdLag9v+BjUqfDzepKAyDDcZbznGHG+1NmqSKHpVlfbadJqLW+o2LHobNX+PUB1WPkfnHwYyTmX6lI7Lehr3F576NM/+T3V3wH17f2w1xkg2ggXuSvga6p8p+bgmpVKWpXAmVh+2AsNEKogdYYAJa0GT03J4obyf60HTgKe6PTTqw0QOpcQ3wXs4LlDZyq2FXrrS4uBmjDxuCw3G5eIgA46yeC5ho11pWsWW35PWTibBC4Xf+9eBLRPg0q2+s5UvHG6bMNqJYPHw7nXutxZYvIIiMoCSgbrPVX/fv7syS+3AKfC5MOmF4iRpP6RjrId8O5vrNhS1NpUWQLUholUr6muXEoatP3emrWNR9e/avk9R8P+HuxNypPkrk93pGdnK0VtXemaN6UdOHo55vdE5b/0NKx+K4AxtAAAAABJRU5ErkJggg==\", \"description\":\"Keep up with friends wherever you go on the web.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com/about/messenger-for-firefox\"}"); +-pref("social.manifest.mixi", "{\"builtin\": \"true\",\"origin\":\"https://mixi.jp\",\"name\":\"mixi\",\"description\":\"好きなWebサイトを見ながらmixiのチェックもできる便利なツールです。友人がつけてくれたイイネやコメントを通知するので、見落とさずにすぐにお返事ができます。また友人が今何をしているかをいつでも確認できます。\",\"workerURL\":\"https://mixi.jp/static/public/js/sidebar/firefox/worker.js\",\"sidebarURL\":\"https://mixi.jp/firefox_sidebar.pl\",\"iconURL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozMDZFOUZCMDkyQzIxMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozMDZFOUZCMTkyQzIxMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDc1OTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDc2OTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+fT8vWQAAAkxJREFUeNpi/P//PwMlgBFdIDtST4GLg6Weg50lgJmJUQAm/vff/w8/fv7Z8O3Hn8apyy89wGpAWZJxv7AAR4GYEBeDAC87AxsrEwMjIyMDyJW/fv9j+PD5J8PLt98YXr/7nti78NwCFANq0k3ny0vyJUiL8wA1szGwszEzMDOBDGBgAPny779/DD9//WV49/EHw8NnnxkePv+c2DXv7AJmkObqNNMCZVn+CiBm0LaMZuBgZ2YQVnBg4BSQZ/j27g6DqKoHA7+kAdhFrP8/AOVZGP4xMLlqKAhMYwEZIC8rWi0vyc7AD3S2lE4Iw9/f3xg+PTvDwCflwSCuGczw4+NDsCtFVDwYvu/IZxAGhgwwLLh//JGIZKnLNHMQ4mEQ4eNhBzoZ4qNnlxYzvH94iEH82xsGQXlbhruHWhiYWbkYtH1ng13159d1Bn4eNgYFRRkHJkv7QA1eLjYGVhYmeGD+/vYaif0GEgtAV8FDHmgPSD03Nw8vExMzIwMLEDMykp4GePjF3zFpGXvc/kdiWgLFyn9G9n8aJr47GYFxzHft2IJ7P57uFGZhZiLKgD9//zGwSTg/07FN0WQCJpRPWlYJjRyipp/+EuEUUKL6xyb+E6i5A6SXEUmi/cn1HQnv7mwW/v/rAyu2MPkHtIBVUPuLskXWIU4eIW+MpAw0JAhI5Xz7+Ezh++eXYEPePjjE9+X5ST5GZo5/ohphr6Q1PdYB1VSCbMfnTGkgNgPhS4fmbXl4ddvzn98+noNagJobicjOME17gBjDVoAAAwDPu94Fx/JhBAAAAABJRU5ErkJggg==\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpENEJDNzQ3MzkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpENEJDNzQ3NDkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDcxOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDcyOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+0Zya+QAABRJJREFUeNrEV11sFFUUPjOzMzs7u92Z2W532227u6Ur7VJsS02VBqnwYAIvNYJREQnhgRcIAaNI6hPxxZ+YgJFoeDCGNBhCDNSEGB54wBpFTZtWjC3B8tNq20CX7S5s9292Zz331sXd7fYvLfYkNzNz5977nfOdc+49l8lkMrCawixl8KE3mrYIPIeNfYHn2WaWYZTc/8QWLaVfTWrpgYSW/v6zs791L1uBA683Kiaj4YhF4vdaLYJXtgiA74B9YDCwwDD/LZFO6xCLpyAS0+BhJAmhR4m7j6a1M7FE6uTn566HlqzA23tbjqiKeNyhirJdMUGJWUBgDpAFCo4MQA4+EHciA5DUdIgnUhBGJQJTMbgXjI8GQ7HDJ7r6uxelwMFdjYrNKl50OcxbXGVmUGURJBEt5tg8wPmEuCOFjESRjUAoDmP3IjB2f/rkh1/2vpU7jiucePjN5uYKh2XA55brayqtYFdNlG6OYxYNTi3DsRzLgFEwUJeRhmtsbKyze3v6xr8tqsCRPc1et8v661q3bK1yWsCKlHNLsHpORXANERkkLGLMNK9/qjT8Q9/4z3kKHNrdpLjL1Su+6pKqSocFRKMhL8CWKyReBIGjjKQzbHu9V/n6p4GJkCE7oMJpO1ZdLjaUl0o0yAi2IJWBYLZDOhmFWHgEOF4Ck+IBUfZAHL8jk0N5ICbsF/F/WotCPDQCyehk3n/iEpJFLrsoRRNlH2HXa9TEo/tavHVe9c5ajwKYao8td/p3YtsB04EhCI70gKtxD1UiKwRg5NoJ+u5q2gNmuz8PMDB8Gcavd80KzmkMzOHREAzeDtZQF7y6vfG0p8LUYMNo51j28WBL2TpsfgQ1g1LVBizHU2WIhbyo0H6p1Ad233YwlrioQvHwKO0nYyWbj45PRgOzYiKjZyDDqzMusMmGDtVqpGlWTIjVxAXE2iytdt82ygihnQixlFicHV+/7VP6VN3ts1xFXEGyQpWlDvb4gee2yBIjGgVu3iCaQIBcn06hS3Lfs+B0R0SGHo730nfBXFZ0PRJnIp9xszW1dbvNJEdZdk5wAlxoBQHJSniir8icwLwGkZ1UTwbtrMNZVSkY5s91bYHFdG16yWlpwI1NRNZZssOxLLMqR7HiqIsaVqsO0FIZSELmAWsQpNhq1CTkoLLY1oyy5d4NA/oqaKBpaSivab3I+lu2f8PwivZ/6qDjJiTan45U+1rP0ei72XthMDx83o+lVn6uFpwFhUJ2SSIx3Pdz03KhuVGsmtwbj56vrG2dOQuwktnRe6mzi0+MSCt5AhaTNFovOJ6famg/sAmxhtiZ/Zm5sH7ru5cSaf6JhgMp2XTemfA07TxFwOkxnf0pmtX9vs2dNzK8/ETigVbMuqC7W/Zds8jOT4rWhKihPxELn7517dSGZPAPy0ptUAQ8DYJes+nYDbW8/pWs9UWLUlTCio8PHvzV3zH++9kyPTZuXE5cENoZsSJR/cz+W4Xg85blOPFZfLwXvn+zOXDnqjUe/FNKRceWpAxJN15tiNS2HewRJeWdQvBFXUyIW/DxMjaikP/B3/1Sfq0HcPvHj6t4A5tHOSPImnPdrkln7WZyF+hE8IdFD6WFq1qq9VABM3kSiWq/kIKGBi9n1K3VW6dc6zoGjSb5fZx/ZcXuhnPJd1+8lKl2+xK2NS9O2T1tE4LJ+hV2n5nL6hWXybGhu8hMN9nQ/g3ixd8bVuh67s9101LkHwEGAHiA8Hoi/Qh6AAAAAElFTkSuQmCC\",\"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpENEJDNzQ2RjkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpENEJDNzQ3MDkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDZEOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDZFOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+zVczFAAACZBJREFUeNrkW3lsFOcV/2Zmd2fP2fvwHnixjcGYYMeAgVQEIogU/qAyoapI20CcgpqUIENa0aQSUv5o1ESNokRBQRGtQkgbkipHFeWPqgE1dtpAD8A4UZ0WUuwGX/jaNd5zZmf63vjI2p41u77wsk/6vNd8O/v7vfd+733fjClJkkghG00K3KiFOMkTD1VtUavoapWKKlYx+EgHGZoKTjdHSInNqZQU4gWxEUYbjE9efbulLS8IOLB7dVCjZuq0LLNZx6rqDHo10WtVRMuqiI5lCKtRESCE0LTy6UVRJEleJPFkisTiAonGeRKJCTD4Nnj9h3gi9cax05ebFx0BDT+ofsSoV+81GTRbzEYNMZtYwhnUAHoEsAoHQxOGoQhD04TKcHbUpZQoQRRIBDxPeD5FEjCiQELoZoIMhOMkPJxsi0T5l2MJ4eTxdz4P3TYCfrx7tQUAHgLADXaL1gJDBm4Aj7MAXDONp3Mx1GpIC5JIIhE8CUeSpD8UJ72D8XBoKP5SNC68BCkSWlACfrK35pDVon3GbdWZnTYdQa/rdWrCqtG78ycvSAZGRgxSYxAioncgRrr7Y+GBUOzQi6cunZx3Ag5+v6rayrGve53G6iKHntjMWgCumjas54uIFOgFpkY/pEXnjQjp7B3+JHwzWf/KW5ezEkwm15MeeXTNM3638XRZwOIpLjIRh1Un5zio+oKCl70H58P0AsEloD0EtAeFNkgo+tG7yuznz7d0t81ZBBx4aLUFPP3BEo9pi99jlL0+36Gee0RIJJZIkRv9UXKtc4h09AzX/+r1iydnHQGg7tVFLtOHZX5ufdDHAXhWZn0xgR+JCEquMgbdSNmFDKlbVWZv/+ulruYZE3D44bur/UVcU6nfFAh4THJZw1xftJ0d+ATLrA77Dug3wOoqpyGBuRX4gJdrAs+bvE6DzOpi83rGHh+0QTvadImSVFdZamv8rLmrLWsCIOwtAL5lWcBsKgLw+EX5An4yCZiu0FjuqghaT4MwTugVVIpl7ntVFq/L1FTi40weKHMj+Z6fix3UBIdFR5LJlIkX6LfgrXtuGQF1W5f/usRn3OZzG+U8ylfw6ZHAahgiCHxgZamtvelCZ3NGAp7et7Zuqdf4LNZ4gy7/wj6TMKqYkQrBp+j7y4vNr5673B2fQgCIniXot3y61MdpsJ+fbQ/PqPXEYC8jnHctMbmriMbglBsPIRHOar7RWUEMzpXEDPN1lmJCM2qS4qNEEvkZlUhckMFKU5MQ1OTjz66dnaIBHhd3zOfSGy0AnrkF+OCGwzKwMYv0tZKvmn4hP9foncRd8SCxFt+rOBdB9F39I+lpfW/KZ2Nz8buRQCUbbG8inS1vyt+Tqx7YoYFzmIUGDPYJEfCzH64JBouMv8Faj+v2W0W+vWSb/GPHjI/2yT8MQQc3Pkn0trLMOQmeRO8awbtDnf8c96ij7AGypPagPBePyWQYDXj+4Z6WrKMpvUfgBUG9ssTW/ud/XG8e72i8bsfzblB8nXbmoofgA2t+lNFzk83gqABv75Kf4zzv6oeznovHFW88nPXx4/OgicNVa3Ew+Ph4BKD3Ax7tCa9c77NbH9kAbHoEMGoDsfg3TjgmFm4n4evnyU3wFJKafvyYobdxrr1k64T3k9FeiI4LZKjrAhH5CFFpLVOiAudJoiCnXy5RgCMUDvmWB60vyxrg93kPOq20HPqzEbx04F2Qo8O93/ywntYRAtBrOnPxhLkY+un6gPmN6TTZMEom64q1eJOilkxn2NeYjSzx+YvvkVPArKceGenxZ1/yEPx/QQzTwad7FT/LJF74Pn6uBB7t6wuvTfE2kpprGmB1w1TnOONO+uhjtUE9K9hm4/3JAKZTZ/wMhU/J2s+/KBM4nQ0okIOimKvhVp1OQ9eqvF7/XpNelEvEbA1LWzalKQkVY7KhZ5WiZrLxEEVzYdgTgN7ZaTNn+DZuVc9Fw5cpdJVSIRvPKqZYqH1OCGCwK4z1OWmtWlqCojAX4Z/M0jtKXoxnCSzX5iczAdAaU4KGFpMDDtyvn63Fw7PzTCw8N57NWghx9wi37LVQ93GhUGg20g9QUBFo+o5Y8c1kA1Vv9iUK9uowXnpLSczNwiUgJRFGw4ULlgC8zsganW2wvtCJhXiTiCCIxOIqb6R1Jm+k0BiQrykSVlxRs/1dWmsOXEM2CksARWJwrhqA6tdK6y2BxiSfKigC8O4Tva1U7r3pyvW7fitIbMFkgRz+NMdXbvju8dGOkPo756vtxbAoFPU3edZ2AO4zMgH4x1e+9c14Irc0SCUjeen9REotBqt2HB9viUfbQl/zxy/8Swpf5OZiV2hR137P1s7KTfsqIAKGxiMAXnT4K3f8Lgns3KlaIN9kRSD3N+17bgz8OAFoDu/yZ60l2zuQpTtT+VPEX1P/BYB/ZcKy+JvlIdVRvm73UUofjN5p9w/jwsfg2zzoLd3w2JR9gYlrZOqNivuOfCRpPIk7hQTEIardiSWrHzyGFW9aAtB0Buv+pRsbmnhRk/d6IN9PCDiW1NSfM5rdLyhujGRgzTfQ9eWfrl88USrFu9h83TDBji+w/sl/u4PrdmLbq3SM4nIY9cBWtOI7y+87elZi8zMdUMxdq/Z0A/g9mcBnjIC0SODg4dSVc6/dO9zRaM2XHgHBOyv3dAdWbj8A4N+f7lgqSyH5ed/Xlx7vuHTCTfiwejFnRC7gsyZglIRaeHjuf5+/v2rg6kd2SkzQi4kIzFKRYsXAuic6HYGahmzA50RAGhF7k7Ghhp6rZ/yDbWctUjJ02yMCNYrSFiUCa/Z/ZfWsqFcqd3NGQJo27ISxt//6pWX9bY1crK/FSFILHxXY5Ohc64aCa+v/otVbfjqd4M0ZAQqpgWRsC9/4j3Oo5wt9pO9LHR/pYMXE/EXHWMgXVdV3e0o3nYK3fpne4y8YAZPIqICH2tGBz31ACiskIwwsn+nI4DV2nBAAoDG4eK3JJUQH29gbrb93ZnuFWgSvs7bK4dKNB69odNyRsbX9TIxagPxEIkwwuFFS0q0DxvXWv72zc+DKe0+Z9Opbep2ozby/Zn+P3X/3h/Dq6Zl4Pd1U803ApJxU9NTZd5+voZIpQjIQgMApjYV3LNvR71vxAH7fU7kI3W0lIKvaDQhVCt2mAvBj2Za3vCJAqaypudKoOfCtofkCvigJkGhWNBZtCDuWbhkyu8o/hbc+mC/gi4oAl29Fl/2uDZ2B5Zs7EfQo8NaFODe1SFZ6vtEKcWahT0wV+r/P/1+AAQBXzMCkCOGqMwAAAABJRU5ErkJggg==\",\"author\":\"mixi\",\"homepageURL\":\"https://mixi.jp/promotion.pl?id=social_sidebar\"}"); +-pref("social.manifest.cliqz", "{\"builtin\": \"true\",\"origin\": \"https://mozsocial.cliqz.com\",\"name\": \"Cliqz\",\"description\": \"Cliqz for Firefox Social\",\"author\": \"Cliqz\",\"homepageURL\": \"https://mozsocial.cliqz.com/\",\"version\": \"0.9\",\"workerURL\": \"https://mozsocial.cliqz.com/worker\",\"sidebarURL\": \"https://mozsocial.cliqz.com/sidebar\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKEgkPNcdyEiIAAANaSURBVDjLVZNPUJR1HMY/39/77vLXZYFhKf4sbEKRTlrjFFIzFgtlJmQyddAmrOlgjdIAt+yQp04Wzti9sUZwPFgzOdg0sIuThaGUOBROEqLAimsoiqy77Lvvt0s09ZyeZ+Z5ntPzCKvo2w+7Poe+/YXAQeBtEINqX9gX+2JT3mKpgznT0zhwpyvaTE/jAAACQG8H7D4CJ/YZHFkA/ICi4JW01FtXWFco5NjcPxweXMN/YADw/KMyEkHEj7qKugJQQZxlR4klUEvI74o0H/hfQXc0DG8cgd7uLah5Gle1oWSt7KzYyIH1WyXotYknYHBGJDIHk/fc1tXw5lPbsIaPXuXg2aZ1Wcn5L/3OzbKkeGVTyXpa86u044lmuRC7pkOxCbGMhTGqapuKqnfqArPHrvTP9k4inZFwgSLXz8cTvnDldj0zPcXrj+5gauZPQUT7fo9KVWUJo7f/wJDi2eoACSt1yxa79VzL6Z+lK9L0yVJ65cONpW26u/ZdOT87wUJqCUln9NvpC9IQXK8dT+2Qk5NDvFq7BdsYfWton4zfu9ydbbyHbYW2omw/raGXpGf4OP6cAurL6xCF0O0Ae598hUPnTuDPd4gtzVOc6xdLLIyx6tWYLAPUPJRbzuJyhkNj/fy6cFXzvblqWbZU+AM6Mjshlf4AP8Z+I+Wm+GFmmLG743iNXSyqxlZ0xWNl54SKgnzz2kfM3YnL7L1bpB1H60qCUr6mRPOycqTS9yZluaWMLPzC3sf28P3ckDt6+1LGatjzyDaQ4ONFm/jp2hQ3kotcvxvn1uJfYtse8myvLK08IJlOUVZQSI0vpM8FnuHFsudrkunUBemKNrcLenQxZeuxcVtWXME4GVh6oJlsj3Q07NQNxdXSffYzNqzNxRjFqKXv1bZLla/yvnFd97gqA/leR8r9adRRzSSSmlFXWF7WUEGpXIxfpcAnOLpC2nVIaWp810Bb9Wh87CsB6Iy+kJVlrA8u3+X9Gzfd0Mik8+9NPF6vbq57WJJ5N7FtC4X7ItI+vL3/awDpijbR0zgIQOdguEqMmU6kVCdiLhkX2Ri0UIuxiw88EYWMoB8Pt3yXWJ2zrJLOSBOHw4N0RppeFuGkCDkArnLJQrZ+2jgwv+ptOLWN4ZbTAPwNmUptT0KshT0AAAAASUVORK5CYII=\",\"icon32URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTOwK3bfUAAAj8SURBVFjDnZd5cFXlGcZ/7znnLslNCIEkQBJI2IksAWpcgmjFugRxA41lwFKmTgd0tB2qqVVpLXWGAk4V1y5IxRnRCR2tWIgwWhYxCJECYQmEVWQLSch2c7dz73n7x80NIVKgfn+d78x3zvu8z/d+z/e8wtWMt2YJkA88ATwA5AF+YBOwFKhk7orA02sLkkSwAP/ikhotqyhgcUnNZX8tVwgMc1fAW7OWAPMA47uLFNT8bEafHStzkyOliqQBu4EFi0tqzlwpN7mK4OuB2y9E6/aNQo5V5+9v1bmuywqrx1CvxFfUA/2B8OVYMK4QfFFHcL00YMUtkXCedSZJwVNV73EUHI2vzgTe+35b8NYsgBuArRdlrQoiF2U/xHWivbfZ7ANBFTK8sbYxvcOpjkriu75A3f8CcmkG5q4AeK87SJ/hBtuOA0EBgwyzydB4MAxRGsNmqj9itBmoCIoqpd9nC24FBnVE6kx39oiJzC+YDOqQl9SL61Iy2xx1kkTQYIzwcb/VXN1kNa086jM2nkmqP9zqag3G5AaA4vKi/wOAmmWoRFFT4ruviuNwU99hLPjRDCUQ4rMpT+u2GYt8PieFuqC0H26zjFZbegqaHoyJN6r0POF39djR6L35xvKiSZWlVVcH4NcVIxaOc1dPutazxxrlPtjgNcJ+VIRohCl5hQpItiadG9I7WzAw+voKA+fCZiqKSwQVEQTMlogREVAHegp8XlxeNOhSLFiJh7KKggGqbDsfNrIscQwR1SQCGePdNdGacH5bD7M3Pm9SaiQS0dPHq7MSxXm2LeQRcFQQVAURRNBWW+jlcUSMzhzXV5ZWDSkuL6IrG0ZZRQFlFQVeoFJE+zZHjLAhEAgHpL9ngLaEok6kqd64N+caF6Brd20WnADlX6+XxqbzbD6wL9Re394eCLRKRKMoiqMqLbYSdSKECBmKqqoOLi4v+nn3rTA6KvRlIEcAv23YkWhEl5e8S/n0D2XONfOt9kA0uaSg2APIJzVf8NTtj/HIyt8G+70ylZgZ1WWT/5B65vHN3N93Il7bIs1IZkzK0OTSQdOdZwqfc/tsn0j8+L74HR3oyD4IqIHK1joz+sS4F6xpYx4kbIfVdERcvxlHdHE1pmWS9quJ+sW85bK5dkfkiY1L3c8U/0QX3jlXAFr8rfr+rn/JDwYXUtRvZKd+LK98m2Wn/4yoABQC1QkmDGB253kX6O8bHp425kE9eOZI9HD9SQKREAOzCzAtk6bWZrvV9suYnKGMyx7mTnL5dOEdcwTgmVUvB9NSekhuj36c9Td26oeqkpGUgaNOIumpF9UAcGdiEtMYj46bGwPk2fVvRHPTsmTLsd1MG3UrAB/u2+T6cdHkMMDRxlM8XTxdEGHNzk3U2Oe8AEcaDzoBuyHQRb7jmV24SyZ0PwWjExPbjnFT3m0+gH/WVuL+eLHGVOWXEx6OA9i/iceKpynAmsNfsfSBeQDM3/A2f5zyuAB8fWpbtOXs2WS71c/EwTfH8jLzzb0NezDEAEWAEd11ICcxyU4ZqaYlZkNTQ9TRqPuDA5/Jqj3rKM6PY1xbs0VLht/oBTjeeFr7pPbG3+5nd+NR7hh2PXHg1U5LuJlRA0ZrXma+Wf1NNWvOrU7sP0Cf7gy4OwGkjhCAUNS2EFGX5aWw32AAak8dY1juYDEMg2AwqP0y+gjAp/u3UvbDRwDYeWQ/flzORw99TC9fljS3NTPn80eR1HgtAIiIqzsDwc7Lxp0OQG5mP56b8DPZMuNVxmcOAeDT2m3cOTSe5eZDO4LjBxQA4HG7eeHWeB2vOVjJu1N/n9zLl6XRqM2bX77OXcNLmNTnNgp7jsWHD9ux/V3vBgv4FhgOEIi0kKjcFyfPYd3eL7k+fxQA645sZ+rYeDF+XlvlDMobiKpyT+EttLb78VhuVtd+yYZJb6Ad1+Ozdz3fmWkoEuK0/xSvb301uerNXTmVpVWnEgzsSiyqqd8ExPUc0AUb3qE51AbAlm+rtTHQqgCVx3anNAZaAyLCifrTnGs7D0DV4e34vMkqIrgsl3al2uv2MjB9EH+6e6k81X/evsQZsYA1wMMAQRp4f/vzMijz7tjKnZVm5dnd7N14gnEZQ2gNnufFje9Er80a6jrceJJl2z+Woj7DdcG6ZbLlF3/j0Mlj4IXjdSelOdxgN9r1rohGsMRFmjuN3JRcstNzAGTRXUvSjqw49PeP+GS2lFUUJM6nAhKLRTnRmtqyaq8nFbdloIpHXITVhpDd5o4ZqVGN4VgExO1OnjKsmNUzF/GXzf9gzr9fJie5HyNy6traJZga1SimmHitJNI96QxMHshjY59kSOYQXbPrE7l3x72ZibtgQYdyqWlapCaFzZ5phOOQhDBRgBB2LCWiURwUomqoSeyW/LEKsOWbPSAmpwJ1rWFPyGu4DHW73ZguE1sinIvU8VXz1qr71kye/8Hulc7dY+9h9LmRs40O7/47oDoBoofLsfLSIyKidgc5NoGIdpU0VL2EIu15afHjuPXUXsVB8zPtmKO4uvlN7VDEsv2zD704a/PMCa99/cqx+0bff4fRxa/dAuwAxGupN8XlyLDMsE3MaCdg28QcL8iFwhJRIk7KquoNQUCP1B+TdF/U3zc96tbvel0BVleWVm0sLi8i8qRue2n3ohu2BiozzMSKCTMzQ4tLav46YWbmGYUs2zGCvb2xpGxPKHS8wUiL2+G44bgg8cK+s7XhHccPuo9Evm0fk20ni9dwuosNcBq4rv9DOZ1mZOT4gnY7K7LzIqhdW6l3vhqUeqDZ3WoKHKiz2rYcdVt1TaYLwUI6rLqCx6OhgtxQsGeaZQQxephes3v6a4GfVpZW1Xd9mXBGl23NyioKlqjylCFKKCrRpoBhH6izAu0R6e0yNDwg3WnPTY+lpXgcsR0xtrX5pqtQKiIZQC2wHPhPZWlVqLsVu2JrlmCjrKLgeEczqqBiCEhHi6LaYQbjL55cMrnmte7/+V+BL2/LoWtXOwHYFwcrOCrEVMRRUaWzJBYumVzzWoemXDQuF/yyALqwcAq4EXipq8noYO8b4DbguatpxS81/gvSJCNlZUMZjgAAAABJRU5ErkJggg==\",\"icon64URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTJxa2MboAABYBSURBVHjazZt5fFXlue+/z1p7SnYmMjHPMwJaNAhxQFTUWJHj0FBrK7W2tdajtYPYW/3ce+w5tz2N3rannh7s7amntLXHwxFbtYpinTUKQcFAEhAhEAghZCLJTva01nruH3vI3mEnjNL7fj7wgb3e913v83vm53mXcCbHmlVw11pYs8oAioFy4CZgITAJ8AD9wG7gTeC/gQbuWtuRtv4sDvkUiP8McC9wPVA4aJZmeOceYD3wKHetbTvbIMgZJv4nwLcA7zAEZxoakwy9hbt+9zzA6g2zvw9UAuOAZuBp4EdVFQ26esNsqioa/j8AYIDw/Lg4LzsJogdjoCAy09v82PJRzV8xRP0ZtrHjoDwDnBEQjNNaHSO+BHjvtIlXQya5DjYXaMfdtR2eABBWRQdNNOPqUlVV0cDqDbP/hhKwZlUCwEPAyFMnPjZKjfbmye5DY0FQhRy3c6CsJDTeUVGRjPveXlXR8Nu/DQAx4gV4A7j09I6gamJHLvTuCFtq5saJVUeRsdnWgZkFkUwgJMAuBjpORxWMUxZ9+D9x4vX06Ddkurup1cbISyFSDFFt7neNbg26OkRUhmDcv56uHThVCTgf2HL6NljVQAMXemtzHMxMZ1HLoXfpmKDPEPUMcdw8oPdUgTBOQfSJuyQ9ffpFRpttQQdjKEaIy9C87Z2e9mEOevfZU4GY1f/7eFR3fOlRe8DDDSGApWZnRFWGAVO0M2yOOhoxWjN4BQU+f3bc4AD3f3pC3FdleeEczN5wDKoECKrx5QrgZEl4VKqB0+TfiiqWrViOovVdHmxFog6W7RBBUVBR5dyzZwPWrPom8MsTmmtH2XL9P9B5tIurXnwE8v0Dz4JhvLaB5Qs2l/kbx2qcD6qoiIoq/V0RI9gdFaffMkKWUuAo/mm5dme2S51slxMs9dmlxT67s8DrjHWUOVUVOxs+fRWAfzhh3Y9EOX/cdJbNW8j3Z14d47wC4Qg7bvlnmr/5ODe6xrkUAR0gPhCVxp09LmnuN/MCUaPEUcYbkOsSNTrCRtQULQ1ZxsSmgNu3rcNbuq3du9ctOvXTVYE1q2DNbYtRSlAkBsHwOMwtnAQCqsqPl98Bnb2A8o/n38Q5oyZSmJXDU3f8vDTcGU3Iod0aNPbtCbgm20qWCG4RGPgjdEekQJVIzHwiirg6w+aUv7blrC5fVzYGoHxd2acAwF1rQd13ATbi9IMoaoLKEBZOuXri/JiOiYApzMsbC5EQ9y64GlVFRDDchiwbd7WKgd3UZxxpDZmTTBk6oDSErK6IEUh5LHGAzgU+KF9XNre6subMAJAaZz/08sxvnefZfukF3h1mmac+6wLvds711u8qMjt3ooYcIwyOzXXj56chkuXyUpJVRF52jooMUDB/1Dxp7OVQT9QYY8jw0bSI0hE2+g1SAqPYkjAwCqgpX1eWezJSMJwEeFZvmP3l+1+cHWoPmf/LLdZEQ1QNUTFExSeRmTPcTbMW+mr35BmBXhQnKQ1Rh8umpAEgTR9vazzHMvYOpjDPW9rXGWK8CHp8myz0W1KkYA3QryCE4v/1Ae8CcqIguIbgvAn8BVgmorSHXFGJnVwGXIdgIyro1DmePf2tdtHhRmvCGByr55Ks0ihCUdLoB4N6uPvA5Al9o9NqBKqqLf2dfpdpxJPhE+CYkBWIykG/i7EJ9ymGGCnyMA/4SXVlzepTkoB4VFUXT28RoC1kdqYeTuOMFpCYx5asUrNzzDjrkzr21JsVE+cXpVrJDVveFPKy2dK8MxbZJNaLyNY9uy0nZDTG4v3jOxgRpc+S0pT8wBZDxgxy6/eXryubdFIAJHR+9YbZzwAzUxAnEDUKBokcUTtKxIoko5ZDPZ5DB9uYAVbn8tkXozqgpy/UvQ1uNw4Wv3nzGUQGIr/1O14Lhdt0UvgozSBRTcZCmhoZpUWGPVHjiCSCaUNaMxgOBZ44KQDiBYY7gRtSXxuypVNiCQeqiqI4fQ7LS1fwxYmrcPWY0tjlaznQ5SlB1O3y55XOnTCDVEP359o3Yv+IRrnnhZ/yxGvrpT/Q59z+qwdp94aCGCpWQEf17e8+0t/VLf3BfhAh4sRdpKaRJkFbvPHtRd3qcsRJk8z4WFq+rmz+8WyBpHDfA4QHFzY6Q8b+2k7vRIn79Cmuaaz9/B/weDwA9Pf1WwUPX+WK+g0FleUTF/Hclx9JHqito52R378Ysrw8vbKKm9f9AFzSCozE7wPT6KE3lFvozuG52x6Vi+acr798aa3cs+VR7pi6nCcbX8bIcsWNBhhiIGowP9+xjYhpTiycFOgP9+U060HIjs2Jg6/A+urKms8d1wjGuf+zweGxKvTbkgNgOxbn55fx+I3/nmY5sv3ZrqrL79Rvv/crQeCzM8vTnPTzH7wOuTnML53OTRdfw/17a3mk7mmTbF/SEUwuHNu++e+fKC7OL0RV5e5rVrG+biO/vuVHnPPSVL734S+4anI5V41ZRGn2CCblj2FW6RQKCwoVyAF49v1nebj+IbJys1KZe3P5ujI3EB0qPjBWb5jN6g2z3cA3B2ucCBp1pFAE8p0RPPZ3a9KI19jgxnOXCsEghIOsmHVxmig+v+MtME2Wz4sVjqpuW02u5c1JvisU0tfu/GVRnPik6vzm1h8DcN81dzBDRjN/1AzuW7KKL5RdT/mMC7SwoNBM8SasWLSCaFs0E423DmsD4lb/7szJkUrYkoBlR/nh0h/hMl1J4roC3Y7EBiX5hWBZFGQXM2pESZr+v7DrXSUa5oZzLkus1RvnXOZDENThwUtul0nFYyU1GVRVJo+akHzXlZMXY9n2kElc4n1jfeMyldsrh4sOE/z8ekZ7C0RU+s/NW0D5tKRoa9OR/dHH/vqknVjTerQDXC5WzLgozVXu3LfbtoywZHlyOH/ynMRBZfyIkQDkGFk8fNXXSXWLL25+nT9UP59GmKgQtELHteh5nvzBLBSgYlgJWL1hdg4we6gYtDcUtL6z6P7kgUREbl17f/iCqfPdqiqqyvt7a8Hr4rrp6fr/yq7NXfj93Dzv8rQ9u/sDgPKDi76I6TIREVSVcCjMZ9fe3/KnHW8GUuc3tO3hcKDjuBlYtic74+/l68pmDicB1wy36VTfdD1nwjlJrn7c1MA7Bz8KTSscqwlC39q/DWyHilnlaWufrN1YjGOFV553VZpdqGvZA1GL715ySyr3eWDdT5Viz+jKCytyUufXtm4Pd/Yd2Juq85mGZVtDkXHhUO7QABYP3a9yuGXequwUruoT76/vpKC4+N39tZIQ0Q273mdqwST82SkccGBT83YQaf3svEvS7MLbB7Zzw8yleDyeJPejkSj/suUZwVZWzh+QmKZD+ykq6vX2RHZN6e3vSYCufcF+AsE0QaEr2DUUKecNZQdcwJyhmhr9oSAXTanIT7HO8vvtG724TL7yl5/gx0NleQX7uvfz7bI70vT/1Y/eBb+HZRPK8lN33ntwP1Gjj68vuC5NXf7vq+ugwMPyaRchhpHc5836mqP+An+BiMGq9V+Um8ZXsmV/jeT5c3sevvmfkgGaIOwJfkKRFmYyhNOGU4HJQ+l/kWuq5vpzzAT3jna3c6ivO4IqeF2sfPZBXN9bDHnZXDttUZo4/2VnNXhcesO8y/JT93y5rhr8fq6Zk64u//b+M4DNvRfenLbPf9W+7TcMM4zCQesA/1z/j4wYXaAP3/xPeaqadJ3/8sLPyB+fl0k9BJgwXCA0aqiHs0ZekgbM7ubGfrKzRhALCyE7BxuF/n6unLkwLZ17tu5tsIPy+flXpvn3l3dv4oopC9Pe09bRTn3XJ+SWjoztkwrY3vfck71mc2G2PSYYDsqPLq1i+dwVaXu+VfsWTx78He4i91CkFA8nATmZ9d9mXP7cNESbe7oE00hv6CKcM2oWidK+qhIMBtnXu5/xBRMYkZOfqv/60p7NVMxYlPau/968EQpyuG/hzWlq9ElTI5YnSm/YLLVtSx67fA3L565IiwMOt7dwz8Zv4C5yD2kc43WCIQEwMxZ1HYvS7OlpxksMMyuWEcWTd8cBhaunXZi29oWtb0Ken+tmpIv54bZWDdtHuWjsvLTDbty9OZbDXnxrmvi/vONdyPVrf9Db8eiSn7FkxmVpz1s7W7nlyZXkTMpJk4hMxZ3hAMgYPzqOTaE/XTsun7MQjvYKakNvD09UPACdnSyZeG7awV7c9R6YwrIpFyR/V1Verd8UJcvDBeNnpx323aZa7rngJnKz/Wm/v/zxJrAj8vvlPyxZMv3yNCL7+/v1tie/QP/IAI468crEkKN/OBvQBxQcA4A6eN3+tN9yc3J54cv/xp/q3+T+y7/IyJwivmJFuGzqgmMPLhEumXTeQDQnwmu7awLiy/O63OmFqHNLpvKL5d85houv7Klh8Tmf4fr5l5qpkWFvX69z82N/Z8g4YaprGoZjEFWLzmgHtmljmVGiGk0EbqjqsAC0ZAIABNuxBjV7lGsXXMq1C2KJzUtb3sJTOJo8f25yTiAQ4FB/C+TmUpw/Im39hrrq/tGjRhQN3vOvD/w6rfihqhw43ExI+vjaBcuPAeZw12F55r7n1e/LPkbmWztb2XF4O5uPvM8rjRvp8Xbj9XgPDKcCezM9ME2TrsBhMiUdifFcw9t8Zsz0NGJe2V4NednMLkz3PKFgiJaeg/jdvmP2VFU6urvS9n/xo7ch10v52LmDmaDTx02XTMQDjCwcyRVzruSBS3/A+pXPcoVrGX29fecveWFxXjllGQHYkVE0DDdNR2uHaPvFWPXEthfxmu40Yl7b8wG43eR4s9LmV9dvgWxfSW8kqIP3EhG27qlL22fjrk0ATBgxMt0Qi5xQO88wDAqyCvhJ5aPcO+k7/kib1cQzx9xawwCqM5eKTDbtfzpTqQkR4dG//AfhLIfa1r1pc97ZXwsKDe37kxwTEbY0NYDH4zvcc6R9cJiy9ZM6wthp73lp9yZwHHxu76k3PuPS9ZWld/CDeQ/l97YE3rs7cod50bqFaQC8NFQm0Gp/xLY9bx0j+h837eX+N9aA281Rq5c/ffBqcs62lp0xW2D369M1r2iCYzta9sRcp9rRmsYdmoziEK78+Tf47IIlyT2aW1sImrG6YNiKnt4NkDgI1y24Xr85/Z4Z7z1Z85t3KzenFUQiwNZjU03B5XLzxIdfY9OuDRzubNLG1mbnuQ9fZ87PvgB5WbFAyHRx47oHeWXHexxqbQFvvK5ruuRzf3ygd937L2FZFge6DsdLmq68rz1bJXuPHOTjln1cUfVVSqakFzJer9sEeX4Qk7ZAV7xwFNLWzlZnT+sn1LfUsb2llo8ObaPu8A52te7iQMcBugPdGVU1DoJ8Y9ldOjYwdlX5+rK5g4uidwKPZ9J1EQj2hckzx/BUQ0FgT1erH78v1g5LhMQCEna4qGQW73Q2gCvu5gKho4Qi+ZdM+IzsPtLEYe1VhA6y3cX5+LGtKAEJcs+ilfzium8n33v7rx/ity1vgRXlx4u+SmNrM2FjX6DbaQsfNbqKgk6QKFEsx8JrevEYXvLceRR5ihibNY6y4gu5/twVuL3HhsZ7D+3l2qeWfbjru3vPB5DErcvVG2brUBcdQDAN5andeQ2N7d7Zx1bhNVMm3UxfaFwSpERfSRVys5pBxwCCY/Pnyh+zYu6S5OJJ/+Na9vtiRRPsGJ8WTgz0uXJdhqI+QGLbSfyexLH5n9Nrc9O4lXxn2fcwTTNVGvSr/3G77C7eOc8K2TuMlPs1jwyhRMRb+IzJjRa4TKf9WG1J62PHxCYc8ZNogIik55sRKysepYAVYenkBakRGPu7mxIlSTAFhIDHJ0cRshJ1SEk26CQZ8CR+F0MwC1z6X0f/2HPJ2sVH/7j1DwSCAU2owl2L79Yjje3fra6sidUE432Bh4DQUGUnVfCbjjGjJOzgyHBXYwTb6cRyRmRMs0WUiOWL9yDw+wqSgZSqUl33wYB9iedXpqkd6jFKdZhs55hyqSJe0/uvdr61+Kd1jzx9x0u3ScPBehURzp91AcXR4i8li6JVFQ3EjeGdHNuLSeynBV6nIM9rl/p9dnNGmGJJkkMwoogMfTNKNRvL7gaYVzIlzWK/07gNsnyJ1FpRZHShZSjiPtEYIOX8P3Q5rp0ffKn2c81O8y23vrrSeWPX6wBcNulyc8lzixek9QarKhp+B/xnJhBUkQKP02arMKsklINof5ryxyxmlGC0HUeLj9voD0U9QLDQl5v2nk1NDSl1BRWPy+maUBT1ZLghdjw5eLS6siZcXVlD+boyqj9X85Q/N3vBt96/++Pff7hWrphyJR2HOpYO7g0CfAl4fTAIIjDCa4+2laDL1PwZxeFOHJE4l2LhXDjaQtQuHob7Awd0tICI3d3Y1ZIG1LbDHye7AzjSPXdU0I9p+Ia4LzwU94PAA4lCaAKEd27aXJuTk7Pw8d2/bNja8yGRgHWekaE1bldVNFweB8EZJFJmgcfpACjMtsaV5kbjqqA2YWsvYWtC3DrJCUQoSihS2nDk47YPGusH3FTH/qQBnF4a6nOb2o6QfxLEC/CF6soaJ7UQmvy3Q7dLXPP+89AfWgtHj5g01P0A4iDcA+xKlqOBcX4rW1WwVZhQGCkpyY7W0Wd1EY5OiXNeTkJMDdT0Xfbbe3vXbX4ZjdjgUnAITxgRaS32W2PEbbhPkvjHqytr/jxUGby6soa3Vr5nu93uiw23UXLcw8YbJwuBL6uyUEQL3jyU1Vnoc/qm5Ebn+lxqbqjzHqxvcU+O3x87mbuHiqrgMg66s7LGzXWP1q19+2TKaLupJMcep6qGmWP2AjknaABfqq6sqShfV8Zw7bDE8/J1ZTeeCADHfJnx4MuzfmU7fN2JeT31uFRervfu/fCge4zjiA85SRxUwe06INnmyGnFkZaiLGuio4KYHDCzzfEnuMsb1ZU1S49H/GAQTvq2eNxQlgBHEmKnirpNlX2dZucrO709bUfNScR6t8dBInY9EovQ7HHR3rIpFp/0uq2oI6MFxfSb3Qh5Q3A/de//Cfzv6soa56STpVPNslZvmP14PG5IIUXFUXEOdpmt6z/y9UWjMm3gC4CUA+sACQV+Z+vnFwSn5/o0W0QNVaH+qHtrW8Q1zpVtlhyH8HpgObD3ZO8HnhYAcSnwAV3EvhBLvVShhqh4XNDSYzTvOOQ62t5nlkQsSh0VDFHH5+bwmHy749yx0fG5Xi2I2ANHUUVNUWlzXIvqA76lIrIMKIq/JxIvcNYBv62urHknVZzPGgApQFwHPJ+ptZYAIpkigNqKJL4MUAVHYzYkxccnVOrbj1zb8PMUfc2NAx4Bek9F1D8VAOIg/DtwB6f50VTK+lerKhquPJPfBn6aEpCIIDdyWp/NJddtA8oA62wQf0YkIA6EN55D3HAKICTmbwaurKpo6OUsDuMM7ROuqmi4EfgVKfd4T3DYwItVFQ0XAmeV+DMmAYPUoQK4D7hqGPeVGO8Aa6oqGv7I32jImdwsBYQsYh8930rsktJcYtcYw8BOYCPwO2BfVUVDgL/h+H+8Ex3DrupO9wAAAABJRU5ErkJggg==\"}"); +-pref("social.manifest.msnnow", "{\"builtin\": \"true\",\"origin\": \"https://now.msn.com\",\"name\": \"msnNOW\",\"workerURL\": \"https://now.msn.com/js/firefoxworker\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MomNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5RjUxOThGOTJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5RjUxOThGODJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTVCMTdDQ0M1MkFFMjExODNDRENFQTc0Q0EwNzEyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ppp4JKMAAABiSURBVHjaYvz//z8DJYCJgULAAmNwJEwk2Sk/FuQzUuyCUQMGgwGM+FIitrQBintKXKCG0wVA27Cl0t9IfEUgfoDmGuwuAEkAAbLzJdE14/UC1DUwOW6ggS/ICkRiAECAAQBDhCEtt+sSkAAAAABJRU5ErkJggg==\",\"icon32URL\": \"data:image/gif;base64,R0lGODlhIAAgAMQAAABgkm+lwf///y99psDY5K/N3c/h6k+RtA9pmO/1+I+5zz+HrR9zn7/X5N/r8V+bu3+vyJ/D1oCwySB0oGCcu+Ht80CIrRBqmTB+pwAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAAAgACAAAAXAICCOZGmeaKqubOu+cCzPdG3fraDvfO//OhFwSNwJi0jfUQBpKCCRnQNCdQgMDV0iK9haBcvS4ooYIZyAAjMtUAC4YUYiwQAkDgBIAgIYJAAPAnWBDAxGAEZjAgtvYYgHCAYAFpEACoeJOowNZVZ/CAIFfRcOfQBfYIhBipsPfRADgDoTshgABzxhrG8JjCILCToBb21smEUODahIS0nOzc7MAATU1dbX1qjYBDUSOhQ4JN7g4SMS5OXp6uvs7eshADs=\",\"icon64URL\": \"data:image/gif;base64, R0lGODlhQABAAPcAAABgkonIVjuOhf///7tnLwhnmY6bU8/h6gGO/7/X5H+vyK/N3WBaW0+RtACSnF+buy6Gl0uy/9l7J6PXeV6HaO/1+PvIIwyNxY+5z02acCpfghaw6hR5mPh2FKlXUn/I8v+UcgJ2wSCwoyB0oD+HrfB5TpuZV4TDXsyyOiCc/9/r8Uuf0G+lwdtcPACvoESShBGt+Z/D1iN6hIbFUid/rQea/Ri79x2Cwt9VFZPRYf1bB3B8jHhmYwNnoD1tdjeIjwN7yG+0YK2oRQtokRGV/xKupgWcpLBoTx7E6QWAxy99pueyQJ3Rj1i5/+pJPUmahwl7qjBsjw2m+wC3qQGblftlDB9jgkCIrVGfgn1nUJrRbRzC9h9zn+eEIi+k/5HMYhi33iaqlsHZ5SaKyRBqmRa2+P9PBfH3+Quh+wCllzB+pwNupmC5+WCcuwWV/YrHWBFti4zJWxCUxKxPVJfPaQ5omYCwyabZfjBhfuHt83CmwgCZmQmGxgC8rdHj61CStLHP3YHK+QR4uhaX/1C0/w+TxASjo6HF1xCq+o3MWh7G9RKv+ZG70QOS/kSVgQme/Ad5yQCxo5rSbgqj+xOx+QSV/xKV/43JXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAABAAEAAAAj/AAEIHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNq3Mixo8ePIC2uCPSBRkiNYyJEaMKmwMmLPSzJTOHlxkuLIdzodIMA0s2IO6IITIKmKJoaQH5CBFECDwA+i6IikiJI6cMjZnAAuGCjaxlKazJeKTjW4BU1B0eUBcBAR5UshcCAUaRow8UrMQboTTAi714yAEYk0Lt37BU7ZwgnQEuggwQoVNIYQSLn4oAzba60SYxZ85kEABac+TNCzZ8YdgDotXPFswoAVrrM0bDHhQtDHCy3GdhmwJ+BegYASKAiM+CBAzAQ/DMArQ8nHhxM6RPmBByLA9ZeyT5wOwA1fggP//CD1jfB7WV5tIBQRISkS0Gwa+cu0Ht3zSr8qF4LAL1AIRYYwMQdWsQRgAAV0defgt7pgdZAC+in4IJlUWABCj9MQMcbiWCR4HzzhXZZAgkkttuE/glkwhIAvPDFDDk8UdEVxwFABo0D3VifHTzqMUJ9NdqIo0EyZODIEBWRqOSSTDbp5JNQRvmkQOJVaeWVWGap5ZZ6Ucnll2CGeaWXYpZpZpZknqmmmmmu6WaYbb4pp5ZxVlkBiQdoeecCCww2p5VxkmBjAoLmqICVKjxgEAsV6FWBApD6qZcKkPpFGAaVVhmoQg+Id0CQBCmhgl4/AqCEeMoJ1KheBwyEgaaqVf9ZqEANKNAAQX5WECQJSoSqV6oAjKpXrwJZysJAqxK2qY156hXDQJ0OoMBAorJKLAB5VeDqpAQ1QBgXAkUr3rIkVAkuAOUOcC4ZyQ7QKq163WrqrwU1+q6IsFpZaLqE7dslvFUSy4VeCww06rml5nVsYGPGKp6/DwtUrrYCHSorcnodh8G7IxQMgLfnWpzvxeiSnC60+mI8wMJKLMzCAMeBJpCwI0dcss3pHjeweBTf7O5A5+apKADnbtdwyj7rBfHQAIg7gLwAvErYgwKNQHBBltbcr8Qmc0utAiyca2O7zw70csY5tjuuw1snPQDEA5SNkKSOEtTsAEw7rbXSXONxLN4CYgN9t3hDW02YxwAMvre7eFZ5QONVLqDAAw8oQPefwrGN+ebKas755nV+Pmfoor9Jeulrno76mQJJ6frrSyZW5WevWzXQ5WdQbXtDdOe+O0SS+v77Q34KP7xDgxl/PO/KL8/QAro7L/301FcfUkAAOw==\",\"sidebarURL\": \"https://now.msn.com/sidebar\",\"description\": \"See what's trending in realtime on Twitter, Facebook, Bing, YouTube and more.\",\"author\": \"Microsoft\",\"homepageURL\": \"https://now.msn.com/now-for-firefox\"}"); - - // Comma-separated list of nsIURI::prePaths that are allowed to activate - // built-in social functionality. --pref("social.activation.whitelist", "https://www.facebook.com"); -+pref("social.activation.whitelist", ""); - pref("social.sidebar.open", true); pref("social.sidebar.unload_timeout_ms", 10000); + pref("social.toast-notifications.enabled", true); diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 18:44:27.000000000 -0500 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-01-10 18:26:10.000000000 -0500 -@@ -5,70 +5,41 @@ - // If a definition requires additional params, check that the final search url - // is handled correctly by the engine. +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-05-11 16:19:20.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-20 17:49:18.467307120 -0300 +@@ -3,69 +3,41 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + const SEARCH_ENGINES = { - "Google": { + "DuckDuckGo HTML": { @@ -86,7 +85,6 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil -#ifdef XP_MACOSX - , imageHD: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznVVlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/1lphJSSQ8BB7bub3zW+LO3uN+fiNMcf4jTEX0N/6W3/rb/2tv30smtnXB3zmRi2FQakxQNKX3WkW9S/tgW3HLpmQM543A0BWVSHMYGIwOTDxzxrOf3/RQQfMZ2/SLAvKhTFVBGUqKFONH2QAzwOMF38awHhYZAxWAqhe/iszp3+b970d/sInc57vz/J8L2eMB2MAEYkBQ6DQ3dRw4dq7AUjcP3rAfPZmLWXCLHKoIAcQAUxaB5EaEfc6AEBhjDEwmcx43/fO9HxT4vkReBIAAZgjgodW3NcPnn1sHgD/iHknn+0d6s8XEUhsXXac/34WAAGw8afuT8GZ3X055YeSJcIsG+pMZwFn0UihezRofPt3G54f/0E8cNMN+Myo8jVTCgYd823PLzrPeIBnABiUQ1F+UoWsVOYb33mkoKp/7/dKyT0AGc47X4s0sjBEoLxbBqAQAMfWRfe38B4BM+VHUkYOs8mi1FrABbK4dcvK73zwp1M3xYPOxANKBqbpCdXNGb0UwPKRF74xpfDQ0t+K54+IvlKoahmAhaO/mv/ZmicG3tqPgT61ZM2dZMQJOYhIdByRM/F3dCCOox4Bc3oEliqyyNoQCPPusXceKZqRsigu7pwaWBowiRb46+f9Q1V2wl1nDx09/R7jF30x9adNlN8yPx4DHwht+B/cBIBoRqeIE4hE/oshTcB0wNbT6/o/zrhFyohR5ZxmrVWE+fDxdx4puhGAH4OkPe5B6pykeJAc/7cDEMZ/095Y870P339m+BXs2v4kbCFsm9u2vnpJ3bzR7wAo2B/R2v+PjSnyXcRxtOLUSXFxwAFz5i2SZUIVO82SBWye/vLOIwNvjL8OYqCEfXCmJAZPHkC7sK1REbj2+lmbq86qTVmmfuuyN2cTiREWKCvACgml9kDL7HQksehsZmSdA6yVpsa6P38v3swg7m4vN1dGXrThKGP8yS5fP33j/LEvxKDbl2f2A0YFCtkZQDOaPjLAnP4jrmBGjh1AVhG2ttxfX33++vjY2eeNXf/siLUAzgEwMJZrY2vF/Vu/t4BRqCqgCmj07wMVHXUCzJQfUlZE72ICnANcqNj21h8eiK1AX46gXh29KT9H+rd9XxBjYGCgig7QHOgjPgMAKigXQZYpsi4uCOc3v35zY2wF9ufGSgxA7fdd9g8ho9ol4P4ojiQWnSUMMANECrJNy1NWYH8eGfsEvJbLv1IK1XIAUwEtA0xplJMwjcaYlTDeShg8dOgjj6/cJxNYfWIWkHJoh5yyjkSZ8RbB89YBZq4/pXafGeuzb9WciXJxo2B2houqgAjABJCLOwFMqFv57+bBxMIAJm1det3avnl1OYCLAeSgWhofaY1QXQSRuYc+/OiD3QLmUzNdqTBKhRVMADsF5beuToXJB90KtFz+lVIVniXOVUAUqjpXVB4WwPjGTPB8/0zjeTnjezl43szmKy6vNkDF4MeeXNc3oJyUhfAMkJsJkSxUVrLos6o6z/O8Ucb3phrPzyHKeVTwkpPXseg3Cqe+1SfG+swfaw6KGTAoJ5eyGF3IBeEIJB2AcXxb0FI/L45uFQBMGiu6Z3ai9eqrclBUClFWVatV5GERNT5wEVQnQLUcIuVNX75kFjn60rA5c1d0AoywlkcxfdwZ2LSgbOmBZAv70povu7RcyFUqcZYdPbxix44fnLv8pbYUOWh+P3ZM9uJRo34xoLDgq8b3YTxvqhqsaPzyJTdmn36msjdyqPqkMhWqBFGZMtV8uDX4zMjp2zemyEoPgGn4zyOvGzy48A54GcD3Sz1jFrqqE+4uOOvdmb0ASlYEs5mQE9afUdhy0yv3lHzwya/8ZcjgI0+5yssU3QKYkgQ4Ivp60LL1n8kBQfOWuvdnj6uLldgHQKoKxU7HV/eg2y1XXXmXEs1U0ZVb29o//4k5c5P5eQB+s+68aVeUFBTcCxUoS6kRWfjhueecc9SfX3ytA9QTr7eVACqYFDYEwnbB2qcHHg6gLY6ODhpomi77coUyVaojhKH9+ZHzF/wqXiztEg34APxNX/jCvQOLCi83fpy8UsCJXHLYnGdn785S0uKTyyBUBXJZcW5x4bSN56ciyLQcD4Bf/+ThVwwbUvRb+JkoswqAWX5b9Lm1M3uSM/UnUiaCKiZk2blvvnxX0ePxuBNAmpMur51wyLBPzjVeBBoVwIXBk6vuP+SG+LkcuwkWAA96/JjZKnKxkACkkFb5Nztz220xX9bJlWi+6opKFalQlpqlmzZNu6B6SaJ0knKJ/DW5qd8p8TO3x6ABqza1EE06cdmy9wDAY5LjmBTMkQnUnZ42H0ywNF52aU6FK4UY5NySI+cv+E3MCnMM5HyqtwFoO3rBgmuDMFjGjiCOIEQwzH9c+7lzju+JTaYlJ2ehUqXMWWFqeurFxqsAFMVf25Ss9kTOEZdvebClJbxTyUGZoEzwlL/b9tzRX+pOztSfSBZApSqyIrL45buKnkaUJEzLCN5+csxr+ab6fyILkI2OIZYBlx9/2bYvpLgw2+EqKLKdwoceVKJp+tfuEpYKZcaW1tZbLqheEsbj3GV+oxdV3x0GwQZrHUIiWKIST3VmDG54zFrKrBBWiGgSyx9Uv6Xh0n/MKlGlOII4h80trQ+kuJt8HGklZHg6FZF/Y/uOb7O1YOvAzkGtKxmoehe6SYNEpkErwZIFC4I2fuLKf2tLtDOPzumPhA6wAPJDLt1yuzjaAEcAMUCMApXfvPP7IcO6gkYFs4RRpgy49qanUsAPu/T8W48e/YwL6S/kYtBYwM8U/yu6KVlQUShr9CkKyK7b1vDVy0qVeaYygaxbdeK85/8a/z7sYR3zgXM1gXUInEPoCEw8PR6z8YQxaidQPh6RrgrPEOZS4chKjFuydEEKFD1xQgrAnfO3V98Jw/B5dhFgmByU+MK/nnrq6K6gcQtPyqlIubJAibCxPv/fsVVNgCI9yGEAQdBq71NHUEdQIoBo5PBBeklazuQfSpYFM0UAFsDmd2yMf9+1XkUT3otc8AiRwpFChCBCI0detGbSLtYr5uw6tk26XctZwgxhRt65ZSmr1t389M1Jk85wzKcHRAiJkCfasDnI/0sMGN+jlLMrAigMhp0+f+TBBIw4milEYOcQBHZZAoZeEIgKgIIgeJbD2MqEFhxaDAFmdAWMisxQFigzlAUnX9e4rA9yeHuTna3koBQBRogxwOPvxNbQAAA7VHQEFKSQKEFIu4lA5d3HiiuFNB4XQZlhUHBK11QO0oRdD7ouROVCkeJZG7ak/KBOYHlz4sTy1WVlVY5oYego2+bs82+3tFw6YcVrp01dteqpxNfyhKQuGlxCMSsKBh570ABT/8XP5dhRVpyDWAd2Ns0O9yrhWdfcMpvCEByEoNCCwhBgvgBdM+PM5TH5FPW+1ZLo8de2viehe12dhVoHOAtDPO61O4o+kYCTnE5wVuGsxlzKHul7BUDKdomKgwpB2QHAyNiP2Dl+0Z2WRXZ9YP0F55WJczvX0jp09U3fLiurWD1+/NqQaHZIVNbu3O1vt7aM+fSqVRWXvPvu0pRldwAkQ5brjO+NMh0kgMIvGjYZwIKETPxIrYt1U5M8iThKJil9yZGc++ab298dP36Jb8wZohqhQHRErKEeAA6fG5FT5yIlYYI6tzfOvtiQni3MYDw0ChqEgUMyejyAdwGwDeW4ZI9FAGQOmwzgv/cERmZbDXhnKBNUGMJkUhGVduSSJJ1P6rw8HIalJo7ilBkchgCgL48fVzLceDc4kZnWUdap1AQi10x+660n4jXyk1M7ZXEZgHhMUkMO4NjphQGMf8h56Fx++ZE1a+1xZC2Szjs3sk9uUEhUbSMvP3LeyOGZ0tKJiearo1J1DHVRPYmS7JUcG2g1pxxUsooBnpmQWAOb10YbKGygcKFCZOC0XqxrRKokCBQG5euX77In2k1P+2hhWEZBAAoCuCCEcW7E2xMn/m6oYo0jyjnmuc3Off6UN96YMvmtt5LILSmQ61r3xAA0I+xqPBiIejAd1f7e2MPPfvm4LQs/89a+bP6nZuSzfsaU+T7g+UBixYQVRFGS01kFO22srRy0EgA4CEvFRHS3MANMY/fGbybmlQqAFSBVsCp8kWwCGA5dqefFShnnRV77ecHYU37iXuqLoB0tsuIo34v3NfJR1GlJsrnOuiXGy1y8k+rwxh573srSD/6rbLdra7yMqgjUCGAULR8uWr0LJPYAGApCeCbKNygLPKIxJ65YOSU+YpLUUCYGiqBzQVy3Ft1zbevnJl60UARqACgcVDo9ZZr63Mqua68QxlpmrWJC1FmrmLSKCFVktcpZrbKhzg4D26E5Lgjg8vnoMwwh1hU/dvTRo/qcDyJqcESw5Dp6o3XNHVrqLDSubAdFjuXwwWZcX+Wc9APboKxQUoiLurXaIYfCpjlCDsoxZ6OCouLRt+xpbY3nA8aDMR6E2+9vffOWxl02cQ+Bbdjevt7l83D5ABRaKNHYO484YmgMkoJ4jElCOL8Lz9NN87YumrRDxc2DElQZKgIVhZcZcO1hZ74wtK/H0thvtuXGXdM2S0S/ziQ1FPJiG7pHwvbgDhtKnQ0VNhCEeUHQLmiuf2fymieGvJGY8DCfX+yCEC5xWIlwtO+P6+s4VESJGS4+liwxKjZ/2FGRZvPhYgktxEZdHWOAr2P34ihWIQWTgJ2CnWJbo9Ymz1g/5+h1QsF9wgKJ19Z4hV874fKNE3cnx8v4V8H4UOjqhvce+zW6qdWVlOvSjQsDlw/WUT4A5QNQGIJDizMPHXR+CiRBb4GSzlYr26Z7vYKSC42nUOPBqA9VU1I0ZOJPEYWj1NvVW/3AoEUAFgO4IzZ1hYk2jf9WUw7IjCIXHUVhXrFp/sQtKZPIoXXr/PjoSkZeoHo6gP/bFyeciECqcHG3IrXp37a2SF3xQNPxRAXgq5nS1bHsDWCYALYAu+h0W/impI8Pad9ec/vAoWVTjV84Nsn5FAwcvmDMN5rOqf1jyatdHzjuGjvThloKYH3b5qVXt77544ZuN1QEKknF3a6ImfDee4tWjBrV6R5Qoeq1AP6Avaxx8gDolhdPXAh2qzQmZFQ4ZhALrj/mvLpT+qhxya0BP5VVZQBkA6jNR0AJ2xUUcjKGjsx4k3PVYUwaJU6rJ3reLiHlHppjBjF3fLYSzU/noEZ83611VusoVJBVsFWAdezim/3jemSFe+SNIsvCpAhCXf7TBZI+PnTr4nO2t2xcME3ZroYKIouEEqDoxfHfav/GxOttFgBOucGWll0XVqrqXYDWNLz3aG7bsovWp4i2TvkhScLqNBezq/M/zxLBxV2Yx/75yCPP6usc04CJ+B3bcLMwQTiK+0UIwgz1ip8+4pyaYX0x0SnWMkjnYGygkm9nBO0MGzoI2TTDyQBw7ubNawPmeZYZNt5wZhrxX8OHX9yXSTJzGcVgIWasbs8/hc7XRzXM670cg0Vs5H+MHm6u74ucrb/KlAlFPoySoqFFn+rm+OCGV762df2cYWe4fP0M5qDWhoowRIm1/h+s1YZx3wrVOV1LDhXMaGzfXntF46vXtMQRS/clsqRRT9SNd0GMBo6edRStZbKeg4D//ciQIcP2CTDbqsdVKQePq1JMFkXxv4qO9AaMfPGoaeuG9kXp0LkU0wGgMFC1gYAdAeyg0m3IrE3W3mtTvodjRpHq9X3xL4h5Qsq63P/z9ra6LqScvvmBPkwOTex2lnf4wNee/47fa99NGGVJ8Zl1qP3UPfwkdr15mDDV+Y3Pf+Kh9c9kz9pee89J7dvevaRt+7qLbVv47y5UUKggp3BB/okNz0/aHI8332OaIgELxWDpptQtt6X+Qcu03nVYGQYxjxzl+7/eGyvjdYrCtv31JiW7QTjy6qWj83jF4AeP/MLaodiHRtZBXAihEEIWkq4eSgGmvKGhqpX5d1YEVhiWBaI6Zf6QITN7s5ELhw4tZZavkwhIZMOC1rZfo5s64nPv4+1NzXot2/hYiqKckglH4/7eRojCOospSt6u2ijfS1Hv3I0SdVy5aam9ecumBeOqN8w7aRkxSlMVdRDmRHa4m5xWPKPEusUA6maIrcy/cCKwInASKaCoXrlo2LAH+xpMpAEjLauu2ObaNnxVmZqUHaI8SaR+KnIhTPHCo6ZtOn6vk4qUPNNGnV2PJ0ptENweMq92zHBMcMwwIrfMLS6etKdJEnMlCYOZm9YE4dUPkWvsIUckJ/+SZwd5PCEOEBc5rh7jgrqf+VfvSc7mO/xZSihVAra3YMY/PqqrUhZVe7C8yRHTBqAVQJuQN5idgJ2ASQAz4PJjptWevKc0RZQ0TQATRWDd/dmFDQ2VeaLH0z4dRVTK9EXZ7IqFJSXH7W6eLw0blntp2NAydGOSqPGVs/5mW9ZcJGKbRSxELIRDCFuIuAmiBa8eMW37rcdc1JDtM+3PYdSp43k9/ulPgmDrsnz+vFBktRWBZYEVKSlUfeH5wYPP7u5Hfy4uzi4oLq50IjkSaXrf2vIfBPnV6PlKiwKg0XfyNe2BPkmJ8+oUGeh/bLjNu7En0Gy+w5sppLcyKRra9IZJ98hTvciop9MPSSFUwGTnEjHICsgpyKHYHzjquWMvrJ+wewUENPFjCIAxk3uStyIMbw5FVieWJvJpBE5kgqq+X1VcPGdRcfHMxSUluSUlJbmlUZ+1tKRkLRGVnrZ9Rw12rSLtsDpFg8vmfbpw0HH3wcuMMSaiao2XAbwMjPFhPL/ReN6DfsY8tHHekN0WXR929vqsCpWruFshPEqFo3IyADuWTxgea1rYTbRVeEMmc+SnCwp+OcB4l3kmLq0D4BnzkA/MMUBjvDMXC1DBqlkCFr9N9E//HIZpPyDsQVuTFwsMfP273k8GFeLbvo9izwe8DGA8VMPgIc/D2piALlPFDGWUMqNuazOun/RbeQU7L/zl0cfC+SPOXjG84NBRawCvJNoSE7PiBgr5Xx/MKf7jLnzIbUPKlHVF5C11KgJfD9+shY8Vxjd30780rEvP8bFDDvnVQGO+lU5MeTDwzM5aTbOzNyrw/XNbWx9JFLknk+sjqjobUHJq9XS/cNj3jZcZAc9PwBIDyAeMD2O8RhhvpTFYqYpGqMQOM2UhlFOhsvjfgNJ6ofxyoZaXbHPt8mDNjDU9ACYBbyGAAT/KZEZ/MpO5qciYyRlgROeJGSh0nQCL21Ufmx4EL8dMpqScRt4DFVAAYMCtORx+0Rhz7aFF+GJBBmNM/JKklGo1KlBtHZ474U79P9hZOZcQYb0unD/mwu05qADCZwE4C8Y7I3kTk4kFx+mUuzfMKf5e+rn+rUMq4PR4hFII0gw0xpdvGAWGoDqHf9m8IuV8m2Qtf1pQMPok37+50JhpHlC8EzwRcAzwOqs+Vkv06I+da04nInd3RvuxgCIAhcUTF5zvFQ79oucP+Cy8zIjE6qQnt5Pviu5IqAogVKNCNSrBUte6blnrqi/Vo3O9rI3Pc7cbP6sgGQcAf7rvl3zK908uBKjAGK5jrrmNKKHj/RS3E6L3V2USLUzkZAB4i75pTivwwQMyoKYQ685+QOtScvzUHPbIlJ54ZVsuDPTrZDmnQqUQggo1qkoNRDyFeJ6XGQfjF0fW3O9YWxW6adNzw36Dzm/JKEJ0k7QgtfiSygd1vSrkdZ3jlb6fneT7Y+MN1xrmVX9gbkw9q1MdsemFU5wkpwqSRSw49gfZAcPPHOsVlIww/sBjjPEVnqfGZEQlWKVCjWK31TW/dv56pCruU126TGxPl+USIrAgNQ7TQ+pNukQqfalLNimApvMt6CZMTvsiu3VOJ17XnrNWZ9m85oK8Qmz4sFB+CeXrF29dfOqG1PwKs6fOKyvKjrnb8wrHGD8TWfCOEoX85zb96dgXY9leN2NM+y3SJZG4u7XsSldIykFPz09NHxbRT2U3M11AsKf8aRqtnBqQoG91oWkGOS0/XaQo2Pf3u5mUDK9LukD7Mv5Tv9teSQ4VzipsINUtW9Zct/mFiRu7WbcOuQNP+MXQ4hGX3mEKBl1mjB9bbwAqSz6cf+TZ8Qaabta/u6hM92ItpZs5dvyor5R/dwvp9QAa6eFzfxRlpVMk2mXh93czeyPn1Bn5ShWtYAJsyEve+OPgC7Hzmgx3USDtejQedlbtDX7h0Ns6HChV5LcvP7rpb1+qx/690dHrtewL05c2c7ZLtrM91fOpDGjXyvT9+WYBPQAg3NPcey1n4vVtFUJSIfGNjJZNy2ekkqzpazIJOefSoTaA9q1VY+5Wbvs9NAoYVBkFh5Sesi9lJ/u6lt5+WETpoi2MPpZU/k9szmKGtVGRWBjQ6g3zP78pxfSGKb+tJ4LPAsi31S/+uXCUlVZmCIc+DlI15L4Cpr/1FA1d0VLqAilzgcCGChdQc5eoTXqpkNS66hv1YLsUElURiG1sOZj7lunf3v3fwlBKjRfX9EjEHKcscV98D40zRKIqgEpz4yvTVnfjU/VbmL/r4yhwTTbPCNsZNi8g50/OnvbCsXu5wQqVURCBuOb7seu98n7A/L23Tc8NX8mW6pL73UoOhYPH/GJv/I7Dzlqbg5pRUG1q++A//+Ng+4f9gDlATVzLHfErZiHioKrnH37uhgeG597sdYnIYeeszypQqQawre9dHNbd0Yj9/5KnfsB8DJpuXXj8Q+ryj3dUZglD1Uz3MsWvHX7uh1fv6QGHn7upAmrWQpEV2zSt+bVptamw+6C9VaP/hcoHrvkABgydUjPLywy6Oboh6HW6PgLjLYqStqYRQHKDMQflMhXOQrnata27tvGvufrEn8ZBfmdPP2AO7NpmAAw85B8qTyjKlt1svAHTjPGLk4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiMNAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" -#endif -- , params: "source=hp&channel=np" + "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" + + "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" + + "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" + @@ -123,7 +121,7 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil } }; -@@ -78,7 +49,7 @@ +@@ -75,7 +47,7 @@ // * add an entry here in the proper ordering (based on spans) // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ @@ -132,7 +130,7 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil , "https://www.gnu.org/software/gnuzilla/addons.html" ]; -@@ -141,10 +112,6 @@ +@@ -139,10 +111,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); logoElt.src = searchEngineInfo.image; diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 8fa6a5da1..21d56e13c 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -21,7 +21,6 @@ ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi #ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt index 32c94b018..fc13e32fb 100644 --- a/libre/iceweasel-libre/replace-urls.txt +++ b/libre/iceweasel-libre/replace-urls.txt @@ -2,24 +2,24 @@ # These are whitespace-separated EREs, comments are lines starting with '#' https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://trisquel.info/browser-plain -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://trisquel.info/browser-plain +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://trisquel.info/browser-plain +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://trisquel.info/browser-plain +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE% +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php -"https?://addons\.mozilla\.org/" "https://trisquel.info/browser-plain" +"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" # hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1trisquel.info/browser-plain +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 999131a86..7db206be9 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=iceweasel-noscript pkgver=2.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin for iceweasel which disables script" arch=('any') url="http://noscript.net/" @@ -23,7 +23,7 @@ package() { cd $srcdir local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) - local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid} install -d $dstdir # sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf cp -R * $dstdir diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 256211d8c..7ed1b1a01 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184590 2013-05-07 13:30:09Z andrea $ +# $Id: PKGBUILD 185074 2013-05-10 20:52:59Z tomegun $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -23,7 +23,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') pkgver=4.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 0538d1c76..8f08669c1 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,18 +1,19 @@ -# $Id$ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $ +# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> +# Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=2 -pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." +pkgrel=6 +pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') +depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz") sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) @@ -29,7 +30,6 @@ build() { } package() { - cd $srcdir/$_pkgname-$pkgver + cd "$srcdir/$_pkgname-$pkgver" make DESTDIR="$pkgdir" install } - diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 8213590d8..461c0a3b2 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 174301 2013-01-04 04:58:49Z eric $ +# $Id: PKGBUILD 186254 2013-05-23 00:44:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.12 +pkgver=1.8.14 pkgrel=1 -pkgdesc="A desktop news aggregator for online news feeds and weblogs" +pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64' 'mips64el') url="http://liferea.sourceforge.net/" provides=("liferea=$pkgver") replaces=('liferea') conflicts=('liferea') license=('GPL') -depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme') +depends=('gconf' 'webkitgtk2' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme' + 'desktop-file-utils') makedepends=('intltool') options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('f40c453af577e2870bc12981ef4df6418a627f78' +sha1sums=('980939a9f6483f4e9ca2353ffdba131cb9a88a6e' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { - cd "${srcdir}/liferea-${pkgver}" + cd liferea-${pkgver} patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install make } package() { - cd "${srcdir}/liferea-${pkgver}" + cd liferea-${pkgver} make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install index 7d812ccdb..327c567d2 100644 --- a/libre/liferea-libre/liferea.install +++ b/libre/liferea-libre/liferea.install @@ -3,6 +3,7 @@ pkgname=liferea post_install() { usr/sbin/gconfpkg --install ${pkgname} gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } pre_upgrade() { @@ -19,4 +20,5 @@ pre_remove() { post_remove() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 4c1daea62..ec385c23a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.2 +_kernver=3.9.4 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=3 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 58662b78b..7c3e3ad47 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.77 +_kernver=3.0.80 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=1 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 61bbef162..baab66b5c 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184766 2013-05-08 09:12:14Z tpowa $ +# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=77 +_sublevel=80 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.80 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '8b2ca0f6a92462ba9e544f02fc450c03' + '6dfc33fc2587b36e2bf61ff1b26584c2' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '5b330cc23071e1250b7e0a1613a25952') + '7a0757288e0f61cbd91f7fc6b2bafb7b') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 0030c7ce2..3c8ebbdae 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.77-1-LIBRE-LTS +KERNEL_VERSION=3.0.80-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index 92f3778ca..f8ce261db 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142395 2011-11-08 23:03:12Z thomas $ +# $Id: PKGBUILD 185172 2013-05-11 17:49:25Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=linux-libre-manpages -pkgver=3.1 -pkgrel=1.3 +pkgver=3.9 +pkgrel=1 pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" @@ -15,7 +15,7 @@ replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') provides=('kernel26-manpages' 'linux-manpages') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz") -md5sums=('38703cdbb0b9107e7220bc094c5e36b1') +md5sums=('120df29f88622dabf7015a22c7cc8e25') build() { cd "${srcdir}/linux-$pkgver" diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index f29e3aa1c..4e64f9872 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -12,7 +12,7 @@ _basekernel=3.9 #_sublevel=6 _pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=1 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -37,7 +37,7 @@ sha256sums=('62f113b4bd9ee832e8906da970c5bf4585c057af4eab14ec6ad57e9b2fd084ef' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' - '8053a6bcd0776a7fefccc5012f93a1710653529e0eab59afcc39f24361c64869') + '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') build() { # apply stable patching set @@ -84,7 +84,7 @@ build() { # fix missing man page sed -i 's/usbip_bind_driver.8//' Makefile.am ./autogen.sh - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make popd } @@ -145,6 +145,7 @@ package_cpupower-libre() { pushd linux-$pkgver/tools/power/cpupower make \ DESTDIR="$pkgdir" \ + sbindir='/usr/bin' \ mandir='/usr/share/man' \ docdir='/usr/share/doc/cpupower' \ install install-man diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service index 1f3da08db..1807e94b1 100644 --- a/libre/linux-libre-tools/usbipd.service +++ b/libre/linux-libre-tools/usbipd.service @@ -3,7 +3,7 @@ Description=USB/IP server After=network.target [Service] -ExecStart=/usr/sbin/usbipd +ExecStart=/usr/bin/usbipd [Install] WantedBy=multi-user.target diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 465e17b00..8ba93e018 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185176 2013-05-11 19:40:40Z thomas $ +# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=2 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - '1a5e653d2c281cccef9b44340a94a866' - '9684934c48eb2c7bb7179b7e5b2c245f' - 'd9ff747f6c2bd3a6e4a94a2abc4af9ca' + 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + 'b0bc969b9e8c1767b16cdc0504a7bad7' + '42dfd3a3702433b68c079d6b3fd13c3c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '2cc468726d0b215d45cbd28be6dee198') + '846eb5948403dd0f2f02c50d3acb69c3') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index ed48ff54b..107968129 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0 Kernel Configuration +# Linux/x86 3.9.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -87,7 +87,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -1874,7 +1873,7 @@ CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y -CONFIG_SATA_ZPODD=y +CONFIG_SATA_ZPODD=y CONFIG_SATA_PMP=y # @@ -5048,6 +5047,9 @@ CONFIG_EDAC_I5100=m CONFIG_EDAC_I7300=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -5164,7 +5166,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=y # @@ -5432,7 +5437,6 @@ CONFIG_CED1401=m CONFIG_DGRP=m CONFIG_FIREWIRE_SERIAL=m CONFIG_ZCACHE=y -CONFIG_RAMSTER=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -5725,6 +5729,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5738,6 +5743,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index faee36762..24d6be2bd 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.0-2 Kernel Configuration +# Linux/x86 3.9.4-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -89,7 +89,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -4862,6 +4861,9 @@ CONFIG_EDAC_I7300=m CONFIG_EDAC_SBRIDGE=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # @@ -4976,7 +4978,10 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m -# CONFIG_VFIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m +CONFIG_VFIO_PCI_VGA=y CONFIG_VIRTIO=m # @@ -5514,6 +5519,7 @@ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -5527,8 +5533,9 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_DEBUG=y CONFIG_CEPH_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index f849635c1..619ad6090 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.2-1-LIBRE +KERNEL_VERSION=3.9.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index cd55468eb..509275d5d 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184774 2013-05-08 10:43:50Z tpowa $ +# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=45 +pkgrel=46 epoch=1 _extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -47,7 +47,7 @@ build() { PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ - --with-transmitter + --sbindir=/usr/bin --with-transmitter # Remove drivers already in kernel sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ @@ -108,7 +108,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '087a7d102e1c96bf1179f38db2b0b237' '9ee196bd03ea44af5a752fb0cc6ca96a' '3deb02604b37811d41816e9b4385fcc3' - 'dab8a73bcc5fd5479d8750493d8d97dc' - 'c2e20fe68b034df752dba2773db16ebe' + '1c7ceace42da44f41e5a42b4dd3b3d76' + '121283a6de274e52ed86522aecd0f6e5' '07131d117fcfe9dcd50c453c3a5e9531' 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service index 953601fd3..2123348fd 100644 --- a/libre/lirc-libre/lirc.service +++ b/libre/lirc-libre/lirc.service @@ -3,7 +3,7 @@ Description=Linux Infrared Remote Control [Service] ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd -ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid +ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid Type=forking PIDFile=/run/lirc/lircd.pid diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service index 6b258e312..eedcf5d8f 100644 --- a/libre/lirc-libre/lircm.service +++ b/libre/lirc-libre/lircm.service @@ -4,7 +4,7 @@ After=lirc.service Wants=lirc.service [Service] -ExecStart=/usr/sbin/lircmd -u +ExecStart=/usr/bin/lircmd -u Type=forking [Install] diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index 9b727361a..aba53582b 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91436 2013-05-22 14:15:00Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Ray Powell <ray_al@xphoniexx.net> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=mcomix pkgname=mcomix-libre pkgver=1.00 -pkgrel=1 +pkgrel=3 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation" arch=('any') url="http://sourceforge.net/projects/mcomix/" diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install index 2d3c6c3e3..c33c1d5a1 100644 --- a/libre/mcomix-libre/mcomix.install +++ b/libre/mcomix-libre/mcomix.install @@ -1,13 +1,12 @@ pkgname=mcomix post_install() { - if [ -f usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate - fi if [ -f usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --install ${pkgname} + usr/sbin/gconfpkg --install ${pkgname} &> /dev/null fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null } pre_upgrade() { @@ -20,13 +19,12 @@ post_upgrade() { pre_remove() { if [ -f usr/sbin/gconfpkg ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} + usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null fi } post_remove() { - if [ -f usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate - fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null } diff --git a/libre/mkbootcd/PKGBUILD b/libre/mkbootcd/PKGBUILD index 1eb7bd8a7..8990fbae3 100644 --- a/libre/mkbootcd/PKGBUILD +++ b/libre/mkbootcd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 137619 2011-09-10 08:04:29Z pierre $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=mkbootcd pkgver=2008.09 -pkgrel=2.1 -pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded" +pkgrel=2.2 +pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" arch=('any') license=('GPL') url="https://parabolagnulinux.org/" diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD index 123300201..7c9ab6cc4 100644 --- a/libre/mkisolinux/PKGBUILD +++ b/libre/mkisolinux/PKGBUILD @@ -2,9 +2,9 @@ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=mkisolinux -pkgver=2013.03 -pkgrel=1.1 -pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded" +pkgver=2013.05 +pkgrel=1 +pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" arch=(any) license=('GPL') url="https://parabolagnulinux.org/" @@ -12,16 +12,17 @@ depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') replaces=('mkbootcd') backup=(etc/mkisolinux.conf) source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') -md5sums=('945d5f5d74f37718c8c9d518bfd5698d' - 'e28b82502ae44087852ea6bfac398d5c' - '456eba83dfba319f8132c89e7ba42ce5' - 'ae0007d6679b5a575b2a9e5ac3664baf') + package() { cd "$srcdir/" - install -D -m755 mkisolinux "$pkgdir/usr/sbin/mkisolinux" + install -D -m755 mkisolinux "$pkgdir/usr/bin/mkisolinux" install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf" install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg" install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg" } +md5sums=('945d5f5d74f37718c8c9d518bfd5698d' + '384aac3786506ff96ec3d1147bcacfe5' + '3cc23d74d7e4378d1be431d68a71a173' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux index 0cb53e81e..ce1187d2a 100755 --- a/libre/mkisolinux/mkisolinux +++ b/libre/mkisolinux/mkisolinux @@ -65,7 +65,6 @@ install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux. for i in /usr/lib/syslinux/*.c32; do install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) done -install -m644 /lib/modules/$(uname -r)/modules.pcimap ${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids # create syslinux.cfg echo ":: Creating syslinux.cfg ..." diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf index 83d36219d..4af6f098c 100644 --- a/libre/mkisolinux/mkisolinux.conf +++ b/libre/mkisolinux/mkisolinux.conf @@ -2,7 +2,7 @@ # Rebranded for Parabola by André Silva <emulatorman@lavabit.com> # config file of mkisolinux -# DEFAULT kernel boot options like root=/dev/hda3 etc. +# DEFAULT kernel boot options like root=/dev/sda3 etc. # add your root= option, if you boot from a disk device # and don't want to add it by hand on each boot KERNEL_BOOT_OPTIONS="" diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD index cbdca0960..358e11709 100644 --- a/libre/mkpxelinux/PKGBUILD +++ b/libre/mkpxelinux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 185735 2013-05-18 06:50:57Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=mkpxelinux pkgver=2013.03 -pkgrel=1.1 -pkgdesc="Advanced, modular network pxe boot image creation utility, Parabola rebranded" +pkgrel=2 +pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)" arch=(any) license=('GPL') url="https://parabolagnulinux.org/" @@ -20,7 +20,7 @@ md5sums=('7225e73bfe717f97bd7ab52f5ab157f6' package() { cd "$srcdir/" - install -D -m755 mkpxelinux "$pkgdir/usr/sbin/mkpxelinux" + install -D -m755 mkpxelinux "$pkgdir/usr/bin/mkpxelinux" install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf" install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg" install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg" diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD new file mode 100644 index 000000000..16d595f12 --- /dev/null +++ b/libre/mksyslinux/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mksyslinux +pkgver=2013.05 +pkgrel=1 +pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" +arch=(any) +license=('GPL') +url="https://parabolagnulinux.org/" +depends=('mkinitcpio' 'syslinux' 'pciutils') +backup=(etc/mksyslinux.conf) +source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg') + +package() +{ + cd "$srcdir/" + install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux" + install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf" + install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg" + install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" +} +md5sums=('287aad9693ca8061495e248c41ba43a7' + 'd958575945e4ce8a9002bd056e2f14be' + '1f1e2d80e28b087e4103282bc5c44071' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg new file mode 100644 index 000000000..15476f2bd --- /dev/null +++ b/libre/mksyslinux/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +SYSLINUX BOOT +created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org> +rebranded for Parabola by André Silva <emulatorman@lavabit.com> + +Press ENTER or type 'parabola' to boot image. + +If you wish to change your defaults to boot into your existing system, +type 'vmlinuz initrd=initrd.img <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux new file mode 100755 index 000000000..4db771f83 --- /dev/null +++ b/libre/mksyslinux/mksyslinux @@ -0,0 +1,143 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Settings +APPNAME=$(basename "${0}") +CONFIG="/etc/mksyslinux.conf" +export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX) +TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX) +BOOTDIRNAME=boot/syslinux + +usage () +{ + echo "${APPNAME}: usage" + echo "WRITING TO DEVICE:" + echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!" + echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!" + echo "" + echo "CREATING AN IMAGE FILE:" + echo "- For creating an image file use the -i=IMAGEFILE switch" + echo "- use 'dd if=<yourimage> of=<yourdevice>' to write to your device afterwards." + echo "" + echo "PARAMETERS:" + echo " -d=DEVICE Your DEVICE first partition from /dev/xxx tree to install" + echo " -i=IMAGENAME Your IMAGENAME" + echo " -c=CONFIG Use CONFIG file. default: /etc/mksyslinux.conf" + echo " -h This message." + exit 1 +} + +[ "$1" == "" ] && usage && exit 1 + + +while [ $# -gt 0 ]; do + case $1 in + -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; + -d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;; + -i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;; + -h|--h|?) usage ;; + *) usage ;; + esac + shift +done + +if [ ! -f "${CONFIG}" ]; then + echo "config file '${CONFIG}' cannot be found, aborting..." + exit 1 +fi + +if [ "${IMAGENAME}" = "" ]; then + if [ "${DEVICE}" = "" ]; then + echo "ERROR: No DEVICE name specified, please use the -d option" + exit 1 + fi +fi + +if ! [ $UID -eq 0 ]; then + echo "ERROR: only works when run as root!" + exit 1 +fi + +. "${CONFIG}" +# export for mkinitcpio +[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE +[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX +[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE + +MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')" + +export RUNPROGRAM="${APPNAME}" +[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) +[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) +export USEKERNEL=${VERSION} +# begin script +[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} +mkdir -p ${TEMPDIR}/$BOOTDIRNAME +echo ":: Mounting ${DEVICE} ..." +if ! [ "${IMAGENAME}" = "" ]; then + modprobe loop +else + mount ${DEVICE} ${TEMPDIR} || exit 1 +fi +# prepare syslinux bootloader +install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin +for i in /usr/lib/syslinux/*.c32; do + install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) +done +install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids + +# create syslinux.cfg +echo ":: Creating syslinux.cfg ..." +if [ "${SYSLINUXCFG}" = "" ]; then + [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +else + sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ + ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg +fi +[ ! -s ${TEMPDIR}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 +echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." +# generate initramdisk +echo ":: Creating initramdisk ..." + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img +echo ":: Using ${KERNEL} as image kernel ..." + install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz + install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg + install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 + [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 +if ! [ "${IMAGENAME}" = "" ]; then + # ext2 overhead's upper bound is 6% + # empirically tested up to 1GB + rootsize=$(du -bs ${TEMPDIR}|cut -f1) + IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors + # create the filesystem image file + dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}" + # create a filesystem on the image + mkfs.vfat "${IMAGENAME}" + mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1 + cp -r "${TEMPDIR}"/* "$TMPDIR" + umount ${TMPDIR} +else + echo ":: Unmounting ${DEVICE} ..." + umount ${TEMPDIR} || exit 1 +fi +if ! [ "${IMAGENAME}" = "" ]; then + echo ":: Installing SYSLINUX on ${IMAGENAME} ..." + syslinux ${IMAGENAME} && echo "Installation completed." +else + echo ":: Installing MBR on ${MBRDEVICE} ..." + cat ${MBR} > ${MBRDEVICE} + echo ":: Installing SYSLINUX on ${DEVICE} ..." + syslinux -o offset ${DEVICE} && echo "Installation completed." +fi +# clean /tmp +rm -r ${TEMPDIR} +! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR} diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf new file mode 100644 index 000000000..ab2d4978a --- /dev/null +++ b/libre/mksyslinux/mksyslinux.conf @@ -0,0 +1,34 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# config file of mksyslinux + +# DEFAULT kernel boot options like root=/dev/sda3 etc. +# add your root= option, if you boot from a disk device +# and don't want to add it by hand on each boot +KERNEL_BOOT_OPTIONS="" + +# mkinitcpio config file, defaulted to stock config file +MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" + +# kernel version, defaulted to build for runtime kernel +VERSION="$(uname -r)" + +# kernel image, defaulted to stock libre kernel +KERNEL="/boot/vmlinuz-linux-libre" + +# boot message files +BOOTMESSAGE="/usr/share/mksyslinux/boot.msg" +OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg" + +syslinux.cfg file to use +SYSLINUXCFG="" + +# Prompt on boot, 1=yes 0=no +PROMPT="1" + +# Timeout, 30 seconds to fix usb keyboard issues +# 0 means wait for prompt +TIMEOUT="300" + +# default MBR +MBR="/usr/lib/syslinux/mbr.bin" diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux/options.msg new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mksyslinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre options and troubleshooting: + +- If your system hangs during the boot process, any combinations of the + boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +------------------------------------------------------------------------------ diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 5ad383873..a49b889bd 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183981 2013-04-30 09:11:10Z bpiotrowski $ +# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,23 +7,30 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=35920 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=36285 +pkgrel=1 +arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) -md5sums=('5f96e829d711e7d1ea65e324710dca50' +options=('!buildflags' '!emptydirs') +source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz + mplayer.desktop + cdio-includes.patch) +md5sums=('5e4f0d4d039b0219514cf52ae6da831d' 'c0d6ef795cf6de48e3b87ff7c23f0319' '7b5be7191aafbea64218dc4916343bbc') -build() { - cd "$srcdir/$_pkgbase" +prepare() { + cd "$srcdir/$_pkgbase-$pkgver" + patch -Np0 -i ../cdio-includes.patch +} + +build() { + cd "$srcdir/$_pkgbase-$pkgver" ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -59,7 +66,7 @@ package_mplayer-libre() { replaces=('mplayer') conflicts=('mplayer') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mplayer install-mplayer-man install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" @@ -79,7 +86,7 @@ package_mencoder-libre() { replaces=('mencoder') conflicts=('mencoder') - cd "$srcdir/$_pkgbase" + cd "$srcdir/$_pkgbase-$pkgver" make DESTDIR="$pkgdir" install-mencoder install-mencoder-man - find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; + find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} + } diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 0a67c1a39..311c469ca 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -8,8 +8,8 @@ pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=5 -pkgdesc="A movie player, compiled with vaapi (without unfree faac support)" +pkgrel=8 +pkgdesc="A movie player, compiled with vaapi, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" license=('GPL') @@ -26,19 +26,29 @@ replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz cdio-includes.patch - tweak-desktop-file.patch) + tweak-desktop-file.patch + subreader-fix-srt-parsing.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' - '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') + '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' + '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') -build() { + +prepare() { cd "$srcdir/mplayer-vaapi-$pkgver" patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" + # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 + patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" +} + +build() { + cd "$srcdir/mplayer-vaapi-$pkgver" + ./configure \ --prefix=/usr \ --enable-runtime-cpudetection \ diff --git a/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch new file mode 100644 index 000000000..f1c087377 --- /dev/null +++ b/libre/mplayer-vaapi-libre/subreader-fix-srt-parsing.patch @@ -0,0 +1,40 @@ +Index: sub/subreader.c +=================================================================== +--- sub/subreader.c (revision 36284) ++++ sub/subreader.c (revision 36285) +@@ -378,14 +378,14 @@ + int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; + + while (!current->text[0]) { +- char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep; ++ char line[LINE_LEN + 1], full_line[LINE_LEN + 1]; + int i; + + /* Parse SubRip header */ + if (!stream_read_line(st, line, LINE_LEN, utf16)) + return NULL; +- if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", +- &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10) ++ if (sscanf(line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", ++ &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8) + continue; + + current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10; +@@ -442,7 +442,7 @@ + #endif + while (!current->text[0]) { + if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; +- if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10) ++ if ((len=sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; +@@ -1123,7 +1123,7 @@ + {*uses_time=1;return SUB_MPL2;} + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBRIP;} +- if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10) ++ if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) + {*uses_time=1;return SUB_SUBVIEWER;} + if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4) + {*uses_time=1;return SUB_SUBVIEWER2;} diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index cef33ae90..05e7d8cbb 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -12,8 +12,8 @@ pkgflag=( -docs ) pkgver=1.8.1 -pkgrel=3 -pkgdesc='A scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts' +pkgrel=4 +pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts' arch=( i686 x86_64 diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD index 68615937c..e601bcb41 100644 --- a/libre/parabola-xdg-menu/PKGBUILD +++ b/libre/parabola-xdg-menu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $ # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=parabola-xdg-menu -pkgver=0.7.5.5 +pkgver=0.7.6.1 pkgrel=1 pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)" arch=('any') @@ -18,9 +18,9 @@ source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.g replaces=('archlinux-xdg-menu') conflicts=('archlinux-xdg-menu') provides=("archlinux-xdg-menu=$pkgver") -md5sums=('dd139571e537bbe0190eca53eabb8fd2') +md5sums=('faa2077140c3d5bacc1de974a9eb3384') -build() { +package() { cd $srcdir # Rebranding Archlinux to Parabola @@ -42,7 +42,7 @@ build() { install -D -m 0755 xdg_menu $pkgdir/usr/bin/xdg_menu install -D -m 0755 xdg_menu_su $pkgdir/usr/bin/xdg_menu_su - install -D -m 0755 update-menus $pkgdir/usr/sbin/update-menus + install -D -m 0755 update-menus $pkgdir/usr/bin/update-menus install -D -m 0644 update-menus.conf $pkgdir/etc/update-menus.conf mkdir -p $pkgdir/usr/share/desktop-directories/ cp parabola-desktop-directories/* $pkgdir/usr/share/desktop-directories/ diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index e8a981a3d..1cb968c35 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $ +# $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: orelien <aurelien.foret@wanadoo.fr> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=rp-pppoe pkgname=rp-pppoe-libre pkgver=3.11 -pkgrel=3 +pkgrel=4 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" @@ -36,7 +36,7 @@ prepare() { build() { cd "$srcdir/$_pkgname-$pkgver/src" - ./configure --prefix=/usr --enable-plugin + ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } @@ -49,6 +49,6 @@ package() { } md5sums=('13b5900c56bd602df6cc526e5e520722' 'SKIP' - 'af234125f956f3a356ab0d0fcaa9e8a2' + '45dc8fc3d0341a3930182a480859ad76' 'd38a903a247d689ff0323d7b6caa1c6b' '3c53d550ac408608abb0b6cd6b76b6c2') diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service index 324164943..f9a2fdcc6 100644 --- a/libre/rp-pppoe-libre/adsl.service +++ b/libre/rp-pppoe-libre/adsl.service @@ -3,8 +3,8 @@ Description=ADSL Deamon [Service] Type=forking -ExecStart=/usr/sbin/pppoe-start -ExecStop=/usr/sbin/pppoe-stop +ExecStart=/usr/bin/pppoe-start +ExecStop=/usr/bin/pppoe-stop [Install] WantedBy=multi-user.target diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 193db8900..d23deae0a 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 165555 2012-08-23 18:27:20Z thomas $ +# $Id: PKGBUILD 185894 2013-05-19 17:17:51Z tpowa $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=syslinux -pkgver=4.05 -pkgrel=7 -arch=('i686' 'x86_64' 'mips64el') +pkgver=5.01 +pkgrel=4 +arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" -url="http://syslinux.zytor.com/" +url="http://www.syslinux.org" license=('GPL2') depends=('perl' 'glibc') optdepends=('perl-passwd-md5: For md5pass' @@ -24,16 +24,12 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux-dont-build-dos-windows-targets.patch syslinux.cfg syslinux-install_update - avoid-using-ext2_fs.patch - handle-ctors-dtors-via-init_array-and-fini_array.patch splash.png) -md5sums=('82299242418385da1274c9479a778cb2' - '1528c376e43f0eaccaa80d8ad1bc13b4' - '8dc2afca3739667e892faf04eb97e7b1' - '680750f73dc2e587ac567d057d485813' - '2e2c674a71c0c0bf265d96cfc19ce985' - 'd016d03f15177b1bb534ce3753b2aa9b' - '0035b6cac6756a384b861eda8d33e4f7') +md5sums=('6c21244277fa4e444967ba45469de863' + '25af85a05e7b212b7fb8b7587175e492' + 'e5a69630e3f7083aad2d14362b6117b3' + '4450792e13a0270c1b89bb6a66ce2fbc' + 'befd0e7c38a03442b791f2a530b4dd2d') build() { # Do not try to build syslinux with our default LDFLAGS, it will fail @@ -41,10 +37,6 @@ build() { cd "$srcdir"/$pkgname-${pkgver} # Do not try to build the Windows or DOS installers patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch - # fix #30084 - patch -Np1 -i "$srcdir"/avoid-using-ext2_fs.patch - # fix #31065 (booting breaks with gcc 4.7) - patch -Np1 -i "$srcdir"/handle-ctors-dtors-via-init_array-and-fini_array.patch # Fix FHS manpage path sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk make installer @@ -56,14 +48,16 @@ package() { cd "$srcdir"/$pkgname-${pkgver} make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install + # install docs + cp -ar "$srcdir"/$pkgname-${pkgver}/doc "$pkgdir"/usr/share/ # Install the default configuration install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg # Install Parabola splash install -D -m644 "$srcdir"/splash.png "$pkgdir"/boot/syslinux/splash.png # Install the installation and update script # This script is maintained at git://gist.github.com/772138.git - install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update - # move extlinux binary to /usr/sbin - mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux + install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update + # move extlinux binary to /usr/bin + mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/bin/extlinux rmdir "$pkgdir"/sbin } diff --git a/libre/syslinux/avoid-using-ext2_fs.patch b/libre/syslinux/avoid-using-ext2_fs.patch deleted file mode 100644 index 9a166eefc..000000000 --- a/libre/syslinux/avoid-using-ext2_fs.patch +++ /dev/null @@ -1,965 +0,0 @@ -From a1006762fa6f98750bb77d76dd992cb8ea9f9c99 Mon Sep 17 00:00:00 2001 -From: "H. Peter Anvin" <hpa@zytor.com> -Date: Mon, 26 Mar 2012 22:51:09 -0700 -Subject: [PATCH] libinstaller: Avoid using <linux/ext2_fs.h> - -Don't use <linux/ext2_fs.h> if we can avoid it. - -The ioctl constants have been globalized and moved to <linux/fs.h>. -Use a private copy of ext2_fs.h from e2fsprogs with the ioctl -constants removed for the data structures. - -Do at least attempt backward compatibility for old kernel headers, but -no real hope of proper operation there... - -Signed-off-by: H. Peter Anvin <hpa@zytor.com> ---- - libinstaller/ext2fs/ext2_fs.h | 856 ++++++++++++++++++++++++++++++++++++++++++ - libinstaller/linuxioctl.h | 29 +- - libinstaller/syslxcom.c | 12 +- - 3 files changed, 886 insertions(+), 11 deletions(-) - create mode 100644 libinstaller/ext2fs/ext2_fs.h - -diff -urpN syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 syslinux-4.05/libinstaller/ext2fs/ext2_fs.h ---- syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 2012-08-06 09:48:43.797645032 -0400 -+++ syslinux-4.05/libinstaller/ext2fs/ext2_fs.h 2012-08-06 09:48:43.797645032 -0400 -@@ -0,0 +1,856 @@ -+/* -+ * linux/include/linux/ext2_fs.h -+ * -+ * Copyright (C) 1992, 1993, 1994, 1995 -+ * Remy Card (card@masi.ibp.fr) -+ * Laboratoire MASI - Institut Blaise Pascal -+ * Universite Pierre et Marie Curie (Paris VI) -+ * -+ * from -+ * -+ * linux/include/linux/minix_fs.h -+ * -+ * Copyright (C) 1991, 1992 Linus Torvalds -+ */ -+ -+#ifndef _EXT2FS_EXT2_FS_H -+#define _EXT2FS_EXT2_FS_H -+ -+#include <linux/types.h> -+ -+/* -+ * The second extended filesystem constants/structures -+ */ -+ -+/* -+ * Define EXT2FS_DEBUG to produce debug messages -+ */ -+#undef EXT2FS_DEBUG -+ -+/* -+ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files -+ */ -+#define EXT2_PREALLOCATE -+#define EXT2_DEFAULT_PREALLOC_BLOCKS 8 -+ -+/* -+ * The second extended file system version -+ */ -+#define EXT2FS_DATE "95/08/09" -+#define EXT2FS_VERSION "0.5b" -+ -+/* -+ * Special inode numbers -+ */ -+#define EXT2_BAD_INO 1 /* Bad blocks inode */ -+#define EXT2_ROOT_INO 2 /* Root inode */ -+#define EXT4_USR_QUOTA_INO 3 /* User quota inode */ -+#define EXT4_GRP_QUOTA_INO 4 /* Group quota inode */ -+#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */ -+#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */ -+#define EXT2_RESIZE_INO 7 /* Reserved group descriptors inode */ -+#define EXT2_JOURNAL_INO 8 /* Journal inode */ -+#define EXT2_EXCLUDE_INO 9 /* The "exclude" inode, for snapshots */ -+#define EXT4_REPLICA_INO 10 /* Used by non-upstream feature */ -+ -+/* First non-reserved inode for old ext2 filesystems */ -+#define EXT2_GOOD_OLD_FIRST_INO 11 -+ -+/* -+ * The second extended file system magic number -+ */ -+#define EXT2_SUPER_MAGIC 0xEF53 -+ -+#ifdef __KERNEL__ -+#define EXT2_SB(sb) (&((sb)->u.ext2_sb)) -+#else -+/* Assume that user mode programs are passing in an ext2fs superblock, not -+ * a kernel struct super_block. This will allow us to call the feature-test -+ * macros from user land. */ -+#define EXT2_SB(sb) (sb) -+#endif -+ -+/* -+ * Maximal count of links to a file -+ */ -+#define EXT2_LINK_MAX 65000 -+ -+/* -+ * Macro-instructions used to manage several block sizes -+ */ -+#define EXT2_MIN_BLOCK_LOG_SIZE 10 /* 1024 */ -+#define EXT2_MAX_BLOCK_LOG_SIZE 16 /* 65536 */ -+#define EXT2_MIN_BLOCK_SIZE (1 << EXT2_MIN_BLOCK_LOG_SIZE) -+#define EXT2_MAX_BLOCK_SIZE (1 << EXT2_MAX_BLOCK_LOG_SIZE) -+#ifdef __KERNEL__ -+#define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) -+#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) -+#define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->addr_per_block_bits) -+#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size) -+#define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino) -+#else -+#define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) -+#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) -+#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ -+ EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size) -+#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ -+ EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino) -+#endif -+#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof(__u32)) -+ -+/* -+ * Macro-instructions used to manage allocation clusters -+ */ -+#define EXT2_MIN_CLUSTER_LOG_SIZE EXT2_MIN_BLOCK_LOG_SIZE -+#define EXT2_MAX_CLUSTER_LOG_SIZE 29 /* 512MB */ -+#define EXT2_MIN_CLUSTER_SIZE EXT2_MIN_BLOCK_SIZE -+#define EXT2_MAX_CLUSTER_SIZE (1 << EXT2_MAX_CLUSTER_LOG_SIZE) -+#define EXT2_CLUSTER_SIZE(s) (EXT2_MIN_BLOCK_SIZE << \ -+ (s)->s_log_cluster_size) -+#define EXT2_CLUSTER_SIZE_BITS(s) ((s)->s_log_cluster_size + 10) -+ -+/* -+ * Macro-instructions used to manage fragments -+ * -+ * Note: for backwards compatibility only, for the dump program. -+ * Ext2/3/4 will never support fragments.... -+ */ -+#define EXT2_MIN_FRAG_SIZE EXT2_MIN_BLOCK_SIZE -+#define EXT2_MAX_FRAG_SIZE EXT2_MAX_BLOCK_SIZE -+#define EXT2_MIN_FRAG_LOG_SIZE EXT2_MIN_BLOCK_LOG_SIZE -+#define EXT2_FRAG_SIZE(s) EXT2_BLOCK_SIZE(s) -+#define EXT2_FRAGS_PER_BLOCK(s) 1 -+ -+/* -+ * ACL structures -+ */ -+struct ext2_acl_header /* Header of Access Control Lists */ -+{ -+ __u32 aclh_size; -+ __u32 aclh_file_count; -+ __u32 aclh_acle_count; -+ __u32 aclh_first_acle; -+}; -+ -+struct ext2_acl_entry /* Access Control List Entry */ -+{ -+ __u32 acle_size; -+ __u16 acle_perms; /* Access permissions */ -+ __u16 acle_type; /* Type of entry */ -+ __u16 acle_tag; /* User or group identity */ -+ __u16 acle_pad1; -+ __u32 acle_next; /* Pointer on next entry for the */ -+ /* same inode or on next free entry */ -+}; -+ -+/* -+ * Structure of a blocks group descriptor -+ */ -+struct ext2_group_desc -+{ -+ __u32 bg_block_bitmap; /* Blocks bitmap block */ -+ __u32 bg_inode_bitmap; /* Inodes bitmap block */ -+ __u32 bg_inode_table; /* Inodes table block */ -+ __u16 bg_free_blocks_count; /* Free blocks count */ -+ __u16 bg_free_inodes_count; /* Free inodes count */ -+ __u16 bg_used_dirs_count; /* Directories count */ -+ __u16 bg_flags; -+ __u32 bg_exclude_bitmap_lo; /* Exclude bitmap for snapshots */ -+ __u16 bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ -+ __u16 bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ -+ __u16 bg_itable_unused; /* Unused inodes count */ -+ __u16 bg_checksum; /* crc16(s_uuid+grouo_num+group_desc)*/ -+}; -+ -+/* -+ * Structure of a blocks group descriptor -+ */ -+struct ext4_group_desc -+{ -+ __u32 bg_block_bitmap; /* Blocks bitmap block */ -+ __u32 bg_inode_bitmap; /* Inodes bitmap block */ -+ __u32 bg_inode_table; /* Inodes table block */ -+ __u16 bg_free_blocks_count; /* Free blocks count */ -+ __u16 bg_free_inodes_count; /* Free inodes count */ -+ __u16 bg_used_dirs_count; /* Directories count */ -+ __u16 bg_flags; /* EXT4_BG_flags (INODE_UNINIT, etc) */ -+ __u32 bg_exclude_bitmap_lo; /* Exclude bitmap for snapshots */ -+ __u16 bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ -+ __u16 bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bitmap) LSB */ -+ __u16 bg_itable_unused; /* Unused inodes count */ -+ __u16 bg_checksum; /* crc16(sb_uuid+group+desc) */ -+ __u32 bg_block_bitmap_hi; /* Blocks bitmap block MSB */ -+ __u32 bg_inode_bitmap_hi; /* Inodes bitmap block MSB */ -+ __u32 bg_inode_table_hi; /* Inodes table block MSB */ -+ __u16 bg_free_blocks_count_hi;/* Free blocks count MSB */ -+ __u16 bg_free_inodes_count_hi;/* Free inodes count MSB */ -+ __u16 bg_used_dirs_count_hi; /* Directories count MSB */ -+ __u16 bg_itable_unused_hi; /* Unused inodes count MSB */ -+ __u32 bg_exclude_bitmap_hi; /* Exclude bitmap block MSB */ -+ __u16 bg_block_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */ -+ __u16 bg_inode_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bitmap) MSB */ -+ __u32 bg_reserved; -+}; -+ -+#define EXT2_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not initialized */ -+#define EXT2_BG_BLOCK_UNINIT 0x0002 /* Block bitmap not initialized */ -+#define EXT2_BG_INODE_ZEROED 0x0004 /* On-disk itable initialized to zero */ -+ -+/* -+ * Data structures used by the directory indexing feature -+ * -+ * Note: all of the multibyte integer fields are little endian. -+ */ -+ -+/* -+ * Note: dx_root_info is laid out so that if it should somehow get -+ * overlaid by a dirent the two low bits of the hash version will be -+ * zero. Therefore, the hash version mod 4 should never be 0. -+ * Sincerely, the paranoia department. -+ */ -+struct ext2_dx_root_info { -+ __u32 reserved_zero; -+ __u8 hash_version; /* 0 now, 1 at release */ -+ __u8 info_length; /* 8 */ -+ __u8 indirect_levels; -+ __u8 unused_flags; -+}; -+ -+#define EXT2_HASH_LEGACY 0 -+#define EXT2_HASH_HALF_MD4 1 -+#define EXT2_HASH_TEA 2 -+#define EXT2_HASH_LEGACY_UNSIGNED 3 /* reserved for userspace lib */ -+#define EXT2_HASH_HALF_MD4_UNSIGNED 4 /* reserved for userspace lib */ -+#define EXT2_HASH_TEA_UNSIGNED 5 /* reserved for userspace lib */ -+ -+#define EXT2_HASH_FLAG_INCOMPAT 0x1 -+ -+struct ext2_dx_entry { -+ __u32 hash; -+ __u32 block; -+}; -+ -+struct ext2_dx_countlimit { -+ __u16 limit; -+ __u16 count; -+}; -+ -+ -+/* -+ * Macro-instructions used to manage group descriptors -+ */ -+#define EXT2_MIN_DESC_SIZE 32 -+#define EXT2_MIN_DESC_SIZE_64BIT 64 -+#define EXT2_MAX_DESC_SIZE EXT2_MIN_BLOCK_SIZE -+#define EXT2_DESC_SIZE(s) \ -+ ((EXT2_SB(s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) ? \ -+ (s)->s_desc_size : EXT2_MIN_DESC_SIZE) -+ -+#define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group) -+#define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group) -+#define EXT2_CLUSTERS_PER_GROUP(s) (EXT2_SB(s)->s_clusters_per_group) -+#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) -+/* limits imposed by 16-bit value gd_free_{blocks,inode}_count */ -+#define EXT2_MAX_BLOCKS_PER_GROUP(s) ((((unsigned) 1 << 16) - 8) * \ -+ (EXT2_CLUSTER_SIZE(s) / \ -+ EXT2_BLOCK_SIZE(s))) -+#define EXT2_MAX_CLUSTERS_PER_GROUP(s) (((unsigned) 1 << 16) - 8) -+#define EXT2_MAX_INODES_PER_GROUP(s) (((unsigned) 1 << 16) - \ -+ EXT2_INODES_PER_BLOCK(s)) -+#ifdef __KERNEL__ -+#define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block) -+#define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits) -+#else -+#define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_DESC_SIZE(s)) -+#endif -+ -+/* -+ * Constants relative to the data blocks -+ */ -+#define EXT2_NDIR_BLOCKS 12 -+#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS -+#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) -+#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) -+#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) -+ -+/* -+ * Inode flags -+ */ -+#define EXT2_SECRM_FL 0x00000001 /* Secure deletion */ -+#define EXT2_UNRM_FL 0x00000002 /* Undelete */ -+#define EXT2_COMPR_FL 0x00000004 /* Compress file */ -+#define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */ -+#define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */ -+#define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */ -+#define EXT2_NODUMP_FL 0x00000040 /* do not dump file */ -+#define EXT2_NOATIME_FL 0x00000080 /* do not update atime */ -+/* Reserved for compression usage... */ -+#define EXT2_DIRTY_FL 0x00000100 -+#define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ -+#define EXT2_NOCOMPR_FL 0x00000400 /* Access raw compressed data */ -+#define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ -+/* End compression flags --- maybe not all used */ -+#define EXT2_BTREE_FL 0x00001000 /* btree format dir */ -+#define EXT2_INDEX_FL 0x00001000 /* hash-indexed directory */ -+#define EXT2_IMAGIC_FL 0x00002000 -+#define EXT3_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */ -+#define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */ -+#define EXT2_DIRSYNC_FL 0x00010000 /* Synchronous directory modifications */ -+#define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ -+#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */ -+#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ -+#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ -+/* EXT4_EOFBLOCKS_FL 0x00400000 was here */ -+#define EXT4_SNAPFILE_FL 0x01000000 /* Inode is a snapshot */ -+#define EXT4_SNAPFILE_DELETED_FL 0x04000000 /* Snapshot is being deleted */ -+#define EXT4_SNAPFILE_SHRUNK_FL 0x08000000 /* Snapshot shrink has completed */ -+#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ -+ -+#define EXT2_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ -+#define EXT2_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */ -+ -+/* -+ * ioctl commands -+ */ -+ -+/* Used for online resize */ -+struct ext2_new_group_input { -+ __u32 group; /* Group number for this data */ -+ __u32 block_bitmap; /* Absolute block number of block bitmap */ -+ __u32 inode_bitmap; /* Absolute block number of inode bitmap */ -+ __u32 inode_table; /* Absolute block number of inode table start */ -+ __u32 blocks_count; /* Total number of blocks in this group */ -+ __u16 reserved_blocks; /* Number of reserved blocks in this group */ -+ __u16 unused; /* Number of reserved GDT blocks in group */ -+}; -+ -+struct ext4_new_group_input { -+ __u32 group; /* Group number for this data */ -+ __u64 block_bitmap; /* Absolute block number of block bitmap */ -+ __u64 inode_bitmap; /* Absolute block number of inode bitmap */ -+ __u64 inode_table; /* Absolute block number of inode table start */ -+ __u32 blocks_count; /* Total number of blocks in this group */ -+ __u16 reserved_blocks; /* Number of reserved blocks in this group */ -+ __u16 unused; -+}; -+ -+#ifdef __GNU__ /* Needed for the Hurd */ -+#define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0) -+#endif -+ -+#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) -+#define EXT2_IOC_SETFLAGS _IOW('f', 2, long) -+#define EXT2_IOC_GETVERSION _IOR('v', 1, long) -+#define EXT2_IOC_SETVERSION _IOW('v', 2, long) -+#define EXT2_IOC_GETVERSION_NEW _IOR('f', 3, long) -+#define EXT2_IOC_SETVERSION_NEW _IOW('f', 4, long) -+#define EXT2_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) -+#define EXT2_IOC_GROUP_ADD _IOW('f', 8,struct ext2_new_group_input) -+#define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input) -+#define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64) -+ -+/* -+ * Structure of an inode on the disk -+ */ -+struct ext2_inode { -+ __u16 i_mode; /* File mode */ -+ __u16 i_uid; /* Low 16 bits of Owner Uid */ -+ __u32 i_size; /* Size in bytes */ -+ __u32 i_atime; /* Access time */ -+ __u32 i_ctime; /* Inode change time */ -+ __u32 i_mtime; /* Modification time */ -+ __u32 i_dtime; /* Deletion Time */ -+ __u16 i_gid; /* Low 16 bits of Group Id */ -+ __u16 i_links_count; /* Links count */ -+ __u32 i_blocks; /* Blocks count */ -+ __u32 i_flags; /* File flags */ -+ union { -+ struct { -+ __u32 l_i_version; /* was l_i_reserved1 */ -+ } linux1; -+ struct { -+ __u32 h_i_translator; -+ } hurd1; -+ } osd1; /* OS dependent 1 */ -+ __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ -+ __u32 i_generation; /* File version (for NFS) */ -+ __u32 i_file_acl; /* File ACL */ -+ __u32 i_size_high; /* Formerly i_dir_acl, directory ACL */ -+ __u32 i_faddr; /* Fragment address */ -+ union { -+ struct { -+ __u16 l_i_blocks_hi; -+ __u16 l_i_file_acl_high; -+ __u16 l_i_uid_high; /* these 2 fields */ -+ __u16 l_i_gid_high; /* were reserved2[0] */ -+ __u16 l_i_checksum_lo; /* crc32c(uuid+inum+inode) */ -+ __u16 l_i_reserved; -+ } linux2; -+ struct { -+ __u8 h_i_frag; /* Fragment number */ -+ __u8 h_i_fsize; /* Fragment size */ -+ __u16 h_i_mode_high; -+ __u16 h_i_uid_high; -+ __u16 h_i_gid_high; -+ __u32 h_i_author; -+ } hurd2; -+ } osd2; /* OS dependent 2 */ -+}; -+ -+/* -+ * Permanent part of an large inode on the disk -+ */ -+struct ext2_inode_large { -+ __u16 i_mode; /* File mode */ -+ __u16 i_uid; /* Low 16 bits of Owner Uid */ -+ __u32 i_size; /* Size in bytes */ -+ __u32 i_atime; /* Access time */ -+ __u32 i_ctime; /* Inode Change time */ -+ __u32 i_mtime; /* Modification time */ -+ __u32 i_dtime; /* Deletion Time */ -+ __u16 i_gid; /* Low 16 bits of Group Id */ -+ __u16 i_links_count; /* Links count */ -+ __u32 i_blocks; /* Blocks count */ -+ __u32 i_flags; /* File flags */ -+ union { -+ struct { -+ __u32 l_i_version; /* was l_i_reserved1 */ -+ } linux1; -+ struct { -+ __u32 h_i_translator; -+ } hurd1; -+ } osd1; /* OS dependent 1 */ -+ __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ -+ __u32 i_generation; /* File version (for NFS) */ -+ __u32 i_file_acl; /* File ACL */ -+ __u32 i_size_high; /* Formerly i_dir_acl, directory ACL */ -+ __u32 i_faddr; /* Fragment address */ -+ union { -+ struct { -+ __u16 l_i_blocks_hi; -+ __u16 l_i_file_acl_high; -+ __u16 l_i_uid_high; /* these 2 fields */ -+ __u16 l_i_gid_high; /* were reserved2[0] */ -+ __u16 l_i_checksum_lo; /* crc32c(uuid+inum+inode) */ -+ __u16 l_i_reserved; -+ } linux2; -+ struct { -+ __u8 h_i_frag; /* Fragment number */ -+ __u8 h_i_fsize; /* Fragment size */ -+ __u16 h_i_mode_high; -+ __u16 h_i_uid_high; -+ __u16 h_i_gid_high; -+ __u32 h_i_author; -+ } hurd2; -+ } osd2; /* OS dependent 2 */ -+ __u16 i_extra_isize; -+ __u16 i_checksum_hi; /* crc32c(uuid+inum+inode) */ -+ __u32 i_ctime_extra; /* extra Change time (nsec << 2 | epoch) */ -+ __u32 i_mtime_extra; /* extra Modification time (nsec << 2 | epoch) */ -+ __u32 i_atime_extra; /* extra Access time (nsec << 2 | epoch) */ -+ __u32 i_crtime; /* File creation time */ -+ __u32 i_crtime_extra; /* extra File creation time (nsec << 2 | epoch)*/ -+ __u32 i_version_hi; /* high 32 bits for 64-bit version */ -+}; -+ -+#define i_dir_acl i_size_high -+ -+#if defined(__KERNEL__) || defined(__linux__) -+#define i_reserved1 osd1.linux1.l_i_reserved1 -+#define i_frag osd2.linux2.l_i_frag -+#define i_fsize osd2.linux2.l_i_fsize -+#define i_uid_low i_uid -+#define i_gid_low i_gid -+#define i_uid_high osd2.linux2.l_i_uid_high -+#define i_gid_high osd2.linux2.l_i_gid_high -+#else -+#if defined(__GNU__) -+ -+#define i_translator osd1.hurd1.h_i_translator -+#define i_frag osd2.hurd2.h_i_frag; -+#define i_fsize osd2.hurd2.h_i_fsize; -+#define i_uid_high osd2.hurd2.h_i_uid_high -+#define i_gid_high osd2.hurd2.h_i_gid_high -+#define i_author osd2.hurd2.h_i_author -+ -+#endif /* __GNU__ */ -+#endif /* defined(__KERNEL__) || defined(__linux__) */ -+ -+#define inode_uid(inode) ((inode).i_uid | (inode).osd2.linux2.l_i_uid_high << 16) -+#define inode_gid(inode) ((inode).i_gid | (inode).osd2.linux2.l_i_gid_high << 16) -+#define ext2fs_set_i_uid_high(inode,x) ((inode).osd2.linux2.l_i_uid_high = (x)) -+#define ext2fs_set_i_gid_high(inode,x) ((inode).osd2.linux2.l_i_gid_high = (x)) -+ -+/* -+ * File system states -+ */ -+#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */ -+#define EXT2_ERROR_FS 0x0002 /* Errors detected */ -+#define EXT3_ORPHAN_FS 0x0004 /* Orphans being recovered */ -+ -+/* -+ * Misc. filesystem flags -+ */ -+#define EXT2_FLAGS_SIGNED_HASH 0x0001 /* Signed dirhash in use */ -+#define EXT2_FLAGS_UNSIGNED_HASH 0x0002 /* Unsigned dirhash in use */ -+#define EXT2_FLAGS_TEST_FILESYS 0x0004 /* OK for use on development code */ -+#define EXT2_FLAGS_IS_SNAPSHOT 0x0010 /* This is a snapshot image */ -+#define EXT2_FLAGS_FIX_SNAPSHOT 0x0020 /* Snapshot inodes corrupted */ -+#define EXT2_FLAGS_FIX_EXCLUDE 0x0040 /* Exclude bitmaps corrupted */ -+ -+/* -+ * Mount flags -+ */ -+#define EXT2_MOUNT_CHECK 0x0001 /* Do mount-time checks */ -+#define EXT2_MOUNT_GRPID 0x0004 /* Create files with directory's group */ -+#define EXT2_MOUNT_DEBUG 0x0008 /* Some debugging messages */ -+#define EXT2_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */ -+#define EXT2_MOUNT_ERRORS_RO 0x0020 /* Remount fs ro on errors */ -+#define EXT2_MOUNT_ERRORS_PANIC 0x0040 /* Panic on errors */ -+#define EXT2_MOUNT_MINIX_DF 0x0080 /* Mimics the Minix statfs */ -+#define EXT2_MOUNT_NO_UID32 0x0200 /* Disable 32-bit UIDs */ -+ -+#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -+#define set_opt(o, opt) o |= EXT2_MOUNT_##opt -+#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \ -+ EXT2_MOUNT_##opt) -+/* -+ * Maximal mount counts between two filesystem checks -+ */ -+#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */ -+#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */ -+ -+/* -+ * Behaviour when detecting errors -+ */ -+#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */ -+#define EXT2_ERRORS_RO 2 /* Remount fs read-only */ -+#define EXT2_ERRORS_PANIC 3 /* Panic */ -+#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE -+ -+#if (__GNUC__ >= 4) -+#define ext4_offsetof(TYPE,MEMBER) __builtin_offsetof(TYPE,MEMBER) -+#else -+#define ext4_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -+#endif -+ -+/* -+ * Structure of the super block -+ */ -+struct ext2_super_block { -+ __u32 s_inodes_count; /* Inodes count */ -+ __u32 s_blocks_count; /* Blocks count */ -+ __u32 s_r_blocks_count; /* Reserved blocks count */ -+ __u32 s_free_blocks_count; /* Free blocks count */ -+ __u32 s_free_inodes_count; /* Free inodes count */ -+ __u32 s_first_data_block; /* First Data Block */ -+ __u32 s_log_block_size; /* Block size */ -+ __u32 s_log_cluster_size; /* Allocation cluster size */ -+ __u32 s_blocks_per_group; /* # Blocks per group */ -+ __u32 s_clusters_per_group; /* # Fragments per group */ -+ __u32 s_inodes_per_group; /* # Inodes per group */ -+ __u32 s_mtime; /* Mount time */ -+ __u32 s_wtime; /* Write time */ -+ __u16 s_mnt_count; /* Mount count */ -+ __s16 s_max_mnt_count; /* Maximal mount count */ -+ __u16 s_magic; /* Magic signature */ -+ __u16 s_state; /* File system state */ -+ __u16 s_errors; /* Behaviour when detecting errors */ -+ __u16 s_minor_rev_level; /* minor revision level */ -+ __u32 s_lastcheck; /* time of last check */ -+ __u32 s_checkinterval; /* max. time between checks */ -+ __u32 s_creator_os; /* OS */ -+ __u32 s_rev_level; /* Revision level */ -+ __u16 s_def_resuid; /* Default uid for reserved blocks */ -+ __u16 s_def_resgid; /* Default gid for reserved blocks */ -+ /* -+ * These fields are for EXT2_DYNAMIC_REV superblocks only. -+ * -+ * Note: the difference between the compatible feature set and -+ * the incompatible feature set is that if there is a bit set -+ * in the incompatible feature set that the kernel doesn't -+ * know about, it should refuse to mount the filesystem. -+ * -+ * e2fsck's requirements are more strict; if it doesn't know -+ * about a feature in either the compatible or incompatible -+ * feature set, it must abort and not try to meddle with -+ * things it doesn't understand... -+ */ -+ __u32 s_first_ino; /* First non-reserved inode */ -+ __u16 s_inode_size; /* size of inode structure */ -+ __u16 s_block_group_nr; /* block group # of this superblock */ -+ __u32 s_feature_compat; /* compatible feature set */ -+ __u32 s_feature_incompat; /* incompatible feature set */ -+ __u32 s_feature_ro_compat; /* readonly-compatible feature set */ -+ __u8 s_uuid[16]; /* 128-bit uuid for volume */ -+ char s_volume_name[16]; /* volume name */ -+ char s_last_mounted[64]; /* directory where last mounted */ -+ __u32 s_algorithm_usage_bitmap; /* For compression */ -+ /* -+ * Performance hints. Directory preallocation should only -+ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. -+ */ -+ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ -+ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ -+ __u16 s_reserved_gdt_blocks; /* Per group table for online growth */ -+ /* -+ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. -+ */ -+ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ -+ __u32 s_journal_inum; /* inode number of journal file */ -+ __u32 s_journal_dev; /* device number of journal file */ -+ __u32 s_last_orphan; /* start of list of inodes to delete */ -+ __u32 s_hash_seed[4]; /* HTREE hash seed */ -+ __u8 s_def_hash_version; /* Default hash version to use */ -+ __u8 s_jnl_backup_type; /* Default type of journal backup */ -+ __u16 s_desc_size; /* Group desc. size: INCOMPAT_64BIT */ -+ __u32 s_default_mount_opts; -+ __u32 s_first_meta_bg; /* First metablock group */ -+ __u32 s_mkfs_time; /* When the filesystem was created */ -+ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ -+ __u32 s_blocks_count_hi; /* Blocks count high 32bits */ -+ __u32 s_r_blocks_count_hi; /* Reserved blocks count high 32 bits*/ -+ __u32 s_free_blocks_hi; /* Free blocks count */ -+ __u16 s_min_extra_isize; /* All inodes have at least # bytes */ -+ __u16 s_want_extra_isize; /* New inodes should reserve # bytes */ -+ __u32 s_flags; /* Miscellaneous flags */ -+ __u16 s_raid_stride; /* RAID stride */ -+ __u16 s_mmp_update_interval; /* # seconds to wait in MMP checking */ -+ __u64 s_mmp_block; /* Block for multi-mount protection */ -+ __u32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/ -+ __u8 s_log_groups_per_flex; /* FLEX_BG group size */ -+ __u8 s_reserved_char_pad; -+ __u16 s_reserved_pad; /* Padding to next 32bits */ -+ __u64 s_kbytes_written; /* nr of lifetime kilobytes written */ -+ __u32 s_snapshot_inum; /* Inode number of active snapshot */ -+ __u32 s_snapshot_id; /* sequential ID of active snapshot */ -+ __u64 s_snapshot_r_blocks_count; /* reserved blocks for active -+ snapshot's future use */ -+ __u32 s_snapshot_list; /* inode number of the head of the on-disk snapshot list */ -+#define EXT4_S_ERR_START ext4_offsetof(struct ext2_super_block, s_error_count) -+ __u32 s_error_count; /* number of fs errors */ -+ __u32 s_first_error_time; /* first time an error happened */ -+ __u32 s_first_error_ino; /* inode involved in first error */ -+ __u64 s_first_error_block; /* block involved of first error */ -+ __u8 s_first_error_func[32]; /* function where the error happened */ -+ __u32 s_first_error_line; /* line number where error happened */ -+ __u32 s_last_error_time; /* most recent time of an error */ -+ __u32 s_last_error_ino; /* inode involved in last error */ -+ __u32 s_last_error_line; /* line number where error happened */ -+ __u64 s_last_error_block; /* block involved of last error */ -+ __u8 s_last_error_func[32]; /* function where the error happened */ -+#define EXT4_S_ERR_END ext4_offsetof(struct ext2_super_block, s_mount_opts) -+ __u8 s_mount_opts[64]; -+ __u32 s_usr_quota_inum; /* inode number of user quota file */ -+ __u32 s_grp_quota_inum; /* inode number of group quota file */ -+ __u32 s_overhead_blocks; /* overhead blocks/clusters in fs */ -+ __u32 s_reserved[108]; /* Padding to the end of the block */ -+ __u32 s_checksum; /* crc32c(superblock) */ -+}; -+ -+#define EXT4_S_ERR_LEN (EXT4_S_ERR_END - EXT4_S_ERR_START) -+ -+/* -+ * Codes for operating systems -+ */ -+#define EXT2_OS_LINUX 0 -+#define EXT2_OS_HURD 1 -+#define EXT2_OBSO_OS_MASIX 2 -+#define EXT2_OS_FREEBSD 3 -+#define EXT2_OS_LITES 4 -+ -+/* -+ * Revision levels -+ */ -+#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ -+#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ -+ -+#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV -+#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV -+ -+#define EXT2_GOOD_OLD_INODE_SIZE 128 -+ -+/* -+ * Journal inode backup types -+ */ -+#define EXT3_JNL_BACKUP_BLOCKS 1 -+ -+/* -+ * Feature set definitions -+ */ -+ -+#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \ -+ ( EXT2_SB(sb)->s_feature_compat & (mask) ) -+#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ -+ ( EXT2_SB(sb)->s_feature_ro_compat & (mask) ) -+#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ -+ ( EXT2_SB(sb)->s_feature_incompat & (mask) ) -+ -+#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 -+#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 -+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 -+#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 -+#define EXT2_FEATURE_COMPAT_RESIZE_INODE 0x0010 -+#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 -+#define EXT2_FEATURE_COMPAT_LAZY_BG 0x0040 -+/* #define EXT2_FEATURE_COMPAT_EXCLUDE_INODE 0x0080 not used, legacy */ -+#define EXT2_FEATURE_COMPAT_EXCLUDE_BITMAP 0x0100 -+ -+ -+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 -+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 -+/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 not used */ -+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008 -+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 -+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020 -+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040 -+#define EXT4_FEATURE_RO_COMPAT_HAS_SNAPSHOT 0x0080 -+#define EXT4_FEATURE_RO_COMPAT_QUOTA 0x0100 -+#define EXT4_FEATURE_RO_COMPAT_BIGALLOC 0x0200 -+#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM 0x0400 -+#define EXT4_FEATURE_RO_COMPAT_REPLICA 0x0800 -+ -+#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001 -+#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 -+#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */ -+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */ -+#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010 -+#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 -+#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 -+#define EXT4_FEATURE_INCOMPAT_MMP 0x0100 -+#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -+#define EXT4_FEATURE_INCOMPAT_EA_INODE 0x0400 -+#define EXT4_FEATURE_INCOMPAT_DIRDATA 0x1000 -+ -+#define EXT2_FEATURE_COMPAT_SUPP 0 -+#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \ -+ EXT4_FEATURE_INCOMPAT_MMP) -+#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \ -+ EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \ -+ EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \ -+ EXT2_FEATURE_RO_COMPAT_BTREE_DIR) -+ -+/* -+ * Default values for user and/or group using reserved blocks -+ */ -+#define EXT2_DEF_RESUID 0 -+#define EXT2_DEF_RESGID 0 -+ -+/* -+ * Default mount options -+ */ -+#define EXT2_DEFM_DEBUG 0x0001 -+#define EXT2_DEFM_BSDGROUPS 0x0002 -+#define EXT2_DEFM_XATTR_USER 0x0004 -+#define EXT2_DEFM_ACL 0x0008 -+#define EXT2_DEFM_UID16 0x0010 -+#define EXT3_DEFM_JMODE 0x0060 -+#define EXT3_DEFM_JMODE_DATA 0x0020 -+#define EXT3_DEFM_JMODE_ORDERED 0x0040 -+#define EXT3_DEFM_JMODE_WBACK 0x0060 -+#define EXT4_DEFM_NOBARRIER 0x0100 -+#define EXT4_DEFM_BLOCK_VALIDITY 0x0200 -+#define EXT4_DEFM_DISCARD 0x0400 -+#define EXT4_DEFM_NODELALLOC 0x0800 -+ -+/* -+ * Structure of a directory entry -+ */ -+#define EXT2_NAME_LEN 255 -+ -+struct ext2_dir_entry { -+ __u32 inode; /* Inode number */ -+ __u16 rec_len; /* Directory entry length */ -+ __u16 name_len; /* Name length */ -+ char name[EXT2_NAME_LEN]; /* File name */ -+}; -+ -+/* -+ * The new version of the directory entry. Since EXT2 structures are -+ * stored in intel byte order, and the name_len field could never be -+ * bigger than 255 chars, it's safe to reclaim the extra byte for the -+ * file_type field. -+ */ -+struct ext2_dir_entry_2 { -+ __u32 inode; /* Inode number */ -+ __u16 rec_len; /* Directory entry length */ -+ __u8 name_len; /* Name length */ -+ __u8 file_type; -+ char name[EXT2_NAME_LEN]; /* File name */ -+}; -+ -+/* -+ * Ext2 directory file types. Only the low 3 bits are used. The -+ * other bits are reserved for now. -+ */ -+#define EXT2_FT_UNKNOWN 0 -+#define EXT2_FT_REG_FILE 1 -+#define EXT2_FT_DIR 2 -+#define EXT2_FT_CHRDEV 3 -+#define EXT2_FT_BLKDEV 4 -+#define EXT2_FT_FIFO 5 -+#define EXT2_FT_SOCK 6 -+#define EXT2_FT_SYMLINK 7 -+ -+#define EXT2_FT_MAX 8 -+ -+/* -+ * EXT2_DIR_PAD defines the directory entries boundaries -+ * -+ * NOTE: It must be a multiple of 4 -+ */ -+#define EXT2_DIR_PAD 4 -+#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) -+#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ -+ ~EXT2_DIR_ROUND) -+ -+/* -+ * This structure is used for multiple mount protection. It is written -+ * into the block number saved in the s_mmp_block field in the superblock. -+ * Programs that check MMP should assume that if SEQ_FSCK (or any unknown -+ * code above SEQ_MAX) is present then it is NOT safe to use the filesystem, -+ * regardless of how old the timestamp is. -+ * -+ * The timestamp in the MMP structure will be updated by e2fsck at some -+ * arbitary intervals (start of passes, after every few groups of inodes -+ * in pass1 and pass1b). There is no guarantee that e2fsck is updating -+ * the MMP block in a timely manner, and the updates it does are purely -+ * for the convenience of the sysadmin and not for automatic validation. -+ * -+ * Note: Only the mmp_seq value is used to determine whether the MMP block -+ * is being updated. The mmp_time, mmp_nodename, and mmp_bdevname -+ * fields are only for informational purposes for the administrator, -+ * due to clock skew between nodes and hostname HA service takeover. -+ */ -+#define EXT4_MMP_MAGIC 0x004D4D50U /* ASCII for MMP */ -+#define EXT4_MMP_SEQ_CLEAN 0xFF4D4D50U /* mmp_seq value for clean unmount */ -+#define EXT4_MMP_SEQ_FSCK 0xE24D4D50U /* mmp_seq value when being fscked */ -+#define EXT4_MMP_SEQ_MAX 0xE24D4D4FU /* maximum valid mmp_seq value */ -+ -+struct mmp_struct { -+ __u32 mmp_magic; /* Magic number for MMP */ -+ __u32 mmp_seq; /* Sequence no. updated periodically */ -+ __u64 mmp_time; /* Time last updated */ -+ char mmp_nodename[64]; /* Node which last updated MMP block */ -+ char mmp_bdevname[32]; /* Bdev which last updated MMP block */ -+ __u16 mmp_check_interval; /* Changed mmp_check_interval */ -+ __u16 mmp_pad1; -+ __u32 mmp_pad2[227]; -+}; -+ -+/* -+ * Default interval for MMP update in seconds. -+ */ -+#define EXT4_MMP_UPDATE_INTERVAL 5 -+ -+/* -+ * Maximum interval for MMP update in seconds. -+ */ -+#define EXT4_MMP_MAX_UPDATE_INTERVAL 300 -+ -+/* -+ * Minimum interval for MMP checking in seconds. -+ */ -+#define EXT4_MMP_MIN_CHECK_INTERVAL 5 -+ -+#endif /* _EXT2FS_EXT2_FS_H */ -diff -urpN syslinux-4.05/libinstaller/linuxioctl.h.ext2 syslinux-4.05/libinstaller/linuxioctl.h ---- syslinux-4.05/libinstaller/linuxioctl.h.ext2 2011-12-09 13:28:17.000000000 -0500 -+++ syslinux-4.05/libinstaller/linuxioctl.h 2012-08-06 09:52:42.653335110 -0400 -@@ -9,17 +9,33 @@ - - #include <sys/ioctl.h> - -+#ifdef __linux__ -+ - #define statfs _kernel_statfs /* HACK to deal with broken 2.4 distros */ - - #include <linux/fd.h> /* Floppy geometry */ - #include <linux/hdreg.h> /* Hard disk geometry */ - --#include <linux/fs.h> /* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */ -+#include <linux/fs.h> /* FIGETBSZ, FIBMAP, FS_IOC_* */ - #include <linux/msdos_fs.h> /* FAT_IOCTL_SET_ATTRIBUTES */ - - #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ - #undef SECTOR_BITS --#include <linux/ext2_fs.h> /* EXT2_IOC_* */ -+ -+#ifndef FS_IOC_GETFLAGS -+/* Old kernel headers, these were once ext2-specific... */ -+# include <linux/ext2_fs.h> /* EXT2_IOC_* */ -+ -+# define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS -+# define FS_IOC_SETFLAGS EXT2_IOC_SETFLAGS -+ -+# define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL -+ -+#else -+ -+# include <ext2fs/ext2_fs.h> -+ -+#endif - - #ifndef FAT_IOCTL_GET_ATTRIBUTES - # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) -@@ -37,11 +53,13 @@ - - #undef statfs - --#if defined(__linux__) && !defined(BLKGETSIZE64) -+#ifndef BLKGETSIZE64 - /* This takes a u64, but the size field says size_t. Someone screwed big. */ - # define BLKGETSIZE64 _IOR(0x12,114,size_t) - #endif - - #include <linux/loop.h> - -+#endif /* __linux__ */ -+ - #endif /* LIBINSTALLER_LINUXIOCTL_H */ -diff -urpN syslinux-4.05/libinstaller/syslxcom.c.ext2 syslinux-4.05/libinstaller/syslxcom.c ---- syslinux-4.05/libinstaller/syslxcom.c.ext2 2011-12-09 13:28:17.000000000 -0500 -+++ syslinux-4.05/libinstaller/syslxcom.c 2012-08-06 09:48:43.797645032 -0400 -@@ -121,9 +121,9 @@ void clear_attributes(int fd) - { - int flags; - -- if (!ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) { -- flags &= ~EXT2_IMMUTABLE_FL; -- ioctl(fd, EXT2_IOC_SETFLAGS, &flags); -+ if (!ioctl(fd, FS_IOC_GETFLAGS, &flags)) { -+ flags &= ~FS_IMMUTABLE_FL; -+ ioctl(fd, FS_IOC_SETFLAGS, &flags); - } - break; - } -@@ -151,9 +151,9 @@ void set_attributes(int fd) - { - int flags; - -- if (st.st_uid == 0 && !ioctl(fd, EXT2_IOC_GETFLAGS, &flags)) { -- flags |= EXT2_IMMUTABLE_FL; -- ioctl(fd, EXT2_IOC_SETFLAGS, &flags); -+ if (st.st_uid == 0 && !ioctl(fd, FS_IOC_GETFLAGS, &flags)) { -+ flags |= FS_IMMUTABLE_FL; -+ ioctl(fd, FS_IOC_SETFLAGS, &flags); - } - break; - } diff --git a/libre/syslinux/fix-undefined-type-umode_t.patch b/libre/syslinux/fix-undefined-type-umode_t.patch deleted file mode 100644 index 33ac6d323..000000000 --- a/libre/syslinux/fix-undefined-type-umode_t.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- syslinux-4.05.orig/libinstaller/linuxioctl.h 2011-12-09 16:28:17.000000000 -0200 -+++ syslinux-4.05/libinstaller/linuxioctl.h 2012-05-18 20:30:23.000000000 -0300 -@@ -9,22 +9,36 @@ - - #include <sys/ioctl.h> - -+#ifdef __linux__ -+ - #define statfs _kernel_statfs /* HACK to deal with broken 2.4 distros */ - - #include <linux/fd.h> /* Floppy geometry */ - #include <linux/hdreg.h> /* Hard disk geometry */ - --#include <linux/fs.h> /* FIGETBSZ, FIBMAP, FS_IOC_FIEMAP */ --#include <linux/msdos_fs.h> /* FAT_IOCTL_SET_ATTRIBUTES */ -+#include <linux/fs.h> /* FIGETBSZ, FIBMAP, FS_IOC_* */ - - #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ - #undef SECTOR_BITS --#include <linux/ext2_fs.h> /* EXT2_IOC_* */ -+ -+#ifndef FS_IOC_GETFLAGS -+/* Old kernel headers, these were once ext2-specific... */ -+# include <linux/ext2_fs.h> /* EXT2_IOC_* */ -+ -+# define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS -+# define FS_IOC_SETFLAGS EXT2_IOC_SETFLAGS -+ -+# define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL -+ -+#else -+ -+# include <ext2fs/ext2_fs.h> -+ -+#endif - - #ifndef FAT_IOCTL_GET_ATTRIBUTES - # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) - #endif -- - #ifndef FAT_IOCTL_SET_ATTRIBUTES - # define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) - #endif -@@ -37,11 +51,13 @@ - - #undef statfs - --#if defined(__linux__) && !defined(BLKGETSIZE64) -+#ifndef BLKGETSIZE64 - /* This takes a u64, but the size field says size_t. Someone screwed big. */ - # define BLKGETSIZE64 _IOR(0x12,114,size_t) - #endif - - #include <linux/loop.h> - -+#endif /* __linux__ */ -+ - #endif /* LIBINSTALLER_LINUXIOCTL_H */ diff --git a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch deleted file mode 100644 index aa513312b..000000000 --- a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch +++ /dev/null @@ -1,67 +0,0 @@ -From b6be466444740a34bacd140dccbe57f6629b15bc Mon Sep 17 00:00:00 2001 -From: "H. Peter Anvin" <hpa@zytor.com> -Date: Mon, 28 May 2012 21:28:52 -0700 -Subject: [PATCH 1/1] com32.ld: handle .init_array and .fini_array - -Handle constructors/destructors via .init_array and .fini_array, as -generated by newer gccs. - -Signed-off-by: H. Peter Anvin <hpa@zytor.com> ---- - com32/lib/com32.ld | 33 ++++++++++----------------------- - 1 files changed, 10 insertions(+), 23 deletions(-) - -diff --git a/com32/lib/com32.ld b/com32/lib/com32.ld -index 37ee46c..008e4ce 100644 ---- a/com32/lib/com32.ld -+++ b/com32/lib/com32.ld -@@ -36,36 +36,23 @@ SECTIONS - .rodata1 : { *(.rodata1) } - __rodata_end = .; - -- /* Ensure the __preinit_array_start label is properly aligned. We -- could instead move the label definition inside the section, but -- the linker would then create the section even if it turns out to -- be empty, which isn't pretty. */ -+ /* -+ * The difference betwee .ctors/.dtors and .init_array/.fini_array -+ * is the ordering, but we don't use prioritization for libcom32, so -+ * just lump them all together and hope that's okay. -+ */ - . = ALIGN(4); -- .preinit_array : { -- PROVIDE (__preinit_array_start = .); -- *(.preinit_array) -- PROVIDE (__preinit_array_end = .); -- } -- .init_array : { -- PROVIDE (__init_array_start = .); -- *(.init_array) -- PROVIDE (__init_array_end = .); -- } -- .fini_array : { -- PROVIDE (__fini_array_start = .); -- *(.fini_array) -- PROVIDE (__fini_array_end = .); -- } - .ctors : { - PROVIDE (__ctors_start = .); -- KEEP (*(SORT(.ctors.*))) -- KEEP (*(.ctors)) -+ KEEP (*(SORT(.preinit_array*))) -+ KEEP (*(SORT(.init_array*))) -+ KEEP (*(SORT(.ctors*))) - PROVIDE (__ctors_end = .); - } - .dtors : { - PROVIDE (__dtors_start = .); -- KEEP (*(SORT(.dtors.*))) -- KEEP (*(.dtors)) -+ KEEP (*(SORT(.fini_array*))) -+ KEEP (*(SORT(.dtors*))) - PROVIDE (__dtors_end = .); - } - --- -1.7.6.5 - diff --git a/libre/syslinux/rePKGBUILD b/libre/syslinux/rePKGBUILD deleted file mode 100644 index 33a96d1a1..000000000 --- a/libre/syslinux/rePKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# This is an example rePKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -source PKGBUILD -unset build package md5sums source check -_repo=core -pkgname='syslinux' -options=(!strip) -source=(PKGBUILD - http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} -# http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname}-${pkgver}-4-${CARCH}${PKGEXT} - # files for pkg modifications - syslinux.cfg - splash.png) - -build() { - cd "${srcdir}/" - rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-$pkgrel-$CARCH$PKGEXT || true -# rm -v .{INSTALL,PKGINFO} ${pkgname%}-$pkgver-4-$CARCH$PKGEXT || true - # put actions for package modifications below this line - - rm -v boot/syslinux/syslinux.cfg -} - -package_syslinux() { - pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" - backup=('boot/syslinux/syslinux.cfg' - 'boot/syslinux/splash.png') - # Install the default configuration - install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg - # Install Parabola splash - install -D -m644 "$srcdir"/splash.png "$pkgdir"/boot/syslinux/splash.png - - - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} -} diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png Binary files differindex 43d4692ab..f94067681 100644 --- a/libre/syslinux/splash.png +++ b/libre/syslinux/splash.png diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch index 2b86ab828..54151ab87 100644 --- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile @@ -54,7 +54,7 @@ # files that depend only on the B phase, but may have to be regenerated # for "make installer". - BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ -- diag libinstaller dos win32 win64 dosutil -+ libinstaller + BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil txt ++ libinstaller txt ITARGET = IOBJECTS = $(ITARGET) \ utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index cd1baa572..6d52f7703 100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update @@ -28,10 +28,10 @@ shopt -s nullglob libpath="/usr/lib/syslinux" bootpath="/boot/syslinux" -extlinux="/usr/sbin/extlinux" +extlinux="/usr/bin/extlinux" +core_modules=(ldlinux.c32) autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) pciids_file=/usr/share/hwdata/pci.ids ## Helper functions ## @@ -294,9 +294,10 @@ install_mbr() { } _install() { - # Copy files to /boot - for file in "${com32_files[@]}"; do - # Symlink files even if links exist + # Copy all com32 files to /boot + for file in "${libpath}"/*.c32; do + file=${file##*/} + # Symlink files if /boot resides on the same partition as root if [[ "$boot" = root ]]; then ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null elif [[ "$boot" = boot ]]; then @@ -304,8 +305,8 @@ _install() { fi done - # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS - if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + # Copy / Symlink pci.ids if pci.ids exists on the FS + if [[ -f $pciids_file ]]; then if [[ "$boot" = root ]]; then ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null elif [[ "$boot" = boot ]]; then @@ -331,10 +332,10 @@ _install() { } update() { - # Update any com and c32 files in /boot + # Update c32 files in /boot, if /boot is not on same fs if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.{c32,com}; do - file=$(basename "$file") + for file in "$bootpath"/*.{c32}; do + file=${file##*/} cp "$libpath/$file" "$bootpath/$file" &> /dev/null done if [[ -f "$bootpath/pci.ids" ]]; then @@ -342,6 +343,17 @@ update() { fi fi + # Ensure core modules exist and if not install them + for file in "${core_modules[@]}"; do + if [[ ! -f $bootpath/$file ]]; then + if [[ "$boot" = root ]]; then + ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$libpath/$file" "$bootpath/$file" + fi + fi + done + if device_is_raid $bootpart; then echo "Detected RAID on /boot - installing Syslinux with --raid" "$extlinux" --update "$bootpath" -r &> /dev/null diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index 5debfef9c..e4f8d8e28 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -7,7 +7,6 @@ # * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders # * hdt.c32 - hardware detection tool # * reboot.c32 - reboots the system -# * poweroff.com - shutdown the system # # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. # If /usr and /boot are on the same file system, symlink the files instead @@ -50,30 +49,26 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std #-* LABEL parabola - MENU LABEL Parabola GNU/Linux-libre - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro - INITRD ../initramfs-linux-libre.img + MENU LABEL Parabola GNU/Linux-libre + LINUX ../vmlinuz-linux-libre + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux-libre.img LABEL parabolafallback - MENU LABEL Parabola GNU/Linux-libre Fallback - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro - INITRD ../initramfs-linux-libre-fallback.img + MENU LABEL Parabola GNU/Linux-libre Fallback + LINUX ../vmlinuz-linux-libre + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) -#LABEL memtest -# MENU LABEL Memtest86+ -# LINUX ../memtest86+/memtest.bin +# LABEL memtest +# MENU LABEL Memtest86+ +# LINUX ../memtest86+/memtest.bin LABEL hdt MENU LABEL HDT (Hardware Detection Tool) COM32 hdt.c32 - + LABEL reboot MENU LABEL Reboot COM32 reboot.c32 - -LABEL off - MENU LABEL Power Off - COMBOOT poweroff.com diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install index 0dc0ece36..19caa1026 100644 --- a/libre/syslinux/syslinux.install +++ b/libre/syslinux/syslinux.install @@ -1,13 +1,26 @@ post_install() { echo "==> If you want to use syslinux as your bootloader" echo "==> edit /boot/syslinux/syslinux.cfg and run" - echo "==> # /usr/sbin/syslinux-install_update -i -a -m" + echo "==> # /usr/bin/syslinux-install_update -i -a -m" echo "==> to install it." } post_upgrade() { # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists - /usr/sbin/syslinux-install_update -s + /usr/bin/syslinux-install_update -s + # update to 5.01 message + if [ "$(vercmp $2 5.01)" -lt 0 ]; then + echo "If you used syslinux-install_update to install syslinux:" + echo "==> If you want to use syslinux with menu and all modules please rerun" + echo "==> # /usr/bin/syslinux-install_update -i -a -m" + echo "" + echo "If you manually installed syslinux:" + echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory." + echo "==> If (/ and /boot on seperate fs):" + echo "==> # cp /usr/lib/syslinux/*.c32 /boot/syslinux" + echo "==> If (/ and /boot on same fs):" + echo "==> # ln -s /usr/lib/syslinux/*.c32 /boot/syslinux" + fi } # vim:set ts=2 sw=2 et: diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index e6c202136..442dc9d15 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183993 2013-04-30 14:22:00Z foutrelis $ +# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=11 +pkgrel=12 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index a3d48d0f3..4dd77dda3 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90191 2013-05-08 10:50:10Z tpowa $ +# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=21 +pkgrel=22 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index 6aa9ae4fb..8fe6b165c 100755 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -4,15 +4,15 @@ pkgname=unar pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') url="http://unarchiver.c3.cx/" license=('LGPL2.1') -depends=('gnustep-base' 'openssl' 'bzip2' 'icu=51.1' 'gcc-libs' 'zlib') +depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') makedepends=('gcc-objc') replaces=("unarchiver") -conflicts=("unarchiver") +conflicts=("unarchiver" 'icu<51') provides=("unarchiver") source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip" "native_obj_exceptions.patch") diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD index 7d594cdcd..9225de264 100644 --- a/libre/usermin/PKGBUILD +++ b/libre/usermin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 185710 2013-05-17 13:08:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=usermin -pkgver=1.540 -pkgrel=1.1 +pkgver=1.550 +pkgrel=1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:usermin') @@ -44,7 +44,6 @@ backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/co ) install=usermin.install source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz - usermin.rc usermin.service ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) @@ -119,16 +118,12 @@ package() { #install systemd service file install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service - - #install rc file - install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin # delete temp dir rm -r "$pkgdir"/tmp #install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE } -md5sums=('d29c9fdebab14c168c33bde8906efe21' - 'cfef4490cd1ef9517c0b39a7bd75c968' +md5sums=('ba764af4b40a7e11be69985e19a81562' 'a5bd5e5ee779f8a3cf3d776ca77ee36e' 'ec37a79f948f778224550930d2a7ca07') diff --git a/libre/usermin/usermin.rc b/libre/usermin/usermin.rc deleted file mode 100644 index af365780a..000000000 --- a/libre/usermin/usermin.rc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -start=/etc/usermin/start -stop=/etc/usermin/stop -lockfile=/var/lock/usermin - -case "$1" in -'start') - stat_busy "Starting Usermin daemon" - $start >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - touch $lockfile >/dev/null 2>&1 - stat_done - else - stat_fail -fi -;; - -'stop') - stat_busy "Stopping Usermin daemon" - $stop >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - rm -f $lockfile - stat_done - else - stat_fail -fi -;; - -'restart') - $stop && $start - RETVAL=$? -;; -*) -echo "Usage: $0 { start | stop | restart }" -RETVAL=1 -;; -esac -exit $RETVAL
\ No newline at end of file diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 95f94c9b4..b1f8c6ffb 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90193 2013-05-08 10:51:01Z tpowa $ +# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.9-LIBRE -pkgrel=24 +pkgrel=25 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 9077a0ac4..a6c22c177 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90212 2013-05-09 00:26:24Z seblu $ +# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.12 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index 82bda9855..9a98c5752 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index 6c1a57d3a..f0ca024ed 100755 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,4 +1,4 @@ -VERSION='' +VERSION='3.9.4-1-LIBRE' post_install() { cat << EOF diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 4cf483641..b7b1988f9 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89632 2013-04-30 16:22:22Z foutrelis $ +# $Id: PKGBUILD 90797 2013-05-14 00:31:45Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -14,7 +14,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.12 -pkgrel=2.1 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '7c5eca076af3d0601f5321f99b815b9c' + '17fca4ba3a751c8a1db19b92b1820462' '50387fba578646a9d29de3f917a199d2') prepare() { @@ -318,8 +318,7 @@ package_virtualbox-libre-guest-utils(){ source "VirtualBox-$pkgver/env.sh" pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" install -d "$pkgdir"/{usr/bin,sbin} - install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" - install -m755 mount.vboxsf "$pkgdir/sbin" + install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin" install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index c3e2e4ad4..75a5ed22f 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ --- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300 -+++ VirtualBox-4.2.12/Config.kmk 2013-05-10 15:03:20.817944799 -0300 ++++ VirtualBox-4.2.12/Config.kmk 2013-05-23 18:48:57.560690206 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -1001,341 +1001,9 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS # ---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-04-12 07:37:59.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-05-10 16:26:44.137679260 -0300 -@@ -1829,166 +1829,12 @@ - "available on this virtual machine, and shared folders " - "cannot be used without them. To use shared folders inside " - "the virtual machine, please install the Guest Additions " -- "if they are not installed, or re-install them if they are " -- "not working correctly, by selecting <b>Install Guest Additions</b> " -- "from the <b>Devices</b> menu. " -+ "if they are not installed." - "If they are installed but the machine is not yet fully started " - "then shared folders will be available once it is.</p>"), - "remindAboutGuestAdditionsAreNotActive"); - } - --bool UIMessageCenter::cannotFindGuestAdditions() --{ -- return messageYesNo(mainMachineWindowShown(), Question, -- tr("<p>Could not find the VirtualBox Guest Additions " -- "CD image file.</nobr></p><p>Do you wish to " -- "download this CD image from the Internet?</p>")); --} -- --void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) --{ -- message(mainMachineWindowShown(), Error, -- tr("<p>Could not insert the VirtualBox Guest Additions " -- "installer CD image into the virtual machine <b>%1</b>, as the machine " -- "has no CD/DVD-ROM drives. Please add a drive using the " -- "storage page of the virtual machine settings dialog.</p>") -- .arg(strMachineName)); --} -- --bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, qulonglong uSize) --{ -- QLocale loc(VBoxGlobal::languageId()); -- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, -- tr("<p>Are you sure you want to download the VirtualBox " -- "Guest Additions CD image from " -- "<nobr><a href=\"%1\">%2</a></nobr> " -- "(size %3 bytes)?</p>").arg(strUrl).arg(strUrl).arg(loc.toString(uSize)), -- 0, /* pcszAutoConfirmId */ -- tr("Download", "additions")); --} -- --bool UIMessageCenter::confirmMountAdditions(const QString &strUrl, const QString &strSrc) --{ -- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, -- tr("<p>The VirtualBox Guest Additions CD image has been " -- "successfully downloaded from " -- "<nobr><a href=\"%1\">%2</a></nobr> " -- "and saved locally as <nobr><b>%3</b>.</nobr></p>" -- "<p>Do you wish to register this CD image and mount it " -- "on the virtual CD/DVD drive?</p>") -- .arg(strUrl).arg(strUrl).arg(strSrc), -- 0, /* pcszAutoConfirmId */ -- tr("Mount", "additions")); --} -- --void UIMessageCenter::warnAboutAdditionsCantBeSaved(const QString &strTarget) --{ -- message(networkManagerOrMainMachineWindowShown(), Error, -- tr("<p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p>") -- .arg(QDir::toNativeSeparators(strTarget))); --} -- --bool UIMessageCenter::askAboutUserManualDownload(const QString &strMissedLocation) --{ -- return messageOkCancel(mainWindowShown(), Question, -- tr("<p>Could not find the VirtualBox User Manual " -- "<nobr><b>%1</b>.</nobr></p><p>Do you wish to " -- "download this file from the Internet?</p>") -- .arg(strMissedLocation), -- 0, /* Auto-confirm Id */ -- tr("Download", "additions")); --} -- --bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, qulonglong uSize) --{ -- QLocale loc(VBoxGlobal::languageId()); -- return messageOkCancel(networkManagerOrMainWindowShown(), Question, -- tr("<p>Are you sure you want to download the VirtualBox " -- "User Manual from " -- "<nobr><a href=\"%1\">%2</a></nobr> " -- "(size %3 bytes)?</p>").arg(strURL).arg(strURL).arg(loc.toString(uSize)), -- 0, /* Auto-confirm Id */ -- tr("Download", "additions")); --} -- --void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) --{ -- message(networkManagerOrMainWindowShown(), Warning, -- tr("<p>The VirtualBox User Manual has been " -- "successfully downloaded from " -- "<nobr><a href=\"%1\">%2</a></nobr> " -- "and saved locally as <nobr><b>%3</b>.</nobr></p>") -- .arg(strURL).arg(strURL).arg(strTarget)); --} -- --void UIMessageCenter::warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget) --{ -- message(networkManagerOrMainWindowShown(), Error, -- tr("<p>The VirtualBox User Manual has been " -- "successfully downloaded from " -- "<nobr><a href=\"%1\">%2</a></nobr> " -- "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>" -- "<p>Please choose another location for that file.</p>") -- .arg(strURL).arg(strURL).arg(strTarget)); --} -- --bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) --{ -- return messageOkCancel(mainWindowShown(), -- Question, -- tr("<p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p>" -- "<p>Do you wish to download latest one from the Internet?</p>") -- .arg(strExtPackVersion).arg(strExtPackName), -- 0, /* Auto-confirm Id */ -- tr("Download", "extension pack")); --} -- --bool UIMessageCenter::requestUserDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) --{ -- return message(mainWindowShown(), Info, -- tr("<p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p>" -- "<p>You should download and install version %3 of this extension pack from Oracle!</p>") -- .arg(strExtPackVersion).arg(strExtPackName).arg(strVBoxVersion), -- 0, /* Auto-confirm Id */ -- QIMessageBox::Ok | QIMessageBox::Default, -- 0, -- 0, -- tr("Ok", "extension pack")); --} -- --bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) --{ -- QLocale loc(VBoxGlobal::languageId()); -- return messageOkCancel(networkManagerOrMainWindowShown(), Question, -- tr("<p>Are you sure you want to download the <b><nobr>%1</nobr></b> " -- "from <nobr><a href=\"%2\">%2</a></nobr> (size %3 bytes)?</p>") -- .arg(strExtPackName, strURL, loc.toString(uSize)), -- 0, /* Auto-confirm Id */ -- tr("Download", "extension pack")); --} -- --bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) --{ -- return messageOkCancel(networkManagerOrMainWindowShown(), Question, -- tr("<p>The <b><nobr>%1</nobr></b> has been " -- "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " -- "and saved locally as <nobr><b>%3</b>.</nobr></p>" -- "<p>Do you wish to install this extension pack?</p>") -- .arg(strExtPackName, strFrom, strTo), -- 0, /* Auto-confirm Id */ -- tr ("Install", "extension pack")); --} -- --void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo) --{ -- message(networkManagerOrMainWindowShown(), Error, -- tr("<p>The <b><nobr>%1</nobr></b> has been " -- "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " -- "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>" -- "<p>Please choose another location for that file.</p>") -- .arg(strExtPackName, strFrom, strTo)); --} -- - void UIMessageCenter::cannotConnectRegister(QWidget *pParent, - const QString &strUrl, - const QString &strReason) -@@ -2572,162 +2418,6 @@ - formatErrorInfo(progress.GetErrorInfo())); - } - --void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress, -- QWidget *pParent /* = NULL */) const --{ -- AssertWrapperOk(progress); -- -- message(pParent ? pParent : mainWindowShown(), -- Error, -- tr("Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation."), -- formatErrorInfo(progress.GetErrorInfo())); --} -- --void UIMessageCenter::cannotOpenExtPack(const QString &strFilename, -- const CExtPackManager &extPackManager, -- QWidget *pParent) --{ -- message(pParent ? pParent : mainWindowShown(), -- Error, -- tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename), -- formatErrorInfo(extPackManager)); --} -- --void UIMessageCenter::badExtPackFile(const QString &strFilename, -- const CExtPackFile &extPackFile, -- QWidget *pParent) --{ -- message(pParent ? pParent : mainWindowShown(), -- Error, -- tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename), -- "<!--EOM-->" + extPackFile.GetWhyUnusable()); --} -- --void UIMessageCenter::cannotInstallExtPack(const QString &strFilename, -- const CExtPackFile &extPackFile, -- const CProgress &progress, -- QWidget *pParent) --{ -- if (!pParent) -- pParent = mainWindowShown(); -- QString strErrInfo = !extPackFile.isOk() || progress.isNull() -- ? formatErrorInfo(extPackFile) : formatErrorInfo(progress.GetErrorInfo()); -- message(pParent, -- Error, -- tr("Failed to install the Extension Pack <b>%1</b>.").arg(strFilename), -- strErrInfo); --} -- --void UIMessageCenter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, -- const CProgress &progress, QWidget *pParent) --{ -- if (!pParent) -- pParent = mainWindowShown(); -- QString strErrInfo = !extPackManager.isOk() || progress.isNull() -- ? formatErrorInfo(extPackManager) : formatErrorInfo(progress.GetErrorInfo()); -- message(pParent, -- Error, -- tr("Failed to uninstall the Extension Pack <b>%1</b>.").arg(strPackName), -- strErrInfo); --} -- --bool UIMessageCenter::confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, -- const QString &strPackDescription, QWidget *pParent) --{ -- return messageOkCancel(pParent ? pParent : mainWindowShown(), -- Question, -- tr("<p>You are about to install a VirtualBox extension pack. " -- "Extension packs complement the functionality of VirtualBox and can contain system level software " -- "that could be potentially harmful to your system. Please review the description below and only proceed " -- "if you have obtained the extension pack from a trusted source.</p>" -- "<p><table cellpadding=0 cellspacing=0>" -- "<tr><td><b>Name: </b></td><td>%1</td></tr>" -- "<tr><td><b>Version: </b></td><td>%2</td></tr>" -- "<tr><td><b>Description: </b></td><td>%3</td></tr>" -- "</table></p>") -- .arg(strPackName).arg(strPackVersion).arg(strPackDescription), -- 0, -- tr("&Install")); --} -- --bool UIMessageCenter::confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew, -- const QString &strPackVersionOld, const QString &strPackDescription, -- QWidget *pParent) --{ -- if (!pParent) -- pParent = pParent ? pParent : mainWindowShown(); /* this is boring stuff that messageOkCancel should do! */ -- -- QString strBelehrung = tr("Extension packs complement the functionality of VirtualBox and can contain " -- "system level software that could be potentially harmful to your system. " -- "Please review the description below and only proceed if you have obtained " -- "the extension pack from a trusted source."); -- -- QByteArray ba1 = strPackVersionNew.toUtf8(); -- QByteArray ba2 = strPackVersionOld.toUtf8(); -- int iVerCmp = RTStrVersionCompare(ba1.constData(), ba2.constData()); -- -- bool fRc; -- if (iVerCmp > 0) -- fRc = messageOkCancel(pParent, -- Question, -- tr("<p>An older version of the extension pack is already installed, would you like to upgrade? " -- "<p>%1</p>" -- "<p><table cellpadding=0 cellspacing=0>" -- "<tr><td><b>Name: </b></td><td>%2</td></tr>" -- "<tr><td><b>New Version: </b></td><td>%3</td></tr>" -- "<tr><td><b>Current Version: </b></td><td>%4</td></tr>" -- "<tr><td><b>Description: </b></td><td>%5</td></tr>" -- "</table></p>") -- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), -- 0, -- tr("&Upgrade")); -- else if (iVerCmp < 0) -- fRc = messageOkCancel(pParent, -- Question, -- tr("<p>An newer version of the extension pack is already installed, would you like to downgrade? " -- "<p>%1</p>" -- "<p><table cellpadding=0 cellspacing=0>" -- "<tr><td><b>Name: </b></td><td>%2</td></tr>" -- "<tr><td><b>New Version: </b></td><td>%3</td></tr>" -- "<tr><td><b>Current Version: </b></td><td>%4</td></tr>" -- "<tr><td><b>Description: </b></td><td>%5</td></tr>" -- "</table></p>") -- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), -- 0, -- tr("&Downgrade")); -- else -- fRc = messageOkCancel(pParent, -- Question, -- tr("<p>The extension pack is already installed with the same version, would you like reinstall it? " -- "<p>%1</p>" -- "<p><table cellpadding=0 cellspacing=0>" -- "<tr><td><b>Name: </b></td><td>%2</td></tr>" -- "<tr><td><b>Version: </b></td><td>%3</td></tr>" -- "<tr><td><b>Description: </b></td><td>%4</td></tr>" -- "</table></p>") -- .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription), -- 0, -- tr("&Reinstall")); -- return fRc; --} -- --bool UIMessageCenter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent) --{ -- return messageOkCancel(pParent ? pParent : mainWindowShown(), -- Question, -- tr("<p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p>" -- "<p>Are you sure you want to proceed?</p>").arg(strPackName), -- 0, -- tr("&Remove")); --} -- --void UIMessageCenter::notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent) --{ -- message(pParent ? pParent : mainWindowShown(), -- Info, -- tr("The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.").arg(strPackName)); --} -- - void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent) const - { - message(pParent, Error, +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp --- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 17:03:11.087825690 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-23 18:59:56.434051894 -0300 @@ -650,27 +650,6 @@ } }; @@ -1372,3 +1040,46 @@ #ifdef VBOX_WITH_DEBUGGER_GUI /* 'Debug' actions: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-05-24 11:26:13.789861574 -0300 +@@ -62,7 +62,6 @@ + UIActionIndexRuntime_Menu_SharedFolders, + UIActionIndexRuntime_Simple_SharedFoldersDialog, + UIActionIndexRuntime_Toggle_VRDEServer, +- UIActionIndexRuntime_Simple_InstallGuestTools, + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* 'Debugger' menu actions: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-05-24 11:27:14.723176263 -0300 +@@ -651,7 +651,6 @@ + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)); + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); +- m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); + } + + void UIMachineLogic::prepareActionConnections() +@@ -705,8 +704,6 @@ + this, SLOT(sltOpenSharedFoldersDialog())); + connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)), + this, SLOT(sltSwitchVrde(bool))); +- connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()), +- this, SLOT(sltInstallGuestAdditions())); + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* "Debug" actions connections: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-05-24 11:28:03.193841501 -0300 +@@ -244,8 +244,6 @@ + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog)); + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); +- pMenu->addSeparator(); +- pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); + } + + #ifdef VBOX_WITH_DEBUGGER_GUI diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 094f14b34..6fae3ff41 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 185708 2013-05-17 13:04:19Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.620 -pkgrel=1.1 -pkgdesc="a web-based interface for system administration, Parabola rebranded" +pkgver=1.630 +pkgrel=1 +pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:webmin') url="http://www.webmin.com/" @@ -86,7 +86,6 @@ install=webmin.install source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 - webmin.rc webmin.service) options=(!strip) @@ -201,9 +200,6 @@ package() { cd "$srcdir"/webmin-pacman/config cp -rfp * "$pkgdir"/etc/webmin/pacman - #install rc file - install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin - # install systemd files install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service @@ -214,8 +210,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('e93bc5057a5b7d7e31ecb2bb228d7044' +md5sums=('c52551ed405fcb67ea9d383ac6a32658' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'bfebb75bb94029b48c46b7f1ba1aa811' - 'c77dfcd621b417a7826d25f56a1e60ae' - 'fc29ecb6a5cd8c278abe054e60381095') + '458ef48fc471b70d38883753ec7211de') diff --git a/libre/webmin/webmin.rc b/libre/webmin/webmin.rc deleted file mode 100644 index 6aac8941d..000000000 --- a/libre/webmin/webmin.rc +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -start=/etc/webmin/start -stop=/etc/webmin/stop -lockfile=/var/lock/webmin - -case "$1" in -'start') - stat_busy "Starting Webmin daemon" - $start >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - touch $lockfile >/dev/null 2>&1 - add_daemon webmin - stat_done - else - stat_fail -fi -;; - -'stop') - stat_busy "Stopping Webmin daemon" - $stop >/dev/null 2>&1 </dev/null - RETVAL=$? - if [ "$RETVAL" = "0" ]; then - rm -f $lockfile - rm_daemon webmin - stat_done - else - stat_fail -fi -;; - -'restart') - $0 stop - $0 start -;; -*) -echo "Usage: $0 { start | stop | restart }" -RETVAL=1 -;; -esac -exit $RETVAL
\ No newline at end of file diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index e7805a9b4..cc50fb44c 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176357 2013-01-30 21:29:22Z eric $ +# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=12 -pkgdesc="A GTK+ based IRC client without non-free browser reference" +pkgrel=13 +pkgdesc="A GTK+ based IRC client, without nonfree browser reference" arch=('i686' 'x86_64' 'mips64el') url="http://www.xchat.org/" provides=("xchat=$pkgver") @@ -35,14 +35,18 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' 'e6a3b69ba333fc7ba0f70792d78d44fba7c4a911' '20aef0ae608af6b30e1b4249f9c53830f8f514f6') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" +prepare() { + cd ${_pkgname}-${pkgver} sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" patch -p1 -i "${srcdir}/no-firefox.patch" +} + +build() { + cd ${_pkgname}-${pkgver} autoconf autoheader @@ -52,7 +56,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd ${_pkgname}-${pkgver} make DESTDIR="${pkgdir}" install for i in 24 32 48 64 128 256 ; do diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 487adf4bc..96c0f3537 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,35 +1,37 @@ -# $Id$ +# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.15 -pkgrel=3.1 -pkgdesc="Screen saver and locker for the X Window System (without non-free asm files)" +pkgver=5.21 +pkgrel=1 +pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' \ +depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \ 'perl-libwww' 'perl-http-message') -makedepends=('bc' 'libxpm' 'gdm') +makedepends=('bc' 'libxpm' 'gdm' 'mesa') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ - add-electricsheep.diff xscreensaver.pam LICENSE libre.patch) -sha1sums=('b5ce7caa19f4d57c3bac83377a36dddbe7095052' + add-electricsheep.diff xscreensaver.pam LICENSE) +sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077' '677496218b81a42d90bee400026e94dd87fb8ffb' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - '4209ea586b204fd1d81c382a0522c654f9fd9134' - '327b839eb5d069827c1f25ef19fc8d4e83de7ab2') + '4209ea586b204fd1d81c382a0522c654f9fd9134') build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -p0 -i "${srcdir}/add-electricsheep.diff" - patch -Np1 -i "${srcdir}/libre.patch" # deleting dmsc.asm file due that doesn't has source code supplied + + # Deleting dmsc.asm file due that don't have source code supplied + rm -v hacks/images/m6502/dmsc.asm + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ diff --git a/libre/xscreensaver-libre/libre.patch b/libre/xscreensaver-libre/libre.patch deleted file mode 100644 index 569f8435c..000000000 --- a/libre/xscreensaver-libre/libre.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -Naur xscreensaver-5.15/hacks/images/m6502/dmsc.asm /dev/null ---- xscreensaver-5.15/hacks/images/m6502/dmsc.asm 2008-03-02 03:34:37.000000000 -0200 -+++ /dev/null 2012-06-14 14:00:43.782877377 -0300 -@@ -1,108 +0,0 @@ --; By DMSC - daniel.serpell@gmail.com --; --; This demo was programmed in ACME: --; http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/acme/ --; --; If you want the source code, send me an email :-) --; -- -- dcb 76, 94, 11,133, 32,162, 8,160, 8,145, 16,136,208,251,165, 16 -- dcb 24,105, 32,133, 16,165, 17,105, 0,133, 17,165, 32,202,208,231 -- dcb 96,230, 48,165, 48, 41, 63,133, 48,170,189,106, 6,170,189, 8 -- dcb 3,105, 1, 41, 3,157, 8, 3,138, 73,231,170,189, 0, 2,105 -- dcb 1, 41, 3,157, 0, 2,165, 48, 73, 63,170,189,106, 6, 73,224 -- dcb 170,189, 8, 2,105, 1, 41, 3,157, 8, 2,138, 73,231,170,189 -- dcb 0, 3,105, 1, 41, 3,157, 0, 3, 96,224,192,160,128, 96,225 -- dcb 64,193,161,226,129, 32,194, 97,162,227,195,130,228, 65,163,196 -- dcb 98,229,131,164,197,230,231,132,165,198, 99, 66, 33, 0,199,166 -- dcb 133,100,167, 67,134,101,135, 34, 68,102,103, 69, 35, 70, 71, 36 -- dcb 1, 37, 38, 39, 2, 3, 4, 5, 6, 7,166, 48,189,198, 6,170 -- dcb 254, 24, 3, 73, 7,170,254, 16, 3, 73,231,170,254, 24, 2, 73 -- dcb 7,170,254, 16, 2, 96, 0, 32, 1, 33, 64, 2, 65, 34, 96, 66 -- dcb 3, 97, 35, 98, 67,128, 4,129, 36, 99,130, 68,160, 5,161,131 -- dcb 100, 37,162, 69,132,192,163,101, 6,193, 38,194, 70,164,133,195 -- dcb 102,224, 7,225, 39,165,226,196,134, 71,227,103,197,166,228,135 -- dcb 198,229,167,230,199,231,166, 49,189, 21, 7,170,189, 0,160,157 -- dcb 0, 5,230, 49, 96,195,227,194,162,228, 97,226,128,129,130,225 -- dcb 64,161,163,224, 96,160,193,196, 32, 98,192, 65, 0,131,229,164 -- dcb 33, 99,197, 66,132, 1,230, 34,165, 67,100,198, 2, 3, 68, 6 -- dcb 35,133,166, 5,101, 4,199, 7, 36,231, 69,134,167, 37, 38,102 -- dcb 135, 70,232, 71, 39,103,136,200,168, 8, 11, 10,169,233,104, 9 -- dcb 12,137,201, 13, 40, 44, 72, 43,170, 42, 45, 41,105, 73,202, 14 -- dcb 138,234, 74, 75,106,203, 76,171, 46, 77,235,107,139, 15,108,172 -- dcb 174,140,173,141,142,204,109,206,207,205, 78,175, 47,236,239,143 -- dcb 237,238,110,240,241,111,208, 16, 79,176,209,242, 48,144,243, 80 -- dcb 177,244,112,210, 17, 49,178,179, 52, 53,147, 18, 81,211,145, 19 -- dcb 146, 51, 85,180, 20, 54,113,148, 22, 50, 84,212, 21, 55,115,245 -- dcb 83,114,116, 23, 82, 86, 88, 89, 87,118,117,119,149,213, 56, 57 -- dcb 181,214, 90,121,122,150,151,182,183,215,246, 58,120,247, 24,153 -- dcb 184,152,216, 25, 26, 59, 91,248,123,185, 27, 60,217,154, 28, 92 -- dcb 249, 29,155,186, 61,218, 93,124,250,187, 30,251, 62,156, 94,125 -- dcb 219,188, 31,252,254,220,253, 63,126,255,157,221, 95,159,191,222 -- dcb 127,189,223,158,190,165, 66, 41,224,208, 72,165, 66, 24,105, 1 -- dcb 41, 31,133, 66,165, 67,240, 7,198, 67,169, 0, 76, 97, 8,198 -- dcb 69,240,247, 16, 37,166, 64,230, 64,189,177, 9, 16, 15, 41,127 -- dcb 133, 67, 73,127,208,228,169, 1,133, 70, 76, 42, 8,170,189,117 -- dcb 8,133, 69,234,234,189,181, 8,133, 65,166, 65,230, 65,189,245 -- dcb 8,133, 68,165, 66, 24,105,224,133, 66,166, 66,169, 1,102, 68 -- dcb 42,157, 0,160, 96, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2 -- dcb 3, 2, 3, 3, 3, 3, 3, 1, 2, 3, 1, 5, 3, 3, 3, 3 -- dcb 3, 2, 2, 3, 3, 5, 4, 3, 3, 5, 4, 4, 4, 3, 3, 4 -- dcb 4, 1, 3, 4, 3, 5, 5, 5, 4, 5, 4, 4, 3, 4, 4, 7 -- dcb 4, 4, 4, 2, 1, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30 -- dcb 32, 35, 35, 38, 40, 43, 46, 49, 50, 52, 4, 55, 55, 60, 63, 65 -- dcb 68, 71, 73, 75, 78, 78, 33, 83, 86, 89, 94, 98,102,106,109,112 -- dcb 116, 94,120,123,127,130,134,139,144,148,153,157,161,164,167,171 -- dcb 178,171,182,186, 5, 56, 68, 56, 36,124, 4, 76, 84, 36, 68, 84 -- dcb 40, 24, 40,124,100, 84, 88, 56, 84, 72, 76, 80, 96, 40, 84, 40 -- dcb 36, 84, 56, 44, 28,124, 36, 24, 24, 36,124, 24, 52, 16, 60, 80 -- dcb 24, 37, 30,124, 32, 28,188, 1,190,124, 24, 36, 60, 32, 28, 32 -- dcb 28, 24, 36, 24, 63, 36, 24, 36, 63, 60, 16, 32, 52, 44,120, 36 -- dcb 56, 4, 60, 56, 4, 56, 4, 56, 57, 6, 56, 44, 52, 36, 12, 48 -- dcb 208, 48, 12,252,164,164, 88,120,132,132, 72,252,132,132,120,252 -- dcb 164,132,252,160,128,120,132,164, 56,252, 32, 32,252, 8, 4,248 -- dcb 252, 48, 80,140,252, 4, 4,252, 64, 60, 64,252, 64, 48, 8,252 -- dcb 120,132,132,132,120,252,144,144, 96,120,132,134,133,120,252,144 -- dcb 144,108, 68,164,164,152,128,252,128,248, 4, 4,248, 4, 8,240 -- dcb 224, 28, 16,224, 28, 16,224,204, 48, 48,204,140,148,164,196, 0 -- dcb 0,133, 41, 10, 28, 29, 63, 63, 63,136, 15, 10, 28, 29, 14, 27 -- dcb 63, 63, 63,132, 55, 17, 18, 28, 62, 18, 28, 62, 10,136, 27, 14 -- dcb 10, 21, 21, 34,143, 15, 10, 28, 29,142, 39, 40, 48, 50,149,145 -- dcb 10, 23, 13, 62, 23, 24, 32,136, 28, 24, 22, 14,136, 11, 14, 10 -- dcb 30, 29, 18, 15, 30, 21,128, 14, 15, 15, 14, 12, 29, 28, 63, 63 -- dcb 63,144,159,255, 55, 17, 18, 28, 62, 18, 28, 62, 10, 21, 21,129 -- dcb 15, 24, 27, 62, 23, 24, 32,136, 11, 34, 14, 63, 63, 63,141, 63 -- dcb 63, 63, 11, 34, 14,150,159,143, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9, 11, 34, 62, 39, 48, 54, 38, 2 -- dcb 0, 0, 7, 63, 5, 63, 2, 9,143,159,255,169, 0,133, 42,169 -- dcb 1,133, 44,133, 45,169, 0,133, 32,169,160,133, 33,165, 42,133 -- dcb 43,162, 15,160, 15,145, 32, 24,101, 44,230, 44,136, 16,246,165 -- dcb 32, 24,105, 32,133, 32,165, 33,105, 0,133, 33,169, 1,133, 44 -- dcb 165, 43, 24,101, 45,133, 43,230, 45,202, 16,215,169, 0,133, 32 -- dcb 169,160,133, 33,169,224,133, 34,169, 3,133, 35,169, 0,133, 36 -- dcb 169, 4,133, 37,169,240,133, 38,169, 3,133, 39,169, 16,133, 40 -- dcb 169, 4,133, 41,169, 15,133, 46,160, 15,177, 32, 74, 74, 74, 74 -- dcb 170,189, 62, 11,209, 34,240, 18,145, 34,145, 36,170,152, 73, 15 -- dcb 168,138,145, 38,145, 40,152, 73, 15,168,136, 16,221,165, 32, 24 -- dcb 105, 32,133, 32,165, 33,105, 0,133, 33,165, 34, 24,105,224,133 -- dcb 34,165, 35,105,255,133, 35,165, 36, 24,105, 32,133, 36,165, 37 -- dcb 105, 0,133, 37,165, 38, 24,105,224,133, 38,165, 39,105,255,133 -- dcb 39,165, 40, 24,105, 32,133, 40,165, 41,105, 0,133, 41,198, 46 -- dcb 16,150,230, 42,165, 42, 41, 63,240, 3, 76, 95, 10, 96, 0, 11 -- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11, 0, 11 -- dcb 12, 15, 1, 15, 12, 11, 0, 11, 12, 15, 1, 15, 12, 11,169, 1 -- dcb 162,255,134, 16,162, 1,134, 17, 32, 3, 6,169, 2,162, 7,134 -- dcb 16,162, 2,134, 17, 32, 3, 6,169, 3,162, 7,134, 16,162, 3 -- dcb 134, 17, 32, 3, 6,169, 31,133, 66,169, 0,133, 70,133, 67,133 -- dcb 64,169, 1,141,109, 8,169, 0,141,114, 8,169,160,141,115, 8 -- dcb 169, 63,133, 48,169,128,133, 49,169, 3,141,109, 8,169, 0,170 -- dcb 157, 0,160,232,208,250, 32, 33, 6, 32,170, 6, 32, 6, 7, 32 -- dcb 21, 8,165, 66, 73, 31,208, 13,173,109, 8, 24,105, 2, 41, 3 -- dcb 105, 3,141,109, 8,165, 49,208,221,173, 17, 7, 73, 1,141, 17 -- dcb 7,165, 70,240,209, 32, 29, 12, 32, 91, 10,169, 31,133, 66,169 -- dcb 0,133, 70,133, 67,141,109, 8,169, 0,141,114, 8,169, 3,141 -- dcb 115, 8, 32, 29, 12, 32, 21, 8,165, 66, 73, 31,208,247,173,115 -- dcb 8, 73, 7,141,115, 8,165, 70,240,235, 76, 94, 11,169, 0,170 -- dcb 157, 0, 2,157, 0, 3,157, 0, 4,157, 0, 5,232,208,241, 96 -- diff --git a/pcr/a2jmidid/PKGBUILD b/pcr/a2jmidid/PKGBUILD new file mode 100644 index 000000000..3391d0d9a --- /dev/null +++ b/pcr/a2jmidid/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer : Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/a2jmidid/ + +pkgname=a2jmidid +pkgver=8 +pkgrel=1 +pkgdesc="A daemon for exposing legacy ALSA sequencer applications in JACK MIDI system." +arch=('i686' 'mips64el') +url="http://home.gna.org/$pkgname/" +license=('GPL') +depends=('jack' 'python2-dbus') +source=("http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2" + "$pkgname-dso-pthread.patch") +md5sums=('9cf4edbc3ad2ddeeaf6c8c1791ff3ddd' + '4b15e485301aee48371844cb01689ad2') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # DSO link patch + patch -p1 -i ../$pkgname-dso-pthread.patch + + python2 waf configure --prefix=/usr + python2 waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 waf install --destdir="$pkgdir/" + + # python2 fix + sed -i "s/python/&2/" "$pkgdir/usr/bin/a2j_control" +} diff --git a/pcr/a2jmidid/a2jmidid-dso-pthread.patch b/pcr/a2jmidid/a2jmidid-dso-pthread.patch new file mode 100644 index 000000000..028b9d432 --- /dev/null +++ b/pcr/a2jmidid/a2jmidid-dso-pthread.patch @@ -0,0 +1,20 @@ +diff -aur a2jmidid-8/wscript a2jmidid-8.patched/wscript +--- a2jmidid-8/wscript 2012-07-05 03:14:23.000000000 +0200 ++++ a2jmidid-8.patched/wscript 2012-07-10 17:48:30.710109306 +0200 +@@ -67,6 +67,7 @@ + conf.env['DBUS_ENABLED'] = False + + conf.env['LIB_DL'] = ['dl'] ++ conf.env['LIB_PTHREAD'] = ['pthread'] + + #conf.check_header('expat.h', mandatory=True) + #conf.env['LIB_EXPAT'] = ['expat'] +@@ -152,7 +153,7 @@ + + prog.includes = '.' # make waf dependency tracking work + prog.target = 'a2jmidid' +- prog.uselib = 'ALSA JACK DL' ++ prog.uselib = 'ALSA JACK DL PTHREAD' + if bld.env()['DBUS_ENABLED']: + prog.uselib += " DBUS-1" + prog = bld.create_obj('cc', 'program') diff --git a/pcr/ams/PKGBUILD b/pcr/ams/PKGBUILD new file mode 100644 index 000000000..93b810df5 --- /dev/null +++ b/pcr/ams/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer : Guest One <theguestone at gmail dot com> + +_name=alsamodular +pkgname=ams +pkgver=2.0.1 +pkgrel=1 +pkgdesc="Alsa Modular Synth is a realtime modular synthesizer and effect processor" +arch=('i686' 'mips64el') +url="http://alsamodular.sourceforge.net/" +license=('GPL') +depends=('qt4' 'clalsadrv' 'ladspa' 'jack') +makedepends=('fftw') +optdepends=('swh-plugins: Steve Harris plugins' + 'cmt: Computer Music Toolkit plugins') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/project/$_name/$_name/$pkgver/$pkgname-$pkgver.tar.bz2" + "$pkgname.desktop" "$pkgname.png") +md5sums=('0d41bd5aac066aa98be45fd7ab12d35f' + 'ffa277cffd52254f0297cbc2f200767e' + '0349171d5431f1c6e56085f080eb8c68') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # DSO link flag + export LIBS=" -ldl" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR=$pkgdir/ install + + # desktop file + install -Dm644 ../$pkgname.desktop \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + + # icon + install -Dm644 ../$pkgname.png \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" +} diff --git a/pcr/ams/ams.desktop b/pcr/ams/ams.desktop new file mode 100644 index 000000000..4761ab9fc --- /dev/null +++ b/pcr/ams/ams.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Alsa Modular Synth +Comment=Realtime modular synthesizer and effect processor +Exec=ams +Icon=ams +Terminal=false +Categories=Application;AudioVideo;AudioVideo;Qt;X-Jack;X-Sound; +StartupNotify=true
\ No newline at end of file diff --git a/extra/bmp/bmp.install b/pcr/ams/ams.install index 2eaa60550..e111ef946 100644 --- a/extra/bmp/bmp.install +++ b/pcr/ams/ams.install @@ -3,9 +3,9 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/pcr/ams/ams.png b/pcr/ams/ams.png Binary files differnew file mode 100644 index 000000000..d3a8dfe49 --- /dev/null +++ b/pcr/ams/ams.png diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD new file mode 100644 index 000000000..2c874ed61 --- /dev/null +++ b/pcr/amsynth/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer : Guest One <theguestone at gmail dot com> + +pkgname=amsynth +pkgver=1.3.2 +pkgrel=2 +pkgdesc="Analogue Modeling SYNTHesizer" +arch=('i686' 'x86_64' 'mips64el') +url="http://code.google.com/p/amsynth/" +license=('GPL') +depends=('gtkmm' 'jack' 'liblo') +makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa') +install="$pkgname.install" +source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz") +md5sums=('991329e433bb8c496f9ca5158faf0bca') + +build() { + cd "$srcdir/amSynth-$pkgver" + libtoolize + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/amSynth-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/emerald/emerald.install b/pcr/amsynth/amsynth.install index c2fa624ae..e111ef946 100644 --- a/community/emerald/emerald.install +++ b/pcr/amsynth/amsynth.install @@ -1,6 +1,4 @@ post_install() { - xdg-icon-resource forceupdate - update-mime-database usr/share/mime &> /dev/null update-desktop-database -q } diff --git a/pcr/anyremote/PKGBUILD b/pcr/anyremote/PKGBUILD index 96e030245..8bf7e00cf 100644 --- a/pcr/anyremote/PKGBUILD +++ b/pcr/anyremote/PKGBUILD @@ -7,7 +7,7 @@ pkgname=anyremote pkgver=6.0 pkgrel=1 pkgdesc="Remote control (console-oriented) through bluetooth or IR connection" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://anyremote.sourceforge.net" license=('GPL') depends=('bluez' 'dbus-glib' 'libxtst') diff --git a/pcr/azr3-jack/PKGBUILD b/pcr/azr3-jack/PKGBUILD new file mode 100644 index 000000000..024ed1b59 --- /dev/null +++ b/pcr/azr3-jack/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +pkgname=azr3-jack +pkgver=1.2.3 +pkgrel=1.5 +pkgdesc="A tonewheel organ with drawbars, distortion and rotating speakers" +arch=('i686' 'mips64el') +url="http://ll-plugins.nongnu.org/azr3/" +license=('GPL') +depends=('jack' 'gtkmm' 'lash') +source=(http://download.savannah.nongnu.org/releases-noredirect/ll-plugins/$pkgname-$pkgver.tar.bz2) +md5sums=('aa71715e5873aea724713be5970ebfbc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package(){ + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index e1e3eb0c4..20d442fd6 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Yann Lopez <arch at lonewulf dot net> # Maintainer (Parabola): fauno <fauno@parabola.nu> pkgname=babeld -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) @@ -28,5 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } -md5sums=('4ad44bca59f594a629306ac5c9b89d57' +md5sums=('406bbd940e3a9019d832d20e277266f2' 'SKIP') diff --git a/pcr/bambus/PKGBUILD b/pcr/bambus/PKGBUILD index d76ba2dc2..73cd77cd5 100755 --- a/pcr/bambus/PKGBUILD +++ b/pcr/bambus/PKGBUILD @@ -8,7 +8,7 @@ pkgver=2.4 pkgrel=1 pkgdesc="A small and simple GTK Gui to change Wallpapers using feh, Esetroot, hsetroot, habak or any other command tool." url="http://malisch-ts.de" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('gtkmm' 'eterm') # 'eterm' can be changed in any command tool to draw the wallpaper. optdepends=('eterm' 'habak' 'feh' 'hsetroot' 'others') diff --git a/pcr/bamf2/PKGBUILD b/pcr/bamf2/PKGBUILD new file mode 100644 index 000000000..9afbb3c81 --- /dev/null +++ b/pcr/bamf2/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Ivan de Jesús Pompa García <ivan.pompa@gmx.com> +# Contributors: niQo ??? + +pkgname=bamf2 +_dname=bamf +pkgver=0.2.126 +pkgrel=2 +pkgdesc="Removes the headache of applications matching into a simple DBus daemon and c wrapper library, 0.2 branch" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/bamf" +license=('GPL') +depends=('dbus-glib' 'libwnck3' 'libgtop') +makedepends=('libwnck' 'vala') +optdepends=('gtk2: GTK+ 2 library') +options=(!libtool) +source=(http://launchpad.net/${_dname}/0.2/${pkgver}/+download/${_dname}-${pkgver}.tar.gz) +md5sums=('709735137e4b028bb94f9e106bb9ac6e') + +conflicts=('bamf') +provides=('bamf') + +build() { + cd "$srcdir/${_dname}-${pkgver}" + + # Disable building tests + sed -i '/tests/ d' Makefile.in + + sed -i -e 's/--c-include/--include/' lib/libbamf/Makefile.in + export CFLAGS="$CFLAGS -Wno-deprecated-declarations -Wno-unused-local-typedefs" + + [[ -d build-gtk3 ]] || mkdir build-gtk3 + pushd build-gtk3 + ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \ + --disable-static + make + popd + + [[ -d build-gtk2 ]] || mkdir build-gtk2 + pushd build-gtk2 + ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${_dname} \ + --disable-static --with-gtk=2 + make -C lib/libbamf + popd +} + +package() { + cd "$srcdir/${_dname}-${pkgver}/build-gtk3" + make DESTDIR="${pkgdir}/" install + + cd "$srcdir/${_dname}-${pkgver}/build-gtk2" + make -C lib/libbamf DESTDIR="${pkgdir}" install +} diff --git a/pcr/barnyard2/PKGBUILD b/pcr/barnyard2/PKGBUILD index 7b52c952c..178e054bc 100644 --- a/pcr/barnyard2/PKGBUILD +++ b/pcr/barnyard2/PKGBUILD @@ -5,7 +5,7 @@ pkgname=barnyard2 pkgver=1 pkgrel=9 pkgdesc="Barnyard2 is a fork of the original barnyard project, designed specifically for Snort's new unified2 file format. Barnyard2 is under active development and continues to adapt based on user feedback." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.securixlive.com/barnyard2/index.php" license=('GPLv2') depends=('snort' 'mysql') @@ -42,3 +42,4 @@ package() { #not needed since conf is copied to /etc/ and barnyard is sent to /usr/bin rm -rf "${pkgdir}/usr/local/" } +md5sums=('fadb3bb25dd4cc4ed2fb674e06031ee9') diff --git a/pcr/bison++/PKGBUILD b/pcr/bison++/PKGBUILD index 947c41df4..485bff943 100644 --- a/pcr/bison++/PKGBUILD +++ b/pcr/bison++/PKGBUILD @@ -5,7 +5,7 @@ pkgname=bison++ pkgver=1.21.11 pkgrel=1 pkgdesc="Parser generator in C or C++ from BNF notation" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/bison++" license=('GPL') source=('http://ftp.de.debian.org/debian/pool/main/b/bison++/bison++_1.21.11.orig.tar.gz' 'http://ftp.de.debian.org/debian/pool/main/b/bison++/bison++_1.21.11-3.diff.gz') @@ -49,3 +49,5 @@ package() { } # vim:set ts=2 sw=2 et: +md5sums=('5cdeae3478207d5e1052e4616daa41cd' + 'c290793fb5ff7c35ad9b424b90b167d0') diff --git a/pcr/bristol/PKGBUILD b/pcr/bristol/PKGBUILD new file mode 100644 index 000000000..6464f6b29 --- /dev/null +++ b/pcr/bristol/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=bristol +pkgver=0.60.11 +pkgrel=1 +pkgdesc="Vintage synthesizers emulator" +arch=('i686') +url="http://bristol.sourceforge.net" +license=('GPL') +makedepends=('gcc') +depends=('jack' 'libx11') +options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('9ea4dacdac0dba3048156e2f6a5ee4d6') +sha256sums=('7d1f0bbd0d7d303fc77c6b9549b61708d7a83b4dc007818011b1f55d1fa922ba') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --disable-version-check --enable-jack-default-audio # --enable-jack-default-midi + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -v -m 0644 ChangeLog ${pkgdir}/usr/share/bristol/ + install -v -m 0644 README ${pkgdir}/usr/share/bristol/ +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/bup/PKGBUILD b/pcr/bup/PKGBUILD index d45d60961..98b7d12c7 100644 --- a/pcr/bup/PKGBUILD +++ b/pcr/bup/PKGBUILD @@ -12,7 +12,7 @@ pkgver=0.25rc1 _pkgver=0.25-rc1 pkgrel=2 pkgdesc="Backup tool using git pack files." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://github.com/apenwarr/bup" license=('GPL') depends=('python2-fuse' 'par2cmdline' 'python' 'git') @@ -33,3 +33,4 @@ package() { make DESTDIR=$pkgdir install } +md5sums=('9d9af10900d84e2951aa64631ff4860d') diff --git a/pcr/clalsadrv/PKGBUILD b/pcr/clalsadrv/PKGBUILD new file mode 100644 index 000000000..76ecedbc1 --- /dev/null +++ b/pcr/clalsadrv/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/clalsadrv/ +pkgname=clalsadrv +pkgver=2.0.0 +pkgrel=1 +pkgdesc="Audio library for aeolus, aliki, ams, jaaa and japa." +arch=('i686' 'mips64el') +url="http://kokkinizita.linuxaudio.org/linuxaudio/index.html" +license=('GPL') +depends=('alsa-lib') +install=${pkgname}.install +source=(http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.patch) +md5sums=('be123e1701e4b6c6300907df949bd71c' + 'cc5a4abbc49590dfbbf942ebfd966b70') +build() { + cd "${pkgname}-${pkgver}/libs" + patch < ${srcdir}/${pkgname}.patch + make DESTDIR=${pkgdir} PREFIX=/usr LIBDIR=lib +} + +package(){ + cd "${pkgname}-${pkgver}/libs" + make DESTDIR=${pkgdir} PREFIX=/usr LIBDIR=lib install +} diff --git a/pcr/clalsadrv/clalsadrv.install b/pcr/clalsadrv/clalsadrv.install new file mode 100644 index 000000000..21117d5a8 --- /dev/null +++ b/pcr/clalsadrv/clalsadrv.install @@ -0,0 +1,12 @@ +post_install() { +ldconfig +echo "==> ran ldconfig" +} + +post_upgrade() { +post_install +} + +post_remove() { +post_install +} diff --git a/pcr/clalsadrv/clalsadrv.patch b/pcr/clalsadrv/clalsadrv.patch new file mode 100644 index 000000000..5081f42fb --- /dev/null +++ b/pcr/clalsadrv/clalsadrv.patch @@ -0,0 +1,10 @@ +--- Makefile.orig 2010-03-15 12:58:40.862423046 +0100 ++++ Makefile 2010-03-15 12:59:01.578587306 +0100 +@@ -47,7 +47,6 @@ + install: $(CLALSADRV_MIN) + install -Dm 644 $(CLALSADRV_H) $(DESTDIR)$(PREFIX)/include/$(CLALSADRV_H) + install -Dm 755 $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_MIN) +- /sbin/ldconfig $(PREFIX)/$(LIBDIR) + ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO) + + clean: diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD new file mode 100644 index 000000000..684efe7c2 --- /dev/null +++ b/pcr/cluster-glue/PKGBUILD @@ -0,0 +1,242 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=cluster-glue +_pkgname1=${pkgname::7} +_pkgname2=${pkgname:8} +_pkgname=${_pkgname1^}_${_pkgname2^} +pkgver=1.0.11 +pkgrel=11 +pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' +arch=( + i686 + x86_64 + mips64el +) +group=linux-ha +url=http://$group.org/wiki/$_pkgname +license=( + GPL2 + LGPL2.1 +) +depends=( + curl + dbus-glib + glib2 + libaio + libesmtp + libltdl + libnet + libxml2 + net-snmp + openhpi + openipmi + openssh + python + util-linux + #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!! +) +optdepends=net-tools +makedepends=( + help2man + libxslt + lynx + net-tools + openssh + valgrind + w3m +) +options=(!libtool) +provides=(ha-$_pkgname2) +conflicts=ha-$_pkgname2 +replaces=ha-$_pkgname2 +install=$pkgname.install +source=http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 +sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 + +prepare() { + export _CLUSTER_USER=hacluster + export _CLUSTER_GROUP=haclient + _DGID=666 + _DUID=666 + + #verify the cluster user and group + if ! getent group $_CLUSTER_GROUP >/dev/null;then + msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:' + echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n" + _EXITCODE=1 + fi + if ! getent passwd $_CLUSTER_USER >/dev/null;then + msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:' + echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n" + _EXITCODE=1 + fi + if [[ $_EXITCODE -eq 1 ]] ;then + return 1 + fi + + cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s| -O0||; + s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; + s|${localstatedir}/lock ${localstatedir}/spool/lock ${localstatedir}/spool/locks ${localstatedir}/lock|/run/lock|; + s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|; + ' configure.ac + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + #sed -i 's|usr/libexec|usr/lib|; + # ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + s|freesoftware.org|opensource.org|; + s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --disable-ansi\ + --disable-fatal-warnings\ + --disable-static\ + --enable-doc\ + --enable-libnet\ + --enable-upstart\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc\ + --with-daemon-group=haclient\ + --with-daemon-user=hacluster\ + --with-ocf-root=/usr/lib/ocf + setarch $CARCH make +} + +package() { + cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,} + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'Description=Startup script logd service' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'ExecStart=/usr/lib/heartbeat/ha_logd' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ha_log.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service + + msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:' + echo -e "# userdel $_CLUSTER_USER" + echo -e "# groupdel $_CLUSTER_GROUP" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ha-glue/ha-glue.install b/pcr/cluster-glue/cluster-glue.install index abfedb7c4..05e2160d3 100644 --- a/pcr/ha-glue/ha-glue.install +++ b/pcr/cluster-glue/cluster-glue.install @@ -1,22 +1,17 @@ _CLUSTER_USER=hacluster _CLUSTER_GROUP=haclient -_PREFIX=/usr -_PREFIXETC=/etc -_PREFIXVAR=/var -_LCRSODIR=$PREFIX/libexec/lcrso _DGID=666 _DUID=666 + pre_install() { getent group $_CLUSTER_GROUP >/dev/null || groupadd -r -g $_DGID $_CLUSTER_GROUP - getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c "cluster user" ${_CLUSTER_USER} + getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c 'cluster user' $_CLUSTER_USER } post_install() { - echo -e "\nNow you must install ha-resourceagent, ha-heartbeat and ha-pacemaker\n" - + echo -e 'Now you must install ha-resourceagent, ha-heartbeat and ha-pacemaker' } post_remove() { - echo -e "\nDeleting user $_CLUSTER_USER and group $_CLUSTER_GROUP " - userdel $_CLUSTER_USER - groupdel $_CLUSTER_GROUP + echo -e "Deleting user $_CLUSTER_USER and group $_CLUSTER_GROUP" + userdel $_CLUSTER_USER && groupdel $_CLUSTER_GROUP } diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD new file mode 100644 index 000000000..e176cb112 --- /dev/null +++ b/pcr/corosync/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=corosync +_pkgflag=lts +pkgver=2.3.0 +pkgrel=2 +pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.$pkgname.org +license=BSD +depends=( + libqb + libstatgrab + net-snmp + nss +) +makedepends=doxygen +conflicts=$pkgname-$_pkgflag +options=(!libtool) +source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz +sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51 + +prepare() { + cd $srcdir/$pkgname-$pkgver +} + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --datarootdir=/usr/share\ + --disable-coverage\ + --disable-fatal-warnings\ + --disable-rdma\ + --disable-static\ + --enable-augeas\ + --enable-dbus\ + --enable-monitoring\ + --enable-qdevices\ + --enable-secure-build\ + --enable-shared\ + --enable-snmp\ + --enable-systemd\ + --enable-testagents\ + --enable-watchdog\ + --enable-xmlconf\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc\ + --with-initddir=/etc/rc.d\ + --with-systemddir=/usr/lib/systemd/system + setarch $CARCH make +} + +package () { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/din/PKGBUILD b/pcr/din/PKGBUILD new file mode 100644 index 000000000..5f3369f0a --- /dev/null +++ b/pcr/din/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=din +pkgver=5.2.1 +pkgrel=1 +pkgdesc="A software musical instrument and audio synthesizer using Bezier curves to draw waveforms." +arch=('i686' 'mips64el') +url="http://dinisnoise.org/" +license=('GPL3') +depends=('fftw' 'jack' 'liblo' 'libgl' 'libircclient' 'tcl') +makedepends=('mesa') +install="$pkgname.install" +source=("http://din.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('d5a9c375b58e7652004bfcc1e3e17f88') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove previously generated checkdotdin + rm data/checkdotdin + + # colourized echo in m00 script + sed -i "s|echo|& -e|" data/m00 + + # tcl 8.6 fix + sed -i "s/tcl8\.5/tcl8\.6/g" `grep -rl "tcl8\.5"` + + ./configure --prefix=/usr \ + --datarootdir=/usr/share + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/din/din.install b/pcr/din/din.install new file mode 100644 index 000000000..810ee4bfd --- /dev/null +++ b/pcr/din/din.install @@ -0,0 +1,12 @@ +post_install() { + echo ">>> If you get any trouble, remeber to clean your ~/.din folder" + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/django-tagging/PKGBUILD b/pcr/django-tagging/PKGBUILD index 83f808280..ba6c0def8 100644 --- a/pcr/django-tagging/PKGBUILD +++ b/pcr/django-tagging/PKGBUILD @@ -6,7 +6,7 @@ pkgname=django-tagging pkgver=0.3.1 pkgrel=2 pkgdesc="A generic tagging application for Django projects" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/django-tagging/" license=('MIT') depends=('python2') @@ -18,3 +18,4 @@ build() { python2 setup.py install --root=$pkgdir || return 1 install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE } +md5sums=('a0855f2b044db15f3f8a025fa1016ddf') diff --git a/pcr/doxymacs/PKGBUILD b/pcr/doxymacs/PKGBUILD index 09a46a0ae..2fe820376 100644 --- a/pcr/doxymacs/PKGBUILD +++ b/pcr/doxymacs/PKGBUILD @@ -5,7 +5,7 @@ pkgname=doxymacs pkgver=1.8.0 pkgrel=2 pkgdesc="Use Doxygen from within {X}Emacs" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url=http://$pkgname.sourceforge.net license=(GPL) depends=('libxml2>=2.6.13') diff --git a/pcr/emacs-js2-mode/PKGBUILD b/pcr/emacs-js2-mode/PKGBUILD index 7a73d3f40..f71bd6b55 100644 --- a/pcr/emacs-js2-mode/PKGBUILD +++ b/pcr/emacs-js2-mode/PKGBUILD @@ -5,7 +5,7 @@ pkgname=emacs-js2-mode pkgver=20090723b pkgrel=1 pkgdesc="An improved JavaScript mode for GNU Emacs" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/js2-mode/" license=('GPL2') depends=('emacs') diff --git a/pcr/eterm/PKGBUILD b/pcr/eterm/PKGBUILD index 00030e80a..c3416f8e0 100644 --- a/pcr/eterm/PKGBUILD +++ b/pcr/eterm/PKGBUILD @@ -8,7 +8,7 @@ pkgname=eterm pkgver=0.9.6 pkgrel=1 pkgdesc="A vt102 terminal emulator intended as a replacement for xterm." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.eterm.org/" license=('custom') depends=('freetype2>=2.3.5' 'libast>=0.7' 'libxmu' 'libxres') diff --git a/pcr/frame/PKGBUILD b/pcr/frame/PKGBUILD new file mode 100644 index 000000000..e46c369fc --- /dev/null +++ b/pcr/frame/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Nicolas Quiénot < niQo at aur > + +pkgname=frame +pkgver=2.5.0 +pkgrel=1 +pkgdesc="Frame handles the buildup and synchronization of a set of simultaneous touches." +arch=(i686 x86_64 mips64el) +url="https://launchpad.net/frame" +license=(GPL) +depends=('libxi' 'gcc-libs') +makedepends=('xorg-server-devel' 'asciidoc') +provides=('utouch-frame') +conflicts=('utouch-frame') +replaces=('utouch-frame') +options=('!libtool') +source=(http://launchpad.net/$pkgname/trunk/v$pkgver/+download/$pkgname-$pkgver.tar.gz) + + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + +md5sums=('02baa941091c5d198cd1623b3ad36e68') diff --git a/pcr/freeipmi/PKGBUILD b/pcr/freeipmi/PKGBUILD index ff321ea02..7f2bb291c 100644 --- a/pcr/freeipmi/PKGBUILD +++ b/pcr/freeipmi/PKGBUILD @@ -7,7 +7,7 @@ pkgname=freeipmi pkgver=1.2.3 pkgrel=1 pkgdesc="sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/freeipmi/" license=('GPL') depends=('libgcrypt') @@ -47,3 +47,4 @@ package() { } # vim:set ts=2 sw=2 et: +md5sums=('b1e21641c31b9d3291bdfe4a2b323d03') diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD new file mode 100644 index 000000000..3a2e54dd8 --- /dev/null +++ b/pcr/ganglia/PKGBUILD @@ -0,0 +1,81 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=ganglia +pkgver=3.6.0 +pkgrel=1 +pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids' +arch=( + i686 + x86_64 + mips64el +) +url=http://$pkgname.sourceforge.net/ +license=BSD +depends=( + apr + confuse + #php-embed + python2 + rrdtool +) +options=(!libtool) +optdepends="$pkgname-web: Web frontend" +backup=( + etc/gmond.conf + etc/gmetad.conf +) +source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz +sha512sums=2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394 + +prepare() { + cd $srcdir/$pkgname-$pkgver + #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure + touch gm{on,eta}d/gm{on,eta}d.service.in + + echo '[Unit]' > gmetad/gmetad.service.in + echo 'Description=Ganglia Meta Daemon' >> gmetad/gmetad.service.in + echo 'After=network.target' >> gmetad/gmetad.service.in + echo '' >> gmetad/gmetad.service.in + echo '[Service]' >> gmetad/gmetad.service.in + echo 'Type=forking' >> gmetad/gmetad.service.in + echo 'PIDFile=/run/gmetad.pid' >> gmetad/gmetad.service.in + echo 'ExecStart=/usr/sbin/gmetad -p /run/gmetad.pid' >> gmetad/gmetad.service.in + echo '' >> gmetad/gmetad.service.in + echo '[Install]' >> gmetad/gmetad.service.in + echo 'WantedBy=multi-user.target' >> gmetad/gmetad.service.in + + echo '[Unit]' > gmond/gmond.service.in + echo 'Description=Ganglia Monitor Daemon' >> gmond/gmond.service.in + echo 'After=network.target' >> gmond/gmond.service.in + echo '' >> gmond/gmond.service.in + echo '[Service]' >> gmond/gmond.service.in + echo 'ExecStart=/usr/sbin/gmond -f -p /run/gmond.pid' >> gmond/gmond.service.in + echo '' >> gmond/gmond.service.in + echo '[Install]' >> gmond/gmond.service.in + echo 'WantedBy=multi-user.target' >> gmond/gmond.service.in +} + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --enable-gexec\ + --enable-perl\ + --enable-status\ + --disable-static\ + --libdir=/usr/lib\ + --with-gmetad\ + --with-python=/usr/bin/python2\ + --sysconfdir=/etc +# --enable-php\ + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mkdir $pkgdir/usr/lib/$pkgname/python_modules + + msg2 'Generating default gmond.conf' + ./gmond/gmond --default_config > $pkgdir/etc/gmond.conf +} diff --git a/pcr/geis/PKGBUILD b/pcr/geis/PKGBUILD new file mode 100644 index 000000000..f70fa9f64 --- /dev/null +++ b/pcr/geis/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Nicolas Quiénot <niQo @ AUR > +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> + +pkgname=geis +pkgver=2.2.15 +pkgrel=3 +pkgdesc="Implementation of the GEIS (Gesture Engine Interface and Support) interface." +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/geis" +license=('GPL' 'LGPL') +depends=('grail' 'dbus' 'python-gobject') +makedepends=('xorg-server-devel') +provides=('utouch-geis') +conflicts=('utouch-geis') +replaces=('utouch-geis') +options=('!emptydirs' '!libtool') +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ## add -Wno-format in CFLAGS see FS#34658 + CFLAGS="$CFLAGS -Wno-format" ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="${pkgdir}/" install +} + +md5sums=('94c8a08497f5fc22061fb0573ca1e220') diff --git a/pcr/ginn/PKGBUILD b/pcr/ginn/PKGBUILD new file mode 100644 index 000000000..5a7588d06 --- /dev/null +++ b/pcr/ginn/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Nicolas Quiénot <niQo @ aur> + +pkgname=ginn +pkgver=0.2.6 +pkgrel=2 +pkgdesc="A deamon with jinn-like wish-granting capabilities" +url="http://launchpad.net/ginn" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('geis' 'bamf2' 'libxtst' 'libwnck') +source=(http://launchpad.net/ginn/0.x/${pkgver}/+download/ginn-${pkgver}.tar.gz) + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} + +md5sums=('008854147f0809877b3e7ccf5af5337f') diff --git a/pcr/grail/PKGBUILD b/pcr/grail/PKGBUILD new file mode 100644 index 000000000..2c8342477 --- /dev/null +++ b/pcr/grail/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Nicolas Quiénot <niQo @ aur> +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> +# Contributor: thn81 <root@scrat> + +pkgname=grail +pkgver=3.1.0 +pkgrel=1 +pkgdesc="Gesture Recognition And Instantiation Library" +arch=('i686' 'x86_64' 'mips64el') +url="https://launchpad.net/grail" +license=('GPL') +depends=('frame>=2.5.0' 'libxi') +makedepends=('inputproto') +conflicts=('utouch-grail') +replaces=('utouch-grail') +options=('!libtool') +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Static library needed for tests + ./configure --prefix=/usr # --disable-static + MAKEFLAGS="-j1" + make ${MAKEFLAGS} +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install +} + +md5sums=('f0f8c56430ee3717778dec6452201c33') diff --git a/pcr/gtk-theme-numix/PKGBUILD b/pcr/gtk-theme-numix/PKGBUILD new file mode 100644 index 000000000..4c4c10b20 --- /dev/null +++ b/pcr/gtk-theme-numix/PKGBUILD @@ -0,0 +1,21 @@ +# Mantainer: Diego +# Contributor: Aleessio Sergi + +pkgname=gtk-theme-numix +_theme=Numix +pkgver=1.4 +pkgrel=1 +pkgdesc="A flat and light theme with a modern look" +arch=('any') +url="http://satya164.deviantart.com/art/Numix-GTK3-theme-360223962" +license=('GPL3') +depends=('gtk-engine-murrine') +source=(https://github.com/shimmerproject/${_theme}/archive/v${pkgver}.tar.gz) +md5sums=('323ce459ebf9ee30bf920d18fab3645a') + +package() { + install -d "$pkgdir/usr/share/themes/${_theme}" + cp -rv ${srcdir}/${_theme}-${pkgver}/* "$pkgdir/usr/share/themes/${_theme}/" +} + +md5sums=('323ce459ebf9ee30bf920d18fab3645a') diff --git a/pcr/ha-glue/PKGBUILD b/pcr/ha-glue/PKGBUILD deleted file mode 100644 index d170155d9..000000000 --- a/pcr/ha-glue/PKGBUILD +++ /dev/null @@ -1,98 +0,0 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgname=ha-glue -_pkgname=${pkgname:3} -pkgver=1.0.11 -pkgrel=2 -pkgdesc='A set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.' -arch=( - i686 - x86_64 - mips64el -) -url=http://linux-ha.org/wiki/Cluster_${_pkgname^} -license=GPL -depends=( - curl - glib2 - libaio - libtool - libxml2 - net-snmp - python2 - util-linux -) -source=( - http://hg.linux-ha.org/$_pkgname/archive/$_pkgname-$pkgver.tar.bz2 - ha-logd.service -) -sha512sums=( - 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 - 9252472a6d7a1bbad765c63becdec4064d882b1eb98abdf27833a6e06d8750f06663b2460d32a4c72d04f10a7480ef0a2093b8a18b4d1fc62a989cde54ee056a -) -install=$pkgname.install -options=( - '!libtool' - docs -) - -prepare() { - export _CLUSTER_USER=hacluster - export _CLUSTER_GROUP=haclient - _DGID=666 - _DUID=666 - - #verify the cluster user and group - if ! getent group $_CLUSTER_GROUP >/dev/null;then - msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:' - echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n" - _EXITCODE=1 - fi - if ! getent passwd $_CLUSTER_USER >/dev/null;then - msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:' - echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n" - _EXITCODE=1 - fi - if [[ $_EXITCODE -eq 1 ]] ;then - return 1 - fi - - cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver - sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac -} - -build() { - cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver - sed -i 's/<glib\/gtypes\.h>/<glib\.h>/g' include/clplumbing/cl_uuid.h - setarch $CARCH ./autogen.sh - setarch $CARCH ./configure --prefix=/usr\ - --enable-fatal-warnings=no\ - --libdir=/usr/lib\ - --libexecdir=/usr/lib/$pkgname\ - --localstatedir=/var\ - --sysconfdir=/etc\ - --with-daemon-group=$_CLUSTER_GROUP\ - --with-daemon-user=$_CLUSTER_USER - setarch $CARCH make -} - -package() { - cd $srcdir/Reusable-Cluster-Components-$_pkgname--$_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install - - #python path correction - for py in `grep -r -l "\#\!\/usr\/bin\/python" $pkgdir`;do - sed -i 's:/usr/bin/python$:/usr/bin/python2:g' $py - done - for py in `grep -r -l "\#\!\/usr\/bin\/env python" $pkgdir`;do - sed -i 's:/usr/bin/env python$:/usr/bin/env python2:g' $py - done - #end python path correction - - install -d $pkgdir/usr/lib/systemd/system - install -Dm644 $srcdir/ha-logd.service $pkgdir/usr/lib/systemd/system - - msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:' - echo -e "# userdel $_CLUSTER_USER" - echo -e "# groupdel $_CLUSTER_GROUP" -} diff --git a/pcr/ha-glue/ha-logd.service b/pcr/ha-glue/ha-logd.service deleted file mode 100644 index 1847d8cdd..000000000 --- a/pcr/ha-glue/ha-logd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Startup script logd service. -Requires=network.target remote-fs.target - -[Service] -Type=forking -ExecStart=/usr/lib/heartbeat/ha_logd - -[Install] -WantedBy=multi-user.target diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD new file mode 100644 index 000000000..f9ee9254b --- /dev/null +++ b/pcr/heartbeat/PKGBUILD @@ -0,0 +1,202 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=heartbeat +pkgver=3.0.5 +_pkgver=${pkgver::1}_${pkgver:2:1} +pkgrel=10 +pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)' +arch=( + i686 + x86_64 + mips64el +) +group=linux-ha +url=http://$group.org/wiki/${pkgname^} +license=( + GPL2 + lGPL2.1 +) +depends=( + gnutls + cluster-glue +) +optdepends=net-tools +makedepends=( + docbook-xsl + libxslt + lynx + net-tools + openssh + swig + valgrind + w3m +) +options=(!libtool) +provides=(ha-$pkgname) +conflicts=ha-$pkgname +replaces=ha-$pkgname +source=http://hg.$group.org/$pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2 +sha512sums=e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d + +prepare() { + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver + + mv configure.{in,ac} + + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|; + " configure.ac + + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + #sed -i 's|usr/libexec|usr/lib|; + # ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # s|freesoftware.org|opensource.org|; + # s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + # s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + # s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + /Linux: "mail" offers "-s"./ s|Linux|GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + s|ConfigureLinux|ConfigureGNULinux|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver + setarch $CARCH ./bootstrap + setarch $CARCH ./configure --prefix=/usr\ + --disable-fatal-warnings\ + --disable-static\ + --enable-valgrind\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sysconfdir=/etc + setarch $CARCH make +} + +package() { + cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mv $pkgdir/{var/,}run + rm $pkgdir/etc/{ha.d/,}rc.d/* && rmdir $pkgdir/etc/{ha.d/,}rc.d + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Description=Startup script high-availability services' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Requires=network.target remote-fs.target timers.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'ExecStart=/usr/lib/heartbeat/heartbeat' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/$pkgname.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/hexter/PKGBUILD b/pcr/hexter/PKGBUILD new file mode 100644 index 000000000..e0ccbb848 --- /dev/null +++ b/pcr/hexter/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +# file 'hexter' taken from https://aur.archlinux.org/packages/hexter/ +pkgname=hexter +pkgver=1.0.2 +pkgrel=1 +pkgdesc="A DSSI software synthesizer that models the sound generation of a Yamaha DX7" +arch=('i686') +url="http://dssi.sourceforge.net/hexter.html" +license=('GPL') +depends=('alsa-lib' 'liblo' 'gtk2' 'dssi') +makedepends=('ladspa') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/dssi/hexter/${pkgver}/${pkgname}-${pkgver}.tar.gz hexter) +md5sums=('a61765a649fcab05811c226fb5c9415b' 'ce72d4f996c17ffd72eb02af76c4dd9b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install || return 1 + install -D -m755 ${srcdir}/hexter ${pkgdir}/usr/bin/hexter +} diff --git a/pcr/hexter/hexter b/pcr/hexter/hexter new file mode 100644 index 000000000..8338bfdc5 --- /dev/null +++ b/pcr/hexter/hexter @@ -0,0 +1,4 @@ +#!/bin/bash + +export DSSI_PATH=/usr/lib/dssi +exec jack-dssi-host hexter.so diff --git a/pcr/jalv/PKGBUILD b/pcr/jalv/PKGBUILD new file mode 100644 index 000000000..6100c5902 --- /dev/null +++ b/pcr/jalv/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=jalv +pkgver=1.4.0 +pkgrel=1 +pkgdesc="Run an LV2 plugin as a JACK application" +arch=('i686') +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('lilv' 'suil') +makedepends=('python2' 'qt4' 'gtk2' 'gtk3' 'gtkmm') +optdepends=('qt4: Qt 4.x frontend' + 'gtk2: Gtk+ 2.x frontend' + 'gtk3: Gtk+ 3.x frontend' + 'gtkmm: Gtk++ 2.x frontend') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('23297b15cb541e0b3c5c05a2fdd9bcca') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 waf install --destdir="$pkgdir" + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index 788d4f435..87913af64 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -1,34 +1,78 @@ # Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=jitsi -pkgver=2.0.4506.10553 -pkgrel=6 +pkgver=2.2.4603.9615 +pkgrel=2 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://jitsi.org" license=('LGPL') -depends=('java-runtime') -makedepends=('apache-ant' 'java-environment') +depends=('jre7-openjdk') +makedepends=('apache-ant' 'jdk7-openjdk') options=(!strip !emptydirs zipman !libtool docs) source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip" jitsi.desktop - jitsi.sh) -sha256sums=('939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d' + jitsi.sh + drop-open-term-on-index-jn-html.patch) +sha256sums=('6ec46cc8f2306f5542c65fc637f70a7fe348b309ecc70a2483e05a745487ad41' '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d' - '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5') + '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5' + 'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631') + +prepare() { + cd $srcdir/$pkgname-src-$pkgver -build() -{ - cd "${srcdir}/${pkgname}" # append the build revision to the jitsi version - sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + + # remove Open Source term + patch -Np0 -i ../drop-open-term-on-index-jn-html.patch + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i '/, Linux/ s|Linux|GNU/Linux|; + /And Linux/ s|Linux|GNU/Linux|; + /and Linux/ s|Linux|GNU/Linux|; + /For Linux/ s|Linux|GNU/Linux|; + /for Linux/ s|Linux|GNU/Linux|; + /Linux,/ s|Linux|GNU/Linux|; + /Linux and/ s|Linux|GNU/Linux|; + /Linux distribution/ s|Linux|GNU/Linux|; + /Linux machine/ s|Linux|GNU/Linux|; + /Linux operating/ s|Linux|GNU/Linux|; + /Linux OS/ s|Linux|GNU/Linux|; + /Linux specific/ s|Linux|GNU/Linux|; + /Linux system/ s|Linux|GNU/Linux|; + /Under Linux/ s|Linux|GNU/Linux|; + /under Linux/ s|Linux|GNU/Linux|; + /On Linux/ s|Linux|GNU/Linux|; + /on Linux/ s|Linux|GNU/Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$pkgname-src-$pkgver . /etc/profile.d/apache-ant.sh ant rebuild } package() { - cd "${srcdir}/${pkgname}" + cd $srcdir/$pkgname-src-$pkgver find lib/ lib/bundle/ -maxdepth 1 -type f \ -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; find lib/os-specific/linux/ -maxdepth 1 -type f \ diff --git a/pcr/jitsi/drop-open-term-on-index-jn-html.patch b/pcr/jitsi/drop-open-term-on-index-jn-html.patch new file mode 100644 index 000000000..8d4012a05 --- /dev/null +++ b/pcr/jitsi/drop-open-term-on-index-jn-html.patch @@ -0,0 +1,6 @@ +--- www/index-jn.html 2011-01-29 08:36:48.000000000 -0200 ++++ www/index-jn.html-new 2013-05-29 01:05:48.942716248 -0300 +@@ -1,2 +1,2 @@ + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2"> <tbody><tr> <td valign="middle" style="width: 20%"> <p align="center"> <a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br /> SIP Communicator <br />Open Source VoIP & IM </p> <br /> </td> <td style="width: 90%"> <p align="justify"> SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC. </p> <p align="justify"> SIP Communicator is completely <a href="http://www.opensource.org/">Open Source</a> / <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is freely available under the terms of the <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>. </p> <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white"> <tbody><tr><td style="background-color: lightgray"> <p> RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a> can usually answer most questions. You can also ask on the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a> mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a> #sip-communicator at irc.freenode.net. </p> </td></tr> </tbody></table> <p><em> <strong>Note:</strong> Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a> or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>. You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em> </p> <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p> </td> </tr> </tbody></table> ++<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2"> <tbody><tr> <td valign="middle" style="width: 20%"> <p align="center"> <a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br /> SIP Communicator <br />Free Software VoIP & IM </p> <br /> </td> <td style="width: 90%"> <p align="justify"> SIP Communicator is an audio/video Internet phone and instant messenger that support some of the most popular instant messaging and telephony protocols such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC. </p> <p align="justify"> SIP Communicator is completely <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is freely available under the terms of the <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>. </p> <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white"> <tbody><tr><td style="background-color: lightgray"> <p> RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a> can usually answer most questions. You can also ask on the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a> mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a> #sip-communicator at irc.freenode.net. </p> </td></tr> </tbody></table> <p><em> <strong>Note:</strong> Right now SIP Communicator is still a work in progress and as such is still unstable. If you would like to help or follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a> or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>. You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em> </p> <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p> </td> </tr> </tbody></table> diff --git a/pcr/libast/PKGBUILD b/pcr/libast/PKGBUILD index ede9ab2ce..7d447c6e6 100644 --- a/pcr/libast/PKGBUILD +++ b/pcr/libast/PKGBUILD @@ -7,7 +7,7 @@ pkgname=libast pkgver=0.7 pkgrel=3 pkgdesc="The Library of Assorted Spiffy Things." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://eterm.sourceforge.net" license=('BSD') depends=('imlib2' 'pcre' 'libsm') diff --git a/pcr/libdshconfig/PKGBUILD b/pcr/libdshconfig/PKGBUILD index adf9d18b2..e44d11ffd 100644 --- a/pcr/libdshconfig/PKGBUILD +++ b/pcr/libdshconfig/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libdshconfig pkgver=0.20.9 pkgrel=2 pkgdesc="Library for parsing dsh-style configuration files. Required by dsh and other applications." -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url="http://www.netfort.gr.jp/~dancer/software/dsh.html.en" license=('GPL') depends=('glibc') @@ -18,3 +18,4 @@ build() { make || return 1 make prefix=$startdir/pkg/usr install } +md5sums=('c3fabfae1782c17ee989373c2f6a73c1') diff --git a/pcr/libqb/PKGBUILD b/pcr/libqb/PKGBUILD new file mode 100644 index 000000000..6b9d7d9d7 --- /dev/null +++ b/pcr/libqb/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=libqb +pkgver=0.14.4 +pkgrel=2 +pkgdesc='Library with the primary purpose of providing high performance client server reusable features' +arch=( + i686 + x86_64 + mips64el +) +makedepends=( + doxygen + splint +) +license=LGPL2.1 +options=!libtool +url=https://github.com/asalkeld/$pkgname/wiki +source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz +sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977 + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --disable-fatal-warnings\ + --disable-static\ + --libdir=/usr/lib + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD new file mode 100644 index 000000000..04ffee934 --- /dev/null +++ b/pcr/lua51-sql-mysql/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> + +pkgname=lua51-sql-mysql +pkgdesc='MySQL module for Lua 5.1' +pkgver=2.2.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://www.keplerproject.org/luasql/' +license=('MIT') +depends=('lua51' 'libmariadbclient') +source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz") +md5sums=('59d72db444c6369c936d4f03694db6b7') + +build() { + cd luasql-$pkgver + sed -i '24s,$,/lua5.1,' config + msg2 'Building MySQL support' + make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \ + DRIVER_INCS="$(mysql_config --include) -fPIC" +} + +package() { + cd luasql-$pkgver + install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.1/luasql/mysql.so" + install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/lv2-c++-tools/PKGBUILD b/pcr/lv2-c++-tools/PKGBUILD new file mode 100644 index 000000000..de2e69578 --- /dev/null +++ b/pcr/lv2-c++-tools/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer : Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/lv2-c%2B%2B-tools/ +pkgname=lv2-c++-tools +pkgver=1.0.4 +pkgrel=1 +pkgdesc="Tools and libraries that may come in handy when writing LV2 plugins." +arch=('i686') +url="http://ll-plugins.nongnu.org/hacking.html" +license=('GPL3') +depends=('gtkmm') +makedepends=('boost') +source=("http://download.savannah.nongnu.org/releases-noredirect/ll-plugins/$pkgname-$pkgver.tar.bz2" + "$pkgname-boost-1.50.patch") +md5sums=('2468f8750bae1d57300853479846e5ed' + '1dd1152e9ab8be15248b54546716c8c9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # boots 1.50 patch + patch -p1 -i ../${source[1]} + + # do not call ldconfig + sed -i '/ldconfig/d' Makefile.template + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +}
\ No newline at end of file diff --git a/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch b/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch new file mode 100644 index 000000000..85d3e32da --- /dev/null +++ b/pcr/lv2-c++-tools/lv2-c++-tools-boost-1.50.patch @@ -0,0 +1,42 @@ +diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp +--- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.cpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.cpp 2012-09-27 16:41:39.925303056 +0200 +@@ -28,7 +28,7 @@ + #include <fcntl.h> + #include <unistd.h> + +-#include <boost/spirit/dynamic.hpp> ++#include <boost/spirit/include/classic_dynamic.hpp> + + #include "turtleparser.hpp" + +diff -aur lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp +--- lv2-c++-tools-1.0.4/libraries/paq/turtleparser.hpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/turtleparser.hpp 2012-09-27 16:41:39.925303056 +0200 +@@ -23,10 +23,10 @@ + #ifndef TURTLEPARSER_HPP + #define TURTLEPARSER_HPP + +-#include <boost/spirit/core.hpp> +-#include <boost/spirit/utility.hpp> +-#include <boost/spirit/tree/parse_tree.hpp> +-#include <boost/spirit/tree/ast.hpp> ++#include <boost/spirit/include/classic_core.hpp> ++#include <boost/spirit/include/classic_utility.hpp> ++#include <boost/spirit/include/classic_parse_tree.hpp> ++#include <boost/spirit/include/classic_ast.hpp> + + #include <algorithm> + #include <iostream> +diff -aur lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp +--- lv2-c++-tools-1.0.4/libraries/paq/unicode.hpp 2011-02-27 13:34:39.000000000 +0100 ++++ lv2-c++-tools-1.0.4.patched/libraries/paq/unicode.hpp 2012-09-27 16:42:00.818959807 +0200 +@@ -29,7 +29,7 @@ + + + using namespace std; +-using namespace boost::spirit; ++using namespace boost::spirit::classic; + + + template <typename ScannerT> diff --git a/pcr/mda-lv2/PKGBUILD b/pcr/mda-lv2/PKGBUILD new file mode 100644 index 000000000..500a656a5 --- /dev/null +++ b/pcr/mda-lv2/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=mda-lv2 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="An LV2 port of the MDA plugins by Paul Kellett" +arch=('i686') +url="http://drobilla.net/2012/04/21/mda-lv2-1-0-0/" +license=('GPL3') +depends=('lv2') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('843ac4eade386034562917e95905e5d8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + python2 ./waf configure --prefix=/usr + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/minaton-lv2/PKGBUILD b/pcr/minaton-lv2/PKGBUILD new file mode 100644 index 000000000..797a74653 --- /dev/null +++ b/pcr/minaton-lv2/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +pkgname=minaton-lv2 +pkgver=0.0.3 +pkgrel=1 +pkgdesc="A music software synthesizer project, LV2 instrument." +arch=('i686') +url="http://sourceforge.net/p/minaton/home/Home/" +license=('GPL') +groups=('lv2-plugins') +depends=('lv2' 'jack' 'gtkmm') +makedepends=('lv2-c++-tools') +provides=('lv2-minaton') +conflicts=('lv2-minaton') +source=("http://downloads.sourceforge.net/project/minaton/$pkgname-v.$pkgver.tar.gz") +md5sums=('b5190a6c6942c1a1fe6b929963ad1f86') + +build() { + cd "$srcdir/$pkgname-v$pkgver" + + # set bundle_path + sed -i "s|\(string bundle_path\);|\1 = \"/usr/lib/lv2/minaton.lv2/\";|" *.{hpp,h,cpp} + + make +} + +package() { + cd "$srcdir/$pkgname-v$pkgver" + make INSTALL_DIR="$pkgdir/usr/lib/lv2" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/minicomputer/PKGBUILD b/pcr/minicomputer/PKGBUILD new file mode 100644 index 000000000..4888c999f --- /dev/null +++ b/pcr/minicomputer/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=minicomputer +pkgver=1.41 +pkgrel=1 +pkgdesc="A standalone Linux softwaresynthesizer for creating experimental electronic sounds." +arch=('i686') +url="http://minicomputer.sourceforge.net" +license=('GPL3') +depends=('fltk' 'jack' 'liblo') +makedepends=('scons') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/MinicomputerV$pkgver.tar.gz" + "$pkgname.desktop") +md5sums=('d2524f5fee7475159292e29a5bcd73d2' + '3cc74321d55870b1684767255c74c2f8') + +build() { + cd "$srcdir" + + # installpresets.sh fix + sed -i "s|factory|/usr/share/$pkgname/&|g" installpresets.sh + + # 'R_OK' was not declared fix + sed -i '/#include <cstdlib>/a#include <unistd.h>' editor/Memory.h + + # DSO linking fix + sed -i "35aenv.Append(LINKFLAGS = ['-lm'])" -i SConstruct + + # build + LDFLAGS="LDFLAGS -lm" scons +} +package() { + cd "$srcdir" + + # bin + install -d "$pkgdir/usr/bin" + install -Dm755 "$pkgname"{,CPU} "$pkgdir/usr/bin" + + # icon + install -Dm644 $pkgname.xpm \ + "$pkgdir/usr/share/pixmaps/$pkgname.xpm" + + # desktop file + install -Dm644 $pkgname.desktop \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + + # presets + install -d "$pkgdir/usr/share/$pkgname/factoryPresets" + install -Dm644 factoryPresets/* "$pkgdir/usr/share/$pkgname/factoryPresets" + + # doc + install -Dm644 "$pkgname"Manual.pdf \ + "$pkgdir/usr/share/doc/$pkgname/Manual.pdf" + + # presets installer script + install -Dm755 installpresets.sh \ + "$pkgdir/usr/share/$pkgname/installpresets.sh" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/minicomputer/minicomputer.desktop b/pcr/minicomputer/minicomputer.desktop new file mode 100644 index 000000000..578f04ddb --- /dev/null +++ b/pcr/minicomputer/minicomputer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Minicomputer +Comment=An industrial grade software synthesizer +Exec=minicomputer +Icon=minicomputer +Terminal=false +Type=Application +Categories=Application;AudioVideo; diff --git a/pcr/minicomputer/minicomputer.install b/pcr/minicomputer/minicomputer.install new file mode 100644 index 000000000..e441a6f02 --- /dev/null +++ b/pcr/minicomputer/minicomputer.install @@ -0,0 +1,21 @@ +post_install() { + post_remove + + cat << EOF + +>>> For installing some sample presets in ~/.miniComputer, use +>>> /usr/share/minicomputer/installpresets.sh +>>> +>>> Use "minicomputer" to start the engine and the GUI +>>> Documentation can be found in /usr/share/doc/minicomputer/Manual.pdf + +EOF +} + +post_upgrade() { + post_remove +} + +post_remove() { + update-desktop-database -q +} diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index bc9600e25..219da84fc 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -76,7 +76,7 @@ prepare() { build() { cd $srcdir/${pkgname[0]}/build - [[ $CARCH == i686 ]] && DMTS_SSE='-DMTS_SSE=OFF' + [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF' setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ $DMTS_SSE\ diff --git a/pcr/mx44/PKGBUILD b/pcr/mx44/PKGBUILD new file mode 100644 index 000000000..6666a1405 --- /dev/null +++ b/pcr/mx44/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +pkgname=mx44 +_pkgname=Mx44 +pkgver=2 +pkgrel=1 +pkgdesc="polyphonic multi-channel MIDI software synthesizer" +arch=('i686') +url="http://web.comhem.se/luna/" +license=('GPL') +depends=('jack' 'gtk2') +source=(http://web.comhem.se/luna/$_pkgname.$pkgver.tar.gz) +md5sums=('8e532c78d79e189fe5b6e2dd10acf0e2') + +build() { + cd $srcdir/$_pkgname.$pkgver/src + make +} + +package() { + cd $srcdir/$_pkgname.$pkgver/src + install -m755 -d ${pkgdir}/usr/bin + make PREFIX=$pkgdir/usr/ install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/nekobee/PKGBUILD b/pcr/nekobee/PKGBUILD new file mode 100644 index 000000000..4e71ae93d --- /dev/null +++ b/pcr/nekobee/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=nekobee +pkgver=0.1.8 +pkgrel=2 +pkgdesc="A TB303-style synthesizer for DSSI" +url="https://github.com/gordonjcp/nekobee" +depends=('liblo' 'gtk2') +makedepends=('dssi' 'python' 'ladspa') +arch=('i686') +license=('GPL') +source=("https://github.com/gordonjcp/${pkgname}/archive/${pkgver}.tar.gz" + "nekobee.patch") +md5sums=('5954ac49043bc80588be72a9b9a9b28f' + '8dde87ad9b2a8500c51d773b25b7984f') + +build() { +cd $startdir/src/$pkgname-$pkgver +patch -p1 -i $srcdir/$pkgname.patch +./waf configure --prefix=/usr +./waf +} + +package() { +cd $startdir/src/$pkgname-$pkgver +DESTDIR=$pkgdir ./waf install +} diff --git a/pcr/nekobee/nekobee.patch b/pcr/nekobee/nekobee.patch new file mode 100644 index 000000000..dd995c357 --- /dev/null +++ b/pcr/nekobee/nekobee.patch @@ -0,0 +1,20 @@ +diff -aur nekobee-0.1.8/wscript nekobee-0.1.8.new/wscript +--- nekobee-0.1.8/wscript 2010-09-12 21:34:13.000000000 +0200 ++++ nekobee-0.1.8.new/wscript 2013-05-25 22:47:23.923441000 +0200 +@@ -31,7 +31,7 @@ + # DSSI plugin + plugin_dssi = bld.new_task_gen('cc', 'shlib') + plugin_dssi.env['shlib_PATTERN'] = '%s.so' +- plugin_dssi.env.append_value("LINKFLAGS", "-module -avoid-version -Wc,-nostartfiles") ++ plugin_dssi.env.append_value("LINKFLAGS", "-lm") + plugin_dssi.includes = ['.', 'src'] + plugin_dssi.defines = 'HAVE_CONFIG_H' + plugin_dssi.source = [ +@@ -49,6 +49,7 @@ + + # DSSI UI executable + gui_gtk = bld.new_task_gen('cc', 'program') ++ gui_gtk.env.append_value("LINKFLAGS", "-lm") + gui_gtk.includes = ['.', 'src'] + gui_gtk.defines = 'HAVE_CONFIG_H' + gui_gtk.source = [ diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD new file mode 100644 index 000000000..71b3802e5 --- /dev/null +++ b/pcr/networkmanager-openswan/PKGBUILD @@ -0,0 +1,26 @@ +# Contributor: Marti Raudsepp <marti@juffo.org> + +pkgname=networkmanager-openswan +_pkgname=NetworkManager-openswan +pkgver=0.9.8.0 +pkgrel=1 +pkgdesc="NetworkManager plugin for IPSec VPN tunnels" +arch=('i686' 'x86_64' 'mips64el') +url="http://ftp.acc.umu.se/pub/GNOME/sources/NetworkManager-openswan/" +license=('GPL') +depends=('openswan' 'gtk3' 'networkmanager' 'libgnome-keyring') +makedepends=('intltool') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$_pkgname/0.9/$_pkgname-$pkgver.tar.xz) +md5sums=('6a373868f85ac3b7c953f7fd6c76e637') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/networkmanager + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/networkmanager-strongswan/PKGBUILD b/pcr/networkmanager-strongswan/PKGBUILD new file mode 100644 index 000000000..3c30f3615 --- /dev/null +++ b/pcr/networkmanager-strongswan/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Michael Seiwald <michael@mseiwald.at> +# Maintainer: Dmitry Korzhevin <dkorzhevin at gmail dot com> +pkgname=networkmanager-strongswan +_pkgname=NetworkManager-strongswan +pkgver=1.3.0 +pkgrel=2 +pkgdesc="strongswan NetworkManager plugin" +arch=('i686' 'x86_64' 'mips64el') +url="http://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager" +license=('GPL') +depends=(networkmanager strongswan libgnomeui) +makedepends=(intltool) +source=(http://download.strongswan.org/NetworkManager/$_pkgname-$pkgver.tar.gz) +md5sums=('215f1d3b7b65be236b86bf30b6a4615b') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --sysconfdir=/etc \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-charon=/usr/lib/strongswan/charon \ + CFLAGS="$CFLAGS -Wno-error=unused-local-typedefs" + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install + #make install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/newtonator/PKGBUILD b/pcr/newtonator/PKGBUILD new file mode 100644 index 000000000..f007a12b9 --- /dev/null +++ b/pcr/newtonator/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=newtonator +pkgver=0.5.2 +pkgrel=1 +pkgdesc="An LV2 soft synth based on velocity and acceleration" +arch=('i686') +url="http://newtonator.sourceforge.net/" +license=('GPL3') +depends=('lv2' 'gtkmm') +makedepends=('cmake' 'lv2-c++-tools') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('2a9a809e4c8a4851911cb661bcab24c0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + [ -d build ] || mkdir build && cd build + + cmake .. -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/nicotine/PKGBUILD b/pcr/nicotine/PKGBUILD new file mode 100644 index 000000000..b0bd552b4 --- /dev/null +++ b/pcr/nicotine/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=nicotine +pkgver=1.2.16 +pkgrel=1 +pkgdesc="Soulseek music-sharing client, written in python" +arch=('i686') +url='http://sourceforge.net/projects/nicotine-plus/' +license=('GPL') +depends=('pygtk' 'mutagen' 'python2-sexy') +makedepends=('setconf') +optdepends=('python2-geoip: to enable Geographical blocker') +source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2") +sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d') + +prepare() { + cd "$srcdir/${pkgname}+-$pkgver" + + # Fix for FS#22476 + setconf files/nicotine.desktop Icon nicotine-plus-32px + + # Python fix + sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ + -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py +} + +build() { + cd "$srcdir/${pkgname}+-$pkgver/trayicon" + + python2 autogen.py + make +} + +package() { + cd "$srcdir/${pkgname}+-$pkgver" + + python2 setup.py install --root="$pkgdir" + cd trayicon + make DESTDIR="$pkgdir" install + ln -s nicotine.py "$pkgdir/usr/bin/nicotine" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD new file mode 100644 index 000000000..bffcc74ba --- /dev/null +++ b/pcr/openhpi/PKGBUILD @@ -0,0 +1,185 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=openhpi +pkgver=3.2.0 +pkgrel=4 +pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers' +arch=( + i686 + x86_64 + mips64el +) +url=http://www.$pkgname.org/ +license=custom +depends=( + libxml2 + net-snmp +) +options=(!libtool) +source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz +sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab + +prepare() { + cd $srcdir/$pkgname-$pkgver + + _automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||') + sed -i "/am__api_version=/ s|1.12|${_automake::4}|; + " $(grep -rl am__api_version=) + + #sed -i 's|INCLUDES|AM_CPPFLAGS|; + # ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + sed -i 's|usr/libexec|usr/lib|; + ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + #sed -i 's|Open Source / ||; + # s|open source / ||; + # s|Open Source|Free Software|; + # s|open source|free software|; + # s|Free Software Development Lab|Open Source Development Lab|; + # ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # s|freesoftware.org|opensource.org|; + # s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + # s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + # s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --disable-static\ + --enable-clients\ + --enable-dynamic_simulator\ + --enable-ilo2_ribcl\ + --enable-ipmidirect\ + --enable-man\ + --enable-oa_soap\ + --enable-simulator\ + --enable-slave\ + --enable-snmp_bc\ + --enable-sysfs\ + --enable-test_agent\ + --enable-watchdog\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + rm $pkgdir/etc/init.d/openhpid && rmdir $pkgdir/etc/init.d + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'Description=Enable OpenHPI service which is provided by openhpid' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'After=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'ExecStart=/usr/bin/openhpid -c /etc/openhpi/openhpi.conf' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/openhpi.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/openhpi.service +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD new file mode 100644 index 000000000..cced11d05 --- /dev/null +++ b/pcr/openipmi/PKGBUILD @@ -0,0 +1,177 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=openipmi +_pkgname1=${pkgname::4} +_pkgname2=${pkgname:4} +_pkgname=${_pkgname1^}${_pkgname2^^} +pkgver=2.0.19 +_pkgver=${pkgver::3} +pkgrel=3 +pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})" +arch=( + i686 + x86_64 + mips64el +) +url=http://sourceforge.net/projects/$pkgname/ +depends=( + glib + net-snmp + #python2 + swig + tcl +) +makedepends=( + dia + ghostscript-libre + texlive-bibtexextra +) +options=(!libtool) +license=( + BSD-new + GPL2 + LGPL2.1 +) +source=http://downloads.sourceforge.net/project/$pkgname/$_pkgname' '$_pkgver' 'Library/$_pkgname-$pkgver.tar.gz +sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44ccc836924267b5f9901f7a8a3f4c66272cc0b663aa55689d7529841217cb + +prepare() { + cd $srcdir/$_pkgname-$pkgver + + #mv configure.{in,ac} + + #_automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||') + #sed -i "/am__api_version=/ s|1.11|${_automake::4}|; + # " $(grep -rl am__api_version=) + + #sed -i "s|AC_INIT(README.Force)|AC_INIT(OpenIPMI, $pkgver|; + # " configure.ac + #sed -i 's|AM_INIT_AUTOMAKE(OpenIPMI, ${OPENIPMI_VERSION_MAJOR}.${OPENIPMI_VERSION_MINOR}.${OPENIPMI_VERSION_RELEASE}${OPENIPMI_VERSION_EXTRA})|AM_INIT_AUTOMAKE|; + # ' configure.ac + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + #sed -i 's|/lib64|/lib|; + # ' $(grep -rl /lib64) + sed -i 's|usr/libexec|usr/lib|; + ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + #sed -i 's|var/run|run|; + # ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + #sed -i 's|OpenSource / ||; + # s|opensource / ||; + # s|OpenSource|FreeSoftware|; + # s|opensource|freesoftware|; + # s|freesoftware.org|opensource.org|; + # s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + # s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + # s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + # ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$_pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --disable-static + setarch $CARCH make +} + +package() { + cd $srcdir/$_pkgname-$pkgver + install -d $pkgdir/usr/bin + setarch $CARCH make DESTDIR=$pkgdir install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD index bae970025..26a2830d6 100644 --- a/pcr/openswan/PKGBUILD +++ b/pcr/openswan/PKGBUILD @@ -1,24 +1,23 @@ -# Contributor: Jan Fader <jan.fader@web.de> +# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info> pkgname=openswan -pkgver=2.6.36 -pkgrel=2 +pkgver=2.6.38 +pkgrel=1 pkgdesc="Open Source implementation of IPsec for the Linux operating system" url="http://www.openswan.org" license=('GPL' 'custom') arch=('i686' 'x86_64' 'mips64el') -depends=('iproute' 'gmp' 'perl') +depends=('iproute2>=2.6.8' 'gmp' 'perl') +makedepends=('flex' 'bison') +conflicts=('ipsec-tools' 'openswan') +provides=('openswan') backup=(etc/ipsec.conf \ etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) -source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz - openswan.rc.d - compile.patch) +source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz + openswan + openswan.service) build() { - # Create /etc/rc.d for init script, and license directory - mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} - cd $srcdir/openswan-$pkgver - patch -p1 -i $srcdir/compile.patch # Change install paths to Arch defaults sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc @@ -26,21 +25,27 @@ build() { make USE_XAUTH=true USE_OBJDIR=true programs } -package(){ +package() { cd $srcdir/openswan-$pkgver + + # Create /etc/rc.d for init script, and license directory + mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} make DESTDIR=$pkgdir install # Change permissions in /var - chmod 755 $pkgdir/var/run/pluto - + chmod 700 $pkgdir/var/run/pluto + # Copy License cp LICENSE $pkgdir/usr/share/licenses/openswan - + # Install init script - install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan + install -Dm755 ../openswan $pkgdir/etc/rc.d/openswan + install -Dm644 ../openswan.service $pkgdir/usr/lib/systemd/system/openswan.service + mkdir $pkgdir/usr/lib/systemd/scripts/ + cp $pkgdir/etc/rc.d/ipsec $pkgdir/usr/lib/systemd/scripts/ipsec # fix manpages mv $pkgdir/usr/man $pkgdir/usr/share/ } -md5sums=('b3a1733493520bb18729633b62ef8247' +md5sums=('13073eb5314b83a31be88e4117e8bbcd' '543d84162761b9cc9ec319e938c4dd2a' - '5540437bb334873da646e21ac9caa963') + 'd8b465c10838c72e31329d65011002b6') diff --git a/pcr/openswan/openswan b/pcr/openswan/openswan new file mode 100755 index 000000000..30bd0d56e --- /dev/null +++ b/pcr/openswan/openswan @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting Openswan IPsec" + /etc/rc.d/ipsec --start + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + stop) + stat_busy "Stopping Openswan IPsec" + /etc/rc.d/ipsec --stop + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon openswan + fi + ;; + restart) + stat_busy "Restarting Openswan IPsec" + /etc/rc.d/ipsec --restart + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + status) + /etc/rc.d/ipsec --status + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac + diff --git a/pcr/openswan/openswan.service b/pcr/openswan/openswan.service new file mode 100755 index 000000000..6d899705c --- /dev/null +++ b/pcr/openswan/openswan.service @@ -0,0 +1,13 @@ +[Unit] +Description=Openswan daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/lib/systemd/scripts/ipsec --start +ExecStop=/usr/lib/systemd/scripts/ipsec --stop +ExecReload=/usr/lib/systemd/scripts/ipsec --restart +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD new file mode 100644 index 000000000..7ee8209ad --- /dev/null +++ b/pcr/pacemaker/PKGBUILD @@ -0,0 +1,222 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=pacemaker +pkgver=1.1.9 +pkgrel=5 +pkgdesc='Cluster resource manager (Linux-HA)' +arch=( + i686 + x86_64 + mips64el +) +group=linux-ha +url=http://$group.org/wiki/${pkgname^} +license=GPL2 +depends=( + corosync + heartbeat + libqb + libxslt + resource-agent + #saxon-he +) +makedepends=( + asciidoc + help2man + inkscape + lynx + openssh + valgrind + w3m +) +options=(!libtool) +provides=(ha-$pkgname) +conflicts=ha-$pkgname +replaces=ha-$pkgname +source=https://github.com/ClusterLabs/$pkgname/archive/${pkgname^}-$pkgver.tar.gz +sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071 + +prepare() { + cd $srcdir/$pkgname-${pkgname^}-$pkgver + + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|; + ' configure.ac + + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + sed -i 's|/lib64|/lib|; + ' $(grep -rl /lib64) + sed -i 's|usr/libexec|usr/lib|; + ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + s|freesoftware.org|opensource.org|; + s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux) + sed -i 's|Linux|GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + ' $(grep -rl Linux | grep .po) +} + +build() { + cd $srcdir/$pkgname-${pkgname^}-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --disable-static\ + --enable-fatal-warnings\ + --enable-systemd\ + --enable-upstart\ + --libdir=/usr/lib\ + --libexecdir=/usr/lib\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc\ + --with-acl\ + --with-ais\ + --with-cibsecrets\ + --with-cman\ + --with-corosync\ + --with-cs-quorum\ + --with-esmtp\ + --with-heartbeat\ + --with-lcrso-dir=/usr/lib/lcrso\ + --with-nagios\ + --with-profiling\ + --with-snmp\ + --without-gcov + setarch $CARCH make +} + +package() { + cd $srcdir/$pkgname-${pkgname^}-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + rm $pkgdir/etc/rc.d/pacemaker{_remote,} && rmdir $pkgdir/etc{/rc.d,} + mv $pkgdir/{var/,}run + mv $pkgdir/usr/bin/cibsecret{,-$pkgname} +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/petri-foo/PKGBUILD b/pcr/petri-foo/PKGBUILD new file mode 100644 index 000000000..72ca1e45a --- /dev/null +++ b/pcr/petri-foo/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/petri-foo/ +pkgname=petri-foo +pkgver=0.1.87 +pkgrel=1 +pkgdesc="A fork of specimen, a MIDI controllable audio sampler, for JACK." +arch=('i686') +url="http://petri-foo.sourceforge.net/" +license=('GPL2') +depends=('jack' 'libgnomecanvas') +makedepends=('cmake') +optdepends=('liblo: Non Session Manager support') +install='petri-foo.install' +source=(http://sourceforge.net/projects/${pkgname}/files/Source/${pkgname}-${pkgver}.tar.bz2 + petri-foo-0.1.87_fix_recent_file_not_exist.patch) +md5sums=('40f8a224368187672f9f306f8a4fa8c5' + '964db40cc53d77d42f6593f2201b9c40') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 < ../petri-foo-0.1.87_fix_recent_file_not_exist.patch + cmake -DCMAKE_INSTALL_PREFIX=/usr -DUpdateMime:BOOL=OFF . + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch b/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch new file mode 100644 index 000000000..3e88487b0 --- /dev/null +++ b/pcr/petri-foo/petri-foo-0.1.87_fix_recent_file_not_exist.patch @@ -0,0 +1,24 @@ +diff -Naur a/gui/bank-ops.c b/gui/bank-ops.c +--- a/gui/bank-ops.c 2012-08-06 05:33:34.000000000 +0200 ++++ b/gui/bank-ops.c 2012-08-07 17:57:28.580145691 +0200 +@@ -393,6 +393,8 @@ + g_signal_connect_swapped(G_OBJECT(msg), "response", + G_CALLBACK(gtk_widget_destroy), msg); + gtk_widget_show (msg); ++ ++ gtk_recent_manager_remove_item(recent_manager, filename, NULL); + } + else + { +diff -Naur a/libpetrifui/dish_file.c b/libpetrifui/dish_file.c +--- a/libpetrifui/dish_file.c 2012-08-06 05:33:34.000000000 +0200 ++++ b/libpetrifui/dish_file.c 2012-08-07 17:56:09.063909801 +0200 +@@ -1440,7 +1440,7 @@ + + if (stat(path, &st) != 0) + { +- msg_log(MSG_ERROR, "file '%s' does not exist\n"); ++ msg_log(MSG_ERROR, "file '%s' does not exist\n", path); + return -1; + } + diff --git a/pcr/petri-foo/petri-foo.install b/pcr/petri-foo/petri-foo.install new file mode 100644 index 000000000..5dd24bbe5 --- /dev/null +++ b/pcr/petri-foo/petri-foo.install @@ -0,0 +1,19 @@ +updatedesktopdtb() { + [ -x /usr/bin/update-desktop-database ] \ + && update-desktop-database -q + [ -x /usr/bin/update-mime-database ] \ + && update-mime-database usr/share/mime > /dev/null 2>&1 +} + +post_install() { + updatedesktopdtb +} + +post_upgrade() { + updatedesktopdtb +} + +post_remove() { + updatedesktopdtb +} + diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD new file mode 100644 index 000000000..03f53784e --- /dev/null +++ b/pcr/prboom/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: dale <dale@archlinux.org> + +pkgname=prboom +pkgver=2.5.0 +pkgrel=7 +pkgdesc='A game engine which provides a program to play Doom levels.' +url='http://prboom.sourceforge.net/' +license=('GPL2') +arch=('i686' 'x86_64' 'mips64el') +depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" + 'libpng-1.4.patch') +md5sums=('a8a15f61fa2626ab98051ab2703378c4' + 'ba53474db8e747035ca2320a445e4ae0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../libpng-1.4.patch + + ./configure --prefix=/usr --disable-i386-asm + sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/pcr/prboom/libpng-1.4.patch b/pcr/prboom/libpng-1.4.patch new file mode 100644 index 000000000..a2215e37b --- /dev/null +++ b/pcr/prboom/libpng-1.4.patch @@ -0,0 +1,21 @@ +diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c +--- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 ++++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 +@@ -231,7 +231,7 @@ + if (fp) + { + png_struct *png_ptr = png_create_write_struct( +- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); ++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); + + if (png_ptr) + { +@@ -279,7 +279,7 @@ + break; + } + } +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + } + fclose(fp); + } diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD new file mode 100644 index 000000000..9f77354b2 --- /dev/null +++ b/pcr/pybonjour/PKGBUILD @@ -0,0 +1,19 @@ +# Contributor: Ruben Schuller <r.schuller@orgizm.net> + +pkgname=pybonjour +pkgver=1.1.1 +pkgrel=2 +pkgdesc="pybonjour provides a pure-Python interface to Apple Bonjour/Avahi" +arch=('any') +provides=('pybonjour') +license=('MIT') +url="http://code.google.com/p/pybonjour/" +depends=('python2') +makedepends=() +source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2') + +package() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir + } diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD index 41df1a9d0..17779b13f 100644 --- a/pcr/python-sfml2/PKGBUILD +++ b/pcr/python-sfml2/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python-sfml2 pkgver=1.2 pkgrel=0 pkgdesc="Python 3 binding for SFML 2, written with Cython." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://openhelbreath.net/python-sfml2" license=('LGPL3') depends=('sfml' 'python3') diff --git a/~mtjm/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD index 237b6c9bd..f5b96f752 100644 --- a/~mtjm/python2-postfix-policyd-spf/PKGBUILD +++ b/pcr/python2-postfix-policyd-spf/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Samed Beyribey <ras0ir@eventualis.org> pkgname=python2-postfix-policyd-spf _pkgname=pypolicyd-spf -pkgver=0.8.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Python2 Postfix Sender Policy Framework (SPF) filter" arch=('any') @@ -12,14 +12,17 @@ license=('GPL') depends=('postfix' 'python2-pyspf' 'python2') conflicts=('python-postfix-policyd-spf') options=(!emptydirs) -source=(http://launchpad.net/pypolicyd-spf/0.8/$pkgver/+download/$_pkgname-$pkgver.tar.gz) -md5sums=('a37c209e88e4dc419f62ae7c6b52f0e7') - +backup=(etc/python-policyd-spf/policyd-spf.conf) +source=(http://launchpad.net/pypolicyd-spf/1.1/$pkgver/+download/$_pkgname-$pkgver.tar.gz) +sha256sums=('f8999a9febc5ccb4a66f9961e4ec2d8f81b407bdc3ac1c84563cd5085429cdea') + build() { - cd "$srcdir/$_pkgname-$pkgver" - - python2 setup.py build || return 1 - python2 setup.py install --root=$pkgdir/ --optimize=1 || return 1 - install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf || return 1 + cd "$srcdir/$_pkgname-$pkgver" + python2 setup.py build } +package() { + cd "$srcdir/$_pkgname-$pkgver" + python2 setup.py install --root=$pkgdir/ --optimize=1 + install -m644 policyd-spf.conf.commented $pkgdir/etc/python-policyd-spf +} diff --git a/~mtjm/python2-pydns/PKGBUILD b/pcr/python2-pydns/PKGBUILD index cf5f4b388..cf5f4b388 100644 --- a/~mtjm/python2-pydns/PKGBUILD +++ b/pcr/python2-pydns/PKGBUILD diff --git a/~mtjm/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD index abb3bfa5f..abb3bfa5f 100644 --- a/~mtjm/python2-pyspf/PKGBUILD +++ b/pcr/python2-pyspf/PKGBUILD diff --git a/pcr/python2-sexy/PKGBUILD b/pcr/python2-sexy/PKGBUILD new file mode 100644 index 000000000..81c4e453e --- /dev/null +++ b/pcr/python2-sexy/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=python2-sexy +pkgver=0.1.9 +pkgrel=1 +pkgdesc="Python bindings for libsexy" +arch=('i686') +url='http://chipx86.com/wiki/Libsexy' +license=('LGPL') +depends=('libsexy' 'pygtk') +options=(!libtool) +source=(http://releases.chipx86.com/libsexy/sexy-python/sexy-python-$pkgver.tar.gz) +sha256sums=('2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15') +sha512sums=('e735f06efce302e10b89cfd3d6c641d523cd29517792ccaa4d022d7be6f6a350fff180f1c94d255ccbc82891cac7346520dfed2a88d828fbd7e891aa56396530') + +build() { + cd sexy-python-$pkgver/ + ./configure --prefix=/usr + make +} + +package() { + make -C sexy-python-$pkgver DESTDIR="$pkgdir" install +} diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD index b612997f3..a7b9a5230 100644 --- a/pcr/python2-sfml2/PKGBUILD +++ b/pcr/python2-sfml2/PKGBUILD @@ -1,15 +1,15 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=python2-sfml2 -pkgver=1.2 +pkgver=master pkgrel=0 pkgdesc="Python 2 binding for SFML 2, written with Cython." -arch=('i686' 'x86_64') -url="http://openhelbreath.net/python-sfml2" +arch=('i686' 'x86_64' 'mips64el') +url="http://python-sfml.org" license=('LGPL3') depends=('sfml' 'python2') makedepends=('sfml' 'cython2') conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2') -source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') +source=('https://github.com/Sonkun/python-sfml/archive/master.zip') optdepends=('pyqt-common: To use pysfml with Qt') build() { @@ -37,4 +37,4 @@ package() { install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE fi } -sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') +sha256sums=('01bb4a07c3100807163cd2ddcb1208794b1dbac19706eabea430e23fbf00414b') diff --git a/pcr/rakarrack/PKGBUILD b/pcr/rakarrack/PKGBUILD new file mode 100644 index 000000000..4bdfe7c94 --- /dev/null +++ b/pcr/rakarrack/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/rakarrack/ + +pkgname=rakarrack +pkgver=0.6.1 +pkgrel=1 +pkgdesc="Versatile guitar multi-effects processor" +arch=('i686') +license=('GPL') +url="http://rakarrack.sourceforge.net" +depends=('alsa-utils' 'jack' 'fltk' 'libxpm') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" + 'fltk_include.patch') +md5sums=('56b1e04779ae3d56cc8a3ad3c4e25152' + 'd43512466f514434daaf16bd72951ea0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fix for latest fltk include dir name + patch -Np1 -i "$srcdir/fltk_include.patch" + + ./configure --prefix=/usr + make + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/rakarrack/fltk_include.patch b/pcr/rakarrack/fltk_include.patch new file mode 100644 index 000000000..447e8d539 --- /dev/null +++ b/pcr/rakarrack/fltk_include.patch @@ -0,0 +1,24 @@ +diff -baur rakarrack-0.6.1.orig/src/global.h rakarrack-0.6.1/src/global.h +--- rakarrack-0.6.1.orig/src/global.h 2011-07-12 05:13:31.367583829 +0800 ++++ rakarrack-0.6.1/src/global.h 2011-07-12 05:15:20.670325018 +0800 +@@ -99,7 +99,7 @@ + #include <X11/xpm.h> + #include <jack/jack.h> + #include <jack/midiport.h> +-#include <Fl/Fl_Preferences.H> ++#include <FL/Fl_Preferences.H> + #include "FPreset.h" + #include "Reverb.h" + #include "Chorus.h" +diff -baur rakarrack-0.6.1.orig/src/process.C rakarrack-0.6.1/src/process.C +--- rakarrack-0.6.1.orig/src/process.C 2011-07-12 05:13:31.367583829 +0800 ++++ rakarrack-0.6.1/src/process.C 2011-07-12 05:15:31.293600800 +0800 +@@ -28,7 +28,7 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <unistd.h> +-#include <Fl/Fl_Preferences.H> ++#include <FL/Fl_Preferences.H> + #include "global.h" + + int Pexitprogram, preset; diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD new file mode 100644 index 000000000..46c95ede1 --- /dev/null +++ b/pcr/resource-agent/PKGBUILD @@ -0,0 +1,202 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=resource-agent +_pkgname1=${pkgname::8} +_pkgname2=${pkgname:9} +_pkgnamex=${_pkgname1^}_${_pkgname2^} +_pkgnamey=${pkgname}s +_pkgnamez=ha-${_pkgname1}${_pkgname2} +pkgver=3.9.5 +pkgrel=5 +pkgdesc='Standardized interface for a cluster resource (Linux-HA)' +arch=( + i686 + x86_64 + mips64el +) +group=linux-ha +url=http://$group.org/wiki/$_pkgnamex +license=GPL +depends=( + cluster-glue + ipvsadm + perl-socket6 + perl-lwp-protocol-https + perl-io-socket-inet6 + perl-mailtools + #rgmanager (clulog) !!redhat-cluster!! +) +optdepends=net-tools +makedepends=( + libxslt + libvirt + net-tools + openssh +) +options=(!libtool) +provides=($_pkgnamez) +conflicts=$_pkgnamez +replaces=$_pkgnamez +source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz +sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e + +prepare() { + cd $srcdir/$_pkgnamey-$pkgver + + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|; + ' configure.ac + + sed -i 's|INCLUDES|AM_CPPFLAGS|; + ' $(grep -rl INCLUDES | grep Makefile.am) + + # fixing path + sed -i 's|bin/sh|usr/bin/bash|; + ' $(grep -rl bin/sh) + sed -i 's| /bin| /usr/bin|; + ' $(grep -rl ' /bin') + sed -i 's| /sbin| /usr/bin|; + ' $(grep -rl ' /sbin') + sed -i 's|usr/sbin|usr/bin|; + ' $(grep -rl usr/sbin) + sed -i 's|/lib64|/lib|; + ' $(grep -rl /lib64) + #sed -i 's|usr/libexec|usr/lib|; + # ' $(grep -rl usr/libexec) + sed -i 's|var/lock|run/lock|; + ' $(grep -rl var/lock) + sed -i 's|var/run|run|; + ' $(grep -rl var/run) + + # remove Open Source term + sed -i 's|Open Source / ||; + s|open source / ||; + s|Open Source|Free Software|; + s|open source|free software|; + s|Free Software Development Lab|Open Source Development Lab|; + ' $(grep -ril 'open source') + sed -i 's|OpenSource / ||; + s|opensource / ||; + s|OpenSource|FreeSoftware|; + s|opensource|freesoftware|; + s|freesoftware.org|opensource.org|; + s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; + s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; + s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; + ' $(grep -ril opensource) + + # remove Linux term + sed -i 's|Linux,|GNU/Linux,|; + s|Linux and|GNU/Linux and|; + s|Linux distro|GNU/Linux distro|; + s|Linux distribution|GNU/Linux distribution|; + s|Linux machine|GNU/Linux machine|; + s|Linux Only|GNU/Linux Only|; + s|Linux only|GNU/Linux only|; + s|Linux operating|GNU/Linux operating|; + s|Linux OS|GNU/Linux OS|; + s|Linux platform|GNU/Linux platform|; + s|Linux software|GNU/Linux software|; + s|Linux specific|GNU/Linux specific|; + s|Linux system|GNU/Linux system|; + s|Linux will|GNU/Linux will|; + s|# Linux$|# GNU/Linux|; + s|# Linux.$|# GNU/Linux.|; + s|* Linux$|* GNU/Linux|; + s|* Linux.$|* GNU/Linux.|; + s|// Linux$|// GNU/Linux|; + s|// Linux.$|// GNU/Linux.|; + s|, Linux|, GNU/Linux|; + s|As Linux|As GNU/Linux|; + s|as Linux|as GNU/Linux|; + s|And Linux|And GNU/Linux|; + s|and Linux|and GNU/Linux|; + s|Be Linux|Be GNU/Linux|; + s|be Linux|be GNU/Linux|; + s|Because Linux|Because GNU/Linux|; + s|because Linux|because GNU/Linux|; + s|e.g. Linux|e.g. GNU/Linux|; + s|For Linux|For GNU/Linux|; + s|for Linux|for GNU/Linux|; + s|In Linux|In GNU/Linux|; + s|in Linux|in GNU/Linux|; + s|Like Linux|Like GNU/Linux|; + s|like Linux|like GNU/Linux|; + s|non-Linux|non GNU/Linux|; + s|Of Linux|Of GNU/Linux|; + s|of Linux|of GNU/Linux|; + s|On Linux|On GNU/Linux|; + s|on Linux|on GNU/Linux|; + s|OS type: Linux|OS type: GNU/Linux|; + s|Other Linux|Other GNU/Linux|; + s|other Linux|other GNU/Linux|; + s|The Linux|The GNU/Linux|; + s|the Linux|the GNU/Linux|; + s|Typically Linux|Typically GNU/Linux|; + s|typically Linux|typically GNU/Linux|; + s|To Linux|To GNU/Linux|; + s|to Linux|to GNU/Linux|; + s|Under Linux|Under GNU/Linux|; + s|under Linux|under GNU/Linux|; + s|ArchGNU/Linux|ArchLinux|; + s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; + s|GNU/GNU|GNU|; + s|GNU/Linux device|Linux device|; + s|GNU/Linux Director Daemon|Linux Director Daemon|; + s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; + s|GNU/Linux kernel|Linux kernel|; + s|GNU/Linux specific kernel|Linux specific kernel|; + s|GNU/Linux Standard Base|Linux Standard Base|; + s|GNU/Linux sysfs|Linux sysfs|; + s|GNU/Linux Virtual Server|Linux Virtual Server|; + s|GNU/Linux Watchdog|Linux Watchdog|; + s|GNU/Linux watchdog|Linux watchdog|; + s|GNU/LinuxHA|LinuxHA|; + s|GNU/Linux-HA|Linux-HA|; + s|GNU/LinuxSCSI|LinuxSCSI|; + s|HA GNU/Linux|HA Linux|; + s|High-Availability GNU/Linux|High-Availability Linux|; + s|MkGNU/Linux|MkLinux|; + s|SEGNU/Linux|SELinux|; + s|VA GNU/Linux Cluster|VA Linux Cluster|; + s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|; + / 2.6, the alignment should be / s|GNU/Linux|Linux|; + s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|; + ' $(grep -rl Linux) +} + +build() { + cd $srcdir/$_pkgnamey-$pkgver + setarch $CARCH ./autogen.sh + setarch $CARCH ./configure --prefix=/usr\ + --enable-fatal-warnings\ + --enable-libnet\ + --libdir=/usr/lib\ + --localstatedir=/var\ + --sbindir=/usr/bin\ + --sysconfdir=/etc\ + --with-ocf-root=/usr/lib/ocf + setarch $CARCH make +} + +package() { + cd $srcdir/$_pkgnamey-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install + + mv $pkgdir/{var/,}run + touch $pkgdir/etc/ha.d/ldirectord.cf + rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d + + install -d $pkgdir/usr/lib/systemd/system + echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Description=Non-heartbeat systems service, that manages the LVS component for TCP/UDP load-balancing' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'ExecStart=/usr/bin/ldirectord' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ldirectord.service + echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ldirectord.service +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index e01f42ef0..8bc928115 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -1,29 +1,45 @@ # Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com -# Maintainer:Jorge Araya Navarro <jorgean@lavabit.com> #_gui_toolkit=qt # qt or gtk _build_server=false # set true to build server (default:false) _build_client=true # set false to don't build client (default:true) _CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client _CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client - if [ $_build_client = true ] ; then true && pkgname=( 'ryzom-client-hg' ) fi if [ $_build_server = true ] ; then true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg') -fi +fi +pkgbase=ryzom-hg +pkgname=ryzom-hg +pkgver=20130331 +pkgrel=1 +pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server" +arch=('i686' 'x86_64') +url="http://www.ryzom.com/" +license=('AGPL3') +depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') +conflicts=('ryzom-client-latest-hg') +groups=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison') +provides=('ryzom') +source=( 'ryzom.sh' 'ryzom.desktop' ) +md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' + '71d5136d40ec4e76c2ac2b0c9e506aef') + + case $_gui_toolkit in qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;; gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;; -esac +esac _hg_root='https://bitbucket.org/ryzom/ryzomcore' -_hg_name='ryzomcore' +_hg_name='ryzomcore' prepare() { if [ -d "$_hg_name" ] ; then # fetch sources @@ -33,84 +49,52 @@ prepare() { else hg clone "$_hg_root" fi - + msg2 "hg clone done or server timeout" } build() { cd $_hg_name - - if [ $_build_client = true ] ; then - + + if [ $_build_client = true ] ; then mkdir -p "$srcdir/build-client" cd "$srcdir/build-client" msg "client is $_build_client, building client" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin msg "Starting make, to build client" make - + fi - + if [ $_build_server = true ] ; then mkdir -p "$srcdir/build-server" cd "$srcdir/build-server" msg "client is $_build_server, building server" cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - msg "Starting make, to build server" - make - + msg "Starting make, to build server" + make fi - } -if [ $_build_client = true ] ; then +if [ $_build_client = true ] ; then + package_ryzom-client-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server" depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql' 'ryzom-data' ) cd "$srcdir/build-client" make DESTDIR="$pkgdir/" install - install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + install -Dm755 ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom } - fi if [ $_build_server = true ] ; then - + package_ryzom-server-hg() { pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server" cd "$srcdir/build-server" - make DESTDIR="$pkgdir/" install - # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications - # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script - # cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom - #chmod +x ${pkgdir}/usr/bin/ryzom - mkdir -p ${pkgdir}/usr/bin - + make DESTDIR="$pkgdir/" install } - fi - - - -pkgname=ryzom-hg -pkgbase=ryzom-hg -pkgver=20130331 -pkgrel=1 -pkgdesc="An awesome free software 3D MMORPG game" -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL3') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51') #'lua51-sql-mysql') -conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg') -groups=('ryzom') -makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -provides=('ryzom') -source=( 'ryzom.sh' 'ryzom.desktop' ) -md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' - '71d5136d40ec4e76c2ac2b0c9e506aef') diff --git a/pcr/send-to-torrent/PKGBUILD b/pcr/send-to-torrent/PKGBUILD new file mode 100644 index 000000000..110ba0b1a --- /dev/null +++ b/pcr/send-to-torrent/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=send-to-torrent +pkgver=0.0.3 +pkgrel=1 +pkgdesc="Share files from the file browser" +arch=('any') +url="http://repo.hackcoop.com.ar/send-to-torrent.git/" +license=("AGPL3") +source=("http://repo.hackcoop.com.ar/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.xz") +md5sums=('e9d465ebec3abd1e142731f53adf8cf2') +depends=("bash" "mktorrent" "xdg-utils") +optdepends=("libnotify: desktop notifications" + "transmission-cli: transmission support" + "opentracker: local sharing support") + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/" + + make TARGET="${pkgdir}" PREFIX="/usr" install +} diff --git a/pcr/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD new file mode 100644 index 000000000..41cba9632 --- /dev/null +++ b/pcr/setbfree/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=setbfree +pkgver=0.5.5 +pkgrel=1 +pkgdesc="A DSP Tonewheel Organ emulator." +arch=('i686') +url="http://setbfree.org/" +license=('GPL') +depends=('jack' 'liblo' 'tk' 'desktop-file-utils') +makedepends=('lv2') +install="$pkgname.install" +source=("https://github.com/pantherb/setBfree/tarball/v$pkgver" + "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop") +md5sums=('604cc477a6fa76ee936f1d010c815c55' + '8c2a863562f26856dcff0a456cf36dcf') + +build() { + cd "$srcdir/pantherb"* + make PREFIX=/usr +} + +package() { + cd "$srcdir/pantherb"* + make DESTDIR="$pkgdir/" PREFIX=/usr install + + # desktop file + install -Dm644 ../$pkgname.desktop \ + "$pkgdir/usr/share/applications/$pkgname.desktop" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/setbfree/setbfree.desktop b/pcr/setbfree/setbfree.desktop new file mode 100644 index 000000000..0e9d14452 --- /dev/null +++ b/pcr/setbfree/setbfree.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=setBfree +GenericName=DSP tonewheel organ +Comment=MIDI-controlled, software synthesizer using JACK +Icon=setBfree +Exec=setBfree-start +Terminal=false +Categories=AudioVideo;Audio; diff --git a/pcr/setbfree/setbfree.install b/pcr/setbfree/setbfree.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/pcr/setbfree/setbfree.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/sineshaper/PKGBUILD b/pcr/sineshaper/PKGBUILD new file mode 100644 index 000000000..61560a770 --- /dev/null +++ b/pcr/sineshaper/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer : Guest One <theguestone at gmail dot com> +# patch taken from https://aur.archlinux.org/packages/sineshaper/ +pkgname=sineshaper +pkgver=0.4.2 +pkgrel=1 +pkgdesc="A monophonic DSSI synth plugin." +arch=('i686') +url="http://www.student.nada.kth.se/~d00-llu/music_dssi.php?lang=en" +license=('GPL') +depends=('libglademm' 'dssi') +makedepends=('ladspa') +source=("http://ll-plugins.sourceforge.net/release/$pkgname-$pkgver.tar.gz" gcc-4.3.patch) +md5sums=('952cb5bde0ae4fe2274859df5ed1ee61' + '78c44bb7b1586917224f26aaa9545e9e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # gcc 4.3 patch + patch -Np1 -i "$srcdir/${source[1]}" + + # DSO link fix + LDFLAGS+="-lgthread-2.0" \ + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # rename launcher + mv "$pkgdir/usr/bin/$pkgname.sh" \ + "$pkgdir/usr/bin/$pkgname" +} diff --git a/pcr/sineshaper/gcc-4.3.patch b/pcr/sineshaper/gcc-4.3.patch new file mode 100644 index 000000000..c62220608 --- /dev/null +++ b/pcr/sineshaper/gcc-4.3.patch @@ -0,0 +1,57 @@ +diff -aur sineshaper-0.4.2/src/common/dssiplugin.hpp sineshaper-0.4.2-patched/src/common/dssiplugin.hpp +--- sineshaper-0.4.2/src/common/dssiplugin.hpp 2005-10-29 01:14:08.000000000 +0200 ++++ sineshaper-0.4.2-patched/src/common/dssiplugin.hpp 2009-01-29 15:19:40.000000000 +0100 +@@ -25,6 +25,7 @@ + #define DSSIPLUGIN_HPP + + #include <unistd.h> ++#include <cstdlib> + + #include <cstring> + #include <string> +diff -aur sineshaper-0.4.2/src/common/dssiuiclient.hpp sineshaper-0.4.2-patched/src/common/dssiuiclient.hpp +--- sineshaper-0.4.2/src/common/dssiuiclient.hpp 2005-10-29 01:14:08.000000000 +0200 ++++ sineshaper-0.4.2-patched/src/common/dssiuiclient.hpp 2009-01-29 15:19:48.000000000 +0100 +@@ -99,13 +99,13 @@ + // Host to UI + /** This signal is emitted when the host sends a new control value. + The parameters are the control port number and the new control value. */ +- signal<void, int, float> control_received; ++ sigc::signal<void, int, float> control_received; + /** Emitted when the host sends a program change. The parameters are the + bank and program numbers. */ +- signal<void, int, int> program_received; ++ sigc::signal<void, int, int> program_received; + /** Emitted when the host sends a configuration value. The parameters are + the configuration key and the configuration value. */ +- signal<void, const string, const string> configure_received; ++ sigc::signal<void, const string, const string> configure_received; + /** Emitted when the host wants the UI to be visible. A DSSI GUI should not + show any windows until this signal is emitted. */ + Dispatcher show_received; +@@ -134,7 +134,7 @@ + void* allocate_shared_memory(int bytes); + + /** Emitted when the plugin has attached to the shared memory segment. */ +- signal<void> plugin_attached; ++ sigc::signal<void> plugin_attached; + + /** Returns true if the plugin has attached to the shared memory segment. */ + bool plugin_has_attached(); +diff -aur sineshaper-0.4.2/src/sineshaper/sineshapergui.hpp sineshaper-0.4.2-patched/src/sineshaper/sineshapergui.hpp +--- sineshaper-0.4.2/src/sineshaper/sineshapergui.hpp 2005-10-29 01:14:08.000000000 +0200 ++++ sineshaper-0.4.2-patched/src/sineshaper/sineshapergui.hpp 2009-01-29 15:20:31.000000000 +0100 +@@ -31,11 +31,11 @@ + void program_selected(int bank, int program); + + /** This signal is emitted when the user selects a program in the GUI. */ +- signal<void, unsigned long, unsigned long> signal_select_program; ++ sigc::signal<void, unsigned long, unsigned long> signal_select_program; + + /** This signal is emitted when the user has edited the programs and + the plugin needs to reload the file with the user presets. */ +- signal<void> signal_programs_changed; ++ sigc::signal<void> signal_programs_changed; + + protected: + diff --git a/pcr/skanlite/PKGBUILD b/pcr/skanlite/PKGBUILD index 42a164785..b0fa953e5 100644 --- a/pcr/skanlite/PKGBUILD +++ b/pcr/skanlite/PKGBUILD @@ -4,7 +4,7 @@ pkgname=skanlite pkgver=1.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="Image Scanning Application for KDE" arch=('i686' 'x86_64') url='http://www.kde.org/applications/graphics/skanlite' diff --git a/pcr/snort/PKGBUILD b/pcr/snort/PKGBUILD index 2439a1c73..c8a49678f 100644 --- a/pcr/snort/PKGBUILD +++ b/pcr/snort/PKGBUILD @@ -8,9 +8,9 @@ pkgname=snort pkgver=2.9.3.1 -pkgrel=1 +pkgrel=1.1 pkgdesc='A lightweight network intrusion detection system.' -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.snort.org' license=('GPL') depends=('libdaq' 'libdnet' 'libpcap' 'pcre' 'zlib') @@ -49,3 +49,7 @@ package() { sed -i 's#/usr/local/lib/#/usr/lib/#' "${pkgdir}/etc/snort/snort.conf" } +md5sums=('b2102605a7ca023ad6a2429821061c29' + 'SKIP' + '361b8b9e40b9af0164f6b3e3da2e8277' + 'b4fb8a68490589cd34df93de7609bfac') diff --git a/pcr/strongswan/CHANGELOG b/pcr/strongswan/CHANGELOG new file mode 100644 index 000000000..a798a08c4 --- /dev/null +++ b/pcr/strongswan/CHANGELOG @@ -0,0 +1,20 @@ +strongswan-5.0.4 +---------------- + +- Fixed a security vulnerability in the openssl plugin which was reported by + Kevin Wojtysiak. The vulnerability has been registered as CVE-2013-2944. + Before the fix, if the openssl plugin's ECDSA signature verification was used, + due to a misinterpretation of the error code returned by the OpenSSL + ECDSA_verify() function, an empty or zeroed signature was accepted as a + legitimate one. + +- The handling of a couple of other non-security relevant openssl return codes + was fixed as well. + +- The tnc_ifmap plugin now publishes virtual IPv4 and IPv6 addresses via its + TCG TNC IF-MAP 2.1 interface. + +- The charon.initiator_only option causes charon to ignore IKE initiation + requests. + +- The openssl plugin can now use the openssl-fips library. diff --git a/pcr/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD index ed603e5c2..2ec8bc5b7 100644 --- a/pcr/strongswan/PKGBUILD +++ b/pcr/strongswan/PKGBUILD @@ -7,24 +7,27 @@ # Maintainer: dkorzhevin <dkorzhevin at gmail dot com> pkgname=strongswan -pkgver=5.0.1 -pkgrel=2 +pkgver=5.0.4 +pkgrel=5 pkgdesc="open source IPsec implementation" url='http://www.strongswan.org' license=("GPL") arch=('i686' 'x86_64' 'mips64el') -depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3') +depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite') conflicts=('openswan') options=(!libtool) backup=(etc/ipsec.conf etc/strongswan.conf) source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 strongswan.rc::https://gist.github.com/raw/3106703/96d2ce9683f1e33ef14c679880ddc298e9673508/strongswan.rc) -md5sums=('58fdeb49f133139a58f4d8adafc69a16' - 'cf815adef48a1ffee34517380c731277') - +changelog='CHANGELOG' +md5sums=('0ab0397b44b197febfd0f89148344035' + '390b3cea47d1ecf642c333e29dc9f32a') build() { - cd ${srcdir}/${pkgname}-${pkgver} || return 1 + cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-ipsecdir=/usr/lib/strongswan \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-ipsecdir=/usr/lib/strongswan \ --enable-sqlite \ --enable-openssl --enable-curl \ --enable-sql --enable-attr-sql \ @@ -34,12 +37,15 @@ build() { --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \ --enable-eap-mschapv2 --enable-eap-radius --enable-xauth-eap \ --enable-ha \ - --disable-mysql --disable-ldap || return 1 + --disable-mysql --disable-ldap - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} - install -d ${pkgdir}/etc/rc.d || return 1 - ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec || return 1 - install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + install -d ${pkgdir}/etc/rc.d + ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec + install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan } diff --git a/pcr/sword-svn/PKGBUILD b/pcr/sword-svn/PKGBUILD new file mode 100644 index 000000000..8e29cdab8 --- /dev/null +++ b/pcr/sword-svn/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +pkgname=sword-svn +pkgver=2793 +pkgrel=1 +pkgdesc="Libraries for Bible programs - svn -version" +arch=('i686' 'x86_64') +url="http://www.crosswire.org/sword/" +license=('GPL') +depends=('curl' 'clucene' 'swig') +makedepends=('subversion') +provides=('sword') +conflicts=('sword') +source=('sword::svn+https://www.crosswire.org/svn/sword/trunk/' 'automake.patch') +md5sums=('SKIP' '24a4821088da78725b9374807d0d3508') +options=('!makeflags') +_svnmod=sword + +pkgver() { + cd $SRCDEST/${_svnmod} + svnversion +} + +prepare() { + cd "$srcdir/$_svnmod" + patch -p1 < $srcdir/automake.patch +} + +build() { + cd "$srcdir/$_svnmod" + ./autogen.sh + CPPFLAGS+="-fpermissive" ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$_svnmod" + make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir/" install_config +} diff --git a/pcr/sword-svn/automake.patch b/pcr/sword-svn/automake.patch new file mode 100644 index 000000000..3cfd5eb44 --- /dev/null +++ b/pcr/sword-svn/automake.patch @@ -0,0 +1,52 @@ +diff -Naur sword.orig/configure.ac sword.new/configure.ac +--- sword.orig/configure.ac 2013-01-13 12:46:13.000000000 +0100 ++++ sword.new/configure.ac 2013-01-13 12:47:34.000000000 +0100 +@@ -13,7 +13,7 @@ + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE + +-AM_CONFIG_HEADER(include/config.h) ++AC_CONFIG_HEADERS(include/config.h) + + AC_CONFIG_MACRO_DIR([m4]) + +diff -Naur sword.orig/examples/cmdline/Makefile.am sword.new/examples/cmdline/Makefile.am +--- sword.orig/examples/cmdline/Makefile.am 2013-01-13 12:46:13.000000000 +0100 ++++ sword.new/examples/cmdline/Makefile.am 2013-01-13 12:53:55.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = 1.6 +-INCLUDES = -I $(top_srcdir)/include ++AM_CPPFLAGS = -I $(top_srcdir)/include + if USE_INTERNAL_REGEX +-INCLUDES += -I$(top_srcdir)/include/internal/regex ++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex + endif + LDADD = $(top_builddir)/lib/libsword.la + +diff -Naur sword.orig/tests/Makefile.am sword.new/tests/Makefile.am +--- sword.orig/tests/Makefile.am 2013-01-13 12:46:14.000000000 +0100 ++++ sword.new/tests/Makefile.am 2013-01-13 12:54:33.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = 1.6 +-INCLUDES = -I $(top_srcdir)/include ++AM_CPPFLAGS = -I $(top_srcdir)/include + if USE_INTERNAL_REGEX +-INCLUDES += -I$(top_srcdir)/include/internal/regex ++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex + endif + LDADD = $(top_builddir)/lib/libsword.la + +diff -Naur sword.orig/utilities/Makefile.am sword.new/utilities/Makefile.am +--- sword.orig/utilities/Makefile.am 2013-01-13 12:46:13.000000000 +0100 ++++ sword.new/utilities/Makefile.am 2013-01-13 12:56:12.000000000 +0100 +@@ -1,8 +1,8 @@ + AUTOMAKE_OPTIONS = 1.6 + SUBDIRS = diatheke +-INCLUDES = -I $(top_srcdir)/include ++AM_CPPFLAGS = -I $(top_srcdir)/include + if USE_INTERNAL_REGEX +-INCLUDES += -I$(top_srcdir)/include/internal/regex ++AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex + endif + LDADD = $(top_builddir)/lib/libsword.la + noinst_PROGRAMS = cipherraw lexdump \ diff --git a/pcr/synthv1/PKGBUILD b/pcr/synthv1/PKGBUILD new file mode 100644 index 000000000..a0d858664 --- /dev/null +++ b/pcr/synthv1/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=synthv1 +pkgver=0.3.2 +pkgrel=1 +pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx" +arch=('i686') +url="http://$pkgname.sourceforge.net/$pkgname-index.html" +license=('GPL') +depends=('lv2' 'jack' 'qt4') +install="$pkgname.install" +source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('88fd93df7cd6754de355edb5fe3cb3e7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # x86_64 lib path fix + sed -i "s/lib64/lib/" src/src_lv2.pro + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/epiphany-extensions/epiphany-extensions.install b/pcr/synthv1/synthv1.install index c0ed9a0d7..bce670aff 100644 --- a/extra/epiphany-extensions/epiphany-extensions.install +++ b/pcr/synthv1/synthv1.install @@ -1,6 +1,6 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } post_upgrade() { diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD new file mode 100644 index 000000000..ff02793aa --- /dev/null +++ b/pcr/triceratops-lv2/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=triceratops-lv2 +pkgver=0.1.6c +pkgrel=1 +pkgdesc="Polyphonic synthesizer LV2 plugin" +arch=('i686') +url="http://sourceforge.net/projects/triceratops/" +license=('GPL') +depends=('gtkmm' 'lv2') +makedepends=('python2') +source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz") +md5sums=('7a0755876c4d3af6f1b4cac899679472') + +build() { + cd "$srcdir/$pkgname-v$pkgver" + python2 waf configure --prefix=/usr + python2 waf +} + +package() { + cd "$srcdir/$pkgname-v$pkgver" + DESTDIR="$pkgdir/" python2 waf install +} + +# vim:set ts=2 sw=2 et: diff --git a/~mtjm/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD index ff338e0d4..3bbe41397 100644 --- a/~mtjm/ttf-beteckna/PKGBUILD +++ b/pcr/ttf-beteckna/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ttf-beteckna pkgver=0.4 -pkgrel=1 +pkgrel=1.1 pkgdesc="A geometric sans serif typeface inspired by the popular Futura" arch=('any') url="http://gnu.ethz.ch/linuks.mine.nu/beteckna/" diff --git a/~mtjm/ttf-beteckna/ttf.install b/pcr/ttf-beteckna/ttf.install index 33b7d6549..33b7d6549 100644 --- a/~mtjm/ttf-beteckna/ttf.install +++ b/pcr/ttf-beteckna/ttf.install diff --git a/pcr/whysynth/PKGBUILD b/pcr/whysynth/PKGBUILD new file mode 100644 index 000000000..8d2895984 --- /dev/null +++ b/pcr/whysynth/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +pkgname=whysynth +pkgver=20120903 +pkgrel=1 +pkgdesc="A versatile softsynth plugin for the DSSI Soft Synth Interface" +arch=('i686') +url="http://www.smbolton.com/whysynth.html" +depends=('alsa-lib' 'liblo' 'gtk2' 'fftw') +makedepends=('dssi' 'ladspa') +license=('GPL') +source=(http://www.smbolton.com/whysynth/${pkgname}-${pkgver}.tar.bz2) +md5sums=('b521b63ade13b09062a64c46d2eabee2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install || return 1 + find ${pkgdir}/usr/lib -name '*.la' -exec rm {} \; || return 1 +} diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD index 0c5f9501d..74f21775e 100644 --- a/pcr/xfce-theme-greybird/PKGBUILD +++ b/pcr/xfce-theme-greybird/PKGBUILD @@ -1,32 +1,55 @@ -# Maintainer: flan_suse +# Maintainer: Limao Luo <luolimao+AUR@gmail.com> +# Contributor: flan_suse + +# This suite contains the following: +# * xfwm4 theme +# * xfwm4 compact theme +# * metacity theme +# * emerald theme +# * gtk2 theme +# * gtk2 theme (classic) +# * gtk3 theme +# * gtk3 theme (classic) +# * unity theme +# * xfce4-notify theme +# * lightdm theme +# * wallpaper (found in the shimmer-wallpapers package; optdepends) + +# There have been some drastic changes as of July 22nd, 2012! +# Please read through the AUR page comments if you wish to learn more. +# I have modified this PKGBUILD to compensate for the drastic changes. + pkgname=xfce-theme-greybird -pkgver=1.0.7 +_pkgname=Greybird +pkgver=1.1.1 +_pkgverclassic=0.8.2 pkgrel=1 -pkgdesc="A grey and blue Xfce theme, introduced in the release of Xubuntu 11.04 and updated for 12.04; includes the classic low saturation theme" -arch=('any') -url="http://shimmerproject.org/projects/greybird/" -license=('GPL2' 'CC-BY-SA-3.0') -groups=('xfce-themes-shimmer-collection') -depends=('gtk-engine-murrine') -optdepends=('shimmer-wallpapers: contains the Greybird wallpaper, among others' - 'gtk3: required for CSS/GTK3 theme' - 'elementary-xfce-icons: matching icon set; use the dark icon theme' - 'lightdm-gtk-greeter: required for the LightDM GTK theme' - 'lightdm-unity-greeter: required for the LightDM Unity theme' - 'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme') -source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/Greybird/tarball/v${pkgver}) +pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04; includes the classic low saturation theme" +arch=(any) +url=http://shimmerproject.org/projects/greybird/ +license=(CCPL:by-sa-3.0 GPL) +groups=(xfce-themes-shimmer-collection) +depends=(gtk-engine-murrine) +optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme' + 'gtk-engine-unico: required for gtk3 support for the classic theme; not required for the current theme' + 'gtk3: required for CSS/GTK3 theme' + 'lightdm-gtk-greeter: required for the LightDM GTK theme' + 'lightdm-unity-greeter: required for the LightDM Unity theme' + 'shimmer-wallpapers: contains the Greybird wallpaper, among others') +conflicts=($pkgname-git) +source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz + $pkgname-$_pkgverclassic.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$_pkgverclassic.tar.gz) +sha256sums=('374bc55d6af98ca6052cc5dd6c55db3b1ce9002fe81d3fde3e9b72febe697878' + 'b63da3527760c194bb7299c1cb45297268439740e52e2c5e1f39fc31dce6293a') +sha512sums=('1e4f7dea5e0206972d7d4a5bf42b353abf21e40d215fc1b0e7b546a4c95c7ce0604a37e9f2ad6c272fedf4720d0a5eee732a6b89d83c635c24082c24711c9e5e' + '09f19bbfe02a477de6635198736897d143a5eec8ed13e6d1863c80f5d78b341ecdf2b2cf48bffddead25082eeadde475d360fc7bee773307c5cc10fb3ff90034') package() { - cd "${srcdir}/shimmerproject-Greybird"* - - # Create installation directories - install -d -m755 "${pkgdir}/usr/share/themes/Greybird"{,\ Compact} - - # Install the current theme - cp -a * "${pkgdir}/usr/share/themes/Greybird/" + local _themedir="$pkgdir/usr/share/themes" + install -d "$_themedir/$_pkgname "{Classic,Compact} - # Make a symbolic link for the compact version of the xfwm4 theme - cd "${pkgdir}/usr/share/themes/Greybird Compact" - ln -s "../${_pkgname}/xfwm4_compact" "xfwm4" + cp -rf $_pkgname-$pkgver/ "$_themedir"/$_pkgname/ + rm "$_themedir"/$_pkgname/.gitignore + cp -rf $_pkgname-$_pkgverclassic/gtk-{2,3}.0 "$_themedir/$_pkgname Classic" + ln -s /usr/share/themes/$_pkgname/xfwm4_compact "$_themedir/$_pkgname Compact/xfwm4" } -md5sums=('d7c291408cd644e102cf811ee62e7a37') diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD new file mode 100644 index 000000000..f353b9bfa --- /dev/null +++ b/pcr/xsynth-dssi/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Guest One <theguestone at gmail dot com> + +pkgname=xsynth-dssi +pkgver=0.9.4 +pkgrel=1 +pkgdesc="An analog-style (VCOs-VCF-VCA) synth plugin for DSSI" +arch=('i686') +url="http://dssi.sourceforge.net/download.html#Xsynth-DSSI" +license=('GPL') +depends=('gtk2' 'liblo') +makedepends=('dssi' 'ladspa') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/dssi/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz + xsynth-dssi) +md5sums=('3432ecdac06407a992f80eb1c1ecf7cd' + 'c346e6a944f202fccb2278b77a5e184b') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install || return 1 + install -D -m755 ${srcdir}/xsynth-dssi ${pkgdir}/usr/bin/xsynth-dssi +} + diff --git a/pcr/xsynth-dssi/xsynth-dssi b/pcr/xsynth-dssi/xsynth-dssi new file mode 100644 index 000000000..5503b12ba --- /dev/null +++ b/pcr/xsynth-dssi/xsynth-dssi @@ -0,0 +1,4 @@ +#!/bin/bash + +export DSSI_PATH=/usr/lib/dssi +exec jack-dssi-host xsynth-dssi.so diff --git a/~mtjm/python-coverage/LICENSE b/~mtjm/python-coverage/LICENSE deleted file mode 100644 index 304031cb6..000000000 --- a/~mtjm/python-coverage/LICENSE +++ /dev/null @@ -1,29 +0,0 @@ -# COPYRIGHT AND LICENSE -# -# Copyright 2001 Gareth Rees. All rights reserved. -# Copyright 2004-2010 Ned Batchelder. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -# DAMAGE. diff --git a/~mtjm/python-coverage/PKGBUILD b/~mtjm/python-coverage/PKGBUILD deleted file mode 100644 index f9acc0d94..000000000 --- a/~mtjm/python-coverage/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Michał Masłowski <mtjm@mtjm.eu> - -pkgname=(python-coverage python2-coverage) -pkgver=3.5.1 -pkgrel=1 -pkgdesc="Code coverage measurement for Python" -arch=('i686' 'x86_64' 'mips64el') -url="http://nedbatchelder.com/code/coverage/" -license=('BSD') -makedepends=('python' 'python2' 'python-distribute' 'python2-distribute') -provides=() -conflicts=() -replaces=() -backup=() -options=(!emptydirs) -install= -source=("http://pypi.python.org/packages/source/c/coverage/coverage-${pkgver}.tar.gz" LICENSE) -md5sums=('410d4c8155a4dab222f2bc51212d4a24' - 'f86a7dcb9a1bc636cdbcc19a96d19b2c') - -# Tests are not run, since upstream removes them from release tarballs. - -build() { - cd $srcdir - cp -r coverage-$pkgver build-py2k - cp -r coverage-$pkgver build-py3k - cd build-py2k - python2 setup.py build - cd ../build-py3k - python setup.py build -} - -package_python-coverage() { - depends=('python' 'python-distribute') - cd "$srcdir/build-py3k" - python setup.py install --root="$pkgdir/" --optimize=1 - install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_python2-coverage() { - depends=('python2' 'python2-distribute') - cd "$srcdir/build-py2k" - python2 setup.py install --root="$pkgdir/" --optimize=1 - # Name the script differently. - mv $pkgdir/usr/bin/coverage $pkgdir/usr/bin/coverage2 - install -D -m644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/~mtjm/python2-pyflakes/PKGBUILD b/~mtjm/python2-pyflakes/PKGBUILD deleted file mode 100644 index 397c487b7..000000000 --- a/~mtjm/python2-pyflakes/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 64234 2012-02-11 00:28:07Z arodseth $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: TDY <tdy@gmx.com> -# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> - -pkgname=python2-pyflakes -pkgver=0.5.0 -pkgrel=1 -pkgdesc='A lint-like tool for Python to identify common errors quickly without executing code' -arch=('any') -url='http://pypi.python.org/pypi/pyflakes' -license=('custom:MIT') -depends=('python2') -provides=('pyflakes') -conflicts=('pyflakes') -replaces=('pyflakes') -source=("http://pypi.python.org/packages/source/p/pyflakes/pyflakes-${pkgver}.tar.gz") -md5sums=('568dab27c42e5822787aa8a603898672') - -build() { - cd pyflakes-${pkgver} - - python2 setup.py build -} - -package() { - cd pyflakes-${pkgver} - - python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 - - install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/pyflakes/LICENSE -} |
