fix for #12208

4 files changed, 56 insertions, 14 deletions

diff --git a/media-libs/libcdaudio/ChangeLog b/media-libs/libcdaudio/ChangeLog
index 73abac3d8bb5..66eb2fc5b4c1 100644
--- a/media-libs/libcdaudio/ChangeLog
+++ b/media-libs/libcdaudio/ChangeLog
@@ -1,13 +1,18 @@
 # ChangeLog for media-libs/libcdaudio
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/ChangeLog,v 1.3 2002/12/13 10:59:35 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/ChangeLog,v 1.4 2002/12/17 00:39:25 vapier Exp $
+
+*libcdaudio-0.99.6-r1 (16 Dec 2002)
+
+  16 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added patch from #12208.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *libcdaudio-0.99.6 (1 Feb 2002)
 
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  changed sparc ~sparc keywords
+ 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.6 b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.6-r1
index 6c975b70218a..6c975b70218a 100644
--- a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.6
+++ b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.6-r1
diff --git a/media-libs/libcdaudio/files/libcdaudio-0.99.6-sanity-checks.patch b/media-libs/libcdaudio/files/libcdaudio-0.99.6-sanity-checks.patch
new file mode 100644
index 000000000000..98a52c4c00e1
--- /dev/null
+++ b/media-libs/libcdaudio/files/libcdaudio-0.99.6-sanity-checks.patch
@@ -0,0 +1,38 @@
+--- libcdaudio-0.99.6/source/cddb.c.orig	2002-12-16 23:18:40.000000000 +0100
++++ libcdaudio-0.99.6/source/cddb.c	2002-12-16 23:20:38.000000000 +0100
+@@ -840,7 +840,7 @@
+     inbuffer[index] = inchar;
+   }
+   
+-  fprintf(stdout, "%*s\n", index, index, inbuffer); 
++  fprintf(stdout, "%*s\n", index, inbuffer); 
+   return index;
+ }
+ 
+@@ -916,7 +916,7 @@
+   free(outbuffer);
+    
+   if(mode == CDDB_MODE_HTTP)
+-    cddb_skip_http_header(sock);
++    if (cddb_skip_http_header(sock)<0) return -1;
+ 
+   if((inbuffer = malloc(256)) == NULL)
+     return -1;
+@@ -1160,11 +1160,15 @@
+ 	     cddb_genre(entry->entry_genre),
+ 	     entry->entry_id);
+ 	
+-  send(sock, outbuffer, strlen(outbuffer), 0);
++  if(send(sock, outbuffer, strlen(outbuffer), 0)<0) {
++    free(outbuffer);
++    return -1;
++  }
++
+   free(outbuffer);
+    
+   if(mode == CDDB_MODE_HTTP)
+-    cddb_skip_http_header(sock);
++    if (cddb_skip_http_header(sock)<0) return -1;
+ 
+   if(cddb_read_token(sock, token) < 0)
+     return -1;
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.6.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.6-r1.ebuild
index 80340be7e422..baaacd3d3dfd 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.6.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.6-r1.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.6.ebuild,v 1.9 2002/12/09 04:26:12 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.6-r1.ebuild,v 1.1 2002/12/17 00:40:34 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="a library of cd audio related routines"
 SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 HOMEPAGE="http://libcdaudio.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="virtual/glibc"
+KEYWORDS="x86 ppc sparc"
+IUSE="pic"
 
 src_compile() {
-    econf --enable-threads || die
-    emake || die
+	patch -p1 < ${FILESDIR}/${P}-sanity-checks.patch
+	econf --enable-threads --with-gnu-ld `use_with pic`
+	emake || die
 }
 
-src_install () {
-    make DESTDIR=${D} install || die
-    dodoc AUTHORS COPYING ChangLog NEWS README README.BeOS README.OSF1 TODO
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangLog NEWS README README.BeOS README.OSF1 TODO
 }