Cleaning out a couple old versions though still keeping other

  old versions for now (1.23-r1 is stale but only one marked stable,
  1.24-r2 is only with working sqlite feature). Old versions
  now check whether build kernel is too new (various compile failures
  occur with kernels 2.6.31 or newer).
  Version bump for bug #328627.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 38 insertions, 107 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index acc6e3968584..34fbc13adb92 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.63 2010/06/17 20:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.64 2010/10/07 05:31:53 wormo Exp $
+
+*ulogd-2.0.0_beta4 (07 Oct 2010)
+
+  07 Oct 2010; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  ulogd-1.23-r1.ebuild, -ulogd-1.24-r1.ebuild, ulogd-1.24-r2.ebuild,
+  -ulogd-2.0.0_beta3.ebuild, +ulogd-2.0.0_beta4.ebuild:
+  Cleaning out a couple old versions though still keeping other 
+  old versions for now (1.23-r1 is stale but only one marked stable, 
+  1.24-r2 is only with working sqlite feature). Old versions
+  now check whether build kernel is too new (various compile failures
+  occur with kernels 2.6.31 or newer).
+  Version bump for bug #328627. 
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> ulogd-1.23-r1.ebuild,
   ulogd-1.24-r1.ebuild, ulogd-1.24-r2.ebuild, ulogd-2.0.0_beta3.ebuild:
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 5b5794582512..33a6652b8047 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -6,12 +6,11 @@ AUX ulogd-1.23-gcc41.patch 848 RMD160 40c38db24ef5917794b4994f8b86db344c6f9eb9 S
 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
+DIST ulogd-2.0.0beta4.tar.bz2 354526 RMD160 9208fcbd0d637ae1c99822dba67a2311dc28826d SHA1 92f9bbd6dfd5b72673c392fa6ccd6cc7ff811f24 SHA256 f29a75b87e2da6284a6e52a359c9d9e1f7c14b6dd96a4cd1b68f18a91f48e7a2
 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 1503 RMD160 38724c98835417d48c34eb47198df292853f8c8a SHA1 a2006c343f1e16d9b357ea54b5eb5c1f4c94acf2 SHA256 287d152cf83a190c4c31b80e5cdc536b8851bf8af3f43b0ad1e276b4ff570c10
-EBUILD ulogd-1.24-r1.ebuild 2534 RMD160 174c9115cfea7d81e5c9e04089868edae9df0516 SHA1 9421189f13c802dfc3571e46f776aa84b1d6dbb0 SHA256 9dc0986e26c19be309ab1726ca772801157475bb69d351a754352e075090e406
-EBUILD ulogd-1.24-r2.ebuild 2918 RMD160 fba1fff1fd7825d89356a88034efc3f65ea36ea2 SHA1 80f287eec6b15fa16288149392343957003cef65 SHA256 68f6aea2dc9bf5ab31bca2117fa08639d1668aa063049cecb7779c59bc862ba1
-EBUILD ulogd-2.0.0_beta3.ebuild 2215 RMD160 94f318060773c86105f232fe27b019c5cf509e09 SHA1 91a09188aad0ada64863acb48e1756380ca8316e SHA256 5252a1191ed5a4c8eb91582a98bc0cc283bb10716f0cd31771a75373d1214e68
-MISC ChangeLog 10039 RMD160 16492e10decb1b2be1ddf222c0045a104b49bb2e SHA1 6ba7c470e7b7eaa4c378c52245b7814564d2bbf0 SHA256 65335e49a160d8eceed909b38b939f90ebd68da5c4635e194a56c8f965d782b0
+EBUILD ulogd-1.23-r1.ebuild 1798 RMD160 66f9c529b82be44652557f8acc306237e273e036 SHA1 be571558c759582c4e9bbac0f7939bbce53c782b SHA256 fd028539ffaa1e6f43107698326c96c8e5fce0b371939f1d7bbf2f4eb73ab026
+EBUILD ulogd-1.24-r2.ebuild 3197 RMD160 55c18e142ea81f506be046e7f61505dd9b530091 SHA1 21f470ae9d3b02e372d070dbda7612eca927ad32 SHA256 91ce1b6c1524c09600705f89cf9d824dbe6b00aaf8c377bedc9d4a4e50e431b1
+EBUILD ulogd-2.0.0_beta4.ebuild 2210 RMD160 966d1553e2095124dc528bfe8a834b5c21abdafd SHA1 813438bc17a205074f7e6a18ddaafc7b2fe4445f SHA256 b9f1923e41683e85ae1bfc78bd44d4d2b056b5eab8bbdac8c801f86cc8b8cc20
+MISC ChangeLog 10595 RMD160 bd9f987ef6d4e48bd8234d750bc2a4b0cb80459c SHA1 defb0af04478f9561e6965b22f65601762b41d2f SHA256 37b64d119a73a0e5880a2febd448ce2e1d35ecc7a5d8961dc6ce0b2697a7a38c
 MISC metadata.xml 652 RMD160 23706f56c049f16cca45951bb722d1ead5272bea SHA1 3741f428522626bd92878bfb087540c6e97baf31 SHA256 a99faca17715ced900841407711595e7b67e41bb68645ebaac124db5a2a55f6c
diff --git a/app-admin/ulogd/ulogd-1.23-r1.ebuild b/app-admin/ulogd/ulogd-1.23-r1.ebuild
index 07c74ad44a81..d636f7d81af1 100644
--- a/app-admin/ulogd/ulogd-1.23-r1.ebuild
+++ b/app-admin/ulogd/ulogd-1.23-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 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.6 2010/06/17 20:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.7 2010/10/07 05:31:53 wormo Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic linux-info
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
 SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2
@@ -18,6 +18,14 @@ DEPEND="net-firewall/iptables
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-server )"
 
+pkg_setup() {
+	# can't depend on supported kernel versions because dependencies 
+	# on virtuals are not versioned
+	linux-info_pkg_setup
+	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+	kernel_is ge 2 6 31 && die "kernel version is too new -- try a newer ulogd"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/app-admin/ulogd/ulogd-1.24-r1.ebuild b/app-admin/ulogd/ulogd-1.24-r1.ebuild
deleted file mode 100644
index af44d181446c..000000000000
--- a/app-admin/ulogd/ulogd-1.24-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 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.3 2010/06/17 20:00:40 patrick 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? ( 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"
-
-	# 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-r2.ebuild b/app-admin/ulogd/ulogd-1.24-r2.ebuild
index cfd804bd7c9d..2de06968af08 100644
--- a/app-admin/ulogd/ulogd-1.24-r2.ebuild
+++ b/app-admin/ulogd/ulogd-1.24-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.2 2010/06/17 20:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.3 2010/10/07 05:31:53 wormo Exp $
 
 EAPI="1"
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools linux-info
 
 DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
 HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
@@ -24,6 +24,12 @@ RDEPEND="${DEPEND}
 	net-libs/libpcap"
 
 pkg_setup() {
+	# can't depend on supported kernel versions because dependencies 
+	# on virtuals are not versioned
+	linux-info_pkg_setup
+	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
+	kernel_is ge 2 6 31 && die "kernel version is too new -- try a newer ulogd"
+
 	enewgroup ulogd
 	enewuser ulogd -1 -1 /var/log/ulogd ulogd
 }
diff --git a/app-admin/ulogd/ulogd-2.0.0_beta3.ebuild b/app-admin/ulogd/ulogd-2.0.0_beta4.ebuild
index d8366ee7ba47..f9626746b300 100644
--- a/app-admin/ulogd/ulogd-2.0.0_beta3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.0_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.0_beta3.ebuild,v 1.7 2010/06/17 20:00:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.0_beta4.ebuild,v 1.1 2010/10/07 05:31:53 wormo Exp $
 
 EAPI="1"
 
@@ -22,7 +22,7 @@ IUSE="doc mysql postgres pcap" # sqlite
 RDEPEND="net-firewall/iptables
 	>=net-libs/libnfnetlink-0.0.39
 	>=net-libs/libnetfilter_conntrack-0.0.95
-	>=net-libs/libnetfilter_log-0.0.15
+	>=net-libs/libnetfilter_log-1.0
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
 	pcap? ( net-libs/libpcap )"