aboutsummaryrefslogtreecommitdiff
path: root/audio/cdparanoia
diff options
context:
space:
mode:
Diffstat (limited to 'audio/cdparanoia')
-rw-r--r--audio/cdparanoia/files/patch-Makefile.in10
-rw-r--r--audio/cdparanoia/files/patch-configure7
-rw-r--r--audio/cdparanoia/files/patch-interface_Makefile.in (renamed from audio/cdparanoia/files/patch-interface-Makefile.in)11
-rw-r--r--audio/cdparanoia/files/patch-interface_cdda__interface.h (renamed from audio/cdparanoia/files/patch-interface-cdda_interface.h)8
-rw-r--r--audio/cdparanoia/files/patch-interface_common__interface.c (renamed from audio/cdparanoia/files/patch-interface-common_interface.c)15
-rw-r--r--audio/cdparanoia/files/patch-interface_cooked__interface.c (renamed from audio/cdparanoia/files/patch-interface-cooked_interface.c)10
-rw-r--r--audio/cdparanoia/files/patch-interface_interface.c (renamed from audio/cdparanoia/files/patch-interface-interface.c)6
-rw-r--r--audio/cdparanoia/files/patch-interface_low__interface.h (renamed from audio/cdparanoia/files/patch-interface-low_interface.h)5
-rw-r--r--audio/cdparanoia/files/patch-interface_scan__devices.c (renamed from audio/cdparanoia/files/patch-interface-scan_devices.c)20
-rw-r--r--audio/cdparanoia/files/patch-interface_scsi__interface.c (renamed from audio/cdparanoia/files/patch-interface-scsi_interface.c)26
-rw-r--r--audio/cdparanoia/files/patch-interface_utils.h (renamed from audio/cdparanoia/files/patch-interface-utils.h)5
-rw-r--r--audio/cdparanoia/files/patch-paranoia_Makefile.in (renamed from audio/cdparanoia/files/patch-paranoia-Makefile.in)4
-rw-r--r--audio/cdparanoia/files/patch-paranoia_cdda__paranoia.h (renamed from audio/cdparanoia/files/patch-paranoia-cdda_paranoia.h)5
-rw-r--r--audio/cdparanoia/files/patch-utils.h5
-rw-r--r--audio/cdparanoia/files/patch-version.h5
15 files changed, 67 insertions, 75 deletions
diff --git a/audio/cdparanoia/files/patch-Makefile.in b/audio/cdparanoia/files/patch-Makefile.in
index 1cf4eb97e407..4137b02ec1aa 100644
--- a/audio/cdparanoia/files/patch-Makefile.in
+++ b/audio/cdparanoia/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2001-03-28 00:46:58.000000000 +0200
-+++ Makefile.in 2014-02-09 13:21:39.449603274 +0100
-@@ -8,7 +8,7 @@
+--- Makefile.in.orig 2001-03-27 22:46:58 UTC
++++ Makefile.in
+@@ -8,7 +8,7 @@ VPATH=@srcdir@
srcdir=@srcdir@
@SET_MAKE@
@@ -9,7 +9,7 @@
OPT=@OPT@ $(FLAGS)
DEBUG=@DEBUG@ $(FLAGS)
CC=@CC@
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ export VERSION
ifeq ($(STATIC),TRUE)
LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \
@@ -18,7 +18,7 @@
LIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
else
LIBS = -lcdda_interface -lcdda_paranoia -lm
-@@ -64,28 +64,27 @@
+@@ -64,28 +64,27 @@ slib:
cd paranoia && $(MAKE) slib
install:
diff --git a/audio/cdparanoia/files/patch-configure b/audio/cdparanoia/files/patch-configure
index 5b35c542df07..8bbd2f313ccf 100644
--- a/audio/cdparanoia/files/patch-configure
+++ b/audio/cdparanoia/files/patch-configure
@@ -3,10 +3,9 @@ Index: configure
RCS file: /home/cvs/cdparanoia/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- configure 2003/01/05 09:46:26 1.1.1.1
-+++ configure 2003/01/05 12:41:47 1.2
-@@ -1084,7 +1084,6 @@
+--- configure.orig 2000-04-15 15:13:01 UTC
++++ configure
+@@ -1084,7 +1084,6 @@ EOF
fi
diff --git a/audio/cdparanoia/files/patch-interface-Makefile.in b/audio/cdparanoia/files/patch-interface_Makefile.in
index ba4aee123c93..fc54350e5acd 100644
--- a/audio/cdparanoia/files/patch-interface-Makefile.in
+++ b/audio/cdparanoia/files/patch-interface_Makefile.in
@@ -3,10 +3,9 @@ Index: interface/Makefile.in
RCS file: /home/cvs/cdparanoia/interface/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.3
-diff -u -r1.1.1.1 -r1.3
---- interface/Makefile.in 2003/01/05 09:46:26 1.1.1.1
-+++ interface/Makefile.in 2003/01/05 12:03:46 1.3
-@@ -9,13 +9,13 @@
+--- interface/Makefile.in.orig 1999-12-14 04:27:59 UTC
++++ interface/Makefile.in
+@@ -9,13 +9,13 @@ srcdir=@srcdir@
@SET_MAKE@
FLAGS=@SBPCD_H@ @UCDROM_H@ @TYPESIZES@ @CFLAGS@
OPT=@OPT@ $(FLAGS)
@@ -22,7 +21,7 @@ diff -u -r1.1.1.1 -r1.3
CPPFLAGS+=-D_REENTRANT
OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\
-@@ -23,19 +23,15 @@
+@@ -23,19 +23,15 @@ OFILES = scan_devices.o common_interface
export VERSION
@@ -46,7 +45,7 @@ diff -u -r1.1.1.1 -r1.3
test:
$(MAKE) libcdda_interface.a CFLAGS="$(DEBUG)"
$(CC) $(DEBUG) -c test.c
-@@ -46,7 +42,7 @@
+@@ -46,7 +42,7 @@ libcdda_interface.a: $(OFILES)
$(RANLIB) libcdda_interface.a
libcdda_interface.so: $(OFILES)
diff --git a/audio/cdparanoia/files/patch-interface-cdda_interface.h b/audio/cdparanoia/files/patch-interface_cdda__interface.h
index cf44b717b52d..5a1e76b22cfa 100644
--- a/audio/cdparanoia/files/patch-interface-cdda_interface.h
+++ b/audio/cdparanoia/files/patch-interface_cdda__interface.h
@@ -1,5 +1,5 @@
---- interface/cdda_interface.h.orig Sat Mar 24 02:15:46 2001
-+++ interface/cdda_interface.h Thu Jan 5 22:27:11 2006
+--- interface/cdda_interface.h.orig 2001-03-24 01:15:46 UTC
++++ interface/cdda_interface.h
@@ -21,6 +21,11 @@
#include <sys/types.h>
#include <signal.h>
@@ -12,7 +12,7 @@
#define MAXTRK 100
typedef struct TOC { /* structure of table of contents */
-@@ -47,13 +52,19 @@
+@@ -47,13 +52,19 @@ typedef struct cdrom_drive{
int opened; /* This struct may just represent a candidate for opening */
char *cdda_device_name;
@@ -34,7 +34,7 @@
int interface;
int bigendianp;
int nsectors;
-@@ -83,9 +94,13 @@
+@@ -83,9 +94,13 @@ typedef struct cdrom_drive{
int is_mmc;
/* SCSI command buffer and offset pointers */
diff --git a/audio/cdparanoia/files/patch-interface-common_interface.c b/audio/cdparanoia/files/patch-interface_common__interface.c
index 1248487506dc..f631f86bae78 100644
--- a/audio/cdparanoia/files/patch-interface-common_interface.c
+++ b/audio/cdparanoia/files/patch-interface_common__interface.c
@@ -3,9 +3,8 @@ Index: interface/common_interface.c
RCS file: /home/cvs/cdparanoia/interface/common_interface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.5
-diff -u -r1.1.1.1 -r1.5
---- interface/common_interface.c 2003/01/05 09:46:26 1.1.1.1
-+++ interface/common_interface.c 2003/01/06 21:39:53 1.5
+--- interface/common_interface.c.orig 2000-04-19 22:41:04 UTC
++++ interface/common_interface.c
@@ -13,12 +13,19 @@
#include "utils.h"
#include "smallft.h"
@@ -26,7 +25,7 @@ diff -u -r1.1.1.1 -r1.5
return(1); /* failure */
return(0);
-@@ -26,6 +33,7 @@
+@@ -26,6 +33,7 @@ int ioctl_ping_cdrom(int fd){
}
@@ -34,7 +33,7 @@ diff -u -r1.1.1.1 -r1.5
/* Use the ioctl thingy above ping the cdrom; this will get model info */
char *atapi_drive_info(int fd){
/* Work around the fact that the struct grew without warning in
-@@ -46,6 +54,7 @@
+@@ -46,6 +54,7 @@ char *atapi_drive_info(int fd){
free(id);
return(ret);
}
@@ -42,7 +41,7 @@ diff -u -r1.1.1.1 -r1.5
int data_bigendianp(cdrom_drive *d){
float lsb_votes=0;
-@@ -171,7 +180,9 @@
+@@ -171,7 +180,9 @@ int data_bigendianp(cdrom_drive *d){
knows the leasoud/leadin size. */
int FixupTOC(cdrom_drive *d,int tracks){
@@ -52,7 +51,7 @@ diff -u -r1.1.1.1 -r1.5
int j;
/* First off, make sure the 'starting sector' is >=0 */
-@@ -208,6 +219,8 @@
+@@ -208,6 +219,8 @@ int FixupTOC(cdrom_drive *d,int tracks){
/* For a scsi device, the ioctl must go to the specialized SCSI
CDROM device, not the generic device. */
@@ -61,7 +60,7 @@ diff -u -r1.1.1.1 -r1.5
if (d->ioctl_fd != -1) {
int result;
-@@ -231,6 +244,7 @@
+@@ -231,6 +244,7 @@ int FixupTOC(cdrom_drive *d,int tracks){
return 1;
}
}
diff --git a/audio/cdparanoia/files/patch-interface-cooked_interface.c b/audio/cdparanoia/files/patch-interface_cooked__interface.c
index cc067fdce434..8d739c3f6ad1 100644
--- a/audio/cdparanoia/files/patch-interface-cooked_interface.c
+++ b/audio/cdparanoia/files/patch-interface_cooked__interface.c
@@ -1,5 +1,5 @@
---- interface/cooked_interface.c.orig Wed Apr 19 15:41:04 2000
-+++ interface/cooked_interface.c Fri Nov 7 17:16:03 2003
+--- interface/cooked_interface.c.orig 2000-04-19 22:41:04 UTC
++++ interface/cooked_interface.c
@@ -1,6 +1,8 @@
/******************************************************************
* CopyPolicy: GNU Public License 2 applies
@@ -17,7 +17,7 @@
static int cooked_readtoc (cdrom_drive *d){
int i;
int tracks;
-@@ -129,6 +132,142 @@
+@@ -129,6 +132,142 @@ static long cooked_read (cdrom_drive *d,
return(sectors);
}
@@ -160,7 +160,7 @@
/* hook */
static int Dummy (cdrom_drive *d,int Switch){
return(0);
-@@ -193,6 +332,7 @@
+@@ -193,6 +332,7 @@ static void check_exceptions(cdrom_drive
int cooked_init_drive (cdrom_drive *d){
int ret;
@@ -168,7 +168,7 @@
switch(d->drive_type){
case MATSUSHITA_CDROM_MAJOR: /* sbpcd 1 */
case MATSUSHITA_CDROM2_MAJOR: /* sbpcd 2 */
-@@ -243,6 +383,9 @@
+@@ -243,6 +383,9 @@ int cooked_init_drive (cdrom_drive *d){
default:
d->nsectors=40;
}
diff --git a/audio/cdparanoia/files/patch-interface-interface.c b/audio/cdparanoia/files/patch-interface_interface.c
index 99e7372081e7..3b8a43d48496 100644
--- a/audio/cdparanoia/files/patch-interface-interface.c
+++ b/audio/cdparanoia/files/patch-interface_interface.c
@@ -1,6 +1,6 @@
---- interface/interface.c.orig Thu Apr 20 00:41:04 2000
-+++ interface/interface.c Sat Jan 7 14:31:19 2006
-@@ -30,11 +30,24 @@
+--- interface/interface.c.orig 2000-04-19 22:41:04 UTC
++++ interface/interface.c
+@@ -30,11 +30,24 @@ int cdda_close(cdrom_drive *d){
_clean_messages(d);
if(d->cdda_device_name)free(d->cdda_device_name);
diff --git a/audio/cdparanoia/files/patch-interface-low_interface.h b/audio/cdparanoia/files/patch-interface_low__interface.h
index 1ad09f12b69b..4d8f491e4455 100644
--- a/audio/cdparanoia/files/patch-interface-low_interface.h
+++ b/audio/cdparanoia/files/patch-interface_low__interface.h
@@ -3,9 +3,8 @@ Index: interface/low_interface.h
RCS file: /home/cvs/cdparanoia/interface/low_interface.h,v
retrieving revision 1.1.1.1
retrieving revision 1.3
-diff -u -r1.1.1.1 -r1.3
---- interface/low_interface.h 2003/01/05 09:46:26 1.1.1.1
-+++ interface/low_interface.h 2003/01/06 21:26:23 1.3
+--- interface/low_interface.h.orig 2001-03-26 06:12:11 UTC
++++ interface/low_interface.h
@@ -25,6 +25,8 @@
#include <sys/time.h>
#include <sys/types.h>
diff --git a/audio/cdparanoia/files/patch-interface-scan_devices.c b/audio/cdparanoia/files/patch-interface_scan__devices.c
index 7cc9b3b7b5be..ce83179151b5 100644
--- a/audio/cdparanoia/files/patch-interface-scan_devices.c
+++ b/audio/cdparanoia/files/patch-interface_scan__devices.c
@@ -1,5 +1,5 @@
---- interface/scan_devices.c.orig Mon Mar 26 07:44:01 2001
-+++ interface/scan_devices.c Thu Jan 5 22:27:44 2006
+--- interface/scan_devices.c.orig 2001-03-26 05:44:01 UTC
++++ interface/scan_devices.c
@@ -1,6 +1,8 @@
/******************************************************************
* CopyPolicy: GNU Public License 2 applies
@@ -18,7 +18,7 @@
static char *scsi_cdrom_prefixes[]={
"/dev/scd",
"/dev/sr",
-@@ -49,6 +53,17 @@
+@@ -49,6 +53,17 @@ static char *cdrom_devices[]={
"/dev/cm206cd",
"/dev/gscd",
"/dev/optcd",NULL};
@@ -36,7 +36,7 @@
/* Functions here look for a cdrom drive; full init of a drive type
happens in interface.c */
-@@ -75,10 +90,12 @@
+@@ -75,10 +90,12 @@ cdrom_drive *cdda_find_a_cdrom(int messa
if((d=cdda_identify(buffer,messagedest,messages)))
return(d);
idmessage(messagedest,messages,"",NULL);
@@ -49,7 +49,7 @@
}
}else{
/* Name. Go for it. */
-@@ -117,8 +134,14 @@
+@@ -117,8 +134,14 @@ cdrom_drive *cdda_identify(const char *d
}
#endif
@@ -64,7 +64,7 @@
#ifdef CDDA_TEST
if(!d)d=cdda_identify_test(device,messagedest,messages);
-@@ -143,6 +166,7 @@
+@@ -143,6 +166,7 @@ char *test_resolve_symlink(const char *f
}
@@ -72,7 +72,7 @@
cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest,
char **messages){
-@@ -275,6 +299,61 @@
+@@ -275,6 +299,61 @@ cdrom_drive *cdda_identify_cooked(const
return(d);
}
@@ -134,7 +134,7 @@
struct sg_id {
long l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */
long l2; /* Unique id */
-@@ -390,6 +469,7 @@
+@@ -390,6 +469,7 @@ matchfail:
if(dev!=-1)close(dev);
return(NULL);
}
@@ -142,7 +142,7 @@
void strscat(char *a,char *b,int n){
int i;
-@@ -401,6 +481,7 @@
+@@ -401,6 +481,7 @@ void strscat(char *a,char *b,int n){
strcat(a," ");
}
@@ -150,7 +150,7 @@
/* At this point, we're going to punt compatability before SG2, and
allow only SG2 and SG3 */
static int verify_SG_version(cdrom_drive *d,int messagedest,
-@@ -653,6 +734,89 @@
+@@ -653,6 +734,89 @@ cdda_identify_scsi_fail:
if(g_fd!=-1)close(g_fd);
return(NULL);
}
diff --git a/audio/cdparanoia/files/patch-interface-scsi_interface.c b/audio/cdparanoia/files/patch-interface_scsi__interface.c
index b482169b4dfd..15fe0300e0d7 100644
--- a/audio/cdparanoia/files/patch-interface-scsi_interface.c
+++ b/audio/cdparanoia/files/patch-interface_scsi__interface.c
@@ -1,5 +1,5 @@
---- interface/scsi_interface.c.orig 2001-03-23 17:15:46.000000000 -0800
-+++ interface/scsi_interface.c 2011-10-17 21:33:00.000000000 -0700
+--- interface/scsi_interface.c.orig 2001-03-24 01:15:46 UTC
++++ interface/scsi_interface.c
@@ -3,6 +3,8 @@
* Original interface.c Copyright (C) 1994-1997
* Eissfeldt heiko@colossus.escape.de
@@ -9,7 +9,7 @@
*
* Generic SCSI interface specific code.
*
-@@ -23,6 +25,7 @@
+@@ -23,6 +25,7 @@ static void tweak_SG_buffer(cdrom_drive
int table,reserved;
char buffer[256];
@@ -17,7 +17,7 @@
/* maximum transfer size? */
if(ioctl(d->cdda_fd,SG_GET_RESERVED_SIZE,&reserved)){
/* Up, guess not. */
-@@ -59,8 +62,17 @@
+@@ -59,8 +62,17 @@ static void tweak_SG_buffer(cdrom_drive
cdmessage(d,"\tCouldn't disable command queue! Continuing anyway...\n");
}
@@ -35,7 +35,7 @@
static void reset_scsi(cdrom_drive *d){
int arg;
d->enable_cdda(d,0);
-@@ -74,6 +86,30 @@
+@@ -74,6 +86,30 @@ static void reset_scsi(cdrom_drive *d){
d->enable_cdda(d,1);
}
@@ -66,7 +66,7 @@
static void clear_garbage(cdrom_drive *d){
fd_set fdset;
struct timeval tv;
-@@ -104,8 +140,10 @@
+@@ -104,8 +140,10 @@ static void clear_garbage(cdrom_drive *d
flag=1;
}
}
@@ -77,7 +77,7 @@
static int handle_scsi_cmd(cdrom_drive *d,
unsigned int cmd_len,
unsigned int in_size,
-@@ -284,6 +322,95 @@
+@@ -284,6 +322,95 @@ static int handle_scsi_cmd(cdrom_drive *
return(0);
}
@@ -173,7 +173,7 @@
/* Group 1 (10b) command */
static int mode_sense_atapi(cdrom_drive *d,int size,int page){
-@@ -833,30 +960,37 @@
+@@ -833,30 +960,37 @@ static long scsi_read_map (cdrom_drive *
while(1) {
if((err=map(d,(p?buffer:NULL),begin,sectors))){
if(d->report_all){
@@ -220,7 +220,7 @@
}
if(!d->error_retry)return(-7);
-@@ -1307,6 +1441,7 @@
+@@ -1307,6 +1441,7 @@ static void check_fua_bit(cdrom_drive *d
return;
}
@@ -228,7 +228,7 @@
static int check_atapi(cdrom_drive *d){
int atapiret=-1;
int fd = d->cdda_fd; /* this is the correct fd (not ioctl_fd), as the
-@@ -1333,6 +1468,53 @@
+@@ -1333,6 +1468,53 @@ static int check_atapi(cdrom_drive *d){
}
}
@@ -282,7 +282,7 @@
static int check_mmc(cdrom_drive *d){
char *b;
cdmessage(d,"\nChecking for MMC style command set...\n");
-@@ -1379,6 +1561,7 @@
+@@ -1379,6 +1561,7 @@ static void check_exceptions(cdrom_drive
}
}
@@ -290,7 +290,7 @@
/* request vendor brand and model */
unsigned char *scsi_inquiry(cdrom_drive *d){
memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6);
-@@ -1389,6 +1572,7 @@
+@@ -1389,6 +1572,7 @@ unsigned char *scsi_inquiry(cdrom_drive
}
return (d->sg_buffer);
}
@@ -298,7 +298,7 @@
int scsi_init_drive(cdrom_drive *d){
-@@ -1458,8 +1642,12 @@
+@@ -1458,8 +1642,12 @@ int scsi_init_drive(cdrom_drive *d){
check_fua_bit(d);
d->error_retry=1;
diff --git a/audio/cdparanoia/files/patch-interface-utils.h b/audio/cdparanoia/files/patch-interface_utils.h
index 49b0b57289c4..f89e36217135 100644
--- a/audio/cdparanoia/files/patch-interface-utils.h
+++ b/audio/cdparanoia/files/patch-interface_utils.h
@@ -3,9 +3,8 @@ Index: interface/utils.h
RCS file: /home/cvs/cdparanoia/interface/utils.h,v
retrieving revision 1.1.1.1
retrieving revision 1.3
-diff -u -r1.1.1.1 -r1.3
---- interface/utils.h 2003/01/05 09:46:26 1.1.1.1
-+++ interface/utils.h 2003/01/06 23:34:21 1.3
+--- interface/utils.h.orig 2000-04-19 22:41:04 UTC
++++ interface/utils.h
@@ -1,4 +1,9 @@
+#ifdef LINUX
#include <endian.h>
diff --git a/audio/cdparanoia/files/patch-paranoia-Makefile.in b/audio/cdparanoia/files/patch-paranoia_Makefile.in
index 32d7c25fc532..f08e7c035cb2 100644
--- a/audio/cdparanoia/files/patch-paranoia-Makefile.in
+++ b/audio/cdparanoia/files/patch-paranoia_Makefile.in
@@ -1,6 +1,6 @@
---- paranoia/Makefile.in.orig
+--- paranoia/Makefile.in.orig 1999-12-14 04:28:04 UTC
+++ paranoia/Makefile.in
-@@ -24,18 +24,14 @@
+@@ -24,18 +24,14 @@ OFILES = paranoia.o p_block.o overlap.o
LIBS = ../interface/libcdda_interface.a -lm
export VERSION
diff --git a/audio/cdparanoia/files/patch-paranoia-cdda_paranoia.h b/audio/cdparanoia/files/patch-paranoia_cdda__paranoia.h
index 3d32c9f6982d..f49133c7992a 100644
--- a/audio/cdparanoia/files/patch-paranoia-cdda_paranoia.h
+++ b/audio/cdparanoia/files/patch-paranoia_cdda__paranoia.h
@@ -3,9 +3,8 @@ Index: paranoia/cdda_paranoia.h
RCS file: /home/cvs/cdparanoia/paranoia/cdda_paranoia.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- paranoia/cdda_paranoia.h 2003/01/05 09:46:26 1.1.1.1
-+++ paranoia/cdda_paranoia.h 2003/01/05 12:55:20 1.2
+--- paranoia/cdda_paranoia.h.orig 2001-03-24 01:15:47 UTC
++++ paranoia/cdda_paranoia.h
@@ -34,6 +34,8 @@
#define PARANOIA_MODE_NEVERSKIP 32
diff --git a/audio/cdparanoia/files/patch-utils.h b/audio/cdparanoia/files/patch-utils.h
index 3a1f6796814b..bca77cd1c0ba 100644
--- a/audio/cdparanoia/files/patch-utils.h
+++ b/audio/cdparanoia/files/patch-utils.h
@@ -3,9 +3,8 @@ Index: utils.h
RCS file: /home/cvs/cdparanoia/utils.h,v
retrieving revision 1.1.1.1
retrieving revision 1.3
-diff -u -r1.1.1.1 -r1.3
---- utils.h 2003/01/05 09:46:26 1.1.1.1
-+++ utils.h 2003/01/06 23:34:21 1.3
+--- utils.h.orig 2000-04-19 22:41:04 UTC
++++ utils.h
@@ -1,5 +1,9 @@
#include <stdlib.h>
+#ifdef Linux
diff --git a/audio/cdparanoia/files/patch-version.h b/audio/cdparanoia/files/patch-version.h
index 179759417811..ef314df2e976 100644
--- a/audio/cdparanoia/files/patch-version.h
+++ b/audio/cdparanoia/files/patch-version.h
@@ -3,9 +3,8 @@ Index: version.h
RCS file: /home/cvs/cdparanoia/version.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- version.h 2003/01/05 09:46:26 1.1.1.1
-+++ version.h 2003/01/07 00:49:01 1.2
+--- version.h.orig 2001-03-24 01:15:45 UTC
++++ version.h
@@ -8,6 +8,8 @@