Wed Jan 18 23:14:59 UTC 2012

9 files changed, 77 insertions, 43 deletions

diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index aa7b0a90d..b8797505e 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58212 2011-11-08 22:41:05Z ibiru $
+# $Id: PKGBUILD 62176 2012-01-17 14:45:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 
 pkgname=cdfs
 pkgver=2.6.27
-pkgrel=17
+pkgrel=18
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/community/cdfs/cdfs.install b/community/cdfs/cdfs.install
index 3693d60ed..d20b4c664 100644
--- a/community/cdfs/cdfs.install
+++ b/community/cdfs/cdfs.install
@@ -1,11 +1,14 @@
 post_install() {
-  /sbin/depmod -a
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  /sbin/depmod -a
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  /sbin/depmod -a
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index bb0935d2c..be3e3c257 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61388 2011-12-30 00:12:01Z giovanni $
+# $Id: PKGBUILD 62171 2012-01-17 08:26:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.4.7
-pkgrel=2
+pkgver=0.4.8
+pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64')
 url="http://converseen.sourceforge.net/"
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt' 'libwmf' 'openexr')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d21cb571b268ddf4bcdc395d01c0dc49')
+md5sums=('65cdb89445a3063b9c8362b411d3e3ef')
 
 build() {
   cd "${srcdir}"
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index a346dceac..f504cd36b 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58407 2011-11-12 17:17:53Z ibiru $
+# $Id: PKGBUILD 62167 2012-01-17 08:00:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=minidlna
 pkgver=1.0.22
-pkgrel=4
+pkgrel=5
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/minidlna/"
@@ -19,7 +19,7 @@ changelog=changelog
 source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
         minidlna.rc)
 md5sums=('3de2f6b54f43bb998dfad3c8fa75cef3'
-         '8b064a6c344a3ad8029e2619dfe07b77')
+         'b64b8b749f1c23b3f1a2ee6d6ded07fd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc
index df44a549f..6e6f88f35 100755
--- a/community/minidlna/minidlna.rc
+++ b/community/minidlna/minidlna.rc
@@ -2,46 +2,65 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/minidlna.conf
 . /etc/conf.d/minidlna
 
-PID=`pidof -o %PPID /usr/sbin/minidlna`
+daemon_name=minidlna
+
+get_pid() {
+    pidof -o %PPID /usr/sbin/minidlna
+}
 
 case "$1" in
   start)
     stat_busy "Starting minidlna"
-    [ -z "$PID" ] && su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
+    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
+      su -s /bin/sh -l -c /usr/sbin/minidlna - $MINIDLNA_USER
+      if [[ $? -gt 0 ]]; then
+        stat_fail
+        exit 1
+      else
+        add_daemon $daemon_name
+        stat_done
+      fi
     else
-      add_daemon minidlna
-      stat_done
+      stat_fail
+      exit 1
     fi
     ;;
+
   stop)
     stat_busy "Stopping minidlna"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    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
-	;;
+    $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
     ;;
+
   *)
     echo "usage: $0 {start|stop|restart|clean}"
 esac
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 09c8dee1f..4807e3623 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61571 2012-01-03 12:07:32Z spupykin $
+# $Id: PKGBUILD 62178 2012-01-17 14:46:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
 pkgver=2011.12.20
 _pkgsubver=562307
-pkgrel=1
+pkgrel=2
 pkgdesc="kernel modules for the open source implementation of VMware Tools"
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -43,7 +43,6 @@ package() {
   for MOD in `find -type f -name '*.ko'`; do
     install -Dm644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/
   done
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install
   gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko
 
   install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/etc/modprobe.d/${pkgname}.conf
diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install
index 187dfb1bb..ba2f9ddc2 100644
--- a/community/open-vm-tools-modules/open-vm-tools-modules.install
+++ b/community/open-vm-tools-modules/open-vm-tools-modules.install
@@ -1,8 +1,6 @@
-KERNEL_VERSION='3.1.0-4-ARCH'
-
 post_install() {
-  depmod -a -v $KERNEL_VERSION > /dev/null 2>&1
-
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
   echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf"
   echo ">>> (this will disable pcnet32 driver)"
   echo ">>>"
@@ -12,12 +10,13 @@ post_install() {
 }
 
 post_upgrade() {
-  depmod -a -v $KERNEL_VERSION > /dev/null 2>&1
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  depmod -a -v $KERNEL_VERSION > /dev/null 2>&1
-
+  EXTRAMODULES='extramodules-3.1-ARCH'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
   echo ">>>"
   echo ">>> Remember to un-blacklist pcnet32 driver"
   echo ">>>"
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 2b9f4ec71..fdd3acd26 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=quagga
 pkgver=0.99.20
-pkgrel=1
+pkgrel=2
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64')
 url='http://www.quagga.net'
diff --git a/community/quagga/quagga.install b/community/quagga/quagga.install
index 058f4f1d7..c5d88b976 100644
--- a/community/quagga/quagga.install
+++ b/community/quagga/quagga.install
@@ -1,22 +1,36 @@
+infodir=/usr/share/info
+filelist=(quagga.info quagga.info-1 quagga.info-2)
+
 post_install() {
   groupadd -r quagga
   useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null
   install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga
-  :
+  post_upgrade
+}
+
+post_upgrade() {
+  if [[ -x /usr/bin/install-info ]]; then
+    for file in ${filelist[@]}; do
+      install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+    done
+  fi
 }
 
 pre_remove() {
   for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do
     /etc/rc.d/$d stop &>/dev/null
   done
-  :
+  if [[ -x /usr/bin/install-info ]]; then
+    for file in ${filelist[@]}; do
+      install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+    done
+  fi
 }
 
 post_remove() {
   userdel quagga &>/dev/null
   groupdel quagga &>/dev/null
   rmdir /{etc,var/log}/quagga
-  :
 }
 
 # vim: ft=sh ts=2 sw=2 et: