Sun Aug 19 00:04:07 UTC 2012

15 files changed, 112 insertions, 36 deletions

diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index 00ec0ef53..fdfdabd1c 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74993 2012-08-11 09:42:41Z bpiotrowski $
+# $Id: PKGBUILD 75266 2012-08-17 10:28:57Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=fish
 pkgver=2.0b2
-pkgrel=2
+pkgrel=3
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64')
 url='http://ridiculousfish.com/shell/'
diff --git a/community/fish/fish.install b/community/fish/fish.install
index 765006f95..49a65ad82 100644
--- a/community/fish/fish.install
+++ b/community/fish/fish.install
@@ -1,5 +1,5 @@
 post_install() {
-	grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells
+	grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
 }
 
 post_upgrade() {
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index 5f5d0e842..7186b054b 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75065 2012-08-13 13:28:06Z bpiotrowski $
+# $Id: PKGBUILD 75270 2012-08-17 10:52:47Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=libfm
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for file management"
 url="http://pcmanfm.sourceforge.net/"
 arch=('i686' 'x86_64')
diff --git a/community/libfm/libfm.install b/community/libfm/libfm.install
index 1a6a34b9a..e83eccb55 100644
--- a/community/libfm/libfm.install
+++ b/community/libfm/libfm.install
@@ -1,7 +1,7 @@
 post_install() {
   update-mime-database /usr/share/mime > /dev/null
   update-desktop-database -q
-  [ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules
+  #[ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules
 }
 
 post_upgrade() {
diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD
index 658ad75f9..3312fe01f 100644
--- a/community/multipath-tools/PKGBUILD
+++ b/community/multipath-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73313 2012-07-06 07:32:23Z bpiotrowski $
+# $Id: PKGBUILD 75262 2012-08-17 10:00:23Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
 # Contributor: Michael P <ptchinster@archlinux.us>
@@ -6,7 +6,7 @@
 
 pkgname=multipath-tools
 pkgver=0.4.9
-pkgrel=9
+pkgrel=10
 pkgdesc='Multipath tools for Linux'
 arch=('i686' 'x86_64')
 url="http://christophe.varoqui.free.fr/"
@@ -16,13 +16,14 @@ backup=('etc/multipath.conf' 'etc/multipath.conf.annotated')
 install=multipath-tools.install
 options=(!emptydirs)
 source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2
-        multipath.conf multipath.conf.annotated multipathd.rc
+        rc.d service multipath.conf multipath.conf.annotated
         fix-build.patch buffer-overflows.patch log_enquery_overflow.patch
         blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch)
 md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765'
+         '7c04ef96441363b0d43a2ebb13a87659'
+         '4843e91a83660e4b3acfb2d804fa344e'
          '9324ff0ba8330dcb21b2fcf64988026f'
          'be11462922eeeb9fcd2ba5f3f137b7d9'
-         '7c04ef96441363b0d43a2ebb13a87659'
          '885c0ba9c90b73cc93aa3f78005f81d6'
          'c5aab36777b0304a3525533cdd31bddc'
          '00eae05e02f1b85062e998574ab1b833'
@@ -45,7 +46,8 @@ build() {
 
 package() {
   make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install
-  install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf
-  install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
-  install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd
+  install -Dm644 multipath.conf "$pkgdir"/etc/multipath.conf
+  install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
+  install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd
+  install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service
 }
diff --git a/community/multipath-tools/rc.d b/community/multipath-tools/rc.d
new file mode 100644
index 000000000..7f5ef5d6a
--- /dev/null
+++ b/community/multipath-tools/rc.d
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+    stat_busy "Starting multipathd"
+    /usr/bin/multipathd
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon multipathd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping multipathd"
+    [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        rm_daemon multipathd
+        stat_done
+      fi 
+      ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/multipath-tools/service b/community/multipath-tools/service
new file mode 100644
index 000000000..a70d0ee1f
--- /dev/null
+++ b/community/multipath-tools/service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Device-Mapper Multipath Device Controller
+After=syslog.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/multipathd.pid
+ExecStart=/sbin/multipathd
+ExecReload=/sbin/multipathd reconfigure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index a44a800cd..98584e1ce 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,28 +1,35 @@
-# $Id: PKGBUILD 59714 2011-11-29 13:35:19Z stephane $
+# $Id: PKGBUILD 75281 2012-08-17 18:35:49Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=ntop
-pkgver=4.1.0
+pkgver=5.0
 pkgrel=2
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64')
 url='http://www.ntop.org/'
 license=('GPL')
-depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua')
+depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua')
+makedepends=('subversion' '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')
-md5sums=('116df99cf548431393991ea15443c52f'
+        'ntop.conf.d'
+        'ntop.service')
+md5sums=('e4115a6609fd2def2dce177772f9a789'
          '7b0d7bb57432e768ff387e9f7236f87c'
-         '6a9371de1dcf31d8ef13a4cf349c02b3')
+         '6a9371de1dcf31d8ef13a4cf349c02b3'
+         'bcb2bcfb4b573babdee7d9321591e3e3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp
+  echo 't' | svn export -r 5614 'https://svn.ntop.org/svn/ntop/trunk/nDPI/'
+  tar -czvf nDPI-svn5614.tar.gz nDPI
+
+  ./autogen.sh --noconfig
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp
   make
 }
 
@@ -41,4 +48,6 @@ package() {
     _plug="$(basename ${_f})"
     ln -sf "../../lib${_plug}" "${_f}"
   done
+
+  install -Dm0644 "${srcdir}/ntop.service" "${pkgdir}/usr/lib/systemd/system/ntop.service"
 }
diff --git a/community/ntop/ntop.service b/community/ntop/ntop.service
new file mode 100644
index 000000000..20a9c66f9
--- /dev/null
+++ b/community/ntop/ntop.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=A network traffic probe similar to the UNIX top command
+Requires=network.target
+ConditionPathExists=/var/lib/ntop/ntop_pw.db
+After=syslog.target network.target
+
+[Service]
+Environment=LANG=C
+ExecStart=/usr/sbin/ntop -i eth0 -w 3000
+Type=simple
+StandardError=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD
index 18807fdf7..8841f76cc 100644
--- a/community/oidentd/PKGBUILD
+++ b/community/oidentd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72791 2012-06-22 12:51:10Z dreisner $
+# $Id: PKGBUILD 75286 2012-08-17 22:22:42Z heftig $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: simo <simo@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=oidentd
 pkgver=2.0.8
-pkgrel=6
+pkgrel=7
 pkgdesc='An RFC1413 compliant ident daemon'
 arch=('i686' 'x86_64')
 url="http://dev.ojnk.net/"
@@ -18,7 +18,7 @@ md5sums=('c3d9a56255819ef8904b867284386911'
          '93cbf742cdd0b053f67482273d715f25'
          '603307525771724b0f55a2c34fbc3f3e'
          'b215bee5764cdecb0939f44d5d2dccbe'
-         '651c2ef45d1d345d95056ef0787e29e6')
+         '4442fb9fc10754914568e6ffc3d5fc42')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/community/oidentd/socket b/community/oidentd/socket
index 63df7036e..cf00b55b8 100644
--- a/community/oidentd/socket
+++ b/community/oidentd/socket
@@ -1,6 +1,5 @@
 [Unit]
 Description=Ident (RFC 1413) socket
-Conflicts=oidentd.service
 
 [Socket]
 ListenStream=113
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index ae4015e87..043ae3513 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 75110 2012-08-14 07:14:59Z seblu $
+# $Id: PKGBUILD 75268 2012-08-17 10:49:54Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/psutil/'
 license=('custom: BSD')
 makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
 source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") 
-sha1sums=('67d3292c39af79c1e43b7fce84d7ff51a1b79d8e')
+sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86')
 
 build() {
   cd psutil-$pkgver
diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD
index 828bfefb6..4296079e6 100644
--- a/community/redshift/PKGBUILD
+++ b/community/redshift/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66452 2012-02-25 01:45:00Z lfleischer $
+# $Id: PKGBUILD 75276 2012-08-17 13:33:29Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Geoffrey Teale <tealeg@stop-squark>
 # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com>
@@ -6,13 +6,14 @@
 
 pkgname=redshift
 pkgver=1.7
-pkgrel=3
+pkgrel=4
 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.'
 arch=('i686' 'x86_64')
 url='http://jonls.dk/redshift/'
 license=('GPL3')
 depends=('gconf' 'libxxf86vm')
-optdepends=('pyxdg: for gtk-redshift'
+optdepends=('pygtk: for gtk-redshift'
+            'pyxdg: for gtk-redshift'
             'librsvg: for gtk-redshift')
 makedepends=('python2')
 install='redshift.install'
diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD
index e9f6cde95..ab22feaba 100644
--- a/community/supercollider/PKGBUILD
+++ b/community/supercollider/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73052 2012-06-29 16:50:17Z speps $
+# $Id: PKGBUILD 75278 2012-08-17 15:40:58Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor:  <farid at archlinux-br.org>
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.5.3
+pkgver=3.5.4
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('i686' 'x86_64')
@@ -18,11 +18,15 @@ optdepends=('emacs: emacs interface'
             'ruby: vim support')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/project/$pkgname/Source/$pkgver/$_name-$pkgver-Source-linux.tar.bz2")
-md5sums=('84fde920c32e9644902f989136a35b91')
+md5sums=('8f0cd3a77e3adf0fd44cf6882ad39703')
 
 build() {
   cd "$srcdir/$_name-Source"
 
+  ## glibc 2.16 + boost 1.49 fix
+  #  https://svn.boost.org/trac/boost/ticket/6940
+  sed -i "s/TIME_UTC/&_/" `grep -rl TIME_UTC .`
+
   [ -d bld ] || mkdir bld && cd bld
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
            -DCMAKE_BUILD_TYPE=Release
diff --git a/community/zaz/PKGBUILD b/community/zaz/PKGBUILD
index 87c196109..7a4684d6d 100644
--- a/community/zaz/PKGBUILD
+++ b/community/zaz/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64723 2012-02-18 02:57:50Z svenstaro $
+# $Id: PKGBUILD 75255 2012-08-17 04:30:40Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Adrián Chaves Fernández (aka Gallaecio) <adriyetichaves@gmail.com>
 # Contributor: Todd Partridge (aka Gen2ly) <toddrpartridge@gmail.com>
 
 pkgname=zaz
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Puzzle game where the player has to arrange balls in triplets."
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/zaz/"
@@ -18,7 +18,7 @@ install=zaz.install
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-splash
   make
 }