Fix building with newer glibc #246734 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 39 insertions, 19 deletions

diff --git a/app-admin/cancd/ChangeLog b/app-admin/cancd/ChangeLog
index 6a4f0d45ae3d..bcfbf78bc547 100644
--- a/app-admin/cancd/ChangeLog
+++ b/app-admin/cancd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/cancd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.6 2008/11/14 15:00:41 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/ChangeLog,v 1.7 2009/01/14 05:27:34 vapier Exp $
+
+  14 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/cancd-0.1.0-build.patch, cancd-0.1.0-r1.ebuild:
+  Fix building with newer glibc #246734 by Diego E. Pettenò.
 
   14 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   cancd-0.1.0-r1.ebuild:
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
index 84493b46907c..cb28d053a39a 100644
--- a/app-admin/cancd/Manifest
+++ b/app-admin/cancd/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cancd-0.1.0-build.patch 262 RMD160 a391ae20f87b7998267d7a35613c04029a514bca SHA1 f699f491c40a8308169aca05604c885848bd39b0 SHA256 10be31f427940224cecd5b90de94dfd9b0a76368c57a8354b44f4c3905c8d192
 AUX cancd-0.1.0-c-cleanup.patch 1648 RMD160 597ace0b1a0baf98d52d0d5bbfea286a14e9c272 SHA1 0e8545efa604c9eb55d1b072d1b198985343a752 SHA256 55628aa8e2fabd3aa26bc0023d46562a238047b2f7ad5c8485b88794655f93d7
 AUX cancd-conf.d 605 RMD160 77fd3df8932c6beee17c3521515745d1654943eb SHA1 b02d110f16919d85b4c889891af769746a9b7bfa SHA256 bbf84fdba07bde4a61864715e42a76c2b3ad2ecade4ad11b8ca4d557bfa9deb8
 AUX cancd-init.d 624 RMD160 93588ec35b22084453c14f20bdcd1a0c4db65c1b SHA1 5ab54c427cca6cb89a368c067049852a81c3ff0f SHA256 100342d5bb42b064c7e8cf82d73e45cf6ddfd3f4a44e5df561f6022b3f925ea3
 AUX netconsole-conf.d 866 RMD160 68cf7a8a21d258afe9bda39d77fc39d7f911ed98 SHA1 b35199af379537c90e752ef29c136cbb3cdd66c1 SHA256 480230a83fade7e2c284936fc8814c07e075d8296e37aa83772f8d8cb3c6ff96
 AUX netconsole-init.d 1624 RMD160 27267e5c9e409e7aea7fb1af9fb2415aeabf0e91 SHA1 cef9dd218b35fdd513a8e733455221da605e7a1d SHA256 0e89a95b572450577ff1192feae29059ebab9caab99639557cb709bb9b0c401c
 DIST cancd-0.1.0.tar.gz 7634 RMD160 9ce93f6ad6340d3fb9d5e3c2b073ae4a77d44782 SHA1 28b7bef97059b456f75d36933c18e1b3ae67a5b4 SHA256 aea21e3eadee64d2b76591d272dcd03c566215b2320d7fef5cfe0937c3ef0315
-EBUILD cancd-0.1.0-r1.ebuild 1370 RMD160 16f3735d444771f9aa38e6cab105870dbe67e777 SHA1 cf7ff7fac513ed635a652cc5254d2a2530a920d7 SHA256 451d84120dd2da11fef61ae9ab2d08ca18651fbf2547667c81d8ddbff71635fd
+EBUILD cancd-0.1.0-r1.ebuild 1413 RMD160 37c234052cdf18672b804d7dbfecab96d1ec1a6c SHA1 7998ca243c1820219462118f6713f851a43402f6 SHA256 0a8881c973bb4ddf7919a786ed873d7846f0665bb01e5dbac74a8fa0bcaf461c
 EBUILD cancd-0.1.0.ebuild 920 RMD160 24c1103c2f697a48d91ddab202200e2088fe8b5f SHA1 34728ad07e748ad0380dd329ce9253f0eb7b6a4e SHA256 0099abe459f63e48a7d57ffa0b33a24b304ce0ca2196691643091e752875fd6f
-MISC ChangeLog 1165 RMD160 909ed10e7f5ca8a69ed678416158ae598657ef4c SHA1 2e5f536d09541f45818c124ca567986697a11ddb SHA256 a58e0c2279417c9170ea0f7614b537364de135510b8cfa15816d3b6512b51b09
+MISC ChangeLog 1332 RMD160 591c7b21e9f6ae215d56231d02db6c323b63cf4e SHA1 36722dd0ec4b97a991eb57bbe8ac875a48e55fd7 SHA256 55da44aeb2bcba2fdbdd64799439ef594bda6ee2d082c99353e4655b7a083367
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkdkpwACgkQAiZjviIA2XgofwCg4xQill6vZj2W/FsrzosgWtg+
-1eAAnjiIhlCBdotgTX3+na9NYQ4qo56b
-=07oD
+iEYEARECAAYFAkltd9IACgkQn/5bYzqsSmGO4ACgkXyMynk7NYAAoXd90t9zdGyy
+afsAoJ2WUw4yakTXpQp8U14WjT6uwjYb
+=aELZ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/cancd/cancd-0.1.0-r1.ebuild b/app-admin/cancd/cancd-0.1.0-r1.ebuild
index b4320c83ade2..72a5f8cb46e9 100644
--- a/app-admin/cancd/cancd-0.1.0-r1.ebuild
+++ b/app-admin/cancd/cancd-0.1.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r1.ebuild,v 1.4 2008/11/14 15:00:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r1.ebuild,v 1.5 2009/01/14 05:27:34 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="This is the CA NetConsole Daemon, a daemon to receive output from
-the Linux netconsole driver."
+DESCRIPTION="the CA NetConsole Daemon, a daemon to receive output from the Linux netconsole driver"
 HOMEPAGE="http://oss.oracle.com/projects/cancd/"
 SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -15,13 +15,15 @@ IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-c-cleanup.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch #246734
+	epatch "${FILESDIR}"/${P}-c-cleanup.patch
 	# slight makefile cleanup
-	sed -i.orig \
+	sed -i \
 		-e '/^CFLAGS/s,-g,,' \
 		-e '/^CFLAGS/s,-O2,-Wall -W -Wextra -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wunreachable-code -Wlong-long,' \
 		-e '/rm cancd cancd.o/s,rm,rm -f,' \
-		${S}/Makefile
+		Makefile || die
 }
 
 src_compile() {
@@ -29,12 +31,11 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
 	dosbin cancd || die "dosbin failed"
-	newinitd ${FILESDIR}/cancd-init.d cancd
-	newconfd ${FILESDIR}/cancd-conf.d cancd
-	newinitd ${FILESDIR}/netconsole-init.d netconsole
-	newconfd ${FILESDIR}/netconsole-conf.d netconsole
+	newinitd "${FILESDIR}"/cancd-init.d cancd
+	newconfd "${FILESDIR}"/cancd-conf.d cancd
+	newinitd "${FILESDIR}"/netconsole-init.d netconsole
+	newconfd "${FILESDIR}"/netconsole-conf.d netconsole
 	keepdir /var/crash
 	fowners adm:nobody /var/crash
 	fperms 700 /var/crash
diff --git a/app-admin/cancd/files/cancd-0.1.0-build.patch b/app-admin/cancd/files/cancd-0.1.0-build.patch
new file mode 100644
index 000000000000..b1c99b1cd565
--- /dev/null
+++ b/app-admin/cancd/files/cancd-0.1.0-build.patch
@@ -0,0 +1,14 @@
+fix building with newer glibc
+
+http://bugs.gentoo.org/246734
+
+--- cancd.c
++++ cancd.c
+@@ -36,6 +36,7 @@
+ #include <libgen.h>
+ #include <getopt.h>
+ #include <stdarg.h>
++#include <limits.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>