Version bump (Thanks to parafin, bug #280450)

  sqlite flag removed for this version because sqlite module is disabled
  in upstream code (#if 0 comments out the whole module)
(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 28 insertions, 98 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 331c9b768d97..406027f058b8 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.55 2009/08/09 06:23:59 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.56 2009/08/10 06:01:18 wormo Exp $
+
+*ulogd-2.0.0_beta3 (10 Aug 2009)
+
+  10 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org> files/ulogd,
+  metadata.xml, -ulogd-1.23-r2.ebuild, -ulogd-2.0.0_beta2.ebuild,
+  +ulogd-2.0.0_beta3.ebuild:
+  Version bump (Thanks to parafin, bug #280450)
+  sqlite flag removed for this version because sqlite module is disabled
+  in upstream code ("#if 0" comments out the whole module)
 
 *ulogd-1.24-r1 (09 Aug 2009)
 
diff --git a/app-admin/ulogd/files/ulogd b/app-admin/ulogd/files/ulogd
index 5049ca93ed88..7d05fe8fd28d 100644
--- a/app-admin/ulogd/files/ulogd
+++ b/app-admin/ulogd/files/ulogd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 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.2 2004/07/13 16:32:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.3 2009/08/10 06:01:18 wormo Exp $
 
 opts="reload"
 
@@ -19,7 +19,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting ulogd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
+	start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -u ulogd -d >/dev/null 2>&1
 	eend $?
 }	
 
@@ -30,7 +30,7 @@ stop() {
 }	
 
 reload() {
-        ebegin "Reloading ulogd.conf file"
+	ebegin "Reloading ulogd.conf file"
 	killall -HUP ulogd &>/dev/null
 	eend $?
 }	
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 62c5fe28c064..41507f4df629 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -6,7 +6,9 @@
 		<email>wormo@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='ip-as-string'>Logs IP addresses as stings</flag>
-		<flag name='pcap'>Build the PCAP plugin. Use the <pkg>net-libs/libpcap</pkg> library</flag>
+		<flag name='pcap'>Build PCAP output plugin to save packets in PCAP format. Uses the <pkg>net-libs/libpcap</pkg> library</flag>
+		<flag name='mysql'>Build MYSQL output plugin to save packets in a mysql database.</flag>
+		<flag name='postgres'>Build PGSQL output plugin to save packets in a postgres database.</flag>
+		<flag name='sqlite'>Build SQLITE3 output plugin to save packets in an sqlite database.</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/ulogd/ulogd-1.23-r2.ebuild b/app-admin/ulogd/ulogd-1.23-r2.ebuild
deleted file mode 100644
index 5649ab023212..000000000000
--- a/app-admin/ulogd/ulogd-1.23-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.23-r2.ebuild,v 1.5 2009/01/25 00:55:58 darkside Exp $
-
-inherit autotools 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="sqlite3 mysql postgres ip-as-string pcap"
-
-DEPEND="net-firewall/iptables
-	sqlite3? ( =dev-db/sqlite-3* )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-base )"
-RDEPEND="${DEPEND}
-	pcap? ( net-libs/libpcap )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-	epatch "${FILESDIR}/${P}-configure.in.patch"
-	EPATCH_OPTS="-F3" \
-		epatch "${WORKDIR}/${PN}-glsa-200701.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	# enables logfiles over 2G (#74924)
-	append-lfs-flags
-
-	myconf=""
-	if use ip-as-string; then
-	    use sqlite3  && myconf="${myconf} --with-sqlite3-log-ip-as-string"
-		use mysql    && myconf="${myconf} --with-mysql-log-ip-as-string"
-		use postgres && myconf="${myconf} --with-pgsql-log-ip-as-string"
-	fi
-
-	if [[ -z "${myconf}" ]]; then
-	    ewarn
-		ewarn "No database support enabled, ip-as-string flag ignored."
-		epause
-	fi
-
-	myconf="${myconf} `use_with sqlite3`"
-	myconf="${myconf} `use_with mysql`"
-	myconf="${myconf} `use_with postgres pgsql`"
-
-	econf ${myconf}
-
-	# 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-2.0.0_beta2.ebuild b/app-admin/ulogd/ulogd-2.0.0_beta3.ebuild
index 15109aa459bc..70d7180c800d 100644
--- a/app-admin/ulogd/ulogd-2.0.0_beta2.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # 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-2.0.0_beta2.ebuild,v 1.2 2009/02/09 09:36:03 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.0_beta3.ebuild,v 1.1 2009/08/10 06:01:18 wormo Exp $
 
 EAPI="1"
 
@@ -13,8 +13,9 @@ SRC_URI="http://ftp.netfilter.org/pub/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres sqlite3 pcap doc"
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86"
+# sqlite not supported in ulogd-2 yet
+IUSE="doc mysql postgres pcap" # sqlite
 
 RDEPEND="net-firewall/iptables
 	>=net-libs/libnfnetlink-0.0.39
@@ -22,8 +23,8 @@ RDEPEND="net-firewall/iptables
 	>=net-libs/libnetfilter_log-0.0.15
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )
-	sqlite3? ( dev-db/sqlite:3 )
 	pcap? ( net-libs/libpcap )"
+	#sqlite? ( dev-db/sqlite:3 )
 
 DEPEND="${RDEPEND}
 	sys-devel/autoconf:2.5
@@ -36,13 +37,16 @@ src_compile() {
 	econf \
 		$(use_with mysql) \
 		$(use_with postgres pgsql) \
-		$(use_with sqlite3) \
-		$(use_with pcap)
+		$(use_with pcap pcap /usr) \
+		--without-sqlite3 #$(use_with sqlite sqlite3)
 
 	emake || die "emake failed"
 
 	if use doc ; then
 		# build extra documentation files (.ps, .txt, .html, .dvi)
+
+		# prevent access violations from generation of bitmap font files
+		export VARTEXFONTS="${T}"
 		emake -C doc || die "emake for docs failed"
 	fi
 }
@@ -66,7 +70,7 @@ src_install() {
 
 	use mysql && dodoc doc/mysql-ulogd2.sql
 	use postgres && dodoc doc/pgsql-ulogd2.sql
-	use sqlite3 && dodoc doc/sqlite3.table
+	#use sqlite && dodoc doc/sqlite3.table
 
 	# install logrotate config
 	insinto /etc/logrotate.d