diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
| commit | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (patch) | |
| tree | 0dfcf0ebb742c6e359f0502d9207b3a600aa3462 /community/ulogd | |
| parent | 7a501772e3cb37f438506df7c22a34ed9bba9d88 (diff) | |
| parent | db0dace84403023c8d89b8801f12a5ab278dc440 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
core/glibc/PKGBUILD
Diffstat (limited to 'community/ulogd')
| -rw-r--r-- | community/ulogd/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/ulogd/mac-addr.patch | 22 |
2 files changed, 29 insertions, 4 deletions
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index c4ea91a7c..b002d8e49 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55184 2011-09-05 09:03:02Z spupykin $ +# $Id: PKGBUILD 62776 2012-01-26 14:46:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=ulogd pkgver=1.24 -pkgrel=7 +pkgrel=8 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' @@ -19,14 +19,17 @@ optdepends=('postgresql-libs' backup=('etc/ulogd.conf') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'rc' - 'logrotate') + 'logrotate' + 'mac-addr.patch') md5sums=('05b4ed2926b9a22aaeaf642917bbf8ff' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' - 'fe40b3073b7474a77e0b8b0bfd19ab63') + 'fe40b3073b7474a77e0b8b0bfd19ab63' + 'ca41a10a9f230614cd15e2bb037e057d') build() { cd $pkgname-$pkgver export MAKEFLAGS="-j1" + patch -p0 extensions/ulogd_BASE.c <$srcdir/mac-addr.patch ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-sqlite3 make || true (cd mysql && ld -shared -L/usr/lib -L/usr/lib -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -o ulogd_MYSQL.so ulogd_MYSQL_sh.o -lc) diff --git a/community/ulogd/mac-addr.patch b/community/ulogd/mac-addr.patch new file mode 100644 index 000000000..87a76a22b --- /dev/null +++ b/community/ulogd/mac-addr.patch @@ -0,0 +1,22 @@ +--- 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; + } |