cdparanoia-32: fix build

10 files changed, 718 insertions, 611 deletions

diff --git a/cdparanoia-32/.footprint b/cdparanoia-32/.footprint
index 5c042542..0c7feba6 100644
--- a/cdparanoia-32/.footprint
+++ b/cdparanoia-32/.footprint
@@ -3,8 +3,10 @@ drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libcdda_interface.a
 lrwxrwxrwx	root/root	usr/lib32/libcdda_interface.so -> libcdda_interface.so.0.10.2
 lrwxrwxrwx	root/root	usr/lib32/libcdda_interface.so.0 -> libcdda_interface.so.0.10.2
--rw-r--r--	root/root	usr/lib32/libcdda_interface.so.0.10.2
+-rwxr-xr-x	root/root	usr/lib32/libcdda_interface.so.0.10.2
 -rw-r--r--	root/root	usr/lib32/libcdda_paranoia.a
 lrwxrwxrwx	root/root	usr/lib32/libcdda_paranoia.so -> libcdda_paranoia.so.0.10.2
 lrwxrwxrwx	root/root	usr/lib32/libcdda_paranoia.so.0 -> libcdda_paranoia.so.0.10.2
--rw-r--r--	root/root	usr/lib32/libcdda_paranoia.so.0.10.2
+-rwxr-xr-x	root/root	usr/lib32/libcdda_paranoia.so.0.10.2
+drwxr-xr-x	root/root	usr/lib32/pkgconfig/
+-rw-r--r--	root/root	usr/lib32/pkgconfig/cdparanoia-3.pc
diff --git a/cdparanoia-32/.signature b/cdparanoia-32/.signature
index aa031695..b3176ac2 100644
--- a/cdparanoia-32/.signature
+++ b/cdparanoia-32/.signature
@@ -1,7 +1,12 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXW5dNxANj0kai3n88A4jldkOeObhbOmEmIA5kDi1/h8GoT4vp9LADGYNuiW2BJIn0wlk+KdqQMFwL3CaRY1B/wo=
-SHA256 (Pkgfile) = 4a3e6cb2d67b655a1ed08ff09546426aabcff6c0b7fd04491845337256f84277
-SHA256 (.footprint) = c6b28ac040cba3e244417b0e477c037b9a077586edf2509fffd25f91deb9b7a5
+RWSwxGo/zH7eXVidHZmZiRgZLYvkZcdeUTUVVZgZFLlnxi63SRX4m/Chh08rFYAkUnPDJB9nhPEgomA7hJwJ7l+dBnMUq4cimgg=
+SHA256 (Pkgfile) = 1004fd79b809ea4b2e8894246f0bee435039d318e20bba3fc5dbda9eeb38703b
+SHA256 (.footprint) = ec2dacfb229d2e3580d3dc27f399aa41e47962d7cca61c17ba41ef502c1c3102
 SHA256 (cdparanoia-III-10.2.src.tgz) = 005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
-SHA256 (cdparanoia-10.2-gcc43.patch) = d055d86056809dee6e861af77d766fb0f17084bb19e44d9d99be8a0c11892a18
-SHA256 (cdparanoia-10.2-ldflags.patch) = 11db67bf65f4cb1e6bb33e5166ef081ac0e57bed9703149135a5c83a55481f9f
+SHA256 (cdparanoia-10.2-463009.patch) = bb7d0256b57b2ae630bfb9f78be7bda6e1abaed809f0238112b850fb9ca3e7ef
+SHA256 (cdparanoia-10.2-endian.patch) = da764568a0466cd856c8e4dac09be2be4e7a2104125db4b60de873217a0dece8
+SHA256 (cdparanoia-10.2-install.patch) = 807c72330ebde3fc0c26a10ed7236870f49ae11df75dd8bd2be9c593e774806a
+SHA256 (cdparanoia-10.2-format-security.patch) = a6f80215c801190dfcade6751d12235a1878ab6b5762260086e7f0ce1296bef4
+SHA256 (cdparanoia-use-proper-gnu-config-files.patch) = dc4b2540552f53a563c1f2ba6e279c70049fdd13e066d87e126370e54148e30d
+SHA256 (cdparanoia-10.2-ldflags.patch) = 9b352a93ebedc7c523c76213756f98139ea3912162ee719ab0c5cc6648f94fe2
+SHA256 (cdparanoia-10.2-add-pkgconfig.patch) = f8e09fd0a05723ae8f16ab186394d807d5ec61dfcdcf815accd7aae755182dee
diff --git a/cdparanoia-32/Pkgfile b/cdparanoia-32/Pkgfile
index 94d5ee08..479b5c1a 100644
--- a/cdparanoia-32/Pkgfile
+++ b/cdparanoia-32/Pkgfile
@@ -5,25 +5,34 @@
 
 name=cdparanoia-32
 version=10.2
-release=2
+release=3
 source=(https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$version.src.tgz
-	cdparanoia-$version-gcc43.patch
-	cdparanoia-$version-ldflags.patch)
+	cdparanoia-10.2-463009.patch
+	cdparanoia-10.2-endian.patch
+	cdparanoia-10.2-install.patch
+	cdparanoia-10.2-format-security.patch
+	cdparanoia-use-proper-gnu-config-files.patch
+	cdparanoia-10.2-ldflags.patch
+	cdparanoia-10.2-add-pkgconfig.patch)
 
 build() {
 	cd cdparanoia-III-$version
-	patch -p 0 -i $SRC/cdparanoia-$version-gcc43.patch
-	patch -p 1 -i $SRC/cdparanoia-$version-ldflags.patch
-	autoreconf
+	patch -p3 -i $SRC/cdparanoia-10.2-463009.patch
+	patch -p1 -i $SRC/cdparanoia-10.2-endian.patch
+	patch -p1 -i $SRC/cdparanoia-10.2-install.patch
+	patch -p1 -i $SRC/cdparanoia-10.2-format-security.patch
+	patch -p1 -i $SRC/cdparanoia-use-proper-gnu-config-files.patch
+	patch -p1 -i $SRC/cdparanoia-10.2-ldflags.patch
+	patch -p1 -i $SRC/cdparanoia-10.2-add-pkgconfig.patch
+	autoreconf -ifv
 
 	./configure \
 		--prefix=/usr \
-		--mandir=$PKG/usr/man \
-		--libdir=$PKG/usr/lib32 \
+		--libdir=/usr/lib32 \
 		--host=i686-pc-linux-gnu
 
-    make -j 1
-    make prefix=$PKG/usr install
+	make -j1
+	make DESTDIR=$PKG install
 
-    rm -rf $PKG/{etc,var} $PKG/usr/{bin,etc,include,man,sbin,share}
+	rm -r  $PKG/usr/{bin,include,share}
 }
diff --git a/cdparanoia-32/cdparanoia-10.2-gcc43.patch b/cdparanoia-32/cdparanoia-10.2-463009.patch
index 13b34916..f89f85da 100644
--- a/cdparanoia-32/cdparanoia-10.2-gcc43.patch
+++ b/cdparanoia-32/cdparanoia-10.2-463009.patch
@@ -1,585 +1,480 @@
-# http://bugs.gentoo.org/show_bug.cgi?id=238378
-# https://trac.xiph.org/changeset/15338
-
-Index: interface/test_interface.c
-===================================================================
---- interface/test_interface.c	(revision 15337)
-+++ interface/test_interface.c	(revision 15338)
-@@ -66,9 +66,9 @@
-   if(!fd)fd=fdopen(d->cdda_fd,"r");
- 
-   if(begin<lastread)
--    d->private->last_milliseconds=20;
-+    d->private_data->last_milliseconds=20;
-   else
--    d->private->last_milliseconds=sectors;
-+    d->private_data->last_milliseconds=sectors;
- 
- #ifdef CDDA_TEST_UNDERRUN
-   sectors-=1;
-Index: interface/cdda_interface.h
-===================================================================
---- interface/cdda_interface.h	(revision 15337)
-+++ interface/cdda_interface.h	(revision 15338)
-@@ -84,7 +84,7 @@
-   int is_atapi;
-   int is_mmc;
- 
--  cdda_private_data_t *private;
-+  cdda_private_data_t *private_data;
-   void         *reserved;
-   unsigned char inqbytes[4];
- 
-Index: interface/interface.c
-===================================================================
---- interface/interface.c	(revision 15337)
-+++ interface/interface.c	(revision 15338)
-@@ -39,9 +39,9 @@
-     if(d->drive_model)free(d->drive_model);
-     if(d->cdda_fd!=-1)close(d->cdda_fd);
-     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
--    if(d->private){
--      if(d->private->sg_hd)free(d->private->sg_hd);
--      free(d->private);
-+    if(d->private_data){
-+      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
-+      free(d->private_data);
-     }
- 
-     free(d);
-@@ -127,7 +127,7 @@
- 	}
-       }	
-     }
--    if(ms)*ms=d->private->last_milliseconds;
-+    if(ms)*ms=d->private_data->last_milliseconds;
-     return(sectors);
-   }
-   
-Index: interface/scsi_interface.c
-===================================================================
---- interface/scsi_interface.c	(revision 15337)
-+++ interface/scsi_interface.c	(revision 15338)
-@@ -15,13 +15,13 @@
- static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
-   struct timespec tv1;
-   struct timespec tv2;
--  int ret1=clock_gettime(d->private->clock,&tv1);
-+  int ret1=clock_gettime(d->private_data->clock,&tv1);
-   int ret2=ioctl(fd, command,arg);
--  int ret3=clock_gettime(d->private->clock,&tv2);
-+  int ret3=clock_gettime(d->private_data->clock,&tv2);
-   if(ret1<0 || ret3<0){
--    d->private->last_milliseconds=-1;
-+    d->private_data->last_milliseconds=-1;
-   }else{
--    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
-+    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
-   }
-   return ret2;
- }
-@@ -96,7 +96,7 @@
- static void clear_garbage(cdrom_drive *d){
-   fd_set fdset;
-   struct timeval tv;
--  struct sg_header *sg_hd=d->private->sg_hd;
-+  struct sg_header *sg_hd=d->private_data->sg_hd;
-   int flag=0;
- 
-   /* clear out any possibly preexisting garbage */
-@@ -185,7 +185,7 @@
-   struct timespec tv2;
-   int tret1,tret2;
-   int status = 0;
--  struct sg_header *sg_hd=d->private->sg_hd;
-+  struct sg_header *sg_hd=d->private_data->sg_hd;
-   long writebytes=SG_OFF+cmd_len+in_size;
- 
-   /* generic scsi device services */
-@@ -195,7 +195,7 @@
- 
-   memset(sg_hd,0,sizeof(sg_hd)); 
-   memset(sense_buffer,0,SG_MAX_SENSE); 
--  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
-+  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
-   sg_hd->twelve_byte = cmd_len == 12;
-   sg_hd->result = 0;
-   sg_hd->reply_len = SG_OFF + out_size;
-@@ -209,7 +209,7 @@
-      tell if the command failed.  Scared yet? */
- 
-   if(bytecheck && out_size>in_size){
--    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
-+    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
-     /* the size does not remove cmd_len due to the way the kernel
-        driver copies buffers */
-     writebytes+=(out_size-in_size);
-@@ -243,7 +243,7 @@
-   }
- 
-   sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
--  tret1=clock_gettime(d->private->clock,&tv1);  
-+  tret1=clock_gettime(d->private_data->clock,&tv1);  
-   errno=0;
-   status = write(d->cdda_fd, sg_hd, writebytes );
- 
-@@ -289,7 +289,7 @@
-     }
-   }
- 
--  tret2=clock_gettime(d->private->clock,&tv2);  
-+  tret2=clock_gettime(d->private_data->clock,&tv2);  
-   errno=0;
-   status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
-   sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
-@@ -313,7 +313,7 @@
-   if(bytecheck && in_size+cmd_len<out_size){
-     long i,flag=0;
-     for(i=in_size;i<out_size;i++)
--      if(d->private->sg_buffer[i]!=bytefill){
-+      if(d->private_data->sg_buffer[i]!=bytefill){
- 	flag=1;
- 	break;
-       }
-@@ -326,9 +326,9 @@
- 
-   errno=0;
-   if(tret1<0 || tret2<0){
--    d->private->last_milliseconds=-1;
-+    d->private_data->last_milliseconds=-1;
-   }else{
--    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
-+    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
-   }
-   return(0);
- }
-@@ -347,7 +347,7 @@
- 
-   memset(&hdr,0,sizeof(hdr));
-   memset(sense,0,sizeof(sense));
--  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
-+  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
- 
-   hdr.cmdp = cmd;
-   hdr.cmd_len = cmd_len;
-@@ -355,7 +355,7 @@
-   hdr.mx_sb_len = SG_MAX_SENSE;
-   hdr.timeout = 50000;
-   hdr.interface_id = 'S';
--  hdr.dxferp =  d->private->sg_buffer;
-+  hdr.dxferp =  d->private_data->sg_buffer;
-   hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */
- 
-   /* scary buffer fill hack */
-@@ -400,7 +400,7 @@
-   if(bytecheck && in_size<out_size){
-     long i,flag=0;
-     for(i=in_size;i<out_size;i++)
--      if(d->private->sg_buffer[i]!=bytefill){
-+      if(d->private_data->sg_buffer[i]!=bytefill){
- 	flag=1;
- 	break;
-       }
-@@ -412,7 +412,7 @@
-   }
- 
-   /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
--  /* d->private->last_milliseconds = hdr.duration; */
-+  /* d->private_data->last_milliseconds = hdr.duration; */
- 
-   errno = 0;
-   return 0;
-@@ -445,9 +445,9 @@
- 
-   handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
- 
--  key = d->private->sg_buffer[2] & 0xf;
--  ASC = d->private->sg_buffer[12];
--  ASCQ = d->private->sg_buffer[13];
-+  key = d->private_data->sg_buffer[2] & 0xf;
-+  ASC = d->private_data->sg_buffer[12];
-+  ASCQ = d->private_data->sg_buffer[13];
-   
-   if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
-   return 1;
-@@ -492,7 +492,7 @@
-   if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);
- 
-   {
--    unsigned char *b=d->private->sg_buffer;
-+    unsigned char *b=d->private_data->sg_buffer;
-     if(b[0])return(1); /* Handles only up to 256 bytes */
-     if(b[6])return(1); /* Handles only up to 256 bytes */
- 
-@@ -604,8 +604,8 @@
- static unsigned int get_orig_sectorsize(cdrom_drive *d){
-   if(mode_sense(d,12,0x01))return(-1);
- 
--  d->orgdens = d->private->sg_buffer[4];
--  return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
-+  d->orgdens = d->private_data->sg_buffer[4];
-+  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
- }
- 
- /* switch CDROM scsi drives to given sector size  */
-@@ -664,8 +664,8 @@
-     return(-4);
-   }
- 
--  first=d->private->sg_buffer[2];
--  last=d->private->sg_buffer[3];
-+  first=d->private_data->sg_buffer[2];
-+  last=d->private_data->sg_buffer[3];
-   tracks=last-first+1;
- 
-   if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {
-@@ -683,7 +683,7 @@
-       return(-5);
-     }
-     {
--      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
-+      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
- 
-       d->disc_toc[i-first].bFlags=toc->bFlags;
-       d->disc_toc[i-first].bTrack=i;
-@@ -704,7 +704,7 @@
-     return(-2);
-   }
-   {
--    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
-+    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
-     
-     d->disc_toc[i-first].bFlags=toc->bFlags;
-     d->disc_toc[i-first].bTrack=0xAA;
-@@ -738,7 +738,7 @@
-   }
- 
-   /* copy to our structure and convert start sector */
--  tracks = d->private->sg_buffer[1];
-+  tracks = d->private_data->sg_buffer[1];
-   if (tracks > MAXTRK) {
-     cderror(d,"003: CDROM reporting illegal number of tracks\n");
-     return(-3);
-@@ -754,33 +754,33 @@
-       return(-5);
-     }
-     
--    d->disc_toc[i].bFlags = d->private->sg_buffer[10];
-+    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
-     d->disc_toc[i].bTrack = i + 1;
- 
-     d->disc_toc[i].dwStartSector= d->adjust_ssize * 
--	(((signed char)(d->private->sg_buffer[2])<<24) | 
--	 (d->private->sg_buffer[3]<<16)|
--	 (d->private->sg_buffer[4]<<8)|
--	 (d->private->sg_buffer[5]));
-+	(((signed char)(d->private_data->sg_buffer[2])<<24) | 
-+	 (d->private_data->sg_buffer[3]<<16)|
-+	 (d->private_data->sg_buffer[4]<<8)|
-+	 (d->private_data->sg_buffer[5]));
-   }
- 
-   d->disc_toc[i].bFlags = 0;
-   d->disc_toc[i].bTrack = i + 1;
--  memcpy (&foo, d->private->sg_buffer+2, 4);
--  memcpy (&bar, d->private->sg_buffer+6, 4);
-+  memcpy (&foo, d->private_data->sg_buffer+2, 4);
-+  memcpy (&bar, d->private_data->sg_buffer+6, 4);
-   d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
- 						    be32_to_cpu(bar));
- 
-   d->disc_toc[i].dwStartSector= d->adjust_ssize * 
--    ((((signed char)(d->private->sg_buffer[2])<<24) | 
--      (d->private->sg_buffer[3]<<16)|
--      (d->private->sg_buffer[4]<<8)|
--      (d->private->sg_buffer[5]))+
-+    ((((signed char)(d->private_data->sg_buffer[2])<<24) | 
-+      (d->private_data->sg_buffer[3]<<16)|
-+      (d->private_data->sg_buffer[4]<<8)|
-+      (d->private_data->sg_buffer[5]))+
-      
--     ((((signed char)(d->private->sg_buffer[6])<<24) | 
--       (d->private->sg_buffer[7]<<16)|
--       (d->private->sg_buffer[8]<<8)|
--       (d->private->sg_buffer[9]))));
-+     ((((signed char)(d->private_data->sg_buffer[6])<<24) | 
-+       (d->private_data->sg_buffer[7]<<16)|
-+       (d->private_data->sg_buffer[8]<<8)|
-+       (d->private_data->sg_buffer[9]))));
- 
- 
-   d->cd_extra = FixupTOC(d,tracks+1);
-@@ -817,7 +817,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -836,7 +836,7 @@
-   cmd[9] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -854,7 +854,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -872,7 +872,7 @@
-   cmd[9] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -890,7 +890,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -908,7 +908,7 @@
-   cmd[9] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -922,7 +922,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -936,7 +936,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -950,7 +950,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -964,7 +964,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -978,7 +978,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -992,7 +992,7 @@
-   cmd[8] = sectors;
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -1026,7 +1026,7 @@
- 
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -1039,7 +1039,7 @@
- 
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -1052,7 +1052,7 @@
-   
-   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
-     return(ret);
--  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-+  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
-   return(0);
- }
- 
-@@ -1275,7 +1275,7 @@
- static int count_2352_bytes(cdrom_drive *d){
-   long i;
-   for(i=2351;i>=0;i--)
--    if(d->private->sg_buffer[i]!=(unsigned char)'\177')
-+    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
-       return(((i+3)>>2)<<2);
- 
-   return(0);
-@@ -1284,7 +1284,7 @@
- static int verify_nonzero(cdrom_drive *d){
-   long i,flag=0;
-   for(i=0;i<2352;i++)
--    if(d->private->sg_buffer[i]!=0){
-+    if(d->private_data->sg_buffer[i]!=0){
-       flag=1;
-       break;
-     }
-@@ -1621,7 +1621,7 @@
-   d->is_mmc=0;
-   if(mode_sense(d,22,0x2A)==0){
-   
--    b=d->private->sg_buffer;
-+    b=d->private_data->sg_buffer;
-     b+=b[3]+4;
-     
-     if((b[0]&0x3F)==0x2A){
-@@ -1669,7 +1669,7 @@
-     cderror(d,"008: Unable to identify CDROM model\n");
-     return(NULL);
-   }
--  return (d->private->sg_buffer);
-+  return (d->private_data->sg_buffer);
- }
- 
- int scsi_init_drive(cdrom_drive *d){
-@@ -1725,8 +1725,8 @@
-   check_cache(d);
- 
-   d->error_retry=1;
--  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
--  d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
-+  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
-+  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
-   d->report_all=1;
-   return(0);
- }
-Index: interface/cooked_interface.c
-===================================================================
---- interface/cooked_interface.c	(revision 15337)
-+++ interface/cooked_interface.c	(revision 15338)
-@@ -13,13 +13,13 @@
- static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
-   struct timespec tv1;
-   struct timespec tv2;
--  int ret1=clock_gettime(d->private->clock,&tv1);
-+  int ret1=clock_gettime(d->private_data->clock,&tv1);
-   int ret2=ioctl(fd, command,arg);
--  int ret3=clock_gettime(d->private->clock,&tv2);
-+  int ret3=clock_gettime(d->private_data->clock,&tv2);
-   if(ret1<0 || ret3<0){
--    d->private->last_milliseconds=-1;
-+    d->private_data->last_milliseconds=-1;
-   }else{
--    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
-+    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
-   }
-   return ret2;
- }
-Index: interface/scan_devices.c
-===================================================================
---- interface/scan_devices.c	(revision 15337)
-+++ interface/scan_devices.c	(revision 15338)
-@@ -264,11 +264,11 @@
-   d->interface=COOKED_IOCTL;
-   d->bigendianp=-1; /* We don't know yet... */
-   d->nsectors=-1;
--  d->private=calloc(1,sizeof(*d->private));
-+  d->private_data=calloc(1,sizeof(*d->private_data));
-   {
-     /* goddamnit */
-     struct timespec tv;
--    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
-+    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
-   }
-   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
-   return(d);
-@@ -674,15 +674,15 @@
-   d->bigendianp=-1; /* We don't know yet... */
-   d->nsectors=-1;
-   d->messagedest = messagedest;
--  d->private=calloc(1,sizeof(*d->private));
-+  d->private_data=calloc(1,sizeof(*d->private_data));
-   {
-     /* goddamnit */
-     struct timespec tv;
--    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
-+    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
-   }
-   if(use_sgio){
-     d->interface=SGIO_SCSI;
--    d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
-+    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
-     g_fd=d->cdda_fd=dup(d->ioctl_fd);
-   }else{
-     version=verify_SG_version(d,messagedest,messages);
-@@ -696,8 +696,8 @@
-     }
- 
-     /* malloc our big buffer for scsi commands */
--    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
--    d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
-+    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
-+    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
-   }
- 
-   {
-@@ -772,9 +772,9 @@
-   if(i_fd!=-1)close(i_fd);
-   if(g_fd!=-1)close(g_fd);
-   if(d){
--    if(d->private){
--      if(d->private->sg_hd)free(d->private->sg_hd);
--      free(d->private);
-+    if(d->private_data){
-+      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
-+      free(d->private_data);
-     }
-     free(d);
-   }
-@@ -821,7 +821,7 @@
-   d->interface=TEST_INTERFACE;
-   d->bigendianp=-1; /* We don't know yet... */
-   d->nsectors=-1;
--  d->private=calloc(1,sizeof(*d->private));
-+  d->private_data=calloc(1,sizeof(*d->private_data));
-   d->drive_model=copystring("File based test interface");
-   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
-   
+Index: /trunk/cdparanoia/interface/test_interface.c

+===================================================================

+--- /trunk/cdparanoia/interface/test_interface.c (revision 15299)

++++ /trunk/cdparanoia/interface/test_interface.c (revision 15338)

+@@ -67,7 +67,7 @@

+ 

+   if(begin<lastread)

+-    d->private->last_milliseconds=20;

++    d->private_data->last_milliseconds=20;

+   else

+-    d->private->last_milliseconds=sectors;

++    d->private_data->last_milliseconds=sectors;

+ 

+ #ifdef CDDA_TEST_UNDERRUN

+Index: /trunk/cdparanoia/interface/cdda_interface.h

+===================================================================

+--- /trunk/cdparanoia/interface/cdda_interface.h (revision 15290)

++++ /trunk/cdparanoia/interface/cdda_interface.h (revision 15338)

+@@ -85,5 +85,5 @@

+   int is_mmc;

+ 

+-  cdda_private_data_t *private;

++  cdda_private_data_t *private_data;

+   void         *reserved;

+   unsigned char inqbytes[4];

+Index: /trunk/cdparanoia/interface/interface.c

+===================================================================

+--- /trunk/cdparanoia/interface/interface.c (revision 15314)

++++ /trunk/cdparanoia/interface/interface.c (revision 15338)

+@@ -40,7 +40,7 @@

+     if(d->cdda_fd!=-1)close(d->cdda_fd);

+     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);

+-    if(d->private){

+-      if(d->private->sg_hd)free(d->private->sg_hd);

+-      free(d->private);

++    if(d->private_data){

++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);

++      free(d->private_data);

+     }

+ 

+@@ -128,5 +128,5 @@

+       }	

+     }

+-    if(ms)*ms=d->private->last_milliseconds;

++    if(ms)*ms=d->private_data->last_milliseconds;

+     return(sectors);

+   }

+Index: /trunk/cdparanoia/interface/scsi_interface.c

+===================================================================

+--- /trunk/cdparanoia/interface/scsi_interface.c (revision 15314)

++++ /trunk/cdparanoia/interface/scsi_interface.c (revision 15338)

+@@ -16,11 +16,11 @@

+   struct timespec tv1;

+   struct timespec tv2;

+-  int ret1=clock_gettime(d->private->clock,&tv1);

++  int ret1=clock_gettime(d->private_data->clock,&tv1);

+   int ret2=ioctl(fd, command,arg);

+-  int ret3=clock_gettime(d->private->clock,&tv2);

++  int ret3=clock_gettime(d->private_data->clock,&tv2);

+   if(ret1<0 || ret3<0){

+-    d->private->last_milliseconds=-1;

++    d->private_data->last_milliseconds=-1;

+   }else{

+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;

++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;

+   }

+   return ret2;

+@@ -97,5 +97,5 @@

+   fd_set fdset;

+   struct timeval tv;

+-  struct sg_header *sg_hd=d->private->sg_hd;

++  struct sg_header *sg_hd=d->private_data->sg_hd;

+   int flag=0;

+ 

+@@ -186,5 +186,5 @@

+   int tret1,tret2;

+   int status = 0;

+-  struct sg_header *sg_hd=d->private->sg_hd;

++  struct sg_header *sg_hd=d->private_data->sg_hd;

+   long writebytes=SG_OFF+cmd_len+in_size;

+ 

+@@ -196,5 +196,5 @@

+   memset(sg_hd,0,sizeof(sg_hd)); 

+   memset(sense_buffer,0,SG_MAX_SENSE); 

+-  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);

++  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);

+   sg_hd->twelve_byte = cmd_len == 12;

+   sg_hd->result = 0;

+@@ -210,5 +210,5 @@

+ 

+   if(bytecheck && out_size>in_size){

+-    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 

++    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 

+     /* the size does not remove cmd_len due to the way the kernel

+        driver copies buffers */

+@@ -244,5 +244,5 @@

+ 

+   sigprocmask (SIG_BLOCK, &(d->sigset), NULL );

+-  tret1=clock_gettime(d->private->clock,&tv1);  

++  tret1=clock_gettime(d->private_data->clock,&tv1);  

+   errno=0;

+   status = write(d->cdda_fd, sg_hd, writebytes );

+@@ -290,5 +290,5 @@

+   }

+ 

+-  tret2=clock_gettime(d->private->clock,&tv2);  

++  tret2=clock_gettime(d->private_data->clock,&tv2);  

+   errno=0;

+   status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);

+@@ -314,5 +314,5 @@

+     long i,flag=0;

+     for(i=in_size;i<out_size;i++)

+-      if(d->private->sg_buffer[i]!=bytefill){

++      if(d->private_data->sg_buffer[i]!=bytefill){

+ 	flag=1;

+ 	break;

+@@ -327,7 +327,7 @@

+   errno=0;

+   if(tret1<0 || tret2<0){

+-    d->private->last_milliseconds=-1;

++    d->private_data->last_milliseconds=-1;

+   }else{

+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;

++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;

+   }

+   return(0);

+@@ -348,5 +348,5 @@

+   memset(&hdr,0,sizeof(hdr));

+   memset(sense,0,sizeof(sense));

+-  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);

++  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);

+ 

+   hdr.cmdp = cmd;

+@@ -356,5 +356,5 @@

+   hdr.timeout = 50000;

+   hdr.interface_id = 'S';

+-  hdr.dxferp =  d->private->sg_buffer;

++  hdr.dxferp =  d->private_data->sg_buffer;

+   hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */

+ 

+@@ -401,5 +401,5 @@

+     long i,flag=0;

+     for(i=in_size;i<out_size;i++)

+-      if(d->private->sg_buffer[i]!=bytefill){

++      if(d->private_data->sg_buffer[i]!=bytefill){

+ 	flag=1;

+ 	break;

+@@ -413,5 +413,5 @@

+ 

+   /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */

+-  /* d->private->last_milliseconds = hdr.duration; */

++  /* d->private_data->last_milliseconds = hdr.duration; */

+ 

+   errno = 0;

+@@ -446,7 +446,7 @@

+   handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);

+ 

+-  key = d->private->sg_buffer[2] & 0xf;

+-  ASC = d->private->sg_buffer[12];

+-  ASCQ = d->private->sg_buffer[13];

++  key = d->private_data->sg_buffer[2] & 0xf;

++  ASC = d->private_data->sg_buffer[12];

++  ASCQ = d->private_data->sg_buffer[13];

+   

+   if(key == 2 && ASC == 4 && ASCQ == 1) return 0;

+@@ -493,5 +493,5 @@

+ 

+   {

+-    unsigned char *b=d->private->sg_buffer;

++    unsigned char *b=d->private_data->sg_buffer;

+     if(b[0])return(1); /* Handles only up to 256 bytes */

+     if(b[6])return(1); /* Handles only up to 256 bytes */

+@@ -605,6 +605,6 @@

+   if(mode_sense(d,12,0x01))return(-1);

+ 

+-  d->orgdens = d->private->sg_buffer[4];

+-  return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);

++  d->orgdens = d->private_data->sg_buffer[4];

++  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);

+ }

+ 

+@@ -665,6 +665,6 @@

+   }

+ 

+-  first=d->private->sg_buffer[2];

+-  last=d->private->sg_buffer[3];

++  first=d->private_data->sg_buffer[2];

++  last=d->private_data->sg_buffer[3];

+   tracks=last-first+1;

+ 

+@@ -684,5 +684,5 @@

+     }

+     {

+-      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);

++      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);

+ 

+       d->disc_toc[i-first].bFlags=toc->bFlags;

+@@ -705,5 +705,5 @@

+   }

+   {

+-    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);

++    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);

+     

+     d->disc_toc[i-first].bFlags=toc->bFlags;

+@@ -739,5 +739,5 @@

+ 

+   /* copy to our structure and convert start sector */

+-  tracks = d->private->sg_buffer[1];

++  tracks = d->private_data->sg_buffer[1];

+   if (tracks > MAXTRK) {

+     cderror(d,"003: CDROM reporting illegal number of tracks\n");

+@@ -755,31 +755,31 @@

+     }

+     

+-    d->disc_toc[i].bFlags = d->private->sg_buffer[10];

++    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];

+     d->disc_toc[i].bTrack = i + 1;

+ 

+     d->disc_toc[i].dwStartSector= d->adjust_ssize * 

+-	(((signed char)(d->private->sg_buffer[2])<<24) | 

+-	 (d->private->sg_buffer[3]<<16)|

+-	 (d->private->sg_buffer[4]<<8)|

+-	 (d->private->sg_buffer[5]));

++	(((signed char)(d->private_data->sg_buffer[2])<<24) | 

++	 (d->private_data->sg_buffer[3]<<16)|

++	 (d->private_data->sg_buffer[4]<<8)|

++	 (d->private_data->sg_buffer[5]));

+   }

+ 

+   d->disc_toc[i].bFlags = 0;

+   d->disc_toc[i].bTrack = i + 1;

+-  memcpy (&foo, d->private->sg_buffer+2, 4);

+-  memcpy (&bar, d->private->sg_buffer+6, 4);

++  memcpy (&foo, d->private_data->sg_buffer+2, 4);

++  memcpy (&bar, d->private_data->sg_buffer+6, 4);

+   d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +

+ 						    be32_to_cpu(bar));

+ 

+   d->disc_toc[i].dwStartSector= d->adjust_ssize * 

+-    ((((signed char)(d->private->sg_buffer[2])<<24) | 

+-      (d->private->sg_buffer[3]<<16)|

+-      (d->private->sg_buffer[4]<<8)|

+-      (d->private->sg_buffer[5]))+

++    ((((signed char)(d->private_data->sg_buffer[2])<<24) | 

++      (d->private_data->sg_buffer[3]<<16)|

++      (d->private_data->sg_buffer[4]<<8)|

++      (d->private_data->sg_buffer[5]))+

+      

+-     ((((signed char)(d->private->sg_buffer[6])<<24) | 

+-       (d->private->sg_buffer[7]<<16)|

+-       (d->private->sg_buffer[8]<<8)|

+-       (d->private->sg_buffer[9]))));

++     ((((signed char)(d->private_data->sg_buffer[6])<<24) | 

++       (d->private_data->sg_buffer[7]<<16)|

++       (d->private_data->sg_buffer[8]<<8)|

++       (d->private_data->sg_buffer[9]))));

+ 

+ 

+@@ -818,5 +818,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -837,5 +837,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -855,5 +855,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -873,5 +873,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -891,5 +891,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -909,5 +909,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -923,5 +923,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -937,5 +937,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -951,5 +951,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -965,5 +965,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -979,5 +979,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -993,5 +993,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -1027,5 +1027,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -1040,5 +1040,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -1053,5 +1053,5 @@

+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))

+     return(ret);

+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);

++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);

+   return(0);

+ }

+@@ -1276,5 +1276,5 @@

+   long i;

+   for(i=2351;i>=0;i--)

+-    if(d->private->sg_buffer[i]!=(unsigned char)'\177')

++    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')

+       return(((i+3)>>2)<<2);

+ 

+@@ -1285,5 +1285,5 @@

+   long i,flag=0;

+   for(i=0;i<2352;i++)

+-    if(d->private->sg_buffer[i]!=0){

++    if(d->private_data->sg_buffer[i]!=0){

+       flag=1;

+       break;

+@@ -1622,5 +1622,5 @@

+   if(mode_sense(d,22,0x2A)==0){

+   

+-    b=d->private->sg_buffer;

++    b=d->private_data->sg_buffer;

+     b+=b[3]+4;

+     

+@@ -1670,5 +1670,5 @@

+     return(NULL);

+   }

+-  return (d->private->sg_buffer);

++  return (d->private_data->sg_buffer);

+ }

+ 

+@@ -1726,6 +1726,6 @@

+ 

+   d->error_retry=1;

+-  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);

+-  d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;

++  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);

++  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;

+   d->report_all=1;

+   return(0);

+Index: /trunk/cdparanoia/interface/cooked_interface.c

+===================================================================

+--- /trunk/cdparanoia/interface/cooked_interface.c (revision 15202)

++++ /trunk/cdparanoia/interface/cooked_interface.c (revision 15338)

+@@ -14,11 +14,11 @@

+   struct timespec tv1;

+   struct timespec tv2;

+-  int ret1=clock_gettime(d->private->clock,&tv1);

++  int ret1=clock_gettime(d->private_data->clock,&tv1);

+   int ret2=ioctl(fd, command,arg);

+-  int ret3=clock_gettime(d->private->clock,&tv2);

++  int ret3=clock_gettime(d->private_data->clock,&tv2);

+   if(ret1<0 || ret3<0){

+-    d->private->last_milliseconds=-1;

++    d->private_data->last_milliseconds=-1;

+   }else{

+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;

++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;

+   }

+   return ret2;

+Index: /trunk/cdparanoia/interface/scan_devices.c

+===================================================================

+--- /trunk/cdparanoia/interface/scan_devices.c (revision 15202)

++++ /trunk/cdparanoia/interface/scan_devices.c (revision 15338)

+@@ -265,9 +265,9 @@

+   d->bigendianp=-1; /* We don't know yet... */

+   d->nsectors=-1;

+-  d->private=calloc(1,sizeof(*d->private));

++  d->private_data=calloc(1,sizeof(*d->private_data));

+   {

+     /* goddamnit */

+     struct timespec tv;

+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);

++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);

+   }

+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);

+@@ -675,13 +675,13 @@

+   d->nsectors=-1;

+   d->messagedest = messagedest;

+-  d->private=calloc(1,sizeof(*d->private));

++  d->private_data=calloc(1,sizeof(*d->private_data));

+   {

+     /* goddamnit */

+     struct timespec tv;

+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);

++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);

+   }

+   if(use_sgio){

+     d->interface=SGIO_SCSI;

+-    d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));

++    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));

+     g_fd=d->cdda_fd=dup(d->ioctl_fd);

+   }else{

+@@ -697,6 +697,6 @@

+ 

+     /* malloc our big buffer for scsi commands */

+-    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);

+-    d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;

++    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);

++    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;

+   }

+ 

+@@ -773,7 +773,7 @@

+   if(g_fd!=-1)close(g_fd);

+   if(d){

+-    if(d->private){

+-      if(d->private->sg_hd)free(d->private->sg_hd);

+-      free(d->private);

++    if(d->private_data){

++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);

++      free(d->private_data);

+     }

+     free(d);

+@@ -822,5 +822,5 @@

+   d->bigendianp=-1; /* We don't know yet... */

+   d->nsectors=-1;

+-  d->private=calloc(1,sizeof(*d->private));

++  d->private_data=calloc(1,sizeof(*d->private_data));

+   d->drive_model=copystring("File based test interface");

+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);

diff --git a/cdparanoia-32/cdparanoia-10.2-add-pkgconfig.patch b/cdparanoia-32/cdparanoia-10.2-add-pkgconfig.patch
new file mode 100644
index 00000000..858322f9
--- /dev/null
+++ b/cdparanoia-32/cdparanoia-10.2-add-pkgconfig.patch
@@ -0,0 +1,91 @@
+From 5beb3983942ce92ea18a2a0f2e15f84fb25c27d8 Mon Sep 17 00:00:00 2001
+From: xiphmont <xiphmont@0101bb08-14d6-0310-b084-bc0e0c8e3800>
+Date: Fri, 11 Jun 2010 15:42:00 +0000
+Subject: [PATCH] Add pkgconfig file to cdparanoia; closes Trac #1706
+
+git-svn-id: https://svn.xiph.org/trunk/cdparanoia@17289 0101bb08-14d6-0310-b084-bc0e0c8e3800
+---
+ Makefile.in        |  7 +++++--
+ cdparanoia-3.pc.in | 12 ++++++++++++
+ configure.in       |  5 ++++-
+ 3 files changed, 21 insertions(+), 3 deletions(-)
+ create mode 100644 cdparanoia-3.pc.in
+
+diff --git a/Makefile.in b/Makefile.in
+index 25c91ce..bfef153 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,7 @@
+ # DO NOT EDIT BELOW! ##########################################################
+ # (unless, of course, you know what you are doing :) ##########################
+ 
+-VERSION=10.2
++VERSION=@VERSION@
+ VPATH=@srcdir@
+ srcdir=@srcdir@
+ 
+@@ -23,6 +23,7 @@ BINDIR=@bindir@
+ MANDIR=@mandir@
+ INCLUDEDIR=@includedir@
+ LIBDIR=@libdir@
++PKGCONFIGDIR=@libdir@/pkgconfig
+ PWD = $(shell pwd)
+ 
+ OFILES = main.o report.o header.o buffering_write.o cachetest.o
+@@ -85,6 +86,8 @@ install:
+ 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+ 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(PKGCONFIGDIR) 
++	$(INSTALL) -m 0644 $(srcdir)/cdparanoia-3.pc $(DESTDIR)$(PKGCONFIGDIR) 
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+ 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
+@@ -104,6 +107,6 @@ distclean:
+ 	cd interface && $(MAKE) distclean
+ 	cd paranoia && $(MAKE) distclean
+ 	-rm -f cdparanoia *~ config.* *.o *.wav *.aifc *.raw test.file \
+-		Makefile verify_test core gmon.out
++		Makefile verify_test core gmon.out cdparanoia-3.pc
+ 
+ .PHONY: all debug test lib slib install clean distclean
+diff --git a/cdparanoia-3.pc.in b/cdparanoia-3.pc.in
+new file mode 100644
+index 0000000..3a15099
+--- /dev/null
++++ b/cdparanoia-3.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@ 
++exec_prefix=@exec_prefix@ 
++libdir=@libdir@ 
++includedir=@includedir@ 
++
++Name: Cdparanoia III 
++Description: Compact Disc Digital Audio (CDDA) Digital Audio Extraction (DAE) library 
++Requires: 
++Version: @VERSION@ 
++Libs: -L${libdir} -lcdda_interface -lcdda_paranoia 
++Cflags: -I${includedir} 
++
+diff --git a/configure.in b/configure.in
+index 3ad98ca..3ae6989 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,5 +1,8 @@
+ AC_INIT(interface/interface.c)
+ 
++VERSION="10.2" 
++AC_SUBST(VERSION) 
++
+ AC_CANONICAL_HOST
+ 
+ if test -z "$CC"; then
+@@ -67,4 +70,4 @@ AC_SUBST(OPT)
+ AC_SUBST(DEBUG)
+ AC_SUBST(CC)
+ 
+-AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
++AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile cdparanoia-3.pc)
+-- 
+2.26.2
+
diff --git a/cdparanoia-32/cdparanoia-10.2-endian.patch b/cdparanoia-32/cdparanoia-10.2-endian.patch
new file mode 100644
index 00000000..eaed961b
--- /dev/null
+++ b/cdparanoia-32/cdparanoia-10.2-endian.patch
@@ -0,0 +1,12 @@
+diff -up cdparanoia-III-10.2/interface/interface.c.jx cdparanoia-III-10.2/interface/interface.c
+--- cdparanoia-III-10.2/interface/interface.c.jx	2009-02-10 14:25:02.000000000 -0500
++++ cdparanoia-III-10.2/interface/interface.c	2009-02-10 14:25:49.000000000 -0500
+@@ -115,7 +115,7 @@ long cdda_read_timed(cdrom_drive *d, voi
+ 
+       if(sectors>0){
+ 	/* byteswap? */
+-	if(d->bigendianp==-1) /* not determined yet */
++	if(buffer && d->bigendianp==-1) /* not determined yet */
+ 	  d->bigendianp=data_bigendianp(d);
+ 	
+ 	if(d->bigendianp!=bigendianp()){
diff --git a/cdparanoia-32/cdparanoia-10.2-format-security.patch b/cdparanoia-32/cdparanoia-10.2-format-security.patch
new file mode 100644
index 00000000..20b5bc46
--- /dev/null
+++ b/cdparanoia-32/cdparanoia-10.2-format-security.patch
@@ -0,0 +1,16 @@
+diff -Naur cdparanoia-III-10.2.orig/main.c cdparanoia-III-10.2/main.c
+--- cdparanoia-III-10.2.orig/main.c	2008-09-11 23:11:02.000000000 +0200
++++ cdparanoia-III-10.2/main.c	2014-04-14 21:24:10.023000000 +0200
+@@ -588,10 +588,10 @@
+ 	    buffer[aheadposition+19]='>';
+ 	}
+    
+-	fprintf(stderr,buffer);
++	fprintf(stderr, "%s", buffer);
+        
+ 	if (logfile != NULL && function==-1) {
+-	  fprintf(logfile,buffer+1);
++	  fprintf(logfile, "%s", buffer+1);
+ 	  fprintf(logfile,"\n\n");
+ 	  fflush(logfile);
+ 	}
diff --git a/cdparanoia-32/cdparanoia-10.2-install.patch b/cdparanoia-32/cdparanoia-10.2-install.patch
new file mode 100644
index 00000000..bd43d5e5
--- /dev/null
+++ b/cdparanoia-32/cdparanoia-10.2-install.patch
@@ -0,0 +1,50 @@
+diff -Naupr cdparanoia-III-10.2.orig/Makefile.in cdparanoia-III-10.2/Makefile.in
+--- cdparanoia-III-10.2.orig/Makefile.in	2008-09-11 22:33:30.000000000 +0200
++++ cdparanoia-III-10.2/Makefile.in	2008-12-22 22:31:45.578372040 +0100
+@@ -63,28 +63,28 @@ slib:
+ 	cd paranoia && $(MAKE) slib
+ 
+ install:
+-	$(INSTALL) -d -m 0755 $(BINDIR)
+-	$(INSTALL) -m 755 $(srcdir)/cdparanoia $(BINDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)/man1
+-	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
+-	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
+-	$(INSTALL) -d -m 0755 $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0755 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0755 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
+ 	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so.0
++		$(DESTDIR)$(LIBDIR)/libcdda_interface.so.0
+ 	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so
++		$(DESTDIR)$(LIBDIR)/libcdda_interface.so
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so.0
++		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so
++		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+ 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
diff --git a/cdparanoia-32/cdparanoia-10.2-ldflags.patch b/cdparanoia-32/cdparanoia-10.2-ldflags.patch
index fa643cec..91e14d04 100644
--- a/cdparanoia-32/cdparanoia-10.2-ldflags.patch
+++ b/cdparanoia-32/cdparanoia-10.2-ldflags.patch
@@ -1,24 +1,24 @@
-diff -pruN cdparanoia-III-10.2.orig/interface/Makefile.in cdparanoia-III-10.2/interface/Makefile.in
---- cdparanoia-III-10.2.orig/interface/Makefile.in	2011-12-30 16:30:42.292074083 +1100
-+++ cdparanoia-III-10.2/interface/Makefile.in	2011-12-30 16:30:59.983074083 +1100
+diff -up cdparanoia-III-10.2/interface/Makefile.in.jx cdparanoia-III-10.2/interface/Makefile.in
+--- cdparanoia-III-10.2/interface/Makefile.in.jx	2008-08-21 12:08:54.000000000 -0400
++++ cdparanoia-III-10.2/interface/Makefile.in	2018-03-07 13:12:53.999947802 -0500
 @@ -46,7 +46,7 @@ libcdda_interface.a: 	$(OFILES)
  	$(RANLIB) libcdda_interface.a
  
  libcdda_interface.so: 	$(OFILES)	
 -	$(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
-+	$(CC) -fpic -shared $(LDFLAGS) -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
++	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
  	[ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
  	[ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
  
-diff -pruN cdparanoia-III-10.2.orig/paranoia/Makefile.in cdparanoia-III-10.2/paranoia/Makefile.in
---- cdparanoia-III-10.2.orig/paranoia/Makefile.in	2011-12-30 16:30:42.292074083 +1100
-+++ cdparanoia-III-10.2/paranoia/Makefile.in	2011-12-30 16:31:53.520074087 +1100
+diff -up cdparanoia-III-10.2/paranoia/Makefile.in.jx cdparanoia-III-10.2/paranoia/Makefile.in
+--- cdparanoia-III-10.2/paranoia/Makefile.in.jx	2008-09-04 15:02:47.000000000 -0400
++++ cdparanoia-III-10.2/paranoia/Makefile.in	2018-03-07 13:12:39.352765050 -0500
 @@ -44,7 +44,7 @@ libcdda_paranoia.a: 	$(OFILES)
  	$(RANLIB) libcdda_paranoia.a
  
  libcdda_paranoia.so: 	$(OFILES)	
 -	$(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
-+	$(CC) -fpic -shared $(LDFLAGS) -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
++	$(CC) $(LDFLAGS) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
  	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
  	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
  
diff --git a/cdparanoia-32/cdparanoia-use-proper-gnu-config-files.patch b/cdparanoia-32/cdparanoia-use-proper-gnu-config-files.patch
new file mode 100644
index 00000000..75ae140e
--- /dev/null
+++ b/cdparanoia-32/cdparanoia-use-proper-gnu-config-files.patch
@@ -0,0 +1,27 @@
+Index: cdparanoia-III-10.2/configure
+===================================================================
+--- cdparanoia-III-10.2.orig/configure
++++ cdparanoia-III-10.2/configure
+@@ -1289,9 +1289,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+-cp $srcdir/configure.guess $srcdir/config.guess
+-cp $srcdir/configure.sub $srcdir/config.sub
+-
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+   if test -f $ac_dir/install-sh; then
+Index: cdparanoia-III-10.2/configure.in
+===================================================================
+--- cdparanoia-III-10.2.orig/configure.in
++++ cdparanoia-III-10.2/configure.in
+@@ -1,8 +1,5 @@
+ AC_INIT(interface/interface.c)
+ 
+-cp $srcdir/configure.guess $srcdir/config.guess
+-cp $srcdir/configure.sub $srcdir/config.sub
+-
+ AC_CANONICAL_HOST
+ 
+ if test -z "$CC"; then