[arch-commits] Commit in ulogd/repos (20 files)
Sébastien Luttringer
seblu at archlinux.org
Wed Feb 24 23:20:31 UTC 2016
Date: Thursday, February 25, 2016 @ 00:20:31
Author: seblu
Revision: 260238
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ulogd/repos/extra-i686/01-fix-FS#48318.patch
(from rev 260237, ulogd/trunk/01-fix-FS#48318.patch)
ulogd/repos/extra-i686/PKGBUILD
(from rev 260237, ulogd/trunk/PKGBUILD)
ulogd/repos/extra-i686/ulogd.conf
(from rev 260237, ulogd/trunk/ulogd.conf)
ulogd/repos/extra-i686/ulogd.logrotate
(from rev 260237, ulogd/trunk/ulogd.logrotate)
ulogd/repos/extra-i686/ulogd.service
(from rev 260237, ulogd/trunk/ulogd.service)
ulogd/repos/extra-x86_64/01-fix-FS#48318.patch
(from rev 260237, ulogd/trunk/01-fix-FS#48318.patch)
ulogd/repos/extra-x86_64/PKGBUILD
(from rev 260237, ulogd/trunk/PKGBUILD)
ulogd/repos/extra-x86_64/ulogd.conf
(from rev 260237, ulogd/trunk/ulogd.conf)
ulogd/repos/extra-x86_64/ulogd.logrotate
(from rev 260237, ulogd/trunk/ulogd.logrotate)
ulogd/repos/extra-x86_64/ulogd.service
(from rev 260237, ulogd/trunk/ulogd.service)
Deleted:
ulogd/repos/extra-i686/PKGBUILD
ulogd/repos/extra-i686/ulogd
ulogd/repos/extra-i686/ulogd.conf
ulogd/repos/extra-i686/ulogd.logrotate
ulogd/repos/extra-i686/ulogd.service
ulogd/repos/extra-x86_64/PKGBUILD
ulogd/repos/extra-x86_64/ulogd
ulogd/repos/extra-x86_64/ulogd.conf
ulogd/repos/extra-x86_64/ulogd.logrotate
ulogd/repos/extra-x86_64/ulogd.service
------------------------------------+
/PKGBUILD | 154 +++++++++++++++++++++++++++++++++++
/ulogd.conf | 40 +++++++++
/ulogd.logrotate | 20 ++++
/ulogd.service | 22 +++++
extra-i686/01-fix-FS#48318.patch | 25 +++++
extra-i686/PKGBUILD | 66 ---------------
extra-i686/ulogd | 54 ------------
extra-i686/ulogd.conf | 20 ----
extra-i686/ulogd.logrotate | 10 --
extra-i686/ulogd.service | 10 --
extra-x86_64/01-fix-FS#48318.patch | 25 +++++
extra-x86_64/PKGBUILD | 66 ---------------
extra-x86_64/ulogd | 54 ------------
extra-x86_64/ulogd.conf | 20 ----
extra-x86_64/ulogd.logrotate | 10 --
extra-x86_64/ulogd.service | 10 --
16 files changed, 286 insertions(+), 320 deletions(-)
Copied: ulogd/repos/extra-i686/01-fix-FS#48318.patch (from rev 260237, ulogd/trunk/01-fix-FS#48318.patch)
===================================================================
--- extra-i686/01-fix-FS#48318.patch (rev 0)
+++ extra-i686/01-fix-FS#48318.patch 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,25 @@
+From a82d9cfe03679b82ab4d9586c93ad377e9e27149 Mon Sep 17 00:00:00 2001
+From: Eric Leblond <eric at regit.org>
+Date: Fri, 5 Feb 2016 11:55:26 +0100
+Subject: [PATCH 2/2] ulogd: add missing newline in log message
+
+---
+ src/ulogd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ulogd.c b/src/ulogd.c
+index c8d9376..5b9a586 100644
+--- a/src/ulogd.c
++++ b/src/ulogd.c
+@@ -1515,7 +1515,7 @@ int main(int argc, char* argv[])
+
+ if (daemonize){
+ if (daemon(0, 0) < 0) {
+- ulogd_log(ULOGD_FATAL, "can't daemonize: %s (%d)",
++ ulogd_log(ULOGD_FATAL, "can't daemonize: %s (%d)\n",
+ errno, strerror(errno));
+ warn_and_exit(daemonize);
+ }
+--
+2.7.1
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-i686/PKGBUILD 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Dale Blount <dale at archlinux.org>
-
-pkgname=ulogd
-pkgver=2.0.5
-pkgrel=2
-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'
- 'jansson')
-optdepends=('libmariadbclient: MySQL databases support'
- 'sqlite: SQLite3 databases support'
- 'postgresql-libs: PostgreSQL databases support'
- 'libdbi: DBI abstraction databases support'
- 'libpcap: PCAP output support'
- 'jansson: JSON output support')
-validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
-source=("http://www.netfilter.org/projects/ulogd/files/$pkgname-$pkgver.tar.bz2"{,.sig}
- "$pkgname.logrotate"
- "$pkgname.conf"
- "$pkgname.service")
-md5sums=('f0f8fe1371fa28b5e06cb16aaa0111dd'
- 'SKIP'
- '95f05af0a0c8f5fdea5bd92ccb2fd465'
- '2c8cbedb2fb455cba220ca35186ad846'
- '2181602f38e165280b970ff80653c7b2')
-
-build() {
- 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:
Copied: ulogd/repos/extra-i686/PKGBUILD (from rev 260237, ulogd/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Dale Blount <dale at archlinux.org>
+
+pkgname=ulogd
+pkgver=2.0.5
+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'
+ 'libnetfilter_acct'
+ 'libnetfilter_conntrack'
+ 'libnetfilter_log'
+ 'libnfnetlink')
+backup=('etc/ulogd.conf')
+makedepends=('libmariadbclient'
+ 'libpcap'
+ 'libdbi'
+ 'postgresql-libs'
+ 'sqlite'
+ 'jansson')
+optdepends=('libmariadbclient: MySQL databases support'
+ 'sqlite: SQLite3 databases support'
+ 'postgresql-libs: PostgreSQL databases support'
+ 'libdbi: DBI abstraction databases support'
+ 'libpcap: PCAP output support'
+ 'jansson: JSON output support')
+validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
+source=("http://www.netfilter.org/projects/ulogd/files/$pkgname-$pkgver.tar.bz2"{,.sig}
+ "$pkgname.logrotate"
+ "$pkgname.conf"
+ "$pkgname.service"
+ '01-fix-FS#48318.patch')
+md5sums=('f0f8fe1371fa28b5e06cb16aaa0111dd'
+ 'SKIP'
+ '50c392d3668ee9c69281f05f55430d0f'
+ '2c8cbedb2fb455cba220ca35186ad846'
+ '23a13ee4c118cb40b086bdb23d25eac2'
+ '8a9c41fc01bf65a798e44c7548dce8ac')
+
+prepare() {
+ for _f in "${source[@]}"; do
+ if [[ "$_f" =~ \.patch$ ]]; then
+ msg2 "Apply patch $_f"
+ patch -t -p1 -d $pkgname-$pkgver < "$_f"
+ fi
+ done
+}
+
+build() {
+ 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:
Deleted: extra-i686/ulogd
===================================================================
--- extra-i686/ulogd 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-i686/ulogd 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,54 +0,0 @@
-#!/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
- 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
Deleted: extra-i686/ulogd.conf
===================================================================
--- extra-i686/ulogd.conf 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-i686/ulogd.conf 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,20 +0,0 @@
-[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
Copied: ulogd/repos/extra-i686/ulogd.conf (from rev 260237, ulogd/trunk/ulogd.conf)
===================================================================
--- extra-i686/ulogd.conf (rev 0)
+++ extra-i686/ulogd.conf 2016-02-24 23:20:31 UTC (rev 260238)
@@ -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
Deleted: extra-i686/ulogd.logrotate
===================================================================
--- extra-i686/ulogd.logrotate 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-i686/ulogd.logrotate 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,10 +0,0 @@
-/var/log/ulogd.log /var/log/ulogd.syslogemu {
- missingok
- notifempty
- sharedscripts
- create 0640 root root
-
- postrotate
- systemctl kill --signal=SIGHUP ulogd.service || true
- endscript
-}
Copied: ulogd/repos/extra-i686/ulogd.logrotate (from rev 260237, ulogd/trunk/ulogd.logrotate)
===================================================================
--- extra-i686/ulogd.logrotate (rev 0)
+++ extra-i686/ulogd.logrotate 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,10 @@
+/var/log/ulogd.log /var/log/ulogd.syslogemu {
+ missingok
+ notifempty
+ sharedscripts
+ create 0640 root root
+
+ postrotate
+ systemctl reload ulogd.service || true
+ endscript
+}
Deleted: extra-i686/ulogd.service
===================================================================
--- extra-i686/ulogd.service 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-i686/ulogd.service 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Netfilter Ulogd daemon
-Before=network-pre.target
-Wants=network-pre.target
-
-[Service]
-ExecStart=/usr/bin/ulogd
-
-[Install]
-WantedBy=multi-user.target
Copied: ulogd/repos/extra-i686/ulogd.service (from rev 260237, ulogd/trunk/ulogd.service)
===================================================================
--- extra-i686/ulogd.service (rev 0)
+++ extra-i686/ulogd.service 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Netfilter Ulogd daemon
+Before=network-pre.target
+Wants=network-pre.target
+
+[Service]
+ExecStart=/usr/bin/ulogd
+ExecReload=/usr/bin/kill --signal HUP ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target
Copied: ulogd/repos/extra-x86_64/01-fix-FS#48318.patch (from rev 260237, ulogd/trunk/01-fix-FS#48318.patch)
===================================================================
--- extra-x86_64/01-fix-FS#48318.patch (rev 0)
+++ extra-x86_64/01-fix-FS#48318.patch 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,25 @@
+From a82d9cfe03679b82ab4d9586c93ad377e9e27149 Mon Sep 17 00:00:00 2001
+From: Eric Leblond <eric at regit.org>
+Date: Fri, 5 Feb 2016 11:55:26 +0100
+Subject: [PATCH 2/2] ulogd: add missing newline in log message
+
+---
+ src/ulogd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ulogd.c b/src/ulogd.c
+index c8d9376..5b9a586 100644
+--- a/src/ulogd.c
++++ b/src/ulogd.c
+@@ -1515,7 +1515,7 @@ int main(int argc, char* argv[])
+
+ if (daemonize){
+ if (daemon(0, 0) < 0) {
+- ulogd_log(ULOGD_FATAL, "can't daemonize: %s (%d)",
++ ulogd_log(ULOGD_FATAL, "can't daemonize: %s (%d)\n",
+ errno, strerror(errno));
+ warn_and_exit(daemonize);
+ }
+--
+2.7.1
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-x86_64/PKGBUILD 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Dale Blount <dale at archlinux.org>
-
-pkgname=ulogd
-pkgver=2.0.5
-pkgrel=2
-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'
- 'jansson')
-optdepends=('libmariadbclient: MySQL databases support'
- 'sqlite: SQLite3 databases support'
- 'postgresql-libs: PostgreSQL databases support'
- 'libdbi: DBI abstraction databases support'
- 'libpcap: PCAP output support'
- 'jansson: JSON output support')
-validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
-source=("http://www.netfilter.org/projects/ulogd/files/$pkgname-$pkgver.tar.bz2"{,.sig}
- "$pkgname.logrotate"
- "$pkgname.conf"
- "$pkgname.service")
-md5sums=('f0f8fe1371fa28b5e06cb16aaa0111dd'
- 'SKIP'
- '95f05af0a0c8f5fdea5bd92ccb2fd465'
- '2c8cbedb2fb455cba220ca35186ad846'
- '2181602f38e165280b970ff80653c7b2')
-
-build() {
- 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:
Copied: ulogd/repos/extra-x86_64/PKGBUILD (from rev 260237, ulogd/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Dale Blount <dale at archlinux.org>
+
+pkgname=ulogd
+pkgver=2.0.5
+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'
+ 'libnetfilter_acct'
+ 'libnetfilter_conntrack'
+ 'libnetfilter_log'
+ 'libnfnetlink')
+backup=('etc/ulogd.conf')
+makedepends=('libmariadbclient'
+ 'libpcap'
+ 'libdbi'
+ 'postgresql-libs'
+ 'sqlite'
+ 'jansson')
+optdepends=('libmariadbclient: MySQL databases support'
+ 'sqlite: SQLite3 databases support'
+ 'postgresql-libs: PostgreSQL databases support'
+ 'libdbi: DBI abstraction databases support'
+ 'libpcap: PCAP output support'
+ 'jansson: JSON output support')
+validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
+source=("http://www.netfilter.org/projects/ulogd/files/$pkgname-$pkgver.tar.bz2"{,.sig}
+ "$pkgname.logrotate"
+ "$pkgname.conf"
+ "$pkgname.service"
+ '01-fix-FS#48318.patch')
+md5sums=('f0f8fe1371fa28b5e06cb16aaa0111dd'
+ 'SKIP'
+ '50c392d3668ee9c69281f05f55430d0f'
+ '2c8cbedb2fb455cba220ca35186ad846'
+ '23a13ee4c118cb40b086bdb23d25eac2'
+ '8a9c41fc01bf65a798e44c7548dce8ac')
+
+prepare() {
+ for _f in "${source[@]}"; do
+ if [[ "$_f" =~ \.patch$ ]]; then
+ msg2 "Apply patch $_f"
+ patch -t -p1 -d $pkgname-$pkgver < "$_f"
+ fi
+ done
+}
+
+build() {
+ 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:
Deleted: extra-x86_64/ulogd
===================================================================
--- extra-x86_64/ulogd 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-x86_64/ulogd 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,54 +0,0 @@
-#!/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
- 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
Deleted: extra-x86_64/ulogd.conf
===================================================================
--- extra-x86_64/ulogd.conf 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-x86_64/ulogd.conf 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,20 +0,0 @@
-[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
Copied: ulogd/repos/extra-x86_64/ulogd.conf (from rev 260237, ulogd/trunk/ulogd.conf)
===================================================================
--- extra-x86_64/ulogd.conf (rev 0)
+++ extra-x86_64/ulogd.conf 2016-02-24 23:20:31 UTC (rev 260238)
@@ -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
Deleted: extra-x86_64/ulogd.logrotate
===================================================================
--- extra-x86_64/ulogd.logrotate 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-x86_64/ulogd.logrotate 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,10 +0,0 @@
-/var/log/ulogd.log /var/log/ulogd.syslogemu {
- missingok
- notifempty
- sharedscripts
- create 0640 root root
-
- postrotate
- systemctl kill --signal=SIGHUP ulogd.service || true
- endscript
-}
Copied: ulogd/repos/extra-x86_64/ulogd.logrotate (from rev 260237, ulogd/trunk/ulogd.logrotate)
===================================================================
--- extra-x86_64/ulogd.logrotate (rev 0)
+++ extra-x86_64/ulogd.logrotate 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,10 @@
+/var/log/ulogd.log /var/log/ulogd.syslogemu {
+ missingok
+ notifempty
+ sharedscripts
+ create 0640 root root
+
+ postrotate
+ systemctl reload ulogd.service || true
+ endscript
+}
Deleted: extra-x86_64/ulogd.service
===================================================================
--- extra-x86_64/ulogd.service 2016-02-24 23:19:54 UTC (rev 260237)
+++ extra-x86_64/ulogd.service 2016-02-24 23:20:31 UTC (rev 260238)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Netfilter Ulogd daemon
-Before=network-pre.target
-Wants=network-pre.target
-
-[Service]
-ExecStart=/usr/bin/ulogd
-
-[Install]
-WantedBy=multi-user.target
Copied: ulogd/repos/extra-x86_64/ulogd.service (from rev 260237, ulogd/trunk/ulogd.service)
===================================================================
--- extra-x86_64/ulogd.service (rev 0)
+++ extra-x86_64/ulogd.service 2016-02-24 23:20:31 UTC (rev 260238)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Netfilter Ulogd daemon
+Before=network-pre.target
+Wants=network-pre.target
+
+[Service]
+ExecStart=/usr/bin/ulogd
+ExecReload=/usr/bin/kill --signal HUP ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list