[arch-commits] Commit in ulogd/trunk (PKGBUILD ulogd.conf ulogd.logrotate)

[Sergej Pupykin]

    Date: Monday, October 7, 2013 @ 12:06:50
  Author: spupykin
Revision: 98178

upgpkg: ulogd 2.0.2-3

upd

Modified:
  ulogd/trunk/PKGBUILD
  ulogd/trunk/ulogd.conf
  ulogd/trunk/ulogd.logrotate

-----------------+
 PKGBUILD        |   22 +++++++++++-----------
 ulogd.conf      |    9 ++++-----
 ulogd.logrotate |    2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-07 10:06:23 UTC (rev 98177)
+++ PKGBUILD	2013-10-07 10:06:50 UTC (rev 98178)
@@ -6,17 +6,18 @@
 
 pkgname=ulogd
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 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 @@
 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 \

Modified: ulogd.conf
===================================================================
--- ulogd.conf	2013-10-07 10:06:23 UTC (rev 98177)
+++ ulogd.conf	2013-10-07 10:06:50 UTC (rev 98178)
@@ -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

Modified: ulogd.logrotate
===================================================================
--- ulogd.logrotate	2013-10-07 10:06:23 UTC (rev 98177)
+++ ulogd.logrotate	2013-10-07 10:06:50 UTC (rev 98178)
@@ -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
 }