diff options
| -rw-r--r-- | app-admin/ulogd/ChangeLog | 9 | ||||
| -rw-r--r-- | app-admin/ulogd/files/ulogd | 36 | ||||
| -rw-r--r-- | app-admin/ulogd/files/ulogd-0.98 | 44 | ||||
| -rw-r--r-- | app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch | 11 | ||||
| -rw-r--r-- | app-admin/ulogd/files/ulogd-1.23-gcc41.patch | 26 | ||||
| -rw-r--r-- | app-admin/ulogd/files/ulogd-1.24-syslog-and-logrotate.patch | 34 | ||||
| -rw-r--r-- | app-admin/ulogd/ulogd-1.23-r1.ebuild | 68 | ||||
| -rw-r--r-- | app-admin/ulogd/ulogd-1.24-r2.ebuild | 109 |
8 files changed, 8 insertions, 329 deletions
diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog index 9a6fe266992e..937cc76718ef 100644 --- a/app-admin/ulogd/ChangeLog +++ b/app-admin/ulogd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/ulogd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.80 2013/04/23 08:42:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.81 2013/04/25 13:55:06 pinkbyte Exp $ + + 25 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> -files/ulogd-0.98, + -ulogd-1.23-r1.ebuild, + -files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch, + -files/ulogd-1.23-gcc41.patch, -ulogd-1.24-r2.ebuild, + -files/ulogd-1.24-syslog-and-logrotate.patch, -files/ulogd: + Drop old versions 23 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ulogd-2.0.2.ebuild: Stable for ppc, wrt bug #466590 diff --git a/app-admin/ulogd/files/ulogd b/app-admin/ulogd/files/ulogd deleted file mode 100644 index e2f76a1b7842..000000000000 --- a/app-admin/ulogd/files/ulogd +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.5 2012/01/01 01:01:06 idl0r Exp $ - -extra_started_commands="reload" - -depend() { - need net -} - -checkconfig() { - if [ ! -e /etc/ulogd.conf ]; then - eerror "You need /etc/ulogd.conf" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting ulogd" - start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -u ulogd -d >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping ulogd" - start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1 - eend $? -} - -reload() { - ebegin "Reloading ulogd.conf file" - killall -HUP ulogd &>/dev/null - eend $? -} diff --git a/app-admin/ulogd/files/ulogd-0.98 b/app-admin/ulogd/files/ulogd-0.98 deleted file mode 100644 index 383fb8ccfbbc..000000000000 --- a/app-admin/ulogd/files/ulogd-0.98 +++ /dev/null @@ -1,44 +0,0 @@ -#!/sbin/runscript -# -# chkconfig: - 91 35 -# description: Starts and stops the ulogd daemon -# -# config: /etc/ulogd.conf - -extra_started_commands="reload" - -depend() { - need net - use mysql -} - -initService() { -# Avoid using root's TMPDIR -unset TMPDIR - -# Check that ulogd.conf exists. -[ -f /etc/ulogd.conf ] || exit 0 - -RETVAL=0 -} - -start() { - initService - ebegin "Starting ulogd" - start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -d >/dev/null 2>&1 - eend $? -} - -stop() { - initService - ebegin "Stopping ulogd" - start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1 - eend $? -} - -reload() { - initService - ebegin "Reloading ulogd.conf file" - killall -HUP ulogd - eend $? -} diff --git a/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch b/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch deleted file mode 100644 index 163d49e6d3ff..000000000000 --- a/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libipulog/Makefile.in.orig 2013-03-20 19:18:05.000692936 +0400 -+++ libipulog/Makefile.in 2013-03-20 19:18:12.987692835 +0400 -@@ -1,7 +1,7 @@ - # - - include @top_srcdir@/Rules.make --CFLAGS+=-Iinclude -I/usr/src/linux/include -+CFLAGS+=-Iinclude - - libipulog.a: libipulog.o - $(LD) -i $< -o $@ diff --git a/app-admin/ulogd/files/ulogd-1.23-gcc41.patch b/app-admin/ulogd/files/ulogd-1.23-gcc41.patch deleted file mode 100644 index 1fb0dd2ddad9..000000000000 --- a/app-admin/ulogd/files/ulogd-1.23-gcc41.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: ulogd-1.23/extensions/ulogd_SYSLOG.c -=================================================================== ---- ulogd-1.23.orig/extensions/ulogd_SYSLOG.c -+++ ulogd-1.23/extensions/ulogd_SYSLOG.c -@@ -136,7 +136,7 @@ static ulog_output_t syslog_op = { - .name = "syslog", - .init = &syslog_init, - .fini = &syslog_fini, -- .output &_output_syslog -+ .output = &_output_syslog - }; - - -Index: ulogd-1.23/include/ulogd/ulogd.h -=================================================================== ---- ulogd-1.23.orig/include/ulogd/ulogd.h -+++ ulogd-1.23/include/ulogd/ulogd.h -@@ -56,8 +56,6 @@ - #define ULOGD_ERROR 7 /* error condition, requires user action */ - #define ULOGD_FATAL 8 /* fatal, program aborted */ - --extern FILE *logfile; -- - typedef struct ulog_iret { - /* next interpreter return (key) in the global list */ - struct ulog_iret *next; diff --git a/app-admin/ulogd/files/ulogd-1.24-syslog-and-logrotate.patch b/app-admin/ulogd/files/ulogd-1.24-syslog-and-logrotate.patch deleted file mode 100644 index b3410f6f936e..000000000000 --- a/app-admin/ulogd/files/ulogd-1.24-syslog-and-logrotate.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -u ulogd-1.24.orig/ulogd.conf.in ulogd-1.24/ulogd.conf.in ---- ulogd-1.24.orig/ulogd.conf.in 2009-08-11 22:56:31.000000000 -0700 -+++ ulogd-1.24/ulogd.conf.in 2009-08-11 23:07:35.000000000 -0700 -@@ -50,7 +50,10 @@ - #plugin="@libdir@/ulogd_PGSQL.so" - #plugin="@libdir@/ulogd_SQLITE3.so" - #plugin="@libdir@/ulogd_PCAP.so" -+#plugin="@libdir@/ulogd_SYSLOG.so" - -+## Note: if you change the paths of log files from defaults, you probably -+## will want to update paths in /etc/logrotate.d/ulogd to match - - [LOGEMU] - file="/var/log/ulogd/ulogd.syslogemu" -@@ -83,3 +86,6 @@ - file="/var/log/ulogd/ulogd.pcap" - sync=1 - -+[SYSLOG] -+facility=LOG_DAEMON -+level=LOG_INFO -diff -u ulogd-1.24.orig/ulogd.logrotate ulogd-1.24/ulogd.logrotate ---- ulogd-1.24.orig/ulogd.logrotate 2009-08-11 22:56:32.000000000 -0700 -+++ ulogd-1.24/ulogd.logrotate 2009-08-11 23:06:26.000000000 -0700 -@@ -1,6 +1,8 @@ --/var/log/ulogd.log /var/log/ulogd.syslogemu /var/log/ulogd.pktlog /var/log/ulogd.pcap { -+/var/log/ulogd/ulogd.log /var/log/ulogd/ulogd.syslogemu /var/log/ulogd/ulogd.pktlog /var/log/ulogd/ulogd.pcap { - missingok - sharedscripts -+ weekly -+ compress - postrotate - /bin/killall -HUP ulogd 2> /dev/null || true - endscript diff --git a/app-admin/ulogd/ulogd-1.23-r1.ebuild b/app-admin/ulogd/ulogd-1.23-r1.ebuild deleted file mode 100644 index 743997975bfb..000000000000 --- a/app-admin/ulogd/ulogd-1.23-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.10 2013/03/21 09:07:11 pinkbyte Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging" -SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2 - mirror://gentoo/${PN}-glsa-200701.patch.bz2" -HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc -sparc x86" -IUSE="mysql postgres" - -DEPEND="net-firewall/iptables - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-server )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-gcc41.patch" - EPATCH_OPTS="-F3" \ - epatch "${WORKDIR}/${PN}-glsa-200701.patch" - - # bug #285376 - epatch "${FILESDIR}/${P}-fix-include-in-libipulog-Makefile.patch" -} - -src_compile() { - # enables logfiles over 2G (#74924) - append-lfs-flags - - econf \ - `use_with mysql` \ - `use_with postgres pgsql` \ - || die "configure failed" - - # not parallel make safe: bug #128976 - emake -j1 || die "make failed" -} - -src_install() { - # the Makefile seems to be "broken" - - # it relies on the existance of /usr, /etc .. - dodir /usr/sbin - - make DESTDIR="${D}" install || die "install failed" - - newinitd "${FILESDIR}"/ulogd-0.98 ulogd - - dodoc README AUTHORS Changes - cd doc/ - dodoc ulogd.txt ulogd.a4.ps - - if use mysql; then - dodoc mysql.table mysql.table.ipaddr-as-string - fi - - if use postgres; then - dodoc pgsql.table - fi - - dohtml ulogd.html -} diff --git a/app-admin/ulogd/ulogd-1.24-r2.ebuild b/app-admin/ulogd/ulogd-1.24-r2.ebuild deleted file mode 100644 index fc77e9ae4432..000000000000 --- a/app-admin/ulogd/ulogd-1.24-r2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.7 2013/03/21 09:07:11 pinkbyte Exp $ - -EAPI="1" - -inherit eutils flag-o-matic autotools user - -DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging" -HOMEPAGE="http://netfilter.org/projects/ulogd/index.html" -SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2 - mirror://gentoo/${PN}-glsa-200805.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86" -IUSE="mysql postgres sqlite" - -DEPEND="net-firewall/iptables - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - sqlite? ( dev-db/sqlite:3 )" -RDEPEND="${DEPEND} - net-libs/libpcap" - -pkg_setup() { - enewgroup ulogd - enewuser ulogd -1 -1 /var/log/ulogd ulogd -} - -src_unpack() { - unpack ${A} || die "unpack failed" - cd "${S}" || die "dir ${S} not found" - - # enables logfiles over 2G (#74924) - append-lfs-flags - - epatch "${DISTDIR}/${PN}-glsa-200805.patch.bz2" - - # add syslog example to ulogd.conf, - # make logrotate config match default paths in ulogd.conf - epatch "${FILESDIR}/${P}-syslog-and-logrotate.patch" - - # switch plugin makefiles to use $(CC) instead of $(LD) for linking - # (prevents build from choking on stuff like "LDFLAGS=-Wl,O1") - for p in pgsql sqlite3 extensions mysql pcap ; do - f=$p/Makefile.in - sed -i -e 's/$(LD)/$(CC) -nostartfiles/' $f || die "failed to update $f" - done - - # bug #285376 - epatch "${FILESDIR}/${PN}-1.23-fix-include-in-libipulog-Makefile.patch" - - eautoconf -} - -src_compile() { - econf \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite3) \ - || die "configure failed" - - # Configure uses incorrect syntax for ld - use mysql && sed -i -e "s:-Wl,::g;s:-rdynamic::g" Rules.make - - # not parallel make safe: bug #128976 - emake -j1 || die "make failed" -} - -src_install() { - # the Makefile seems to be "broken" - - # it relies on the existance of /usr, /etc .. - dodir /usr/sbin - - make DESTDIR="${D}" install || die "install failed" - - # make sure ulogd.conf is readable by ulogd user - fowners root:ulogd /etc/ulogd.conf - fperms 640 /etc/ulogd.conf - - newinitd "${FILESDIR}"/ulogd-0.98 ulogd - local UsedServices="use" - use mysql && UsedServices+=" mysql" - use postgres && UsedServices+=" postgresql" - if [[ ${UsedServices} = "use" ]]; then - UsedServices="" - fi - sed -i -e "s:use mysql:${UsedServices}:g" "${D}/etc/init.d/ulogd" || die "sed failed" - - # install logrotate config - insinto /etc/logrotate.d - newins ulogd.logrotate ulogd || die "logrotate config failed" - - dodoc README AUTHORS Changes - cd doc/ - dodoc ulogd.txt ulogd.a4.ps - - use mysql && dodoc mysql.table mysql.table.ipaddr-as-string - use postgres && dodoc pgsql.table - use sqlite && dodoc sqlite3.table - - dohtml ulogd.html -} - -pkg_postinst() { - chown root:ulogd /etc/ulogd.conf - chmod 640 /etc/ulogd.conf -} |