From da6f7ef56eaf7b571b8e4761b54f80b19a02d46e Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 17 Dec 2006 03:48:50 +0000 Subject: [PATCH] Fix GCC-4 build. Thanks to howard_b_golden yahoo com in bug #148731. Package-Manager: portage-2.1.2_rc3-r5 --- app-admin/cpu/ChangeLog | 8 ++++-- app-admin/cpu/Manifest | 35 +++++++++++++++++++++--- app-admin/cpu/cpu-1.4.3-r1.ebuild | 9 ++++-- app-admin/cpu/files/cpu-1.4.3-gcc4.patch | 14 ++++++++++ app-admin/cpu/files/digest-cpu-1.4.3 | 2 ++ app-admin/cpu/files/digest-cpu-1.4.3-r1 | 2 ++ 6 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 app-admin/cpu/files/cpu-1.4.3-gcc4.patch diff --git a/app-admin/cpu/ChangeLog b/app-admin/cpu/ChangeLog index 26f4c1dd1707..cc72a8eade18 100644 --- a/app-admin/cpu/ChangeLog +++ b/app-admin/cpu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/cpu -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/ChangeLog,v 1.14 2005/04/29 23:23:31 robbat2 Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/ChangeLog,v 1.15 2006/12/17 03:48:50 dirtyepic Exp $ + + 17 Dec 2006; Ryan Hill +files/cpu-1.4.3-gcc4.patch, + cpu-1.4.3-r1.ebuild: + Fix GCC-4 build. Thanks to howard_b_golden yahoo com in bug #148731. *cpu-1.4.3-r1 (29 Apr 2005) diff --git a/app-admin/cpu/Manifest b/app-admin/cpu/Manifest index 48df9d0db8b3..69cb7ccafec6 100644 --- a/app-admin/cpu/Manifest +++ b/app-admin/cpu/Manifest @@ -1,8 +1,35 @@ +AUX cpu-1.4.3-gcc4.patch 647 RMD160 56c88c42d4057ba184a102cba869d2a3f84a4830 SHA1 83023698ff7559ed78c43a733c3bacab07d528ac SHA256 72ff9217076f1cbe8ec87b07e41722701a5763d21a2efa5b5dcf4374cc71126f +MD5 ea755cfbbc5f5c90d2da46849cdbe406 files/cpu-1.4.3-gcc4.patch 647 +RMD160 56c88c42d4057ba184a102cba869d2a3f84a4830 files/cpu-1.4.3-gcc4.patch 647 +SHA256 72ff9217076f1cbe8ec87b07e41722701a5763d21a2efa5b5dcf4374cc71126f files/cpu-1.4.3-gcc4.patch 647 +DIST cpu-1.4.2.tar.bz2 250421 +DIST cpu-1.4.3.tar.bz2 255668 RMD160 2bf7a1ff20b6ddb316f133bf2b95490048dfe87c SHA1 c655f14ed0bf6bd18f34fa50def624d3e7dc521a SHA256 ea958f8086fe08df69b884fd49d3d172d3934b9b3d5fd1bd526294b7927b3478 +EBUILD cpu-1.4.2-r1.ebuild 1150 RMD160 164222a8e1aa214d6a674d1cb1b6fd0760f21907 SHA1 eed3570fea96c6f944b0850b1fd567e150498cf7 SHA256 93668ef680150ef4653ae8d82607ed142f16a2eccd3e2b31426c9cb7897afa96 MD5 1eaff02a8f7713255c2d50544032561a cpu-1.4.2-r1.ebuild 1150 +RMD160 164222a8e1aa214d6a674d1cb1b6fd0760f21907 cpu-1.4.2-r1.ebuild 1150 +SHA256 93668ef680150ef4653ae8d82607ed142f16a2eccd3e2b31426c9cb7897afa96 cpu-1.4.2-r1.ebuild 1150 +EBUILD cpu-1.4.3-r1.ebuild 1264 RMD160 ef2287d38dfb009b3b76ca681e355516fe151b55 SHA1 7807122629a6101f808a036664541069772e640e SHA256 5e10b5b16257fca38613020d172c241cf323c3f7219ac099bd7c50038bfa3567 +MD5 a27d55f4df963e03cdcb99bcb9c6b0f0 cpu-1.4.3-r1.ebuild 1264 +RMD160 ef2287d38dfb009b3b76ca681e355516fe151b55 cpu-1.4.3-r1.ebuild 1264 +SHA256 5e10b5b16257fca38613020d172c241cf323c3f7219ac099bd7c50038bfa3567 cpu-1.4.3-r1.ebuild 1264 +EBUILD cpu-1.4.3.ebuild 1075 RMD160 b97eb0ea0c12171731f3595119047a2337e8f6d3 SHA1 386d3ef53205dd79dcfc2be622e3af80db66015f SHA256 25bc0e8125986df4c194d5d8d021e576001553aed11787ee9ffb12f128ed822c MD5 5c8a261add0caaf9ffceca94dd24193a cpu-1.4.3.ebuild 1075 -MD5 c4b43636f01105e9c4adc9337ca178e4 ChangeLog 1861 +RMD160 b97eb0ea0c12171731f3595119047a2337e8f6d3 cpu-1.4.3.ebuild 1075 +SHA256 25bc0e8125986df4c194d5d8d021e576001553aed11787ee9ffb12f128ed822c cpu-1.4.3.ebuild 1075 +MISC ChangeLog 2036 RMD160 b6850d872ba5c036697a01f312aa2f442e64eb7c SHA1 b387b7d235c2f741e285634a3dfbcec3fac925fc SHA256 867d22ae18a5e9ab78bf6b17a0591fed454c380e1df17cecdecb07c6517a9d0f +MD5 c1dc58f61a382a0844d79277b1125264 ChangeLog 2036 +RMD160 b6850d872ba5c036697a01f312aa2f442e64eb7c ChangeLog 2036 +SHA256 867d22ae18a5e9ab78bf6b17a0591fed454c380e1df17cecdecb07c6517a9d0f ChangeLog 2036 +MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223 -MD5 fb7bc6d19d65b1e16c986e21ba45dadd cpu-1.4.3-r1.ebuild 1192 +RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223 +SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223 MD5 5e8365fbe120902788e48f72e1e18ae9 files/digest-cpu-1.4.2-r1 62 -MD5 36e1bd5ca62858bcf4b4f058c790b8b3 files/digest-cpu-1.4.3-r1 62 -MD5 36e1bd5ca62858bcf4b4f058c790b8b3 files/digest-cpu-1.4.3 62 +RMD160 8af188a292a026177a490fe9104dc2a5eddb8563 files/digest-cpu-1.4.2-r1 62 +SHA256 13f3d3f71aacf6d96b9f335d4d02af83153999c41803c8f85888d51896446058 files/digest-cpu-1.4.2-r1 62 +MD5 ff9a4a402d413fd35984fcb1ba65894f files/digest-cpu-1.4.3 232 +RMD160 b873283acc2978bf7cea58254508e7a55d071625 files/digest-cpu-1.4.3 232 +SHA256 af6307c0b8f0b004d39085b35c947f0adae9ed438b8bb4a3565b842e2b3cc460 files/digest-cpu-1.4.3 232 +MD5 ff9a4a402d413fd35984fcb1ba65894f files/digest-cpu-1.4.3-r1 232 +RMD160 b873283acc2978bf7cea58254508e7a55d071625 files/digest-cpu-1.4.3-r1 232 +SHA256 af6307c0b8f0b004d39085b35c947f0adae9ed438b8bb4a3565b842e2b3cc460 files/digest-cpu-1.4.3-r1 232 diff --git a/app-admin/cpu/cpu-1.4.3-r1.ebuild b/app-admin/cpu/cpu-1.4.3-r1.ebuild index 1f0ec08a4b00..ce14766a5776 100644 --- a/app-admin/cpu/cpu-1.4.3-r1.ebuild +++ b/app-admin/cpu/cpu-1.4.3-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/cpu-1.4.3-r1.ebuild,v 1.1 2005/04/29 23:23:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/cpu-1.4.3-r1.ebuild,v 1.2 2006/12/17 03:48:50 dirtyepic Exp $ + +inherit eutils DESCRIPTION="LDAP user management tool written in C and loosely based on FreeBSD's pw(8)" HOMEPAGE="http://cpu.sourceforge.net/" @@ -17,6 +19,9 @@ DEPEND="${RDEPEND} >=sys-devel/autoconf-2.54" src_compile() { + + epatch "${FILESDIR}"/${P}-gcc4.patch # Bug #148731 + export WANT_AUTOCONF=2.5 sed -i.orig -e 's,$(sysconfdir),$(DESTDIR)$(sysconfdir),g' ${S}/doc/Makefile.in ${S}/doc/Makefile.am diff --git a/app-admin/cpu/files/cpu-1.4.3-gcc4.patch b/app-admin/cpu/files/cpu-1.4.3-gcc4.patch new file mode 100644 index 000000000000..842373569ff8 --- /dev/null +++ b/app-admin/cpu/files/cpu-1.4.3-gcc4.patch @@ -0,0 +1,14 @@ +diff -ur cpu-1.4.3/src/plugins/ldap/commandline.c cpu-1.4.3-mychanges/src/plugins/ldap/commandline.c +--- cpu-1.4.3/src/plugins/ldap/commandline.c 2004-01-11 22:31:02.000000000 -0700 ++++ cpu-1.4.3-mychanges/src/plugins/ldap/commandline.c 2005-12-11 14:06:19.000000000 -0700 +@@ -83,7 +83,7 @@ + if (passent == NULL) + return -1; + bzero (passent, sizeof (struct cpass)); +- (int) passent->sp_lstchg = passent->sp_min = passent->sp_max = -10; ++ passent->sp_lstchg = (int) (passent->sp_min = passent->sp_max = -10); + passent->sp_warn = passent->sp_inact = passent->sp_expire = -10; + passent->sp_flag = -10; + passent->pw_gid = -10; + + diff --git a/app-admin/cpu/files/digest-cpu-1.4.3 b/app-admin/cpu/files/digest-cpu-1.4.3 index fe963a19a6f4..55e6debb956f 100644 --- a/app-admin/cpu/files/digest-cpu-1.4.3 +++ b/app-admin/cpu/files/digest-cpu-1.4.3 @@ -1 +1,3 @@ MD5 2d128f82261967d41458800752bc943d cpu-1.4.3.tar.bz2 255668 +RMD160 2bf7a1ff20b6ddb316f133bf2b95490048dfe87c cpu-1.4.3.tar.bz2 255668 +SHA256 ea958f8086fe08df69b884fd49d3d172d3934b9b3d5fd1bd526294b7927b3478 cpu-1.4.3.tar.bz2 255668 diff --git a/app-admin/cpu/files/digest-cpu-1.4.3-r1 b/app-admin/cpu/files/digest-cpu-1.4.3-r1 index fe963a19a6f4..55e6debb956f 100644 --- a/app-admin/cpu/files/digest-cpu-1.4.3-r1 +++ b/app-admin/cpu/files/digest-cpu-1.4.3-r1 @@ -1 +1,3 @@ MD5 2d128f82261967d41458800752bc943d cpu-1.4.3.tar.bz2 255668 +RMD160 2bf7a1ff20b6ddb316f133bf2b95490048dfe87c cpu-1.4.3.tar.bz2 255668 +SHA256 ea958f8086fe08df69b884fd49d3d172d3934b9b3d5fd1bd526294b7927b3478 cpu-1.4.3.tar.bz2 255668 -- 2.26.2