Closing #74924

7 files changed, 35 insertions, 62 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index e513e3c518c1..22350a5076a6 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.26 2005/01/01 11:32:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.27 2005/01/01 19:09:15 aliz Exp $
+
+*ulogd-1.02-r1 (01 Jan 2005)
+
+  01 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> ulogd-0.97-r1.ebuild,
+  ulogd-0.98.ebuild, ulogd-1.02-r1.ebuild:
+  Allow logfiles to grow beyond 2GB, closing #74924.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> ulogd-0.98.ebuild,
   ulogd-1.01.ebuild, ulogd-1.02.ebuild:
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index ac4c54fb9349..23233e91ea64 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,12 +1,10 @@
-MD5 c2e01264eb71b8c17e3b0362093520d5 ChangeLog 3110
-MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 16ef1401fbc5af608c2aa7dd9911a72f ulogd-0.97-r1.ebuild 1091
-MD5 92843ab35b280b3ba19ce98de1a26660 ulogd-0.98.ebuild 1126
 MD5 18909ba7074d2cf8e3ae5417f070f59f ulogd-1.01.ebuild 1029
 MD5 3875d3cbe45a93977da5d46eb480ddc1 ulogd-1.02.ebuild 1178
-MD5 04005ad49c96b691ff84b1305379d3c8 files/digest-ulogd-0.97-r1 61
-MD5 7d8c6f58accc97b0ce3beb6fc172d5df files/digest-ulogd-0.98 62
+MD5 c2e01264eb71b8c17e3b0362093520d5 ChangeLog 3110
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 485fd8dea11822772d0a8e24d0a7b99f ulogd-1.02-r1.ebuild 1265
+MD5 e5952182c592a721008cff1051d53a9c files/ulogd 735
+MD5 86ac93af3679a4fc4f96d0ffff52cd63 files/digest-ulogd-1.02-r1 63
 MD5 e346a1112f49dea95c9302f251dd3102 files/digest-ulogd-1.01 63
 MD5 86ac93af3679a4fc4f96d0ffff52cd63 files/digest-ulogd-1.02 63
-MD5 e5952182c592a721008cff1051d53a9c files/ulogd 735
 MD5 86019df8b3674b4649f91134561f6c59 files/ulogd-0.98 763
diff --git a/app-admin/ulogd/files/digest-ulogd-0.97-r1 b/app-admin/ulogd/files/digest-ulogd-0.97-r1
deleted file mode 100644
index 0a9d4d43de16..000000000000
--- a/app-admin/ulogd/files/digest-ulogd-0.97-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d71753042e28b8dfd83da5e9dd2871fb ulogd-0.97.tar.gz 98940
diff --git a/app-admin/ulogd/files/digest-ulogd-0.98 b/app-admin/ulogd/files/digest-ulogd-0.98
deleted file mode 100644
index e8709f4c1723..000000000000
--- a/app-admin/ulogd/files/digest-ulogd-0.98
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18c6db19de538c57a70b9cfbdb079781 ulogd-0.98.tar.gz 104373
diff --git a/app-admin/ulogd/files/digest-ulogd-1.02-r1 b/app-admin/ulogd/files/digest-ulogd-1.02-r1
new file mode 100644
index 000000000000..34ef40fa3f9d
--- /dev/null
+++ b/app-admin/ulogd/files/digest-ulogd-1.02-r1
@@ -0,0 +1 @@
+MD5 8ca63ca3371fd818587208d07098f8de ulogd-1.02.tar.bz2 133999
diff --git a/app-admin/ulogd/ulogd-0.97-r1.ebuild b/app-admin/ulogd/ulogd-0.97-r1.ebuild
deleted file mode 100644
index b832902dd01c..000000000000
--- a/app-admin/ulogd/ulogd-0.97-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.97-r1.ebuild,v 1.22 2005/01/01 11:32:56 eradicator Exp $
-
-DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
-SRC_URI="ftp://ftp.netfilter.org/pub/ulogd/${P}.tar.gz"
-HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc -sparc"
-IUSE="mysql"
-
-DEPEND="net-firewall/iptables"
-
-src_compile() {
-	sed -i -e "s:/usr/local/lib/:/usr/lib/:" ulogd.conf
-
-	local myconf
-	use mysql && myconf="--with-mysql"
-
-	econf ${myconf} || die "econf failed"
-	make all || die "make failed"
-}
-
-src_install() {
-	# the Makefile seems to be "broken" -
-	# it relies on the existance of /usr, /etc ..
-	dodir /usr/sbin /etc/init.d
-
-	make DESTDIR=${D} install || die "install failed"
-
-	cp ${FILESDIR}/ulogd ${D}/etc/init.d/ulogd
-
-	dodoc README AUTHORS Changes
-	cd doc/
-	dodoc ulogd.txt ulogd.a4.ps mysql.table mysql.table.ipaddr-as-string
-	dohtml ulogd.html
-}
diff --git a/app-admin/ulogd/ulogd-0.98.ebuild b/app-admin/ulogd/ulogd-1.02-r1.ebuild
index 82d0eeb0254f..6a212145f5fe 100644
--- a/app-admin/ulogd/ulogd-0.98.ebuild
+++ b/app-admin/ulogd/ulogd-1.02-r1.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.98.ebuild,v 1.13 2005/01/01 11:32:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.02-r1.ebuild,v 1.1 2005/01/01 19:09:15 aliz Exp $
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
-SRC_URI="ftp://ftp.netfilter.org/pub/ulogd/${P}.tar.gz"
+SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2"
 HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc -sparc"
-IUSE="mysql"
+KEYWORDS="x86 ppc -sparc amd64"
+IUSE="mysql postgres"
 
-DEPEND="net-firewall/iptables"
+DEPEND="net-firewall/iptables
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )"
 
 src_compile() {
-	sed -i -e "s:/usr/local/lib/:/usr/lib/:" ulogd.conf
-
-	local myconf
-	use mysql && myconf="--with-mysql"
-
-	econf ${myconf} || die "econf failed"
-	make all || die "make failed"
+	# enables logfiles over 2G (#74924)
+	append-flags -D_FILE_OFFSET_BITS=64
+
+	econf \
+		`use_with mysql` \
+		`use_with postgres pgsql` \
+		|| die "configure failed"
+	make || die "make failed"
 }
 
 src_install() {
@@ -30,13 +33,19 @@ src_install() {
 
 	make DESTDIR=${D} install || die "install failed"
 
-	cp ${FILESDIR}/ulogd-${PV} ${D}/etc/init.d/ulogd
+	cp ${FILESDIR}/ulogd-0.98 ${D}/etc/init.d/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
 }