Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/conntrack-tools/01-config-file-path.patch
	community-testing/conntrack-tools/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gigi/PKGBUILD
	community-testing/glob2/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community/gtk2hs-buildtools/PKGBUILD
	community/haddock/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libnetfilter_acct/PKGBUILD
	community/libnetfilter_conntrack/PKGBUILD
	community/libnetfilter_queue/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/sfk/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/claws-mail/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/nx/PKGBUILD
	extra/ocaml/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-libxcb/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	social/squirm/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	testing/curl/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/dnsutils/remove-bind.patch
	testing/mesa/PKGBUILD
	testing/openldap/PKGBUILD
	testing/pam/PKGBUILD
	testing/subversion/PKGBUILD
	testing/systemd/PKGBUILD
	testing/sysvinit/PKGBUILD

5 files changed, 115 insertions, 39 deletions

diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index d32b424bb..e78329277 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,62 +1,57 @@
-# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $
+# $Id: PKGBUILD 77483 2012-10-10 23:43:02Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Sergej Pupykin <ps@lx-ltd.ru>
 
 pkgname=ulogd
-pkgver=2.0.0
-pkgrel=5
+pkgver=2.0.1
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
-depends=('libmnl')
+depends=('libmnl' 'libnfnetlink')
 backup=('etc/ulogd.conf')
-makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi'
-	     'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack'
-	     'linuxdoc-tools' 'groff' 'texlive-core')
-optdepends=('postgresql-libs'
-	    'sqlite'
-	    'libpcap'
-	    'libmysqlclient'
-	    'libdbi'
-	    'libnetfilter_acct'
-	    'libnetfilter_log'
-	    'libnetfilter_conntrack')
+makedepends=('libmysqlclient'
+             'libnetfilter_acct'
+             'libnetfilter_conntrack'
+             'libnetfilter_log'
+             'libpcap'
+             'libdbi'
+             'postgresql-libs'
+             'sqlite')
+optdepends=("${makedepends[@]}")
 options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-	'rc'
-	'logrotate'
-	'ulogd.conf.min'
-	'ulogd.service')
-md5sums=('211e68781e3860959606fc94b97cf22e'
+	      "$pkgname.rc"
+	      "$pkgname.logrotate"
+	      "$pkgname.conf"
+	      "$pkgname.service")
+md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9'
          'c42230c1cabf5dd9b80bf9a0fd87ca7e'
          'dd32eeee0949adff4188544419acd17e'
          'c21531312f95e790ed19aa267a17d35a'
-         '13a1227052322b4c17b258ed358f055e')
+         '42fc2c0568ff89ec00c2f0797280f296')
+
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi
   make
-  (cd doc && make)
 }
 
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -dm0755 "$pkgdir/usr/share/doc/ulogd"
-  install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample
-  install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd"
-
-  install -dm0755 "$pkgdir/usr/share/ulogd"
-  install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd"
-
-  install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd"
-  install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd"
-
-  install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf
-  install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service
+  install -dm755 "$pkgdir/usr/share/doc/ulogd"
+  install -Dm644 ulogd.conf "$pkgdir/usr/share/doc/ulogd/ulogd.conf"
+  install -m644 doc/*.{table,sql} "$pkgdir/usr/share/doc/ulogd"
+  cd "$srcdir"
+  install -Dm755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 $pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname"
+  install -Dm644 $pkgname.conf "$pkgdir/etc/$pkgname.conf"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
new file mode 100644
index 000000000..822575613
--- /dev/null
+++ b/community/ulogd/ulogd.conf
@@ -0,0 +1,20 @@
+[global]
+nlgroup=1
+logfile="/var/log/ulogd.log"
+loglevel=5
+rmem=131071
+bufsize=150000
+
+plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so"
+plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
+plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
+plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
+plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
+
+stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+[ulog1]
+nlgroup=1
+
+[emu1]
+file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate
new file mode 100644
index 000000000..312c71acb
--- /dev/null
+++ b/community/ulogd/ulogd.logrotate
@@ -0,0 +1,10 @@
+/var/log/ulogd.log /var/log/ulogd.syslogemu {
+  missingok
+  notifempty
+  sharedscripts
+  create 0640 root root
+
+  postrotate
+    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
+  endscript
+}
diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc
new file mode 100644
index 000000000..83f0550cc
--- /dev/null
+++ b/community/ulogd/ulogd.rc
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+get_pid() {
+	pidof /usr/sbin/ulogd
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting ulogd daemon"
+
+    [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
+    PID=`get_pid`
+    if [ -z "$PID" ]; then
+       /usr/sbin/ulogd -d &>/dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+        exit 1
+      else
+        echo `get_pid` > /var/run/ulogd.pid
+        add_daemon ulogd
+        stat_done
+      fi
+    else
+      stat_fail
+      exit 1
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping ulog daemon"
+    PID=`get_pid`
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+      exit 1
+    else
+      rm -f /var/run/ulogd.pid &> /dev/null
+      rm_daemon ulogd
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service
index 3984bbced..8858427fa 100644
--- a/community/ulogd/ulogd.service
+++ b/community/ulogd/ulogd.service
@@ -3,10 +3,7 @@ Description=Netfilter Ulogd daemon
 After=network.target
 
 [Service]
-Type=forking
-User=root
-ExecStart=/usr/sbin/ulogd -d
-PIDFile=/var/run/ulogd.pid
+ExecStart=/usr/sbin/ulogd
 
 [Install]
 WantedBy=multi-user.target