diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
commit | 9f7fb9c12e84f20cd108b933f1a51e216f76cd98 (patch) | |
tree | 06520d9024b40745b94f02d0d3419386e6496863 /community/ulogd | |
parent | 6cc893589a6bd208f2b7711f985e17df7a6df816 (diff) | |
parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'community/ulogd')
-rw-r--r-- | community/ulogd/PKGBUILD | 12 | ||||
-rw-r--r-- | community/ulogd/logrotate | 10 | ||||
-rw-r--r-- | community/ulogd/mac-addr.patch | 22 | ||||
-rw-r--r-- | community/ulogd/rc | 54 | ||||
-rw-r--r-- | community/ulogd/ulogd.conf.min | 20 | ||||
-rw-r--r-- | community/ulogd/ulogd.rc | 54 |
6 files changed, 6 insertions, 166 deletions
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 3f7f0fe68..7aaf3345d 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 83573 2013-02-03 13:19:13Z seblu $ +# $Id: PKGBUILD 87022 2013-03-25 19:17:05Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Sergej Pupykin <ps@lx-ltd.ru> pkgname=ulogd -pkgver=2.0.1 -pkgrel=4 +pkgver=2.0.2 +pkgrel=1 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') backup=('etc/ulogd.conf') -makedepends=('libmysqlclient' +makedepends=('libmariadbclient' 'libnetfilter_acct' 'libnetfilter_conntrack' 'libnetfilter_log' @@ -27,7 +27,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.logrotate" "$pkgname.conf" "$pkgname.service") -md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9' +md5sums=('660516de4b5b1e110c12dae414619e0f' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' '42fc2c0568ff89ec00c2f0797280f296') diff --git a/community/ulogd/logrotate b/community/ulogd/logrotate deleted file mode 100644 index 312c71acb..000000000 --- a/community/ulogd/logrotate +++ /dev/null @@ -1,10 +0,0 @@ -/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/mac-addr.patch b/community/ulogd/mac-addr.patch deleted file mode 100644 index 87a76a22b..000000000 --- a/community/ulogd/mac-addr.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ulogd_BASE.c-save 2007-08-06 11:23:53.000000000 +0200 -+++ ulogd_BASE.c 2007-08-06 11:28:47.000000000 +0200 -@@ -63,7 +63,7 @@ static ulog_iret_t *_interp_raw(ulog_int - { - unsigned char *p; - int i; -- char *buf, *oldbuf = NULL; -+ char *buf = NULL; - ulog_iret_t *ret = ip->result; - - if (pkt->mac_len) { -@@ -75,9 +75,8 @@ static ulog_iret_t *_interp_raw(ulog_int - *buf = '\0'; - - p = pkt->mac; -- oldbuf = buf; - for (i = 0; i < pkt->mac_len; i++, p++) -- sprintf(buf, "%s%02x%c", oldbuf, *p, i==pkt->mac_len-1 ? ' ':':'); -+ sprintf(buf + (i*3), "%02x%c", *p, i==pkt->mac_len-1 ? ' ':':'); - ret[0].value.ptr = buf; - ret[0].flags |= ULOGD_RETF_VALID; - } diff --git a/community/ulogd/rc b/community/ulogd/rc deleted file mode 100644 index 83f0550cc..000000000 --- a/community/ulogd/rc +++ /dev/null @@ -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 &>/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.conf.min b/community/ulogd/ulogd.conf.min deleted file mode 100644 index 822575613..000000000 --- a/community/ulogd/ulogd.conf.min +++ /dev/null @@ -1,20 +0,0 @@ -[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.rc b/community/ulogd/ulogd.rc deleted file mode 100644 index 83f0550cc..000000000 --- a/community/ulogd/ulogd.rc +++ /dev/null @@ -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 &>/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 |