Package: cdrdao
Version: 1:1.2.2-17
Severity: normal
Tags: patch

Hi,

thanks for maintaining cdrdao.

During Ubuntu's rebuild test, cdrdao fail to build [1]. The reason is that 
getline is provided by Ubuntu's newer eglibc (experimental's eglibc should 
more or less match it), as it was added to POSIX.

Attached is a patch that renames the local definition of getline.

Cheers,
   Stefan.

[1]:
<https://edge.launchpad.net/ubuntu/+archive/test-rebuild-20090909/+build/1211879/+files/buildlog_ubuntu-karmic-amd64.cdrdao_1:1.2.2-17_FAILEDTOBUILD.txt.gz>

-- System Information:
Debian Release: squeeze/sid
  APT prefers karmic-updates
  APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31-11-generic (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages cdrdao depends on:
ii  libao2                  0.8.8-5ubuntu1   Cross Platform Audio Output Librar
ii  libc6                   2.10.1-0ubuntu12 GNU C Library: Shared libraries
ii  libgcc1                 1:4.4.1-4ubuntu4 GCC support library
ii  libogg0                 1.1.4~dfsg-1     Ogg bitstream library
ii  libstdc++6              4.4.1-4ubuntu4   The GNU Standard C++ Library v3
ii  libvorbis0a             1.2.0.dfsg-6     The Vorbis General Audio Compressi
ii  libvorbisfile3          1.2.0.dfsg-6     The Vorbis General Audio Compressi

cdrdao recommends no packages.

cdrdao suggests no packages.

-- no debconf information
Index: cdrdao-1.2.2/scsilib/include/schily.h
===================================================================
--- cdrdao-1.2.2.orig/scsilib/include/schily.h	2009-10-03 01:43:15.000000000 +0200
+++ cdrdao-1.2.2/scsilib/include/schily.h	2009-10-03 01:42:27.000000000 +0200
@@ -187,7 +187,7 @@
 extern	char	*findbytes __PR((const void *, int, char));
 extern	int	findline __PR((const char *, char, const char *,
 							int, char **, int));
-extern	int	getline __PR((char *, int));
+extern	int	getline_schily __PR((char *, int));
 extern	int	getstr __PR((char *, int));
 extern	int	breakline __PR((char *, char, char **, int));
 extern	int	getallargs __PR((int *, char * const**, const char *, ...));
Index: cdrdao-1.2.2/scsilib/libscg/scsitransp.c
===================================================================
--- cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c	2009-10-03 01:43:13.000000000 +0200
+++ cdrdao-1.2.2/scsilib/libscg/scsitransp.c	2009-10-03 01:42:45.000000000 +0200
@@ -324,7 +324,7 @@
 
 	js_printf("%s", msg);
 	flush();
-	if (getline(okbuf, sizeof (okbuf)) == EOF)
+	if (getline_schily(okbuf, sizeof (okbuf)) == EOF)
 		exit(EX_BAD);
 	if (streql(okbuf, "y") || streql(okbuf, "yes") ||
 	    streql(okbuf, "Y") || streql(okbuf, "YES"))
Index: cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c
===================================================================
--- cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c	2009-10-03 01:43:15.000000000 +0200
+++ cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c	2009-10-03 01:43:04.000000000 +0200
@@ -64,7 +64,7 @@
 }
 
 EXPORT int
-getline(buf, len)
+getline_schily(buf, len)
 	char	*buf;
 	int	len;
 {

Reply via email to