[arch-commits] Commit in ulogd/trunk (4 files)

[Sébastien Luttringer]

    Date: Thursday, July 24, 2014 @ 01:15:45
  Author: seblu
Revision: 217788

Fix community2extra fail

I guess because old ulogd was never removed from extra

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

-----------------+
 PKGBUILD        |   74 +++++++++++++++++++++++++++++++++++++++---------------
 ulogd.conf      |   20 ++++++++++++++
 ulogd.logrotate |   10 +++++++
 ulogd.service   |    9 ++++++
 4 files changed, 93 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-23 22:59:21 UTC (rev 217787)
+++ PKGBUILD	2014-07-23 23:15:45 UTC (rev 217788)
@@ -1,26 +1,60 @@
-# Maintainer: Dale Blount <dale at archlinux.org>
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Sébastien Luttringer
+# Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Sergej Pupykin <ps at lx-ltd.ru>
 
 pkgname=ulogd
-pkgver=1.24
-pkgrel=4
-pkgdesc="Userspace Packet Logging for netfilter"
-arch=(i686 x86_64)
-url="http://www.netfilter.org/projects/ulogd/index.html"
-depends=()
-makedepends=('mysql' 'postgresql>=8.2.3' 'sqlite3' 'libpcap>=0.9.8')
-backup=(etc/ulogd.conf)
-source=(ftp://ftp.netfilter.org/pub/ulogd/ulogd-1.24.tar.bz2 ulogd)
-md5sums=(05b4ed2926b9a22aaeaf642917bbf8ff 99fd661b5e689a25e0d6323fb3591d9e)
+pkgver=2.0.4
+pkgrel=1
+pkgdesc='Userspace Packet Logging for netfilter'
+arch=('i686' 'x86_64')
+url='http://www.netfilter.org/projects/ulogd/index.html'
+license=('GPL2')
+depends=('libmnl'
+         'libnetfilter_acct'
+         'libnetfilter_conntrack'
+         'libnetfilter_log'
+         'libnfnetlink')
+backup=('etc/ulogd.conf')
+makedepends=('libmariadbclient'
+             'libpcap'
+             'libdbi'
+             'postgresql-libs'
+             'sqlite')
+optdepends=("${makedepends[@]}")
+source=("http://www.netfilter.org/projects/ulogd/files/$pkgname-$pkgver.tar.bz2"{,.sig}
+        "$pkgname.logrotate"
+        "$pkgname.conf"
+        "$pkgname.service")
+md5sums=('7c71ec460dfea5287eba27472c521ebc'
+         'SKIP'
+         '95f05af0a0c8f5fdea5bd92ccb2fd465'
+         '2c8cbedb2fb455cba220ca35186ad846'
+         '092d72209e30c132e0a08112e4062772')
 
 build() {
-	export MAKEFLAGS="-j1"
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc --with-mysql \
-		--with-pgsql --with-sqlite3
-	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
-	install -D -m755 $startdir/src/ulogd $startdir/pkg/etc/rc.d/ulogd
-	mkdir -p $startdir/pkg/usr/share/ulogd
-	install -m644 doc/*.table $startdir/pkg/usr/share/ulogd
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-mysql \
+    --with-pgsql \
+    --with-dbi
+  make
 }
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  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 -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:

Added: ulogd.conf
===================================================================
--- ulogd.conf	                        (rev 0)
+++ ulogd.conf	2014-07-23 23:15:45 UTC (rev 217788)
@@ -0,0 +1,20 @@
+[global]
+logfile="/var/log/ulogd.log"
+loglevel=5
+rmem=131071
+bufsize=150000
+
+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"
+plugin="/usr/lib/ulogd/ulogd_filter_IFINDEX.so"
+
+stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+[log1]
+group=1
+
+[emu1]
+file=/var/log/ulogd.syslogemu

Added: ulogd.logrotate
===================================================================
--- ulogd.logrotate	                        (rev 0)
+++ ulogd.logrotate	2014-07-23 23:15:45 UTC (rev 217788)
@@ -0,0 +1,10 @@
+/var/log/ulogd.log /var/log/ulogd.syslogemu {
+  missingok
+  notifempty
+  sharedscripts
+  create 0640 root root
+
+  postrotate
+    systemctl kill --signal=SIGHUP ulogd.service || true
+  endscript
+}

Added: ulogd.service
===================================================================
--- ulogd.service	                        (rev 0)
+++ ulogd.service	2014-07-23 23:15:45 UTC (rev 217788)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Netfilter Ulogd daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/ulogd
+
+[Install]
+WantedBy=multi-user.target