Install logrotate file (thanks to Christian Bricart),

  add SYSLOG module to default config (thanks to Dean Hall, bug #235842),
  make sure ulogd user is able to read ulogd.conf
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 152 insertions, 2 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 43d4c51e19b3..4b83bab08030 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.58 2009/08/11 06:35:14 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.59 2009/08/12 07:06:13 wormo Exp $
+
+*ulogd-1.24-r2 (12 Aug 2009)
+
+  12 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/ulogd-1.24-syslog-and-logrotate.patch, +ulogd-1.24-r2.ebuild:
+  Install logrotate file (thanks to Christian Bricart),
+  add SYSLOG module to default config (thanks to Dean Hall, bug #235842),
+  make sure ulogd user is able to read ulogd.conf
 
   11 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
   ulogd-1.24-r1.ebuild, ulogd-2.0.0_beta3.ebuild:
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 48669a856137..350a5357c439 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -3,6 +3,7 @@ AUX ulogd 744 RMD160 9ed4cb7f7b9defb34437fbd83ad417964b2b14e0 SHA1 3802119868394
 AUX ulogd-0.98 681 RMD160 fa4a7448519339d561a2ab958e8d52a460bca023 SHA1 21a1fdebc687d010a3d1a83248c3cf43b04a5dbc SHA256 ee598c0de45e4af05ec459902a9f13fa607c9df158ff52ef393c86e99ec9285b
 AUX ulogd-1.23-configure.in.patch 5492 RMD160 384bbb05caf442b548a4e3cbcdf8d519b9662b6d SHA1 a846210aefcbef62365b468b683c1b656c03b0ab SHA256 dad86f7824724acd4d240c2329a6632bb1f20f75f99ba6c8fcc408eb29af51ed
 AUX ulogd-1.23-gcc41.patch 848 RMD160 40c38db24ef5917794b4994f8b86db344c6f9eb9 SHA1 b031edf49d329cdaf9209dcd2b902b89789a5002 SHA256 9453360a7c1e189df892e87f0f553a156eaea462641ade3e5db328c5fd208819
+AUX ulogd-1.24-syslog-and-logrotate.patch 1230 RMD160 aa3b749901eade2cced5af8bd41176f40446b37a SHA1 30c9b17441ede48645f4093748a69c06e4ff1775 SHA256 315730b76ef2662620055bbb25de7865ca2242106a60222abee307710d3e50a2
 DIST ulogd-1.23.tar.bz2 143608 RMD160 c4b95caeffab03afa192d165e4b6432b348537c6 SHA1 aef1789ed960128e0dc08684b0260baf5c73882e SHA256 78fda62a39e5ebccbd3277d723eb0a0087a6972c6350d987e454f8fa17546341
 DIST ulogd-1.24.tar.bz2 177398 RMD160 e46c886af5bcec96775ec3516ae5a45d77e9bdb9 SHA1 2d767d71a6a96bd40caa0020bbca2ddb09301ae3 SHA256 63a6069d9b537d8a6d6a4d99beeb4ccc0a853717414da3a6e0ce230a34d0e057
 DIST ulogd-2.0.0beta3.tar.bz2 344509 RMD160 51554074ef7646e0e3f3ce0b0b9af360ec718738 SHA1 85593f8b1897dca6e8787f62d963bb28579fbc6b SHA256 ad5f6e48c44e237e311bdbea0e63a06da2a046725c8795e99e2257f50e911e55
@@ -10,6 +11,7 @@ DIST ulogd-glsa-200701.patch.bz2 5279 RMD160 2b119c5e6b41672923246743d32dd8d14ed
 DIST ulogd-glsa-200805.patch.bz2 11649 RMD160 258877d03e6420e39d932ed1946e4ecf655abfe8 SHA1 b385116d4a24fad08317e5eddbbf98998e636626 SHA256 144426251c151f9cbd48931540865da11ff5cafd5039d1b4db46dba505aaebb7
 EBUILD ulogd-1.23-r1.ebuild 1505 RMD160 f874a927362491899421e1c4dad0cab084b37150 SHA1 10e5ff2aeb6f966de518d37520a4e83c490819e0 SHA256 c8bfbf2fbdf7644b39e72b3e8d685c0db5ae1aa5aea8f2c807233b29cf80b9da
 EBUILD ulogd-1.24-r1.ebuild 2533 RMD160 61b194520a696bb848b7cf320ecb169431a3f770 SHA1 2a9707809a1f1e08ad1b179d59e63d2c11174c0e SHA256 2a533ee9f8a9d54ec2dea89d5be41b309ab02e2d33a3b5d22953ef6a8f304228
+EBUILD ulogd-1.24-r2.ebuild 2917 RMD160 ff0be6ac085c668c62bbba7903e87a1226af4ef1 SHA1 4ac29d4a7ab6405ce4f0d83dc7e659afbd72dffe SHA256 a44799093c654a579cf7bfd9d74d33910c7a4d2ea7b2edc284ae4bd9914107f8
 EBUILD ulogd-2.0.0_beta3.ebuild 2004 RMD160 12604100f60d3ffa3d276c42ebb422b39f27a804 SHA1 30b13e5d6ae8f4523fb0ca1562d9b3d44ea5a9e6 SHA256 c11b15cfd2c660f325cec9be507b7963f58eda9398229bd44eecadfe7408fd25
-MISC ChangeLog 9070 RMD160 892819b69808b38b8f6c31d054106cbedfc778e8 SHA1 a00ea984d82cb2e413b1a99131596aa73e8b9ae1 SHA256 cb4a8d069b7c81f891d0778d889373818cbd55aea121fbfac4be77145d0f8567
+MISC ChangeLog 9412 RMD160 ef8954de9d0180d7b8bec25ecd3fbee5da9b09fb SHA1 7996cfefed767f0bf234bdd451075c5cc1abf639 SHA256 abd156571e99ee8d9584579968bf78b9af09d6e89cf26838c9f7570eae775eea
 MISC metadata.xml 652 RMD160 23706f56c049f16cca45951bb722d1ead5272bea SHA1 3741f428522626bd92878bfb087540c6e97baf31 SHA256 a99faca17715ced900841407711595e7b67e41bb68645ebaac124db5a2a55f6c
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
new file mode 100644
index 000000000000..b3410f6f936e
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-1.24-syslog-and-logrotate.patch
@@ -0,0 +1,34 @@
+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.24-r2.ebuild b/app-admin/ulogd/ulogd-1.24-r2.ebuild
new file mode 100644
index 000000000000..7daf4bc8df1b
--- /dev/null
+++ b/app-admin/ulogd/ulogd-1.24-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2009 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.1 2009/08/12 07:06:13 wormo Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic autotools
+
+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? ( virtual/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
+
+	ewarn "Regenerating build system (this may take a bit)..."
+	eautoconf || die "Autoreconf failed"
+	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
+}
+
+src_compile() {
+	# 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
+}