Fix build with glibc-2.10, bug 191945. Thanks to Curtis Magyar <curtm4n@gmail.com> for getting us the patch from Paldo linux and to Jonathan Adamczewski <jadamcze@utas.edu.au> for reporting.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 156 insertions, 4 deletions

diff --git a/app-cdr/cdrkit/ChangeLog b/app-cdr/cdrkit/ChangeLog
index 0560b95c64a1..bbe9e00added 100644
--- a/app-cdr/cdrkit/ChangeLog
+++ b/app-cdr/cdrkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.68 2009/05/07 20:55:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.69 2009/05/24 14:27:43 loki_val Exp $
+
+  24 May 2009; Peter Alfredsen <loki_val@gentoo.org> cdrkit-1.1.9-r1.ebuild,
+  +files/cdrkit-1.1.9-glibc-2.10.patch:
+  Fix build with glibc-2.10, bug 191945. Thanks to Curtis Magyar
+  <curtm4n@gmail.com> for getting us the patch from Paldo linux and to
+  Jonathan Adamczewski <jadamcze@utas.edu.au> for reporting.
 
 *cdrkit-1.1.9-r1 (07 May 2009)
 
diff --git a/app-cdr/cdrkit/Manifest b/app-cdr/cdrkit/Manifest
index cf85886ce6cc..62f48afb3f60 100644
--- a/app-cdr/cdrkit/Manifest
+++ b/app-cdr/cdrkit/Manifest
@@ -1,5 +1,6 @@
+AUX cdrkit-1.1.9-glibc-2.10.patch 5775 RMD160 2e7edb07f71e0b9cf02ccfabfddabda04d47b687 SHA1 a08705d5bdb9da5aad5799099ac58e605e41b941 SHA256 568204ab5b376d1d062798a1bbd943f8fb2f807480f9d8c782a902caf1f0be7b
 DIST cdrkit-1.1.9.tar.gz 1430065 RMD160 ce3c62b98c82f3d524a345a6360d24e1d7ac73d7 SHA1 44c9d85c300803e6b9a415e79f3f0c9ddf1a65ee SHA256 d5d58ab4c7bef036a53ef9742b4e57621f61310cd0cd28f558ba0b88c354efa2
-EBUILD cdrkit-1.1.9-r1.ebuild 1650 RMD160 3fa3d3d13f69a5eb74193ed44b3dcafb2252c9d9 SHA1 c0ee58a147f2b608bafd56b8f171583150fb9649 SHA256 87d1aee218c86221b67e91823ccc0623a80af2559fa49b67c4f2e9f12c691017
+EBUILD cdrkit-1.1.9-r1.ebuild 1698 RMD160 ce04ad000f4cf0f464c8ac6ccb9d4698f51d535a SHA1 db44a91af881821d8bbd9d6d3b6150bcbb82ae03 SHA256 e0a66e3ef9d4dc119947bc2d0969d706a9b0979c2b05605e11cc86d5348799ff
 EBUILD cdrkit-1.1.9.ebuild 1930 RMD160 bbe049a257f2c76c5af5ed4c59018ae1453fc3c1 SHA1 a4edfb2f0ccc3e4133c7a09563a8bec6a559e2c2 SHA256 c7b51693e8813c6234eafa55cdf4f3d2cb4c7d700930f155f50bd170a15f7f49
-MISC ChangeLog 8099 RMD160 e0def3105e996d4f0cdbf3a4fb8e4ac92f56edb1 SHA1 bbeca3ddfe9527d0c828e0d142a8cc0bc841fb9f SHA256 b7cc3fe3b55863c17730a96b21362fdfd3c83b4f1e9a618dd4f9948bb0389d05
+MISC ChangeLog 8413 RMD160 e6bb1af692423245f0ea4830253a58b0b1776c37 SHA1 e02cf3ad8a932866b6c7c803b8e5903efc4f4076 SHA256 01831780d10f1c8b56cb82d96c0532271ef7689c9b84028eda912d869ec1fc90
 MISC metadata.xml 247 RMD160 f3cc383d1015158a8bfe1b6efd3586fa89a95345 SHA1 47a345bfa35d34381b88e9a8770cbe35a24c1476 SHA256 4d18b2a7e3f3237d29a2ea874c71c66abcda946f15bb7e15fa7cfc1d33731a24
diff --git a/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild b/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild
index a3b1b4a37f02..02bcf8f03a2f 100644
--- a/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild
+++ b/app-cdr/cdrkit/cdrkit-1.1.9-r1.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-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild,v 1.1 2009/05/07 20:55:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.9-r1.ebuild,v 1.2 2009/05/24 14:27:43 loki_val Exp $
 
 inherit cmake-utils
 
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/cdrtools"
 
+PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" )
+
 src_install() {
 	cmake-utils_src_install
 
diff --git a/app-cdr/cdrkit/files/cdrkit-1.1.9-glibc-2.10.patch b/app-cdr/cdrkit/files/cdrkit-1.1.9-glibc-2.10.patch
new file mode 100644
index 000000000000..9e2f5082a3e9
--- /dev/null
+++ b/app-cdr/cdrkit/files/cdrkit-1.1.9-glibc-2.10.patch
@@ -0,0 +1,143 @@
+diff -puNr cdrkit-1.1.9.orig/include/schily.h cdrkit-1.1.9/include/schily.h
+--- cdrkit-1.1.9.orig/include/schily.h	2006-11-25 01:20:20.000000000 +0100
++++ cdrkit-1.1.9/include/schily.h	2009-03-11 20:31:53.000000000 +0100
+@@ -116,7 +116,7 @@ extern	int	fexecl(const char *, FILE *, 
+ extern	int	fexecle(const char *, FILE *, FILE *, FILE *, const char *, ...);
+ 		/* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern	int	fexecv(const char *, FILE *, FILE *, FILE *, int, char **);
+-extern	int	fexecve(const char *, FILE *, FILE *, FILE *, char * const *, 
++extern	int	f_execve(const char *, FILE *, FILE *, FILE *, char * const *, 
+ 							  char * const *);
+ extern	int	fspawnv(FILE *, FILE *, FILE *, int, char * const *);
+ extern	int	fspawnl(FILE *, FILE *, FILE *, const char *, const char *, ...);
+@@ -190,7 +190,7 @@ extern	int	schily_error(const char *, ..
+ extern	char	*fillbytes(void *, int, char);
+ extern	char	*findbytes(const void *, int, char);
+ extern	int	findline(const char *, char, const char *, int, char **, int);
+-extern	int	getline(char *, int);
++extern	int	get_line(char *, int);
+ extern	int	getstr(char *, int);
+ extern	int	breakline(char *, char, char **, int);
+ extern	int	getallargs(int *, char * const**, const char *, ...);
+diff -puNr cdrkit-1.1.9.orig/librols/fexec.c cdrkit-1.1.9/librols/fexec.c
+--- cdrkit-1.1.9.orig/librols/fexec.c	2008-02-25 12:14:07.000000000 +0100
++++ cdrkit-1.1.9/librols/fexec.c	2009-03-11 20:31:53.000000000 +0100
+@@ -170,7 +170,7 @@ fexecle(name, in, out, err, va_alist)
+ 	} while (p != NULL);
+ 	va_end(args);
+ 
+-	ret = fexecve(name, in, out, err, av, env);
++	ret = f_execve(name, in, out, err, av, env);
+ 	if (av != xav)
+ 		free(av);
+ 	return (ret);
+@@ -184,11 +184,11 @@ fexecv(name, in, out, err, ac, av)
+ 	char *av[];
+ {
+ 	av[ac] = NULL;			/*  force list to be null terminated */
+-	return (fexecve(name, in, out, err, av, environ));
++	return (f_execve(name, in, out, err, av, environ));
+ }
+ 
+ EXPORT int
+-fexecve(name, in, out, err, av, env)
++f_execve(name, in, out, err, av, env)
+ 	const char *name;
+ 	FILE *in, *out, *err;
+ 	char * const av[], * const env[];
+diff -puNr cdrkit-1.1.9.orig/librols/stdio/fgetline.c cdrkit-1.1.9/librols/stdio/fgetline.c
+--- cdrkit-1.1.9.orig/librols/stdio/fgetline.c	2006-09-05 10:39:04.000000000 +0200
++++ cdrkit-1.1.9/librols/stdio/fgetline.c	2009-03-11 20:31:53.000000000 +0100
+@@ -76,7 +76,7 @@ fgetline(f, buf, len)
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++get_line(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
+diff -puNr cdrkit-1.1.9.orig/libusal/scsitransp.c cdrkit-1.1.9/libusal/scsitransp.c
+--- cdrkit-1.1.9.orig/libusal/scsitransp.c	2008-02-25 12:14:07.000000000 +0100
++++ cdrkit-1.1.9/libusal/scsitransp.c	2009-03-11 20:31:53.000000000 +0100
+@@ -301,7 +301,7 @@ usal_yes(char *msg)
+ 
+ 	printf("%s", msg);
+ 	flush();
+-	if (getline(okbuf, sizeof (okbuf)) == EOF)
++	if (get_line(okbuf, sizeof (okbuf)) == EOF)
+ 		exit(EX_BAD);
+ 	if (streql(okbuf, "y") || streql(okbuf, "yes") ||
+ 	    streql(okbuf, "Y") || streql(okbuf, "YES"))
+diff -puNr cdrkit-1.1.9.orig/readom/io.c cdrkit-1.1.9/readom/io.c
+--- cdrkit-1.1.9.orig/readom/io.c	2006-12-08 14:38:43.000000000 +0100
++++ cdrkit-1.1.9/readom/io.c	2009-03-11 20:31:53.000000000 +0100
+@@ -130,7 +130,7 @@ BOOL getvalue(char *s, long *lp, long mi
+ 		(*prt)(s, *lp, mini, maxi, dp);
+ 		flush();
+ 		line[0] = '\0';
+-		if (getline(line, 80) == EOF)
++		if (get_line(line, 80) == EOF)
+ 			exit(EX_BAD);
+ 
+ 		linep = skipwhite(line);
+@@ -178,7 +178,7 @@ again:
+ 	vprintf(form, args);
+ 	va_end(args);
+ 	flush();
+-	if (getline(okbuf, sizeof(okbuf)) == EOF)
++	if (get_line(okbuf, sizeof(okbuf)) == EOF)
+ 		exit(EX_BAD);
+ 	if (okbuf[0] == '?') {
+ 		printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
+diff -puNr cdrkit-1.1.9.orig/readom/readom.c cdrkit-1.1.9/readom/readom.c
+--- cdrkit-1.1.9.orig/readom/readom.c	2007-04-03 00:43:29.000000000 +0200
++++ cdrkit-1.1.9/readom/readom.c	2009-03-11 20:31:53.000000000 +0100
+@@ -1605,7 +1605,7 @@ read_generic(SCSI *usalp, parm_t *parmp,
+ 		fprintf(stderr, "Copy from SCSI (%d,%d,%d) disk to file\n",
+ 					usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
+ 		fprintf(stderr, "Enter filename [%s]: ", defname); flush();
+-		(void) getline(filename, sizeof (filename));
++		(void) get_line(filename, sizeof (filename));
+ 	}
+ 
+ 	if (askrange) {
+@@ -1772,7 +1772,7 @@ write_disk(SCSI *usalp, parm_t *parmp)
+ 		fprintf(stderr, "Copy from file to SCSI (%d,%d,%d) disk\n",
+ 					usal_scsibus(usalp), usal_target(usalp), usal_lun(usalp));
+ 		fprintf(stderr, "Enter filename [%s]: ", defname); flush();
+-		(void) getline(filename, sizeof (filename));
++		(void) get_line(filename, sizeof (filename));
+ 		fprintf(stderr, "Notice: reading from file always starts at file offset 0.\n");
+ 
+ 		getlong("Enter starting sector for copy:", &addr, 0L, end-1);
+diff -puNr cdrkit-1.1.9.orig/wodim/cue.c cdrkit-1.1.9/wodim/cue.c
+--- cdrkit-1.1.9.orig/wodim/cue.c	2006-12-08 14:38:43.000000000 +0100
++++ cdrkit-1.1.9/wodim/cue.c	2009-03-11 20:32:18.000000000 +0100
+@@ -253,7 +253,7 @@ static	char	*skipwhite(const char *s);
+ static	char	*peekword(void);
+ static	char	*lineend(void);
+ static	char	*markword(char *delim);
+-static	char	getdelim(void);
++static	char	get_delim(void);
+ static	char	*getnextitem(char *delim);
+ static	char	*neednextitem(char *delim);
+ static	char	*nextword(void);
+@@ -746,7 +746,7 @@ parse_track(track_t trackp[], state_t *s
+ 	if (kp == NULL)
+ 		cueabort("Unknown filetype '%s'", word);
+ 
+-	if (getdelim() == '/') {
++	if (get_delim() == '/') {
+ 		word = needitem();
+ 		if (*astol(++word, &secsize) != '\0')
+ 			cueabort("Not a number '%s'", word);
+@@ -1128,7 +1128,7 @@ linelen--;
+ }
+ 
+ static char 
+-getdelim()
++get_delim()
+ {
+ 	return (wordendc);
+ }