diff options
33 files changed, 1089 insertions, 125 deletions
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index bc04e7f9b..a79adcaed 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76105 2012-09-11 14:05:16Z spupykin $ +# $Id: PKGBUILD 76509 2012-09-20 10:48:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" @@ -16,10 +16,12 @@ options=('!libtool' '!makeflags') install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} radiusd + freeradius.tmpfiles krb5-build-fix.patch) md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' '5dd57af81ba075102581fec45316ba7b' 'f1a6530b1b69d2fa793aa45b2de379bb' + 'f959e89812bedfc9f8308076f78cd74e' 'c6a61de7576933f59154a53bfc12a2d2') build() { @@ -42,4 +44,5 @@ package() { chmod o+r $pkgdir/etc/raddb/* mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default rm -rf $pkgdir/var/run + install -Dm0644 $srcdir/freeradius.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/freeradius/freeradius.tmpfiles b/community/freeradius/freeradius.tmpfiles new file mode 100644 index 000000000..e4e056a36 --- /dev/null +++ b/community/freeradius/freeradius.tmpfiles @@ -0,0 +1 @@ +d /run/radiusd 0755 radiusd radiusd - diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index cf147e271..d7a20adce 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72340 2012-06-12 09:32:15Z kkeen $ +# $Id: PKGBUILD 76513 2012-09-20 19:33:36Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.37 +pkgver=3.3.40 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('8747205c6cf1abb34b5a8b2f157f37e0') +md5sums=('f7b4cd0d056084f6725173b7f939152c') build() { cd "${srcdir}/gtkwave-${pkgver}" diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index ada8e7e9f..49e132e5a 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73311 2012-07-06 07:26:16Z bpiotrowski $ +# $Id: PKGBUILD 76505 2012-09-20 05:16:42Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -7,11 +7,11 @@ # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> pkgname=midori -pkgver=0.4.6 -pkgrel=2 -pkgdesc="Lightweight web browser based on Gtk WebKit" +pkgver=0.4.7 +pkgrel=1 +pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686') -url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" +url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' license=('LGPL2.1') install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') @@ -19,31 +19,29 @@ makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support') options=('!emptydirs') source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea') +md5sums=('06db7b88a41e9b2265728960d5e98f35') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf - ./configure \ - --prefix=/usr \ - --jobs=${MAKEFLAGS/-j/} \ - --enable-addons \ - --disable-hildon \ - --enable-unique \ - --enable-nls \ - --enable-docs \ - --enable-apidocs + ./configure --prefix=/usr \ + --jobs=${MAKEFLAGS/-j/} \ + --enable-addons \ + --disable-hildon \ + --enable-unique \ + --enable-nls \ + --enable-docs \ + --enable-apidocs 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/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD index 4e383731b..616472e31 100644 --- a/extra/fluidsynth/PKGBUILD +++ b/extra/fluidsynth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151334 2012-02-25 14:36:41Z pierre $ +# $Id: PKGBUILD 166870 2012-09-20 10:08:01Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fluidsynth -pkgver=1.1.5 -pkgrel=2 +pkgver=1.1.6 +pkgrel=1 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" arch=('i686' 'x86_64') url="http://www.fluidsynth.org/" @@ -13,12 +13,15 @@ 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' - 'fluidsynthd') -md5sums=('657e49e682b316432a4421dbb0313c3e' - '16c5f4d4cbdddc6c5fcbd4fd4cc142f1' - 'b296dbfb524c2164f552f68bd9abe2ec') + 'fluidsynth.rc' + 'fluidsynth.systemd') +md5sums=('ae5aca6de824b4173667cbd3a310b263' + '7d0ab0d75d4e87652f4cb7ffeac8a82b' + 'b296dbfb524c2164f552f68bd9abe2ec' + 'e0406748a154409907df62292be32e8a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,8 +41,11 @@ package() { install -Dm644 "$srcdir/fluidsynth.conf" \ "$pkgdir/etc/conf.d/fluidsynth" - install -Dm755 "$srcdir/fluidsynthd" \ + install -Dm755 "$srcdir/fluidsynth.rc" \ "$pkgdir/etc/rc.d/fluidsynth" + + install -Dm644 "$srcdir/fluidsynth.systemd" \ + "$pkgdir/usr/lib/systemd/system/fluidsynth.service" } # vim:set ts=2 sw=2 et: diff --git a/extra/fluidsynth/fluidsynth.conf b/extra/fluidsynth/fluidsynth.conf index 5267d5835..b8465fa2e 100644 --- a/extra/fluidsynth/fluidsynth.conf +++ b/extra/fluidsynth/fluidsynth.conf @@ -1,2 +1,2 @@ FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000" -FSYNTH_SOUNDFONT=""
\ No newline at end of file +FSYNTH_SOUNDFONT="" # path to your soundfont diff --git a/extra/fluidsynth/fluidsynth.install b/extra/fluidsynth/fluidsynth.install new file mode 100644 index 000000000..86e05f892 --- /dev/null +++ b/extra/fluidsynth/fluidsynth.install @@ -0,0 +1,19 @@ +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 " /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 " 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 new file mode 100644 index 000000000..ca1e8fa6e --- /dev/null +++ b/extra/fluidsynth/fluidsynth.rc @@ -0,0 +1,40 @@ +#!/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/fluidsynth/fluidsynth.systemd b/extra/fluidsynth/fluidsynth.systemd new file mode 100644 index 000000000..06784fe05 --- /dev/null +++ b/extra/fluidsynth/fluidsynth.systemd @@ -0,0 +1,9 @@ +[Unit] +Description=FluidSynth Daemon +After=sound.target + +[Service] +ExecStart=/usr/bin/fluidsynth -is -a alsa -m alsa_seq -r 48000 # append soundfont path here + +[Install] +WantedBy=multi-user.target diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 738fdd14b..dd4088bde 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165509 2012-08-21 14:11:50Z dan $ +# $Id: PKGBUILD 166873 2012-09-20 13:16:25Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.12 +pkgver=1.7.12.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c' - '0070ad185cfc29da545abe35ba8862e7' +md5sums=('1c16e94ca43c2811806567ed6e73d704' + 'efaef000a05938971606fad472a1b9f0' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index 1eff95fe7..4a952f56c 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 161318 2012-06-09 06:49:32Z tpowa $ +# $Id: PKGBUILD 166869 2012-09-20 09:33:33Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax -pkgver=6.0.5 -pkgrel=6 +pkgver=6.0.6 +pkgrel=1 pkgdesc="Fax Server" arch=('i686' 'x86_64') install='hylafax.install' @@ -17,25 +17,12 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax hylafax.cron.daily config.local - configure-6.0.5.patch - hylafax-libtiff4.patch faxq.service hfaxd.service) -md5sums=('eb9ac942354ad708e20e4583cec6615f' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '60f2a7e62c256ead4e9238cb31b35b90' - '51d9f639bb76e5e39cdc8e2ac07e208d' - '3d239c186f24720e945508d349b069b1' - '832c8e8098e2dfa56040c975b554590c' - '38a00db6d9d765d130b2d8d3a98e5c24') -build() { +build () { cd "$srcdir/${pkgname}-${pkgver}" cp ../config.local . - # fix compiling - patch -Np0 -i ../configure-6.0.5.patch - patch -Np1 -i ../hylafax-libtiff4.patch ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" make } @@ -58,3 +45,9 @@ package () { install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } +md5sums=('d063d45049c8fcbabefe09d662313067' + '6602288a405324d8c8e3c5eac2bf19fd' + '52beffe7dc296b4f9ce9fd0387f7804e' + '60f2a7e62c256ead4e9238cb31b35b90' + '832c8e8098e2dfa56040c975b554590c' + '38a00db6d9d765d130b2d8d3a98e5c24') diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index 772ebec46..a3ebc3d37 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,49 +1,46 @@ -# $Id: PKGBUILD 157813 2012-04-30 03:19:10Z heftig $ +# $Id: PKGBUILD 166872 2012-09-20 10:13:42Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado -pkgver=2.0.1 -pkgrel=7 +pkgver=2.1.0 +pkgrel=1 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" license=('GPL') -depends=('libiec61883' 'libavc1394' 'libsigc++' - 'libxml++' 'alsa-lib' 'dbus') -makedepends=('scons' 'python2-pyqt') +depends=('libiec61883' 'libavc1394' 'dbus-c++' + 'libxml++' 'alsa-lib' 'libsigc++' 'libconfig') +makedepends=('scons' 'subversion' 'python2-pyqt') optdepends=('python2: ffado-diag' 'python2-pyqt: mixer applet') provides=('ffado') -source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" - "libffado-gcc47.patch" "fix-segfault-on-close.patch" '60-ffado.rules') -md5sums=('786f31facd417e6207e429f50af0e15e' - '287bb3f506e31626c4b8f91f0e1d9407' - 'ac9763cb2dc2f3eb4e1894e30645c6f1' - 'f03a3e950801c4405b8934084651bca8') +source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz" + 'python2-qt.patch') +md5sums=('26bce2be0b9c1fa4e614f2f494edf388' + '10aa837f5521da213caa93e1ddc58c0e') + +_scons-conf() { + scons DEBUG=False \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + UDEVDIR=/usr/lib/udev/rules.d \ + COMPILE_FLAGS="$CFLAGS" $@ +} build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir"/libffado-gcc47.patch - patch -p3 -i "$srcdir"/fix-segfault-on-close.patch - - # hack to use CFLAGS without optimising - sed -i 's/-O2//g' SConstruct + # python2 fix + patch -Np1 -i "$srcdir/python2-qt.patch" - if [ "$CARCH" = "x86_64" ]; then - sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct + # build! + if [ "$CARCH" = 'x86_64' ]; then + _scons-conf ENABLE_OPTIMIZATIONS=True else - sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct + _scons-conf fi - - # python2 fix - sed -i 's:python $SOURCE:python2 $SOURCE:' SConstruct - sed -i 's:python support/tools:python2 support/tools:' \ - support/tools/SConscript - - scons PREFIX=/usr } package() { @@ -51,16 +48,6 @@ package() { scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install - # add audio device rules - # see https://bugs.archlinux.org/task/26342 - install -Dm644 "$srcdir/60-ffado.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-ffado.rules" - - # python2 fix - for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' "$i" - done - # desktop files & icons install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \ "$pkgdir/usr/share/applications/ffadomixer.desktop" diff --git a/extra/libffado/python2-qt.patch b/extra/libffado/python2-qt.patch new file mode 100644 index 000000000..042aa2665 --- /dev/null +++ b/extra/libffado/python2-qt.patch @@ -0,0 +1,246 @@ +diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct +--- libffado-2.1.0.orig/SConstruct 2012-09-19 14:18:53.827448582 +0800 ++++ libffado-2.1.0/SConstruct 2012-09-19 14:20:01.670414379 +0800 +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2007, 2008, 2010 Arnold Krille +@@ -134,7 +134,7 @@ + + def CheckForPyModule( context, module ): + context.Message( "Checking for the python module '" + module + "' " ) +- ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" ) ++ ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" ) + context.Result( ret[0] ) + return ret[0] + +@@ -351,7 +351,7 @@ + + # PyQT checks + build_mixer = False +-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): ++if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): + env['PYUIC4'] = True + build_mixer = True + +diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py +--- libffado-2.1.0.orig/admin/dbus.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/dbus.py 2012-09-19 14:19:02.957399122 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/admin/doxygen.py libffado-2.1.0/admin/doxygen.py +--- libffado-2.1.0.orig/admin/doxygen.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/doxygen.py 2012-09-19 14:19:02.957399122 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pkgconfig.py libffado-2.1.0/admin/pkgconfig.py +--- libffado-2.1.0.orig/admin/pkgconfig.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pkgconfig.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pyuic.py libffado-2.1.0/admin/pyuic.py +--- libffado-2.1.0.orig/admin/pyuic.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pyuic.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py +--- libffado-2.1.0.orig/admin/pyuic4.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/pyuic4.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +@@ -21,10 +21,8 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # + +-import imp +- + def pyuic4_action( target, source, env ): +- env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) ++ env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) ) + return 0 + + def pyuic4_string( target, source, env ): +@@ -34,7 +32,7 @@ + context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " ) + ret = True + try: +- imp.find_module( "pyqtconfig" ) ++ import PyQt4.pyqtconfig + except ImportError: + ret = False + context.Result( ret ) +diff -baur libffado-2.1.0.orig/admin/scanreplace.py libffado-2.1.0/admin/scanreplace.py +--- libffado-2.1.0.orig/admin/scanreplace.py 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/admin/scanreplace.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # +diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript +--- libffado-2.1.0.orig/doc/SConscript 2012-09-19 14:18:53.857448419 +0800 ++++ libffado-2.1.0/doc/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/python2 + + Import( 'env' ) + +diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript +--- libffado-2.1.0.orig/support/dbus/SConscript 2012-09-19 14:18:53.827448582 +0800 ++++ libffado-2.1.0/support/dbus/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/bin/env python ++#!/usr/bin/python2 + # + # Copyright (C) 2007,2008,2011 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/support/mixer-qt4/SConscript libffado-2.1.0/support/mixer-qt4/SConscript +--- libffado-2.1.0.orig/support/mixer-qt4/SConscript 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/SConscript 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2009 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py +--- libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2008 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in +--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2009 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.1.0/support/mixer-qt4/ffado-mixer.in +--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in 2012-09-19 14:18:53.834115214 +0800 ++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2008 by Pieter Palmers + # 2007-2009 by Arnold Krille +diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/tools/SConscript +--- libffado-2.1.0.orig/support/tools/SConscript 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/SConscript 2012-09-19 14:20:51.970141882 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2007-2008 Arnold Krille + # Copyright (C) 2007-2008 Pieter Palmers +@@ -43,7 +43,7 @@ + # For the installation of the stuff + e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e ) + +-e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" ) ++e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" ) + + e.ScanReplace( "ffado-diag.in" ) + +diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static +--- libffado-2.1.0.orig/support/tools/ffado-diag-static 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-diag-static 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +@@ -74,7 +74,7 @@ + # check libraries + print " gcc ............... %s" % get_version_first_line('gcc --version') + print " g++ ............... %s" % get_version_first_line('g++ --version') +- print " PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version') ++ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version') + print " jackd ............. %s" % get_version_first_line('jackd --version') + print " path ............ %s" % get_command_path('jackd') + print " flags ........... %s" % get_package_flags("jack") +diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/support/tools/ffado-diag.in +--- libffado-2.1.0.orig/support/tools/ffado-diag.in 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-diag.in 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +@@ -120,7 +120,7 @@ + print " Prerequisites (dynamic at run-time)..." + print " gcc ............... %s" % get_version_first_line('gcc --version') + print " g++ ............... %s" % get_version_first_line('g++ --version') +- print " PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version') ++ print " PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version') + print " jackd ............. %s" % get_version_first_line('jackd --version') + print " path ............ %s" % get_command_path('jackd') + print " flags ........... %s" % get_package_flags("jack") +diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2.1.0/support/tools/ffado-sandbox-install.py +--- libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/ffado-sandbox-install.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py +--- libffado-2.1.0.orig/support/tools/listirqinfo.py 2012-09-19 14:18:53.830781898 +0800 ++++ libffado-2.1.0/support/tools/listirqinfo.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + + # +diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py +--- libffado-2.1.0.orig/tests/dbus_test.py 2012-09-19 14:18:53.837448529 +0800 ++++ libffado-2.1.0/tests/dbus_test.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2007 by Pieter Palmers + # 2007-2008 by Arnold Krille +diff -baur libffado-2.1.0.orig/tests/python/test-eap-ctrl.py libffado-2.1.0/tests/python/test-eap-ctrl.py +--- libffado-2.1.0.orig/tests/python/test-eap-ctrl.py 2012-09-19 14:18:53.837448529 +0800 ++++ libffado-2.1.0/tests/python/test-eap-ctrl.py 2012-09-19 14:19:02.957399123 +0800 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright (C) 2005-2009 by Pieter Palmers + # diff --git a/gnome-unstable/empathy/PKGBUILD b/gnome-unstable/empathy/PKGBUILD new file mode 100644 index 000000000..a59b3c533 --- /dev/null +++ b/gnome-unstable/empathy/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 166890 2012-09-20 22:49:35Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=empathy +pkgver=3.5.92 +pkgrel=1 +pkgdesc="A GNOME instant messaging client using the Telepathy framework." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Empathy" +license=('GPL2') +depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') +makedepends=('intltool' 'itstool') +optdepends=('telepathy-gabble: XMPP/Jabber support' + 'telepathy-idle: IRC support' + 'telepathy-salut: Link-local XMPP support' + 'telepathy-rakia: SIP support' + 'telepathy-haze: libpurple support') +options=('!libtool') +groups=('gnome-extra') +install=empathy.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('5e65d07d2f7f991d931cdd2a41702520ef9797904ff24016d4bb37a237ebbcbd') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/empathy \ + --disable-static \ + --disable-schemas-compile + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/empathy/empathy.install b/gnome-unstable/empathy/empathy.install new file mode 100644 index 000000000..f8d2dfb1f --- /dev/null +++ b/gnome-unstable/empathy/empathy.install @@ -0,0 +1,16 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + echo "To use Empathy you need to install at least one Telepathy connection manager." +} + +post_upgrade() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_remove() { + post_upgrade +} diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD index a36e354ca..a5703bd8a 100644 --- a/gnome-unstable/eog/PKGBUILD +++ b/gnome-unstable/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166438 2012-09-07 19:26:51Z jgc $ +# $Id: PKGBUILD 166892 2012-09-20 22:54:41Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.5.91 +pkgver=3.5.92 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('316966a89666df57c1ed55a58eed6eb59701d356ed4594978e4c4b4d05b1e9c2') +sha256sums=('b9ab6a1529d4b5199360b48bbe50d432cc9fe98aae800b5e607af421464bbe3f') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD new file mode 100644 index 000000000..96178b9e9 --- /dev/null +++ b/gnome-unstable/folks/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 166885 2012-09-20 22:19:43Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=folks +pkgver=0.7.4.1 +pkgrel=1 +pkgdesc="Library to aggregates people into metacontacts" +arch=(i686 x86_64) +url="http://telepathy.freedesktop.org/wiki/Folks" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb' 'libzeitgeist') +makedepends=('gobject-introspection' 'intltool') +install=folks.install +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('424ca5ef0bebc12666465fe4ee557d374f4694348109443efe7832be949679d3') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/folks/folks.install b/gnome-unstable/folks/folks.install new file mode 100644 index 000000000..c19349f72 --- /dev/null +++ b/gnome-unstable/folks/folks.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD index c9c72b58c..fba231183 100644 --- a/gnome-unstable/gnome-settings-daemon/PKGBUILD +++ b/gnome-unstable/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166445 2012-09-07 22:40:50Z jgc $ +# $Id: PKGBUILD 166875 2012-09-20 21:45:44Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.5.91 +pkgver=3.5.92 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') @@ -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=('005ad39fb50259fa2a8780db98498bb0af50ce4002cfe0c6e3017107df25ae9e') +sha256sums=('b77c9b36eccdfcdc25acc54e78dd2372970187dff67bf7c2022d3c43292b5979') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gstreamer/PKGBUILD b/gnome-unstable/gstreamer/PKGBUILD new file mode 100644 index 000000000..5f5526a1b --- /dev/null +++ b/gnome-unstable/gstreamer/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 153251 2012-03-12 14:53:13Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gstreamer +pkgver=0.11.99 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) +sha256sums=('a4b1c2fd2ff8762688c1f0f819001d98fd3924618c861cf96995ecfb343895ff') + +build() { + cd "${srcdir}/gstreamer-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ + --with-package-name="GStreamer (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" \ + --enable-gtk-doc --disable-static + make +} + +check() { + cd "${srcdir}/gstreamer-${pkgver}" + make check +} + +package() { + cd "${srcdir}/gstreamer-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/libzeitgeist/PKGBUILD b/gnome-unstable/libzeitgeist/PKGBUILD new file mode 100644 index 000000000..65137cd82 --- /dev/null +++ b/gnome-unstable/libzeitgeist/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: kiefer <jorgelmadrid@gmail.com> +# Contributor: Alessio Sergi <asergi at archlinux dot us> + +pkgname=libzeitgeist +pkgver=0.3.18 +_pkgmainver=0.3 +pkgrel=3 +pkgdesc="Zeitgeist client library" +arch=('i686' 'x86_64') +url="https://launchpad.net/libzeitgeist" +license=('LGPL2.1') +depends=('glib2') +optdepends=("zeitgeist: zeitgeist framework") +options=('!libtool') +source=(http://launchpad.net/${pkgname}/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) +md5sums=('d63a37295d01a58086d0d4ae26e604c2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/radio/jack-rack/PKGBUILD b/radio/jack-rack/PKGBUILD new file mode 100644 index 000000000..26330bb2b --- /dev/null +++ b/radio/jack-rack/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: DonVla <donvla@users.sourceforge.net> +# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> +# Contributor: Berkus <berkus@madfire.net> +# Contributor: Daniele Paolella <danielepaolella@email.it> +pkgname=jack-rack +pkgver=1.4.7 +pkgrel=4 +pkgdesc="Effects rack for JACK" +url="http://jack-rack.sourceforge.net" +arch=('i686' 'x86_64') +license=('GPL') +depends=('jack' 'gtk2' 'libxml2' 'ladspa') +optdepends=('lash: LASH support' + 'raptor1: LRDF support' + 'liblrdf: LRDF support' + 'python2: ecarack') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) + +md5sums=('a29ef4001ee2916a1b758952c936adca') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr --enable-lash --disable-gnome + make LDFLAGS='-ldl -lm' +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + sed -i 's/#!\/usr\/bin\/python/#!\/usr\/bin\/python2/' "${pkgdir}/usr/bin/ecarack" +} + +# vim:set ts=2 sw=2 et: diff --git a/social/aiccu/PKGBUILD b/social/aiccu/PKGBUILD new file mode 100644 index 000000000..5fc4cb086 --- /dev/null +++ b/social/aiccu/PKGBUILD @@ -0,0 +1,33 @@ +pkgname=aiccu +pkgver=20070115 +pkgrel=7 +pkgdesc="SixXS Automatic IPv6 Connectivity Client Utility - AICCU" +arch=('i686' 'x86_64') +url="http://www.sixxs.net/tools/aiccu/" +license=('BSD') +depends=('gnutls' 'iproute2') +makedepends=('glibc' 'libgpg-error' 'libtasn1' 'libgcrypt' 'zlib') +backup=(etc/aiccu.conf) +source=(http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz + aiccu.rc.d) +md5sums=('c9bcc83644ed788e22a7c3f3d4021350' + '9eb63ae132d4835a822ea925c6440b04') + +build() { + cd "$srcdir/$pkgname" + + sed -i 's|Installing Debian-style init.d||' Makefile + + LDFLAGS="" make + make DESTDIR="$pkgdir" install +} + +package() { + cd "$srcdir/$pkgname" + + install -D -m600 doc/aiccu.conf "$pkgdir/etc/aiccu.conf" + install -D -m755 "$srcdir/aiccu.rc.d" "$pkgdir/etc/rc.d/aiccu" + install -D -m444 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + rm -fr "$pkgdir/etc/init.d" +} diff --git a/social/aiccu/aiccu.rc.d b/social/aiccu/aiccu.rc.d new file mode 100644 index 000000000..b0ca08fce --- /dev/null +++ b/social/aiccu/aiccu.rc.d @@ -0,0 +1,60 @@ +#!/bin/bash + +daemon_name=aiccu + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof $daemon_name +} + +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 start > /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` + # RUN + $daemon_name stop + # + 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/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD new file mode 100644 index 000000000..98e64982d --- /dev/null +++ b/social/netatalk/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: SJ_UnderWater +# Maintainer (Parabola): fauno@parabola.nu +# Based on netatalk package : +# Maintainer: Dominik Dingel <mail at wodar dot de> +# Contributor: William Udovich <nerdzrule7 at earthlink dot net> +# Contributor: Farhan Yousaf <farhany at xaviya dot com> + +pkgname=netatalk +pkgver=3.0 +pkgrel=4 +pkgdesc='Open Source AFP fileserver' +arch=('i686' 'x86_64') +url='http://netatalk.sourceforge.net' +license=('GPL') +depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent') +backup=('etc/afp.conf') +options=('!libtool') +install=$pkgname.install +changelog=$pkgname.changelog +source=(netatalk.rc http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +md5sums=('5e92015b0d9ac77af4b598cca6cb435c' + '62eb034011bb60b0bfd95072af3693dc') + +build() { + cd $pkgname-$pkgver + +# TODO what does this fix? + msg2 'Fixing...' + sed -i 's/x"linux/x"generic/' macros/netatalk.m4 + + autoreconf + +# disable bundled libevent + echo -e "all:\ninstall:" >libevent/Makefile + + CFLAGS="-Wno-unused-result" \ + LIBS=-levent \ + ./configure --prefix=/usr \ + --disable-static \ + --localstatedir=/etc \ + --sysconfdir=/etc \ + --disable-bundled-libevent \ + --with-cracklib \ + --with-cnid-cdb-backend \ + --enable-pgp-uam \ + --with-init-style=systemd + + make +} +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + msg2 'Copying initscripts...' + install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk +} diff --git a/social/netatalk/netatalk.changelog b/social/netatalk/netatalk.changelog new file mode 100644 index 000000000..b577562d4 --- /dev/null +++ b/social/netatalk/netatalk.changelog @@ -0,0 +1,83 @@ +2012-07-14 SJ_UnderWater + + * 3.0-3 : + moved localstate dir + to /etc for historical + reasons + +2012-07-12 SJ_UnderWater + + * 3.0-2 : + disable bundled libevent + +2012-07-11 SJ_UnderWater + + * 3.0-1 : + updated to new release + DDP moved to new pkg + +2012-06-12 SJ_UnderWater + + * 2.2.3-4 : + added kill timing + +2012-06-04 SJ_UnderWater + + * 2.2.3-3 : + removed conflicting files + +2012-06-02 SJ_UnderWater + + * 2.2.3-2 : + Missing UAM links + +2012-05-29 SJ_UnderWater + + * 2.2.3-1 : + updated package version + allowing headers and m4 + +2012-05-01 SJ_UnderWater + + * 2.2.2-6 : + moved to .rc files + refactored PKGBUILD + install rc.d files + +2012-04-25 SJ_UnderWater + + * 2.2.2-5 : + init rebuild + fix dep check + fix get_pid + function relocation + +2012-04-21 SJ_UnderWater + + * 2.2.2-4 : + moved to package() + added backup + split backup + moved depends + +2012-04-08 SJ_UnderWater + + * 2.2.2-3 : + fixed extra dependencies + FHS compliance + NAMCAP checking + moved cups to optdepends + +2012-04-07 SJ_UnderWater + + * 2.2.2-2 : + added Install + changed "conflicts" with "replace" + cleaned up PKGBUILD + + * 2.2.2-1 : + added ChangeLog. + moved to split package format + bidirectional dependency-checking + moved to release package format + PKGBUILD compliance diff --git a/social/netatalk/netatalk.install b/social/netatalk/netatalk.install new file mode 100644 index 000000000..a385add10 --- /dev/null +++ b/social/netatalk/netatalk.install @@ -0,0 +1,23 @@ +post_install() { + post_upgrade +} +post_upgrade() { + if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then + echo '>>> Detected old netatalk daemon entries in'; + echo '>>> /etc/rc.conf, please replace these with'; + echo '>>> "netatalk" before restarting!'; + else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi + echo '>>>'; + if [ -f /etc/avahi/services/adisk.service ] || + [ -f /etc/avahi/services/afpd.service ];then + echo '>>> Detected old netatalk service files in'; + echo '>>> /etc/avahi/services, please delete these'; + echo '>>> before restarting!';fi + if [ -f /opt/netatalk/afp_signature.conf ] || + [ -f /opt/netatalk/afp_voluuid.conf ]; then + echo '>>> Found *.conf in /opt/netatalk, please'; + echo '>>> migrate these to /etc/netatalk before restarting';fi +} +pre_remove() { + rc.d stop netatalk +} diff --git a/social/netatalk/netatalk.rc b/social/netatalk/netatalk.rc new file mode 100644 index 000000000..f14d67ee3 --- /dev/null +++ b/social/netatalk/netatalk.rc @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +NAME="Appletalk Services Daemon" +ARGS= +DAEMON=netatalk + +[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON + +PID=`get_pid $DAEMON` + +case "$1" in + start) + stat_busy "Starting $NAME" + [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null + if [ $? = 0 ]; then + add_daemon $DAEMON + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping $NAME" + [ -n "$PID" ] && kill $PID &>/dev/null + if [ $? = 0 ]; then + rm_daemon $DAEMON + 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/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD new file mode 100644 index 000000000..44fdad7ff --- /dev/null +++ b/testing/libarchive/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 166896 2012-09-21 02:03:06Z allan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=libarchive +pkgver=3.0.4 +pkgrel=2 +pkgdesc="library that can create and read several streaming archive formats" +arch=('i686' 'x86_64') +url="http://libarchive.googlecode.com/" +license=('BSD') +depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') +source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz" + libarchive-3.0.x-fix-mtree-writer.patch) +md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16' + '6d36a50a7282db6576bd1fbc23f08055') +sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac' + 'f0081c0d7d7875fc91c683b14fe4876d56b6585f45be9181c755eba4b522f5b9') + + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/libarchive-3.0.x-fix-mtree-writer.patch + ./configure --prefix=/usr --without-xml2 + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING +} diff --git a/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch b/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch new file mode 100644 index 000000000..dbc89686a --- /dev/null +++ b/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch @@ -0,0 +1,34 @@ +--- a/libarchive/archive_write_set_format_mtree.c ++++ b/libarchive/archive_write_set_format_mtree.c +@@ -887,6 +887,19 @@ write_entry(struct archive_write *a, struct mtree_entry *me) + + archive_string_empty(&mtree->ebuf); + str = (mtree->indent)? &mtree->ebuf : &mtree->buf; ++ ++ /* If the pathname does not have a path separator, we have to ++ * add "./" to the head of the pathename because mtree reader ++ * will suppose that it is v1(a.k.a classic) mtree format and ++ * change the directory unexpectedly and so it will make a wrong ++ * path. */ ++ if (strchr(me->pathname, '/') == NULL && ++ strcmp(me->pathname, ".") != 0) { ++ archive_strcat(str, "./"); ++ } ++ /* mtree reader does not accept an absolute path. */ ++ else if (me->pathname[0] == '/') ++ archive_strappend_char(str, '.'); + mtree_quote(str, me->pathname); + keys = get_keys(mtree, me); + if ((keys & F_NLINK) != 0 && +--- a/libarchive/test/test_read_format_mtree.c ++++ b/libarchive/test/test_read_format_mtree.c +@@ -37,7 +37,8 @@ test_read_format_mtree1(void) + * without relying on overflow. This assumes that long long + * is at least 64 bits. */ + static const long long max_int64 = ((((long long)1) << 62) - 1) + (((long long)1) << 62); +- time_t min_time, t; ++ time_t min_time; ++ volatile time_t t; + + extract_reference_file(reffile); +
\ No newline at end of file diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index a35d951e4..e9316da7f 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166533 2012-09-09 18:34:10Z dreisner $ +# $Id: PKGBUILD 166886 2012-09-20 22:22:35Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.22 -pkgrel=5 +pkgrel=6 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -20,25 +20,22 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgve uuidd.tmpfiles pam-login pam-common - pam-su) + pam-su + hwclock-systz.patch) backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login etc/pam.d/su etc/pam.d/su-l) install=util-linux.install -md5sums=('ba2d8cc12a937231c80a04f7f7149303' - '7f524538dcf57284a86f03a98e624f04' - 'a39554bfd65cccfd8254bb46922f4a67' - '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4' - 'fa85e5cce5d723275b14365ba71a8aad') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../hwclock-systz.patch + # unbreak --localstatedir - # TODO(dreisner): find out what sami hand in mind with these heuristics + # TODO(dreisner): find out what sami had in mind with these heuristics sed -i '71,75d' configure.ac ./autogen.sh @@ -91,3 +88,10 @@ package() { # TODO(dreisner): offer this upstream? install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } +md5sums=('ba2d8cc12a937231c80a04f7f7149303' + '7f524538dcf57284a86f03a98e624f04' + 'a39554bfd65cccfd8254bb46922f4a67' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad' + '19eaa197a0cfb046661dede2e991120b') diff --git a/testing/util-linux/hwclock-systz.patch b/testing/util-linux/hwclock-systz.patch new file mode 100644 index 000000000..79ed1a5f3 --- /dev/null +++ b/testing/util-linux/hwclock-systz.patch @@ -0,0 +1,96 @@ +From 46a8834c2eb9b0c37d92e30d1a262e41306cf36f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Wed, 19 Sep 2012 18:10:34 +0200 +Subject: [PATCH 1/2] hwclock: don't warp the systemtime if it is in UTC + +A sideeffect of 839be2ba6b44fa9dc927f081d547ebadec9de19c is that we now +warp the systemtime according to the timezone, on the first call of +--systz. This is not always the correct thing to do, and causes a +regression for us in Arch Linux. + +This is the correct thing to do if the RTC, and hence the systemtime is +set in localtime. However, if the systemtime is already in UTC we don't +want to touch it when we set the kernel timezone (which we still need to +do as e.g. FAT stores timestamps in localtime). + +An almost identical issue was also fixed in systemd commit +72edcff5db936e54cfc322d9392ec46e2428fd9b. + +Fixes: +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + sys-utils/hwclock.8 | 11 +++++++---- + sys-utils/hwclock.c | 17 +++++++++++++++-- + 2 files changed, 22 insertions(+), 6 deletions(-) + +diff --git a/sys-utils/hwclock.8 b/sys-utils/hwclock.8 +index 07d9fc0..5c599ad 100644 +--- a/sys-utils/hwclock.8 ++++ b/sys-utils/hwclock.8 +@@ -58,10 +58,12 @@ This is a good option to use in one of the system startup scripts. + Set the Hardware Clock to the current System Time. + .TP + .B \-\-systz +-Reset the System Time based on the current timezone. ++Set the kernel's timezone and reset the System Time based on the current timezone. + +-Also set the kernel's timezone value to the local timezone +-as indicated by the TZ environment variable and/or ++The system time is only reset on the first call after boot. ++ ++The local timezone is taken to be what is ++indicated by the TZ environment variable and/or + .IR /usr/share/zoneinfo , + as + .BR tzset (3) +@@ -74,7 +76,8 @@ This is an alternate option to + .B \-\-hctosys + that does not read the hardware clock, and may be used in system startup + scripts for recent 2.6 kernels where you know the System Time contains +-the Hardware Clock time. ++the Hardware Clock time. If the Hardware Clock is already in UTC, it is ++not reset. + .TP + .B \-\-adjust + Add or subtract time from the Hardware Clock to account for systematic +diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c +index 5a4c87e..351ce1f 100644 +--- a/sys-utils/hwclock.c ++++ b/sys-utils/hwclock.c +@@ -772,7 +772,6 @@ static int set_system_clock_timezone(const bool universal, const bool testing) + struct timeval tv; + struct tm *broken; + int minuteswest; +- int rc; + + gettimeofday(&tv, NULL); + if (debug) { +@@ -818,10 +817,24 @@ static int set_system_clock_timezone(const bool universal, const bool testing) + ("Not setting system clock because running in test mode.\n")); + retcode = 0; + } else { ++ const struct timezone tz_utc = { 0, 0 }; + const struct timezone tz = { minuteswest, 0 }; + const struct timeval *tv_null = NULL; ++ int rc = 0; ++ ++ /* The first call to settimeofday after boot will assume the systemtime ++ * is in localtime, and adjust it according to the given timezone to ++ * compensate. If the systemtime is in fact in UTC, then this is wrong ++ * so we first do a dummy call to make sure the time is not shifted. ++ */ ++ if (universal) ++ rc = settimeofday(tv_null, &tz_utc); ++ ++ /* Now we set the real timezone. Due to the above dummy call, this will ++ * only warp the systemtime if the RTC is not in UTC. */ ++ if (!rc) ++ rc = settimeofday(tv_null, &tz); + +- rc = settimeofday(tv_null, &tz); + if (rc) { + if (errno == EPERM) { + warnx(_ +-- +1.7.12.1 + diff --git a/~fauno/localepurge/PKGBUILD b/~fauno/localepurge/PKGBUILD index 61386db71..263776a01 100644 --- a/~fauno/localepurge/PKGBUILD +++ b/~fauno/localepurge/PKGBUILD @@ -2,33 +2,32 @@ # Contributor: Dincer Celik <dincer@bornovali.com> pkgname=localepurge -pkgver=0.6.2+nmu2 -pkgrel=3 +pkgver=0.6.3 +pkgrel=2 pkgdesc="Script to remove disk space wasted for unneeded localizations." arch=('any') url="http://packages.debian.org/source/sid/localepurge" license=('GPL') backup=('etc/locale.nopurge') source=("http://ftp.de.debian.org/debian/pool/main/l/localepurge/${pkgname}_${pkgver}.tar.gz" - "http://fgr.bitbucket.org/im/${pkgname}.patch" - "http://fgr.bitbucket.org/im/${pkgname}.8.patch" - "http://fgr.bitbucket.org/im/${pkgname}.config.patch" - "http://fgr.bitbucket.org/im/locale.nopurge") -sha1sums=('a23f77bc770483b3d6f45d1d7caffad8c0891655' - '6e2165f3bb8cf2c463816849a973ea088398605f' - '3ac6c0a3e30395e6ca1c1fd8cc530fdd84e2c98e' - 'ec56640d9bf1a908bac4884aa7a2ecde0ee33c8a' - 'ab47efc3f07d7224382e95d3a5b25355058869b4') + "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.patch" + "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.8.patch" + "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.config.patch" + "http://fgr.bitbucket.org/im/localepurge-arch/locale.nopurge") +sha256sums=('02f7e4a8b5919221a736abb3a937dffc48ffd275f0968e56612d518e1e69c30b' + '3958818b2d54c9ca32a1974d757c3303b6e8e1b81d4302dfaec8b8a7af54d17d' + '3d45b1da93a0fc30dd3ae28d4ef7b319340c5ebaa302f4e375793934262e61fc' + '1cf4c0e9651589502f953ae25654e5b5347de18995055adfb7a6d183a1c4c912' + 'b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8') build() { - #cd "${srcdir}/${pkgname}-${pkgver}" - patch -uN ${srcdir}/${pkgname}-${pkgver}/usr/sbin/localepurge < ${srcdir}/localepurge.patch - patch -uN ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.8 < ${srcdir}/localepurge.8.patch - patch -uN ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.config < ${srcdir}/localepurge.config.patch - install -D -m755 ${srcdir}/${pkgname}-${pkgver}/usr/sbin/localepurge ${pkgdir}/usr/sbin/localepurge - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.8 ${pkgdir}/usr/share/man/man8/localepurge.8 - install -D -m755 ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.config ${pkgdir}/usr/sbin/localepurge.config + patch -uN ${srcdir}/${pkgname}/usr/sbin/localepurge < ${srcdir}/localepurge.patch + patch -uN ${srcdir}/${pkgname}/debian/localepurge.8 < ${srcdir}/localepurge.8.patch + patch -uN ${srcdir}/${pkgname}/debian/localepurge.config < ${srcdir}/localepurge.config.patch + install -D -m755 ${srcdir}/${pkgname}/usr/sbin/localepurge ${pkgdir}/usr/sbin/localepurge + install -D -m644 ${srcdir}/${pkgname}/debian/localepurge.8 ${pkgdir}/usr/share/man/man8/localepurge.8 + install -D -m755 ${srcdir}/${pkgname}/debian/localepurge.config ${pkgdir}/usr/sbin/localepurge.config install -D -m644 locale.nopurge ${pkgdir}/etc/locale.nopurge if [ ! -e /var/cache/localepurge/localelist ]; then find /usr/share/locale -maxdepth 1 -type d -name "*" -printf "%f\n" | grep "^[a-z]" | cut -d" " -f1 | sort -u > ${srcdir}/localelist |