12 files changed, 172 insertions, 36 deletions
diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD
index 66e433311..dbe53d8f6 100644
--- a/community/cdrtools/PKGBUILD
+++ b/community/cdrtools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68938 2012-04-06 10:10:47Z stativ $
+# $Id: PKGBUILD 72573 2012-06-16 18:43:00Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=cdrtools
 pkgver=3.01a07
-pkgrel=3
+pkgrel=4
 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
 arch=('i686' 'x86_64')
 url="http://cdrecord.berlios.de/private/cdrecord.html"
@@ -32,6 +32,10 @@ package() {
   make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
   rm -rf "$pkgdir"/usr/include
   rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
+
+  # autoload 'sg' module needed by cdrecord
+  install -d -m755 "$pkgdir"/usr/lib/modules-load.d/
+  echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/cdrtools/cdrtools.install b/community/cdrtools/cdrtools.install
index af3800716..3f49eb1bb 100644
--- a/community/cdrtools/cdrtools.install
+++ b/community/cdrtools/cdrtools.install
@@ -3,8 +3,12 @@ post_install() {
   echo "To allow other users than root execute rscsi add an entry"
   echo "to /etc/default/rscsi or use an \"rscsi\" user"
   echo ""
-  echo "If you get folowing error while executing \"cdrecord --scanbus\":"
-  echo "  No such file or directory. Cannot open '/dev/pg*'. Cannot open or use SCSI driver."
-  echo "you may need to load the sg module manually using \"modprobe sg\"."
+  post_upgrade
+}
+
+post_upgrade() {
+  echo "The manual loading (or loading using rc.conf)"
+  echo "of the 'sg' module is no longer necessary."
+  echo "It is automatically loaded during boot by systemd-tools (udev 185)."
 }
 
diff --git a/community/conntrack-tools/01-config-file-path.patch b/community/conntrack-tools/01-config-file-path.patch
new file mode 100644
index 000000000..8512cc9ab
--- /dev/null
+++ b/community/conntrack-tools/01-config-file-path.patch
@@ -0,0 +1,11 @@
+--- a/include/conntrackd.h	2012-05-26 15:29:15.630027223 +0200
++++ b/include/conntrackd.h	2012-05-27 02:26:59.426811589 +0200
+@@ -50,7 +50,7 @@
+ #define EXP_DUMP_INT_XML	47	/* dump internal cache in XML	*/
+ #define EXP_DUMP_EXT_XML	48	/* dump external cache in XML	*/
+ 
+-#define DEFAULT_CONFIGFILE	"/etc/conntrackd/conntrackd.conf"
++#define DEFAULT_CONFIGFILE	"/etc/conntrackd.conf"
+ #define DEFAULT_LOCKFILE	"/var/lock/conntrackd.lock"
+ #define DEFAULT_LOGFILE		"/var/log/conntrackd.log"
+ #define DEFAULT_STATS_LOGFILE	"/var/log/conntrackd-stats.log"
diff --git a/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch b/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
new file mode 100644
index 000000000..746934994
--- /dev/null
+++ b/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
@@ -0,0 +1,33 @@
+From 18efbc802479ce042378dc0cccc7577e1c6afa41 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Sat, 26 May 2012 20:58:16 +0200
+Subject: [PATCH] nfct: fix compilation of timeout extension
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+nfct-extensions/timeout.c: In function ânfct_timeout_cbâ:
+nfct-extensions/timeout.c:99:2: warning: passing argument 4 of ânfct_timeout_snprintfâ makes integer from pointer without a cast [enabled by default]
+/usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h:114:5: note: expected âunsigned intâ but argument is of type âstruct nfct_timeout *â
+
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ src/nfct-extensions/timeout.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
+index a1a5c52..5b32023 100644
+--- a/src/nfct-extensions/timeout.c
++++ b/src/nfct-extensions/timeout.c
+@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data)
+ 		goto err_free;
+ 	}
+ 
+-	nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
++	nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0);
+ 	printf("%s\n", buf);
+ 
+ err_free:
+-- 
+1.7.2.5
+
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 006e17429..541456cd8 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,29 +1,37 @@
-# $Id: PKGBUILD 71212 2012-05-25 00:16:39Z seblu $
+# $Id: PKGBUILD 72534 2012-06-16 14:02:03Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=conntrack-tools
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/conntrack-tools'
 license=('GPL2')
-depends=('libnetfilter_conntrack')
-backup=('etc/conntrackd/conntrackd.conf')
+depends=('libnetfilter_conntrack' 'libnetfilter_cttimeout')
+backup=('etc/conntrackd.conf' 'etc/conf.d/conntrackd')
+install=$pkgname.install
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
         'conntrackd.rc'
         'conntrackd.conf'
-        'conntrackd.service')
-md5sums=('8a60f02a177fc31fe40cc992c4de90e2'
-         '977dfb8fc58df0c74120c8ac92026a6a'
-         '92a7fc6ab5cba5e48cde4cac0ac403b1'
-         'bd135eaefb47923bb8e8d26f084d3e9d')
+        'conntrackd.service'
+        '01-config-file-path.patch'
+        '02-fix-compilation-of-timeout-extension.patch')
+md5sums=('8e20330d6ca3a3f23552aa900b1d467c'
+         '478fe76da0202fcb5249bf65968d1c26'
+         'd3e73e81b54e3e8166d357d434680684'
+         'bd135eaefb47923bb8e8d26f084d3e9d'
+         '411fc0eb97c02595aab69b14c26c1d00'
+         '0144021bbec4d5b496ddd86a7ff7a257')
 
 build() {
   cd $pkgname-$pkgver
+  for i in "$srcdir"/*.patch; do
+    patch -p1 -i "$i"
+  done
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
@@ -39,7 +47,7 @@ package() {
   install -D -m 644 conntrackd.service \
     "$pkgdir/usr/lib/systemd/system/conntrackd.service"
   # install empty configuration files
-  install -D -m 644 /dev/null "$pkgdir/etc/conntrackd/conntrackd.conf"
+  install -D -m 644 /dev/null "$pkgdir/etc/conntrackd.conf"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrack-tools.install b/community/conntrack-tools/conntrack-tools.install
new file mode 100644
index 000000000..d21a5f92c
--- /dev/null
+++ b/community/conntrack-tools/conntrack-tools.install
@@ -0,0 +1,9 @@
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  [ $(vercmp "$2" '1.0.1-2') -gt 0 ] || cat <<EOF
+Config file have been moved from /etc/conntrackd/conntrackd.conf to /etc/conntrackd.conf.
+EOF
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrackd.conf b/community/conntrack-tools/conntrackd.conf
index b90427a49..285f566d2 100644
--- a/community/conntrack-tools/conntrackd.conf
+++ b/community/conntrack-tools/conntrackd.conf
@@ -1,3 +1,3 @@
 # vim:set ts=2 sw=2 ft=sh noet:
 
-DAEMON_OPTIONS='-d'
+#DAEMON_OPTIONS=''
diff --git a/community/conntrack-tools/conntrackd.rc b/community/conntrack-tools/conntrackd.rc
index a7040c633..4300a7041 100644
--- a/community/conntrack-tools/conntrackd.rc
+++ b/community/conntrack-tools/conntrackd.rc
@@ -6,6 +6,7 @@
 
 DAEMON=/usr/sbin/conntrackd
 PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTIONS="-d $DAEMON_OPTIONS"
 
 case "$1" in
   start)
diff --git a/community/libnetfilter_cttimeout/PKGBUILD b/community/libnetfilter_cttimeout/PKGBUILD
new file mode 100644
index 000000000..1c3211c32
--- /dev/null
+++ b/community/libnetfilter_cttimeout/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 72544 2012-06-16 15:53:38Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=libnetfilter_cttimeout
+pkgver=1.0.0
+pkgrel=3
+pkgdesc='Library for the connection tracking timeout infrastructure'
+arch=('i686' 'x86_64')
+url='http://www.netfilter.org/projects/libnetfilter_cttimeout/'
+license=('GPL2')
+depends=('libmnl')
+options=('!libtool')
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
+md5sums=('7697437fc9ebb6f6b83df56a633db7f9')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD
index 429204815..28b0d8f71 100644
--- a/community/nautilus-actions/PKGBUILD
+++ b/community/nautilus-actions/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 60313 2011-12-10 09:56:53Z ibiru $
+# $Id: PKGBUILD 72506 2012-06-16 07:11:54Z ebelanger $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-actions
-pkgver=3.1.5
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="Configures programs to be launched when files are selected in Nautilus"
 arch=('i686' 'x86_64')
-url="http://gnome.org"
+url="http://www.nautilus-actions.org/"
 license=('GPL')
 depends=('nautilus' 'libunique3' 'libgtop' 'gconf' 'libsm')
 makedepends=('intltool' 'gnome-doc-utils')
 install=nautilus-actions.install
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.xz)
-sha256sums=('dc6b7522d04e1ed1505d6cb2e3be7888ffbac3f094ba6204da81a19c92cb230a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('214af9fd2a7f561366bf88446f9b79182e696a303da8e15c7a8a1ffaeaca11c4')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
+    cd "$srcdir/$pkgname-$pkgver"
     ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
         --libexecdir=/usr/lib/nautilus-actions
     make
 }
 
 package(){
-    cd $srcdir/$pkgname-$pkgver
-    make  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
-    mkdir -p $pkgdir/usr/share/gconf/schemas
-    gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas --domain nautilus-actions \
-        $pkgdir/etc/gconf/schemas/*.schemas
-    rm -rf $pkgdir/etc/gconf/schemas/
+    cd "$srcdir/$pkgname-$pkgver"
+    make  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+    mkdir -p "$pkgdir/usr/share/gconf/schemas"
+    gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain nautilus-actions \
+        "$pkgdir"/etc/gconf/schemas/*.schemas
+    rm -rf "$pkgdir/etc/gconf/schemas/"
 }
diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD
index e8ae9f9c0..3ec4f440a 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 65353 2012-02-21 02:18:04Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# $Id: PKGBUILD 72514 2012-06-16 08:04:35Z bpiotrowski $
+# Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Tom Killian <tomk@runbox.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=uptimed
-pkgver=0.3.16
-pkgrel=4
+pkgver=0.3.17
+pkgrel=1
 pkgdesc="A system uptime record daemon"
 arch=(i686 x86_64)
 url="http://podgorny.cz/uptimed/"
@@ -15,8 +16,8 @@ backup=(etc/uptimed.conf)
 options=('!libtool')
 install=$pkgname.install
 source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2
-        uptimed)
-md5sums=('f87ec2cc39039239004afa542cf99c59'
+        rc.d)
+md5sums=('528b62c33454b33537c3bf2366977bdb'
          '4ae90bee9fc78014a889a5072effb735')
 
 build() {
@@ -40,5 +41,5 @@ package() {
   make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install
 
   mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf
-  install -D $srcdir/uptimed $pkgdir/etc/rc.d/uptimed
+  install -D $srcdir/rc.d $pkgdir/etc/rc.d/uptimed
 }
diff --git a/community/uptimed/rc.d b/community/uptimed/rc.d
new file mode 100644
index 000000000..6fe9ec3e3
--- /dev/null
+++ b/community/uptimed/rc.d
@@ -0,0 +1,39 @@
+#!/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