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

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

3 files changed, 17 insertions, 18 deletions

diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 5d44fd6d2..8d3798210 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $
+# $Id: PKGBUILD 98179 2013-10-07 10:07:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,17 +6,18 @@
 
 pkgname=ulogd
 pkgver=2.0.2
-pkgrel=2
+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' 'libnfnetlink')
+depends=('libmnl'
+         'libnetfilter_acct'
+         'libnetfilter_conntrack'
+         'libnetfilter_log'
+         'libnfnetlink')
 backup=('etc/ulogd.conf')
 makedepends=('libmariadbclient'
-             'libnetfilter_acct'
-             'libnetfilter_conntrack'
-             'libnetfilter_log'
              'libpcap'
              'libdbi'
              'postgresql-libs'
@@ -24,15 +25,14 @@ makedepends=('libmariadbclient'
 optdepends=("${makedepends[@]}")
 options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-	      "$pkgname.logrotate"
-	      "$pkgname.conf"
-	      "$pkgname.service")
+        "$pkgname.logrotate"
+        "$pkgname.conf"
+        "$pkgname.service")
 md5sums=('660516de4b5b1e110c12dae414619e0f'
-         'dd32eeee0949adff4188544419acd17e'
-         'c21531312f95e790ed19aa267a17d35a'
+         '95f05af0a0c8f5fdea5bd92ccb2fd465'
+         '7ccdb48cd152ff502334d3f6b2a4daab'
          '092d72209e30c132e0a08112e4062772')
 
-
 build() {
   cd $pkgname-$pkgver
   ./configure \
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
index 822575613..f96bd1d2c 100644
--- a/community/ulogd/ulogd.conf
+++ b/community/ulogd/ulogd.conf
@@ -1,20 +1,19 @@
 [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_inppkt_NFLOG.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
+stack=log1:NFLOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
-[ulog1]
-nlgroup=1
+[log1]
+group=1
 
 [emu1]
 file=/var/log/ulogd.syslogemu
diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate
index 312c71acb..299e93d02 100644
--- a/community/ulogd/ulogd.logrotate
+++ b/community/ulogd/ulogd.logrotate
@@ -5,6 +5,6 @@
   create 0640 root root
 
   postrotate
-    [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null
+    systemctl kill --signal=SIGHUP ulogd.service || true
   endscript
 }