Security (Thanks to Yar Odin, bug #225363):

  - prevent buffer overflows
  - configure ulogd to run as non-privileged user instead of root
  QA (Thanks to Henrique Rodrigues for sqlite suggestion, bug #251406):
  - switch sqlite3 flag to sqlite flag, and use slot dependency for sqlite
  - fix plugin Makefiles to work with LDFLAGS=-Wl,O1
  - add runtime dependency on pcap (unconditional, pcap module always built)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 115 insertions, 69 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 17a0a057161f..331c9b768d97 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,18 @@
 # 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.54 2009/02/09 09:36:03 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.55 2009/08/09 06:23:59 wormo Exp $
+
+*ulogd-1.24-r1 (09 Aug 2009)
+
+  09 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  files/ulogd-0.98, metadata.xml, -ulogd-1.24.ebuild, +ulogd-1.24-r1.ebuild:
+  Security (Thanks to Yar Odin, bug #225363):
+  - prevent buffer overflows
+  - configure ulogd to run as non-privileged user instead of root
+  QA (Thanks to Henrique Rodrigues for sqlite suggestion, bug #251406):
+  - switch sqlite3 flag to sqlite flag, and use slot dependency for sqlite
+  - fix plugin Makefiles to work with LDFLAGS="-Wl,O1"
+  - add runtime dependency on pcap (unconditional, pcap module always built)
 
   09 Feb 2009; Christoph Mende <angelos@gentoo.org>
   ulogd-2.0.0_beta2.ebuild:
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index cf509dfcebf7..48c9f7017a0a 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,15 +1,16 @@
 AUX configure-fixes.patch 1519 RMD160 b877e8e91d297f3a2c7ffe62ac12216d9febec16 SHA1 ddebd675545dd17ee2d4265cd2381313009cc3ed SHA256 e29b46964f815bf8b30f1dd9a84e32e3d11cb2e28878bea26315f42d9f0b6495
 AUX ulogd 735 RMD160 2b913c9e679d1f2ab449c814ce849dcd58bd17d8 SHA1 8592dcfd9fba4e290f8aa73aa169bf9203997bcb SHA256 d104ef5e0501bdb2128d75a949b211298df4584dc5227b128989edb688355054
-AUX ulogd-0.98 731 RMD160 fc1fec147ebb78a555b96ebdc5cfb3a260de0e7a SHA1 1d75871491a221652a432bc17c2136770893d4c2 SHA256 af574a0d7a1a35a756f2f5ff030532051675a0f5725661ce45a95903bc4f2f69
+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
 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.0beta2.tar.bz2 338403 RMD160 e066a625ccd2f5b2d9baec15165b420c9613cf2c SHA1 187d9b54984589232c01d4ebe0f395103f84c9dd SHA256 3427f70d6f69b52dea3e349cbc27cfb40b0e401afb649bff5ff235a516f92f12
 DIST ulogd-glsa-200701.patch.bz2 5279 RMD160 2b119c5e6b41672923246743d32dd8d14edc9cfc SHA1 d48d1e8f6f7fded03cd6d831f4027f16833153df SHA256 7b37b10e68761423f2fbf1b0ec15433c1364f8e27c7a8572b094450a7cb963ea
+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.23-r2.ebuild 2105 RMD160 7d70f78f4ef3eca10d474946086e4e2a171d48f9 SHA1 2e2018128532a2d2ba2fba67649ef2195529c17f SHA256 377397c9548a03c3c38eb150ceb7f540bc48e7924db9bd283308bd2897853074
-EBUILD ulogd-1.24.ebuild 1579 RMD160 a43c3223853321110078221a425e4fbc57e2c29d SHA1 e11d46e77a3a2226b286ed25aecc28888f586347 SHA256 3de1e2e702d07f650dc13378df373fda45600a79ce2a9d5029d5fccfdc907b2f
+EBUILD ulogd-1.24-r1.ebuild 2535 RMD160 9db569b084301ae46f84c4d9d1ae62144bdf9066 SHA1 aeb82731007e9a5d9b5107f5898a4216b3d128d9 SHA256 4bc32ebc63f1b6bdeb9f68587eef20716b0a0dc4c6a5cf0cc5ff9a6a9d8c2820
 EBUILD ulogd-2.0.0_beta2.ebuild 1830 RMD160 cf1ba63d407e6af8f9a60e6bcf1435f71e20c4e7 SHA1 336287cbcad15c7f32094ad69b08085aaae66296 SHA256 9dce1ded1423a803cc39daa53c196ac327c2d977da87423f880b1b04d76d6ff6
-MISC ChangeLog 7639 RMD160 015f98a2abc98f4a54b319b2d3c34466c7f01812 SHA1 9247671a2fc16e1b3383c023d7384dcc76ccff38 SHA256 51dccc0d620e1dfed918c170553079f59c734cd87f40e3eaf04501b8184a1934
-MISC metadata.xml 462 RMD160 79a3395d2a5dd80b4c3129037539258ac3e01983 SHA1 1ad9d288ac0f420aafebb4e5f8fafd65963e0afb SHA256 c0634968c6ead5d37fd4f51b4abdd286e42bc9a25f0e3b0755db5671f9a9533a
+MISC ChangeLog 8225 RMD160 04136816a1a6b5eb186f0f9af8a388bba2687dee SHA1 e83e8927c0bdefec664ceb866e41740ac143dd7d SHA256 eea0f56cc1104b88b5b07e247541df971834b4d6fdbb22a5a18af20388bf3d8d
+MISC metadata.xml 396 RMD160 ddade66d695a93c9f14966054576e402bfba21a3 SHA1 0e1cfbe9120c94e4baf715b7cfc22660d4afba0f SHA256 cffad1fcda122fcb3000e8f4499a29b19b36b9e723cd96e949d449fa926ec6d5
diff --git a/app-admin/ulogd/files/ulogd-0.98 b/app-admin/ulogd/files/ulogd-0.98
index e21bac05b998..d60de2a6e24a 100644
--- a/app-admin/ulogd/files/ulogd-0.98
+++ b/app-admin/ulogd/files/ulogd-0.98
@@ -3,15 +3,14 @@
 # chkconfig: - 91 35
 # description: Starts and stops the ulogd daemon
 #
-# pidfile: /var/lock/samba/ulogd.pid
-# config:  /usr/local/etc/ulogd.conf
+# config:  /etc/ulogd.conf
 
 
 opts="${opts} reload"
 
 depend() {
 	need net
-    use mysql
+	use mysql
 }
 
 initService() {
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 00a510a56a3f..62c5fe28c064 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<email>wormo@gentoo.org</email>
 	</maintainer>
 	<use>
 		<flag name='ip-as-string'>Logs IP addresses as stings</flag>
diff --git a/app-admin/ulogd/ulogd-1.24-r1.ebuild b/app-admin/ulogd/ulogd-1.24-r1.ebuild
new file mode 100644
index 000000000000..c4c086c1f379
--- /dev/null
+++ b/app-admin/ulogd/ulogd-1.24-r1.ebuild
@@ -0,0 +1,94 @@
+# 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-r1.ebuild,v 1.1 2009/08/09 06:23:59 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-server )
+	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"
+
+	# 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"
+
+	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"
+
+	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
+}
diff --git a/app-admin/ulogd/ulogd-1.24.ebuild b/app-admin/ulogd/ulogd-1.24.ebuild
deleted file mode 100644
index af19c726b41e..000000000000
--- a/app-admin/ulogd/ulogd-1.24.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24.ebuild,v 1.7 2008/05/21 15:44:43 dev-zero Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86"
-IUSE="mysql postgres"
-
-DEPEND="net-firewall/iptables
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )"
-
-src_compile() {
-	# enables logfiles over 2G (#74924)
-	append-lfs-flags
-
-	epatch "${FILESDIR}/configure-fixes.patch"
-	ewarn "Regenerating build system (this may take a bit)..."
-	eautoconf || die "Autoreconf failed"
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		|| die "configure failed"
-
-	# Configure uses incorrect syntax for ld
-	use mysql && sed -i -e "s:-Wl,::g" Rules.make
-
-#	EPATCH_OPTS="-F3" \
-#		epatch "${FILESDIR}/glsa-200701.patch"
-
-	# 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
-
-	use mysql && dodoc mysql.table mysql.table.ipaddr-as-string
-	use postgres && dodoc pgsql.table
-
-	dohtml ulogd.html
-}