Use append-lfs-flags to add largefile support; add patch to fix build on GCC 4.1, reported by Patrizio Bassi in bug #125733.

Package-Manager: portage-2.1_pre6-r2

4 files changed, 56 insertions, 15 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index cc9c03f8f7bb..ebf2bf0a2a89 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.31 2006/03/08 19:34:02 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.32 2006/03/15 02:01:14 flameeyes Exp $
+
+  15 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ulogd-1.23-gcc41.patch, ulogd-1.23.ebuild:
+  Use append-lfs-flags to add largefile support; add patch to fix build on GCC
+  4.1, reported by Patrizio Bassi in bug #125733.
 
 *ulogd-1.23 (08 Mar 2006)
 
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index adab3f42749c..7c04fb31e5c4 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0dba6b3da79a18e7aefcf868fef4b151 ChangeLog 3746
-RMD160 e655ac4d42de6de9c512b61b8ec0a9de45105f88 ChangeLog 3746
-SHA256 0a161aaf17ca708cf53d8a5566a1855b367404e8d56c1c078e20aeb907e6230a ChangeLog 3746
+MD5 85dc36df0f3e6ca5fbdea9837f2f5e9f ChangeLog 3984
+RMD160 49c012ae54cdf4fb217430098f65ca8a23888080 ChangeLog 3984
+SHA256 bce35f873457de7073bed67cd2de99a964a97a1a953957b75fd40a5bec6eee4c ChangeLog 3984
 MD5 e346a1112f49dea95c9302f251dd3102 files/digest-ulogd-1.01 63
 RMD160 96657fb9afe6a02825048cb1d3dcd7daf7b1cd72 files/digest-ulogd-1.01 63
 SHA256 dcbb16988d5fc5f1bbc75775285c350768903bc908953c61694a549df8db1754 files/digest-ulogd-1.01 63
@@ -22,6 +22,9 @@ SHA256 d104ef5e0501bdb2128d75a949b211298df4584dc5227b128989edb688355054 files/ul
 MD5 f5d3c0a518647280c89caf76f7c6709b files/ulogd-0.98 731
 RMD160 fc1fec147ebb78a555b96ebdc5cfb3a260de0e7a files/ulogd-0.98 731
 SHA256 af574a0d7a1a35a756f2f5ff030532051675a0f5725661ce45a95903bc4f2f69 files/ulogd-0.98 731
+MD5 1835a68ba8e5b8f7407dd139f5092441 files/ulogd-1.23-gcc41.patch 848
+RMD160 40c38db24ef5917794b4994f8b86db344c6f9eb9 files/ulogd-1.23-gcc41.patch 848
+SHA256 9453360a7c1e189df892e87f0f553a156eaea462641ade3e5db328c5fd208819 files/ulogd-1.23-gcc41.patch 848
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 RMD160 fef9d1a57d9abcae3b3536edb05096c67cfdf7c8 metadata.xml 220
 SHA256 2bf8af6b1a1b4477258316f7442781b522a2401b9333ed89a734dc1aa5b132fc metadata.xml 220
@@ -34,13 +37,13 @@ SHA256 47a42a96b4064c849ab3b6c9d8e222ef128cf81eddbb36ad8faef61060cbee08 ulogd-1.
 MD5 aad60f87d1f306a38a0b5583438c38dc ulogd-1.02.ebuild 1176
 RMD160 ff7eac98061154332826e2951384349dee655449 ulogd-1.02.ebuild 1176
 SHA256 5439fde70989908f4f437301dd271267138c626945431bea1e349461f6675ef2 ulogd-1.02.ebuild 1176
-MD5 6eb579dffa632422c48f0398810dc2e0 ulogd-1.23.ebuild 1283
-RMD160 beca86086cf94e542d2fa14991cb23410f1bda04 ulogd-1.23.ebuild 1283
-SHA256 90496d210030e150396bee17dcb52ea656afa7945dae0e30803fa6824072e0ab ulogd-1.23.ebuild 1283
+MD5 758744695e1155f56b51588b2997e436 ulogd-1.23.ebuild 1355
+RMD160 480c4e6865e9ba9d0129d0d0a681afa89dfece8b ulogd-1.23.ebuild 1355
+SHA256 f4d1a5a20cd52cd78ede78eaac5d33fc19655ae6c96008b3f217725eed8df511 ulogd-1.23.ebuild 1355
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEDy4ql5AvwDPiUowRAmTsAKCI/5wRirXX3e2dv0q1GRZygLsPRQCgxkdE
-e5psoGXNOoWJ2/Q4bCODaOE=
-=CWLR
+iD8DBQFEF3V5AiZjviIA2XgRAh3yAKCjjMZ9/1hYIyiikL7pq0X0g7FKqwCbBvai
+9d2jbnlpRwQLhi5VHG/IRuY=
+=mawV
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/files/ulogd-1.23-gcc41.patch b/app-admin/ulogd/files/ulogd-1.23-gcc41.patch
new file mode 100644
index 000000000000..1fb0dd2ddad9
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-1.23-gcc41.patch
@@ -0,0 +1,26 @@
+Index: ulogd-1.23/extensions/ulogd_SYSLOG.c
+===================================================================
+--- ulogd-1.23.orig/extensions/ulogd_SYSLOG.c
++++ ulogd-1.23/extensions/ulogd_SYSLOG.c
+@@ -136,7 +136,7 @@ static ulog_output_t syslog_op = { 
+ 	.name = "syslog", 
+ 	.init = &syslog_init,
+ 	.fini = &syslog_fini,
+-	.output &_output_syslog
++	.output = &_output_syslog
+ };
+ 
+ 
+Index: ulogd-1.23/include/ulogd/ulogd.h
+===================================================================
+--- ulogd-1.23.orig/include/ulogd/ulogd.h
++++ ulogd-1.23/include/ulogd/ulogd.h
+@@ -56,8 +56,6 @@
+ #define ULOGD_ERROR	7	/* error condition, requires user action */
+ #define ULOGD_FATAL	8	/* fatal, program aborted */
+ 
+-extern FILE *logfile;
+-
+ typedef struct ulog_iret {
+ 	/* next interpreter return (key) in the global list */
+ 	struct ulog_iret *next;
diff --git a/app-admin/ulogd/ulogd-1.23.ebuild b/app-admin/ulogd/ulogd-1.23.ebuild
index 1a44b34e4746..2a8f1aa72d0c 100644
--- a/app-admin/ulogd/ulogd-1.23.ebuild
+++ b/app-admin/ulogd/ulogd-1.23.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23.ebuild,v 1.1 2006/03/08 19:34:02 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23.ebuild,v 1.2 2006/03/15 02:01:14 flameeyes Exp $
 
-inherit flag-o-matic
+inherit 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"
@@ -17,15 +17,22 @@ DEPEND="net-firewall/iptables
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_compile() {
 	# enables logfiles over 2G (#74924)
-	append-flags -D_FILE_OFFSET_BITS=64
+	append-lfs-flags
 
 	econf \
 		`use_with mysql` \
 		`use_with postgres pgsql` \
 		|| die "configure failed"
-	make || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {