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)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 33 insertions, 104 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/Manifest b/app-admin/ulogd/Manifest
index 48c9f7017a0a..e9f5b3baf264 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,16 +1,15 @@
 AUX configure-fixes.patch 1519 RMD160 b877e8e91d297f3a2c7ffe62ac12216d9febec16 SHA1 ddebd675545dd17ee2d4265cd2381313009cc3ed SHA256 e29b46964f815bf8b30f1dd9a84e32e3d11cb2e28878bea26315f42d9f0b6495
-AUX ulogd 735 RMD160 2b913c9e679d1f2ab449c814ce849dcd58bd17d8 SHA1 8592dcfd9fba4e290f8aa73aa169bf9203997bcb SHA256 d104ef5e0501bdb2128d75a949b211298df4584dc5227b128989edb688355054
+AUX ulogd 744 RMD160 9ed4cb7f7b9defb34437fbd83ad417964b2b14e0 SHA1 38021198683944468f14c70228980314a1379151 SHA256 61185f9136ecf1a5a0fb5bafcaf156202c4581cda8ee1b9d1bde7dbd477988f8
 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-2.0.0beta3.tar.bz2 344509 RMD160 51554074ef7646e0e3f3ce0b0b9af360ec718738 SHA1 85593f8b1897dca6e8787f62d963bb28579fbc6b SHA256 ad5f6e48c44e237e311bdbea0e63a06da2a046725c8795e99e2257f50e911e55
 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-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 8225 RMD160 04136816a1a6b5eb186f0f9af8a388bba2687dee SHA1 e83e8927c0bdefec664ceb866e41740ac143dd7d SHA256 eea0f56cc1104b88b5b07e247541df971834b4d6fdbb22a5a18af20388bf3d8d
-MISC metadata.xml 396 RMD160 ddade66d695a93c9f14966054576e402bfba21a3 SHA1 0e1cfbe9120c94e4baf715b7cfc22660d4afba0f SHA256 cffad1fcda122fcb3000e8f4499a29b19b36b9e723cd96e949d449fa926ec6d5
+EBUILD ulogd-2.0.0_beta3.ebuild 2017 RMD160 04724aa0f929a5c2f5ea3f397405deba79ef0fa4 SHA1 e263fe64c82412ed0e0d4cb55b51eb8eb2e5e6bd SHA256 bce83ae3cda1e66858dcf7fa9fb8af6bf789d5e5177f6e8b79e60b54a87e6d2d
+MISC ChangeLog 8608 RMD160 1da1e8001633b4dc4bd219d592ce1e8b1c0930f3 SHA1 ab8c4abb1e083fa54840b039c68f439512dddad6 SHA256 dd39bdd4c22530f88b4fd449c31316519cf792b302a2d0a46fb804ac84877ee2
+MISC metadata.xml 652 RMD160 23706f56c049f16cca45951bb722d1ead5272bea SHA1 3741f428522626bd92878bfb087540c6e97baf31 SHA256 a99faca17715ced900841407711595e7b67e41bb68645ebaac124db5a2a55f6c
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