diff -Nru cdparanoia-3.10.2+debian/debian/changelog cdparanoia-3.10.2+debian/debian/changelog --- cdparanoia-3.10.2+debian/debian/changelog 2017-11-17 21:00:09.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/changelog 2018-01-30 05:28:04.000000000 +0000 @@ -1,3 +1,25 @@ +cdparanoia (3.10.2+debian-13) unstable; urgency=medium + + * debian/control: Update Vcs-*. + * debian/rules: Add option --no-parallel (Closes: #888727) + * debian/patches/0009-dh-autoconf-genrate-config-files.patch + * debian/rules: Copy config.guess and config.sub to update config + files by dh-autoreconf (Closes: #888725) + + -- TANIGUCHI Takaki Tue, 30 Jan 2018 14:28:04 +0900 + +cdparanoia (3.10.2+debian-12) unstable; urgency=medium + + * Bump Standards-Version 4.1.3 + * debian/compat: Bump to 10. + * Move Vcs-* to salsa.debian.org. + * Update debehelper version. + * debian/copyright: Remove duplicate license definition. + * debian/rules: Rewrite in modern dh style. + + Add debug symbol. (Closes: #836978) + + -- TANIGUCHI Takaki Sat, 27 Jan 2018 23:21:37 +0900 + cdparanoia (3.10.2+debian-11.1) unstable; urgency=medium [ Manuel A. Fernandez Montecelo ] diff -Nru cdparanoia-3.10.2+debian/debian/compat cdparanoia-3.10.2+debian/debian/compat --- cdparanoia-3.10.2+debian/debian/compat 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/compat 2018-01-30 05:28:04.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru cdparanoia-3.10.2+debian/debian/control cdparanoia-3.10.2+debian/debian/control --- cdparanoia-3.10.2+debian/debian/control 2017-11-17 20:59:34.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/control 2018-01-30 05:28:04.000000000 +0000 @@ -5,12 +5,11 @@ Uploaders: TANIGUCHI Takaki , Rogério Brito Build-Depends: - debhelper (>= 8.1.3~), - autotools-dev, + debhelper (>= 11), libcam-dev [kfreebsd-any] -Standards-Version: 3.9.3 -Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/cdparanoia.git -Vcs-Git: git://git.debian.org/pkg-opt-media/cdparanoia.git +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/optical-media-team/cdparanoia +Vcs-Git: https://salsa.debian.org/optical-media-team/cdparanoia.git Homepage: http://www.xiph.org/paranoia/ Package: cdparanoia @@ -21,20 +20,6 @@ cdda2wav, cdparanoia goes to great lengths to try to extract the audio information without any artifacts such as jitter. -Package: cdparanoia-dbg -Section: debug -Priority: extra -Architecture: any -Depends: - ${misc:Depends}, libcdparanoia0 (= ${binary:Version}), - libcdparanoia-dev (= ${binary:Version}) -Description: audio extraction tool for sampling CDs (debug) - An audio extraction tool for sampling CDs. Unlike similar programs such as - cdda2wav, cdparanoia goes to great lengths to try to extract the audio - information without any artifacts such as jitter. - . - This package contains the debugging symbols. - Package: libcdparanoia0 Section: libs Architecture: any diff -Nru cdparanoia-3.10.2+debian/debian/copyright cdparanoia-3.10.2+debian/debian/copyright --- cdparanoia-3.10.2+debian/debian/copyright 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/copyright 2018-01-30 05:28:04.000000000 +0000 @@ -25,26 +25,12 @@ Files: interface/* paranoia/* Copyright: (C) 1999-2008 Monty License: LGPL-2.1+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of the GNU Lesser General Public License - can be found in /usr/share/common-licenses/LGPL-2.1 file. Files: debian/* Copyright: (C) 2006-2009 Daniel Baumann License: LGPL-2.1+ + +License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either diff -Nru cdparanoia-3.10.2+debian/debian/patches/0009-dh-autoconf-generate-config-files.patch cdparanoia-3.10.2+debian/debian/patches/0009-dh-autoconf-generate-config-files.patch --- cdparanoia-3.10.2+debian/debian/patches/0009-dh-autoconf-generate-config-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/0009-dh-autoconf-generate-config-files.patch 2018-01-30 05:28:04.000000000 +0000 @@ -0,0 +1,22 @@ +From: TANIGUCHI Takaki +Date: Tue, 30 Jan 2018 13:52:33 +0900 +Subject: dh-autoconf generate config files + +--- + configure.in | 3 --- + debian/rules | 4 ++++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index f91a782..8f940a2 100644 +--- a/configure.in ++++ b/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 diff -Nru cdparanoia-3.10.2+debian/debian/patches/01-typos-and-spelling.patch cdparanoia-3.10.2+debian/debian/patches/01-typos-and-spelling.patch --- cdparanoia-3.10.2+debian/debian/patches/01-typos-and-spelling.patch 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/01-typos-and-spelling.patch 2018-01-30 05:28:04.000000000 +0000 @@ -1,12 +1,18 @@ -Author: A Costa -Author: Torquil Macdonald Sørensen -Author: Rogério Brito -Description: Fixes some typos and spelling mistakes. +From: A Costa +Date: Tue, 30 Jan 2018 13:50:59 +0900 +Subject: Fixes some typos and spelling mistakes. + Bug-Debian: http://bugs.debian.org/552209 Bug-Debian: http://bugs.debian.org/572482 Forwarded: yes Last-Updated: 2010-11-06 +--- + cdparanoia.1 | 119 +++++++++++++++++++++++++++++++++++------------------------ + main.c | 27 ++++++++------ + 2 files changed, 86 insertions(+), 60 deletions(-) +diff --git a/cdparanoia.1 b/cdparanoia.1 +index cb625cc..c588403 100644 --- a/cdparanoia.1 +++ b/cdparanoia.1 @@ -1,16 +1,17 @@ @@ -30,7 +36,7 @@ makes are supported; .B cdparanoia can determine if the target drive is CDDA capable. -@@ -24,12 +25,12 @@ +@@ -24,12 +25,12 @@ and scratch reconstruction capability. .TP .B \-A --analyze-drive Run and log a complete analysis of drive caching, timing and reading behavior; @@ -45,7 +51,7 @@ for setup and debugging. .TP -@@ -46,7 +47,7 @@ +@@ -46,7 +47,7 @@ Save result summary to file, default filename cdparanoia.log. .TP .B \-L --log-debug [file] @@ -54,7 +60,7 @@ .TP .B \-V --version -@@ -54,12 +55,12 @@ +@@ -54,12 +55,12 @@ Print the program version and quit. .TP .B \-Q --query @@ -69,7 +75,7 @@ .TP .B \-h --help -@@ -69,7 +70,7 @@ +@@ -69,7 +70,7 @@ usage and options. .TP .B \-p --output-raw @@ -78,7 +84,7 @@ .B \-r or .B \-R -@@ -77,40 +78,46 @@ +@@ -77,40 +78,46 @@ as described below. .TP .B \-r --output-raw-little-endian @@ -133,7 +139,7 @@ .TP .B \-C --force-cdrom-big-endian -@@ -122,7 +129,7 @@ +@@ -122,7 +129,7 @@ Force the interface backend to do atomic reads of .B n sectors per read. This number can be misleading; the kernel will often split read requests into multiple atomic reads (the automated Paranoia @@ -142,7 +148,7 @@ range. .B This option should generally not be used. -@@ -131,13 +138,13 @@ +@@ -131,13 +138,13 @@ range. Force the interface backend to read from .B device rather than the first readable CDROM drive it finds. This can be used @@ -158,7 +164,7 @@ is obsolete in Linux 2.6 if it is present at all. .B \-k cannot be used -@@ -149,22 +156,22 @@ +@@ -149,22 +156,22 @@ or .TP .BI "\-g --force-generic-device " device @@ -187,7 +193,7 @@ which are low on memory. .TP -@@ -184,16 +191,19 @@ +@@ -184,16 +191,19 @@ every track seeming to start too late (losing a bit of the beginning and catching a bit of the next track). .B \-T accounts for this behavior. Note that this option will cause @@ -210,7 +216,7 @@ known user data area of the disc, probably causing read errors on most drives and possibly even hard lockups on some buggy hardware. -@@ -202,8 +212,11 @@ +@@ -202,8 +212,11 @@ drives and possibly even hard lockups on some buggy hardware. .B \-Z --disable-paranoia Disable .B all @@ -224,7 +230,7 @@ This option implies that .B \-Y is active. -@@ -211,7 +224,9 @@ +@@ -211,7 +224,9 @@ is active. .TP .B \-z --never-skip[=max_retries] Do not accept any skips; retry forever if needed. An optional maximum @@ -235,7 +241,7 @@ currently 20. .TP -@@ -221,7 +236,7 @@ +@@ -221,7 +236,7 @@ boundaries is performed. It can wedge if errors occur in the attempted overlap a .TP .B \-X --abort-on-skip @@ -244,7 +250,7 @@ .SH OUTPUT SMILIES .TP -@@ -282,7 +297,9 @@ +@@ -282,7 +297,9 @@ Unreported loss of streaming/other error in read .B ! Errors found after stage 1 correction; the drive is making the @@ -255,7 +261,7 @@ detecting them. .TP .B -@@ -295,8 +312,9 @@ +@@ -295,8 +312,9 @@ Uncorrected error/skip .SH SPAN ARGUMENT @@ -267,7 +273,7 @@ .B NOTE: Unless the span is a simple number, it's generally a good idea to quote the span argument to protect it from the shell. -@@ -307,7 +325,7 @@ +@@ -307,7 +325,7 @@ specification. The syntax of an offset/span takes the rough form: 1[ww:xx:yy.zz]-2[aa:bb:cc.dd] .P Here, 1 and 2 are track numbers; the numbers in brackets provide a @@ -276,7 +282,7 @@ hours/minutes/seconds/sectors format. Zero fields need not be specified: [::20], [:20], [20], [20.], etc, would be interpreted as twenty seconds, [10:] would be ten minutes, [.30] would be thirty -@@ -315,7 +333,7 @@ +@@ -315,7 +333,7 @@ sectors (75 sectors per second). .P When only a single offset is supplied, it is interpreted as a starting offset and ripping will continue to the end of the track. If a single @@ -285,7 +291,7 @@ offset is taken to be the start or end of the disc, respectively. Thus: .TP -@@ -335,18 +353,18 @@ +@@ -335,18 +353,18 @@ Specifies ripping from the beginning of the disc up to 2:[30.35] .B 2-4 Specifies ripping from the beginning of track 2 to the end of track 4. .P @@ -307,7 +313,7 @@ .P cdparanoia -B .TP -@@ -354,26 +372,30 @@ +@@ -354,26 +372,30 @@ Extract from track 1, time 0:30.12 to 1:10.00: .P cdparanoia "1[:30.12]-1[1:10]" .TP @@ -344,7 +350,7 @@ .P Joerg Schilling has also contributed SCSI expertise through his generic SCSI transport library. -@@ -381,5 +403,6 @@ +@@ -381,5 +403,6 @@ generic SCSI transport library. .SH AUTHOR Monty .P @@ -352,9 +358,11 @@ +.B cdparanoia's +homepage may be found at: http://www.xiph.org/paranoia/ +diff --git a/main.c b/main.c +index 664acac..24d6ca3 100644 --- a/main.c +++ b/main.c -@@ -51,7 +51,7 @@ +@@ -51,7 +51,7 @@ static long parse_offset(cdrom_drive *d, char *offset, int begin){ if(offset==NULL)return(-1); @@ -363,7 +371,7 @@ temp=strchr(offset,']'); if(temp){ *temp='\0'; -@@ -221,14 +221,14 @@ +@@ -221,14 +221,14 @@ VERSION"\n" " -V --version : print version info and quit\n" " -Q --query : autosense drive, query disc and quit\n" " -B --batch : 'batch' mode (saves each track to a\n" @@ -382,7 +390,7 @@ " -w --output-wav : output as WAV file (default)\n" " -f --output-aiff : output as AIFF file\n" " -a --output-aifc : output as AIFF-C file\n\n" -@@ -295,7 +295,7 @@ +@@ -295,7 +295,7 @@ VERSION"\n" " 1[ww:xx:yy.zz]-2[aa:bb:cc.dd] \n\n" "Here, 1 and 2 are track numbers; the numbers in brackets provide a\n" @@ -391,7 +399,7 @@ "hours/minutes/seconds/sectors format. Zero fields need not be\n" "specified: [::20], [:20], [20], [20.], etc, would be interpreted as\n" "twenty seconds, [10:] would be ten minutes, [.30] would be thirty\n" -@@ -303,7 +303,7 @@ +@@ -303,7 +303,7 @@ VERSION"\n" "When only a single offset is supplied, it is interpreted as a starting\n" "offset and ripping will continue to the end of he track. If a single\n" @@ -400,7 +408,7 @@ "offset is taken to be the start or end of the disc, respectively. Thus:\n\n" " 1:[20.35] Specifies ripping from track 1, second 20, sector 35 to \n" -@@ -320,15 +320,18 @@ +@@ -320,15 +320,18 @@ VERSION"\n" " 2-4 Specifies ripping from the beginning of track two to the\n" " end of track 4.\n\n" @@ -422,7 +430,7 @@ " C) extract from track 1, time 0:30.12 to 1:10.00:\n" " cdparanoia \"1[:30.12]-1[1:10]\"\n\n" -@@ -726,7 +729,7 @@ +@@ -726,7 +729,7 @@ int main(int argc,char *argv[]){ break; case 'g': if(force_cooked_device){ @@ -431,7 +439,7 @@ exit(1); } force_cooked_device=NULL; -@@ -735,7 +738,7 @@ +@@ -735,7 +738,7 @@ int main(int argc,char *argv[]){ break; case 'k': if(force_generic_device || force_cdrom_device){ diff -Nru cdparanoia-3.10.2+debian/debian/patches/02-ide-devices.patch cdparanoia-3.10.2+debian/debian/patches/02-ide-devices.patch --- cdparanoia-3.10.2+debian/debian/patches/02-ide-devices.patch 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/02-ide-devices.patch 2018-01-30 05:28:04.000000000 +0000 @@ -1,9 +1,16 @@ -Author: Steven Ihde -Description: Adds support for higher ide devices. +From: Steven Ihde +Date: Tue, 30 Jan 2018 13:51:00 +0900 +Subject: Adds support for higher ide devices. +--- + interface/scan_devices.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/interface/scan_devices.c b/interface/scan_devices.c +index fc58110..dc04da2 100644 --- a/interface/scan_devices.c +++ b/interface/scan_devices.c -@@ -179,6 +179,12 @@ +@@ -179,6 +179,12 @@ cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest, case IDE1_MAJOR: case IDE2_MAJOR: case IDE3_MAJOR: diff -Nru cdparanoia-3.10.2+debian/debian/patches/03-gcc4.3.patch cdparanoia-3.10.2+debian/debian/patches/03-gcc4.3.patch --- cdparanoia-3.10.2+debian/debian/patches/03-gcc4.3.patch 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/03-gcc4.3.patch 2018-01-30 05:28:04.000000000 +0000 @@ -1,11 +1,23 @@ -Author: Monty -Description: - Changeset 15338: Commit fix for 'private' becoming a reserved keyword as of - GCC 4.3+ (Closes: #499676). +From: Monty +Date: Tue, 30 Jan 2018 13:51:00 +0900 +Subject: Changeset 15338: Commit fix for 'private' becoming a reserved + keyword as of +GCC 4.3+ (Closes: #499676). +--- + interface/cdda_interface.h | 2 +- + interface/cooked_interface.c | 8 +-- + interface/interface.c | 8 +-- + interface/scan_devices.c | 22 ++++---- + interface/scsi_interface.c | 128 +++++++++++++++++++++---------------------- + interface/test_interface.c | 4 +- + 6 files changed, 86 insertions(+), 86 deletions(-) + +diff --git a/interface/cdda_interface.h b/interface/cdda_interface.h +index 8487cb7..c97d160 100644 --- a/interface/cdda_interface.h +++ b/interface/cdda_interface.h -@@ -84,7 +84,7 @@ +@@ -84,7 +84,7 @@ typedef struct cdrom_drive{ int is_atapi; int is_mmc; @@ -14,6 +26,8 @@ void *reserved; unsigned char inqbytes[4]; +diff --git a/interface/cooked_interface.c b/interface/cooked_interface.c +index de29055..3eea58c 100644 --- a/interface/cooked_interface.c +++ b/interface/cooked_interface.c @@ -13,13 +13,13 @@ @@ -34,9 +48,11 @@ } return ret2; } +diff --git a/interface/interface.c b/interface/interface.c +index e8a90cd..cce83a4 100644 --- a/interface/interface.c +++ b/interface/interface.c -@@ -39,9 +39,9 @@ +@@ -39,9 +39,9 @@ int cdda_close(cdrom_drive *d){ 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); @@ -49,7 +65,7 @@ } free(d); -@@ -127,7 +127,7 @@ +@@ -127,7 +127,7 @@ long cdda_read_timed(cdrom_drive *d, void *buffer, long beginsector, long sector } } } @@ -58,9 +74,11 @@ return(sectors); } +diff --git a/interface/scan_devices.c b/interface/scan_devices.c +index dc04da2..fd3355d 100644 --- a/interface/scan_devices.c +++ b/interface/scan_devices.c -@@ -270,11 +270,11 @@ +@@ -270,11 +270,11 @@ cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest, d->interface=COOKED_IOCTL; d->bigendianp=-1; /* We don't know yet... */ d->nsectors=-1; @@ -74,7 +92,7 @@ } idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); return(d); -@@ -680,15 +680,15 @@ +@@ -680,15 +680,15 @@ cdrom_drive *cdda_identify_scsi(const char *generic_device, d->bigendianp=-1; /* We don't know yet... */ d->nsectors=-1; d->messagedest = messagedest; @@ -93,7 +111,7 @@ g_fd=d->cdda_fd=dup(d->ioctl_fd); }else{ version=verify_SG_version(d,messagedest,messages); -@@ -702,8 +702,8 @@ +@@ -702,8 +702,8 @@ cdrom_drive *cdda_identify_scsi(const char *generic_device, } /* malloc our big buffer for scsi commands */ @@ -104,7 +122,7 @@ } { -@@ -778,9 +778,9 @@ +@@ -778,9 +778,9 @@ cdda_identify_scsi_fail: if(i_fd!=-1)close(i_fd); if(g_fd!=-1)close(g_fd); if(d){ @@ -117,7 +135,7 @@ } free(d); } -@@ -827,7 +827,7 @@ +@@ -827,7 +827,7 @@ cdrom_drive *cdda_identify_test(const char *filename, int messagedest, d->interface=TEST_INTERFACE; d->bigendianp=-1; /* We don't know yet... */ d->nsectors=-1; @@ -126,6 +144,8 @@ d->drive_model=copystring("File based test interface"); idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); +diff --git a/interface/scsi_interface.c b/interface/scsi_interface.c +index adbb9bf..b9cd96d 100644 --- a/interface/scsi_interface.c +++ b/interface/scsi_interface.c @@ -15,13 +15,13 @@ @@ -146,7 +166,7 @@ } return ret2; } -@@ -96,7 +96,7 @@ +@@ -96,7 +96,7 @@ static void tweak_SG_buffer(cdrom_drive *d) { static void clear_garbage(cdrom_drive *d){ fd_set fdset; struct timeval tv; @@ -155,7 +175,7 @@ int flag=0; /* clear out any possibly preexisting garbage */ -@@ -185,7 +185,7 @@ +@@ -185,7 +185,7 @@ static int sg2_handle_scsi_cmd(cdrom_drive *d, struct timespec tv2; int tret1,tret2; int status = 0; @@ -164,7 +184,7 @@ long writebytes=SG_OFF+cmd_len+in_size; /* generic scsi device services */ -@@ -195,7 +195,7 @@ +@@ -195,7 +195,7 @@ static int sg2_handle_scsi_cmd(cdrom_drive *d, memset(sg_hd,0,sizeof(sg_hd)); memset(sense_buffer,0,SG_MAX_SENSE); @@ -173,7 +193,7 @@ sg_hd->twelve_byte = cmd_len == 12; sg_hd->result = 0; sg_hd->reply_len = SG_OFF + out_size; -@@ -209,7 +209,7 @@ +@@ -209,7 +209,7 @@ static int sg2_handle_scsi_cmd(cdrom_drive *d, tell if the command failed. Scared yet? */ if(bytecheck && out_size>in_size){ @@ -182,7 +202,7 @@ /* 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 @@ +@@ -243,7 +243,7 @@ static int sg2_handle_scsi_cmd(cdrom_drive *d, } sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); @@ -191,7 +211,7 @@ errno=0; status = write(d->cdda_fd, sg_hd, writebytes ); -@@ -289,7 +289,7 @@ +@@ -289,7 +289,7 @@ static int sg2_handle_scsi_cmd(cdrom_drive *d, } } @@ -200,7 +220,7 @@ errno=0; status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); -@@ -313,7 +313,7 @@ +@@ -313,7 +313,7 @@ static int sg2_handle_scsi_cmd(cdrom_drive *d, if(bytecheck && in_size+cmd_len MAXTRK || first > MAXTRK || last<0 || first<0) { -@@ -683,7 +683,7 @@ +@@ -683,7 +683,7 @@ static int scsi_read_toc (cdrom_drive *d){ return(-5); } { @@ -310,7 +330,7 @@ d->disc_toc[i-first].bFlags=toc->bFlags; d->disc_toc[i-first].bTrack=i; -@@ -704,7 +704,7 @@ +@@ -704,7 +704,7 @@ static int scsi_read_toc (cdrom_drive *d){ return(-2); } { @@ -319,7 +339,7 @@ d->disc_toc[i-first].bFlags=toc->bFlags; d->disc_toc[i-first].bTrack=0xAA; -@@ -738,7 +738,7 @@ +@@ -738,7 +738,7 @@ static int scsi_read_toc2 (cdrom_drive *d){ } /* copy to our structure and convert start sector */ @@ -328,7 +348,7 @@ if (tracks > MAXTRK) { cderror(d,"003: CDROM reporting illegal number of tracks\n"); return(-3); -@@ -754,33 +754,33 @@ +@@ -754,33 +754,33 @@ static int scsi_read_toc2 (cdrom_drive *d){ return(-5); } @@ -377,7 +397,7 @@ d->cd_extra = FixupTOC(d,tracks+1); -@@ -817,7 +817,7 @@ +@@ -817,7 +817,7 @@ static int i_read_28 (cdrom_drive *d, void *p, long begin, long sectors, unsigne cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -386,7 +406,7 @@ return(0); } -@@ -836,7 +836,7 @@ +@@ -836,7 +836,7 @@ static int i_read_A8 (cdrom_drive *d, void *p, long begin, long sectors, unsigne cmd[9] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -395,7 +415,7 @@ return(0); } -@@ -854,7 +854,7 @@ +@@ -854,7 +854,7 @@ static int i_read_D4_10 (cdrom_drive *d, void *p, long begin, long sectors, unsi cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -404,7 +424,7 @@ return(0); } -@@ -872,7 +872,7 @@ +@@ -872,7 +872,7 @@ static int i_read_D4_12 (cdrom_drive *d, void *p, long begin, long sectors, unsi cmd[9] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -413,7 +433,7 @@ return(0); } -@@ -890,7 +890,7 @@ +@@ -890,7 +890,7 @@ static int i_read_D5 (cdrom_drive *d, void *p, long begin, long sectors, unsigne cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -422,7 +442,7 @@ return(0); } -@@ -908,7 +908,7 @@ +@@ -908,7 +908,7 @@ static int i_read_D8 (cdrom_drive *d, void *p, long begin, long sectors, unsigne cmd[9] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -431,7 +451,7 @@ return(0); } -@@ -922,7 +922,7 @@ +@@ -922,7 +922,7 @@ static int i_read_mmc (cdrom_drive *d, void *p, long begin, long sectors, unsign cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -440,7 +460,7 @@ return(0); } -@@ -936,7 +936,7 @@ +@@ -936,7 +936,7 @@ static int i_read_mmcB (cdrom_drive *d, void *p, long begin, long sectors, unsig cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -449,7 +469,7 @@ return(0); } -@@ -950,7 +950,7 @@ +@@ -950,7 +950,7 @@ static int i_read_mmc2 (cdrom_drive *d, void *p, long begin, long sectors, unsig cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -458,7 +478,7 @@ return(0); } -@@ -964,7 +964,7 @@ +@@ -964,7 +964,7 @@ static int i_read_mmc2B (cdrom_drive *d, void *p, long begin, long sectors, unsi cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -467,7 +487,7 @@ return(0); } -@@ -978,7 +978,7 @@ +@@ -978,7 +978,7 @@ static int i_read_mmc3 (cdrom_drive *d, void *p, long begin, long sectors, unsig cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -476,7 +496,7 @@ return(0); } -@@ -992,7 +992,7 @@ +@@ -992,7 +992,7 @@ static int i_read_mmc3B (cdrom_drive *d, void *p, long begin, long sectors, unsi cmd[8] = sectors; if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -485,7 +505,7 @@ return(0); } -@@ -1026,7 +1026,7 @@ +@@ -1026,7 +1026,7 @@ static int i_read_msf (cdrom_drive *d, void *p, long begin, long sectors, unsign if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -494,7 +514,7 @@ return(0); } -@@ -1039,7 +1039,7 @@ +@@ -1039,7 +1039,7 @@ static int i_read_msf2 (cdrom_drive *d, void *p, long begin, long sectors, unsig if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -503,7 +523,7 @@ return(0); } -@@ -1052,7 +1052,7 @@ +@@ -1052,7 +1052,7 @@ static int i_read_msf3 (cdrom_drive *d, void *p, long begin, long sectors, unsig if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) return(ret); @@ -512,7 +532,7 @@ return(0); } -@@ -1275,7 +1275,7 @@ +@@ -1275,7 +1275,7 @@ long scsi_read_msf3 (cdrom_drive *d, void *p, long begin, static int count_2352_bytes(cdrom_drive *d){ long i; for(i=2351;i>=0;i--) @@ -521,7 +541,7 @@ return(((i+3)>>2)<<2); return(0); -@@ -1284,7 +1284,7 @@ +@@ -1284,7 +1284,7 @@ static int count_2352_bytes(cdrom_drive *d){ static int verify_nonzero(cdrom_drive *d){ long i,flag=0; for(i=0;i<2352;i++) @@ -530,7 +550,7 @@ flag=1; break; } -@@ -1625,7 +1625,7 @@ +@@ -1625,7 +1625,7 @@ static int check_mmc(cdrom_drive *d){ d->is_mmc=0; if(mode_sense(d,22,0x2A)==0){ @@ -539,7 +559,7 @@ b+=b[3]+4; if((b[0]&0x3F)==0x2A){ -@@ -1673,7 +1673,7 @@ +@@ -1673,7 +1673,7 @@ unsigned char *scsi_inquiry(cdrom_drive *d){ cderror(d,"008: Unable to identify CDROM model\n"); return(NULL); } @@ -548,7 +568,7 @@ } int scsi_init_drive(cdrom_drive *d){ -@@ -1742,8 +1742,8 @@ +@@ -1742,8 +1742,8 @@ int scsi_init_drive(cdrom_drive *d){ check_cache(d); d->error_retry=1; @@ -559,9 +579,11 @@ d->report_all=1; return(0); } +diff --git a/interface/test_interface.c b/interface/test_interface.c +index 11bec25..ad7e992 100644 --- a/interface/test_interface.c +++ b/interface/test_interface.c -@@ -66,9 +66,9 @@ +@@ -66,9 +66,9 @@ static long test_read(cdrom_drive *d, void *p, long begin, long sectors){ if(!fd)fd=fdopen(d->cdda_fd,"r"); if(begin -Description: - Changeset 15356: Fix a really stupid oversight that should have been tested: - forcing a drive/host endian mismatch within the interface lib. - Does not check for null buff before trying a byteswap - (Closes: #499716, #506337, #507795, #509762). +From: Monty +Date: Tue, 30 Jan 2018 13:51:00 +0900 +Subject: Changeset 15356: Fix a really stupid oversight that should have been + tested: +forcing a drive/host endian mismatch within the interface lib. +Does not check for null buff before trying a byteswap +(Closes: #499716, #506337, #507795, #509762). +--- + interface/interface.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/interface/interface.c b/interface/interface.c +index cce83a4..30bffb0 100644 --- a/interface/interface.c +++ b/interface/interface.c -@@ -118,7 +118,7 @@ +@@ -118,7 +118,7 @@ long cdda_read_timed(cdrom_drive *d, void *buffer, long beginsector, long sector if(d->bigendianp==-1) /* not determined yet */ d->bigendianp=data_bigendianp(d); diff -Nru cdparanoia-3.10.2+debian/debian/patches/05-kfreebsd.patch cdparanoia-3.10.2+debian/debian/patches/05-kfreebsd.patch --- cdparanoia-3.10.2+debian/debian/patches/05-kfreebsd.patch 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/05-kfreebsd.patch 2018-01-30 05:28:04.000000000 +0000 @@ -1,12 +1,32 @@ +From: Optical Media Tools Team +Date: Tue, 30 Jan 2018 13:51:00 +0900 +Subject: Added support for GNU/kFreeBSD. + Authors: Aurelien Jarno Petr Salinger FreeBSD-Project -Description: Added support for GNU/kFreeBSD. +--- + Makefile.in | 4 +- + configure.in | 2 + + interface/Makefile.in | 2 +- + interface/common_interface.c | 14 +++ + interface/cooked_interface.c | 141 ++++++++++++++++++++++++++++++ + interface/interface.c | 8 ++ + interface/low_interface.h | 31 ++++++- + interface/scan_devices.c | 163 ++++++++++++++++++++++++++++++++++ + interface/scsi_interface.c | 202 ++++++++++++++++++++++++++++++++++++++++++- + interface/utils.h | 5 ++ + main.c | 6 +- + paranoia/paranoia.c | 4 + + utils.h | 4 + + 13 files changed, 578 insertions(+), 8 deletions(-) +diff --git a/Makefile.in b/Makefile.in +index 3d235ad..945d9b5 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -32,10 +32,10 @@ +@@ -32,10 +32,10 @@ export VERSION ifeq ($(STATIC),TRUE) LIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a \ @@ -19,9 +39,11 @@ LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so endif +diff --git a/configure.in b/configure.in +index 3ad98ca..f91a782 100644 --- a/configure.in +++ b/configure.in -@@ -56,12 +56,14 @@ +@@ -56,12 +56,14 @@ fi AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ") AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ") @@ -36,9 +58,11 @@ AC_SUBST(TYPESIZES) AC_SUBST(OPT) AC_SUBST(DEBUG) +diff --git a/interface/Makefile.in b/interface/Makefile.in +index 40c6098..3c29853 100644 --- a/interface/Makefile.in +++ b/interface/Makefile.in -@@ -15,7 +15,7 @@ +@@ -15,7 +15,7 @@ LD=@CC@ LDFLAGS=@LDFLAGS@ $(FLAGS) AR=@AR@ RANLIB=@RANLIB@ @@ -47,6 +71,8 @@ CPPFLAGS+=-D_REENTRANT OFILES = scan_devices.o common_interface.o cooked_interface.o interface.o\ +diff --git a/interface/common_interface.c b/interface/common_interface.c +index fb1d066..bd69d9e 100644 --- a/interface/common_interface.c +++ b/interface/common_interface.c @@ -13,15 +13,22 @@ @@ -72,7 +98,7 @@ return(1); /* failure */ return(0); -@@ -29,6 +36,7 @@ +@@ -29,6 +36,7 @@ int ioctl_ping_cdrom(int fd){ } @@ -80,7 +106,7 @@ /* 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 -@@ -49,6 +57,7 @@ +@@ -49,6 +57,7 @@ char *atapi_drive_info(int fd){ free(id); return(ret); } @@ -88,7 +114,7 @@ int data_bigendianp(cdrom_drive *d){ float lsb_votes=0; -@@ -174,7 +183,9 @@ +@@ -174,7 +183,9 @@ int data_bigendianp(cdrom_drive *d){ knows the leadout/leadin size. */ int FixupTOC(cdrom_drive *d,int tracks){ @@ -98,7 +124,7 @@ int j; /* First off, make sure the 'starting sector' is >=0 */ -@@ -211,6 +222,8 @@ +@@ -211,6 +222,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. */ @@ -107,7 +133,7 @@ if (d->ioctl_fd != -1) { int result; -@@ -235,6 +248,7 @@ +@@ -235,6 +248,7 @@ int FixupTOC(cdrom_drive *d,int tracks){ return 1; } } @@ -115,6 +141,8 @@ return 0; } +diff --git a/interface/cooked_interface.c b/interface/cooked_interface.c +index 3eea58c..c6f2761 100644 --- a/interface/cooked_interface.c +++ b/interface/cooked_interface.c @@ -1,6 +1,8 @@ @@ -126,7 +154,7 @@ * * CDROM code specific to the cooked ioctl interface * -@@ -24,6 +26,7 @@ +@@ -24,6 +26,7 @@ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ return ret2; } @@ -134,7 +162,7 @@ static int cooked_readtoc (cdrom_drive *d){ int i; int tracks; -@@ -157,6 +160,140 @@ +@@ -157,6 +160,140 @@ static long cooked_read (cdrom_drive *d, void *p, long begin, long sectors){ return ret; } @@ -275,7 +303,7 @@ /* hook */ static int Dummy (cdrom_drive *d,int Switch){ return(0); -@@ -221,6 +358,7 @@ +@@ -221,6 +358,7 @@ static void check_exceptions(cdrom_drive *d,exception *list){ int cooked_init_drive (cdrom_drive *d){ int ret; @@ -283,7 +311,7 @@ switch(d->drive_type){ case MATSUSHITA_CDROM_MAJOR: /* sbpcd 1 */ case MATSUSHITA_CDROM2_MAJOR: /* sbpcd 2 */ -@@ -271,6 +409,9 @@ +@@ -271,6 +409,9 @@ int cooked_init_drive (cdrom_drive *d){ default: d->nsectors=40; } @@ -293,9 +321,11 @@ d->enable_cdda = Dummy; d->read_audio = cooked_read; d->read_toc = cooked_readtoc; +diff --git a/interface/interface.c b/interface/interface.c +index 30bffb0..039c84e 100644 --- a/interface/interface.c +++ b/interface/interface.c -@@ -40,7 +40,15 @@ +@@ -40,7 +40,15 @@ int cdda_close(cdrom_drive *d){ 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_data){ @@ -311,6 +341,8 @@ free(d->private_data); } +diff --git a/interface/low_interface.h b/interface/low_interface.h +index 0f9e740..e6e5ba3 100644 --- a/interface/low_interface.h +++ b/interface/low_interface.h @@ -26,6 +26,8 @@ @@ -350,7 +382,7 @@ #ifndef SG_IO /* old kernel version; the usage is all runtime-safe, this is just to build */ -@@ -98,19 +112,30 @@ +@@ -98,19 +112,30 @@ typedef struct sg_io_hdr #endif struct cdda_private_data { @@ -383,6 +415,8 @@ extern int scsi_init_drive (cdrom_drive *d); #ifdef CDDA_TEST extern int test_init_drive (cdrom_drive *d); +diff --git a/interface/scan_devices.c b/interface/scan_devices.c +index fd3355d..3888b7c 100644 --- a/interface/scan_devices.c +++ b/interface/scan_devices.c @@ -24,6 +24,8 @@ @@ -394,7 +428,7 @@ static char *scsi_cdrom_prefixes[]={ "/dev/scd", "/dev/sr", -@@ -52,6 +54,17 @@ +@@ -52,6 +54,17 @@ static char *cdrom_devices[]={ "/dev/cm206cd", "/dev/gscd", "/dev/optcd",NULL}; @@ -412,7 +446,7 @@ /* Functions here look for a cdrom drive; full init of a drive type happens in interface.c */ -@@ -78,10 +91,12 @@ +@@ -78,10 +91,12 @@ cdrom_drive *cdda_find_a_cdrom(int messagedest,char **messages){ if((d=cdda_identify(buffer,messagedest,messages))) return(d); idmessage(messagedest,messages,"",NULL); @@ -425,7 +459,7 @@ } }else{ /* Name. Go for it. */ -@@ -145,6 +160,7 @@ +@@ -145,6 +160,7 @@ char *test_resolve_symlink(const char *file,int messagedest,char **messages){ } @@ -433,7 +467,7 @@ cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest, char **messages){ -@@ -280,6 +296,61 @@ +@@ -280,6 +296,61 @@ cdrom_drive *cdda_identify_cooked(const char *dev, int messagedest, return(d); } @@ -495,7 +529,7 @@ struct sg_id { long l1; /* target | lun << 8 | channel << 16 | low_ino << 24 */ long l2; /* Unique id */ -@@ -406,6 +477,7 @@ +@@ -406,6 +477,7 @@ matchfail: if(dev!=-1)close(dev); return(NULL); } @@ -503,7 +537,7 @@ void strscat(char *a,char *b,int n){ int i; -@@ -417,6 +489,7 @@ +@@ -417,6 +489,7 @@ void strscat(char *a,char *b,int n){ strcat(a," "); } @@ -511,7 +545,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, -@@ -786,6 +859,96 @@ +@@ -786,6 +859,96 @@ cdda_identify_scsi_fail: } return(NULL); } @@ -608,6 +642,8 @@ #ifdef CDDA_TEST +diff --git a/interface/scsi_interface.c b/interface/scsi_interface.c +index b9cd96d..d99cdf4 100644 --- a/interface/scsi_interface.c +++ b/interface/scsi_interface.c @@ -12,6 +12,11 @@ @@ -622,7 +658,7 @@ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ struct timespec tv1; struct timespec tv2; -@@ -36,6 +41,7 @@ +@@ -36,6 +41,7 @@ static void tweak_SG_buffer(cdrom_drive *d) { int table, reserved, cur, err; char buffer[256]; @@ -630,7 +666,7 @@ /* SG_SET_RESERVED_SIZE doesn't actually allocate or reserve anything. * what it _does_ do is give you an error if you ask for a value * larger than q->max_sectors (the length of the device's bio request -@@ -59,6 +65,7 @@ +@@ -59,6 +65,7 @@ static void tweak_SG_buffer(cdrom_drive *d) { "table entry size: %d bytes\n\t" "maximum theoretical transfer: %d sectors\n", table, reserved, table*(reserved/CD_FRAMESIZE_RAW)); @@ -638,7 +674,7 @@ cdmessage(d,buffer); cur=reserved; /* only use one entry for now */ -@@ -90,9 +97,19 @@ +@@ -90,9 +97,19 @@ static void tweak_SG_buffer(cdrom_drive *d) { if(cur==0) exit(1); @@ -658,7 +694,7 @@ static void clear_garbage(cdrom_drive *d){ fd_set fdset; struct timeval tv; -@@ -123,6 +140,7 @@ +@@ -123,6 +140,7 @@ static void clear_garbage(cdrom_drive *d){ flag=1; } } @@ -666,7 +702,7 @@ static int check_sbp_error(const unsigned char status, const unsigned char *sbp) { -@@ -142,7 +160,11 @@ +@@ -142,7 +160,11 @@ static int check_sbp_error(const unsigned char status, case 1: break; case 2: @@ -678,7 +714,7 @@ return(TR_NOTREADY); case 3: if ((ASC==0x0C) & (ASCQ==0x09)) { -@@ -172,6 +194,7 @@ +@@ -172,6 +194,7 @@ static int check_sbp_error(const unsigned char status, return 0; } @@ -686,7 +722,7 @@ /* process a complete scsi command. */ static int sg2_handle_scsi_cmd(cdrom_drive *d, unsigned char *cmd, -@@ -432,6 +455,91 @@ +@@ -432,6 +455,91 @@ static int handle_scsi_cmd(cdrom_drive *d, return sg2_handle_scsi_cmd(d,cmd,cmd_len,in_size,out_size,bytefill,bytecheck,sense); } @@ -778,7 +814,7 @@ static int test_unit_ready(cdrom_drive *d){ unsigned char sense[SG_MAX_SENSE]; -@@ -453,6 +558,7 @@ +@@ -453,6 +561,7 @@ static int test_unit_ready(cdrom_drive *d){ return 1; } @@ -786,7 +822,7 @@ static void reset_scsi(cdrom_drive *d){ int arg,tries=0; d->enable_cdda(d,0); -@@ -471,6 +577,29 @@ +@@ -471,6 +580,29 @@ static void reset_scsi(cdrom_drive *d){ d->enable_cdda(d,1); } @@ -816,7 +852,7 @@ static int mode_sense_atapi(cdrom_drive *d,int size,int page){ unsigned char sense[SG_MAX_SENSE]; -@@ -1080,10 +1210,20 @@ +@@ -1079,10 +1211,20 @@ static long scsi_read_map (cdrom_drive *d, void *p, long begin, long sectors, sprintf(b,"scsi_read error: sector=%ld length=%ld retry=%d\n", begin,sectors,retry_count); cdmessage(d,b); @@ -837,7 +873,7 @@ cdmessage(d,b); sprintf(b," Transport error: %s\n",strerror_tr[err]); cdmessage(d,b); -@@ -1092,10 +1228,19 @@ +@@ -1091,10 +1233,19 @@ static long scsi_read_map (cdrom_drive *d, void *p, long begin, long sectors, fprintf(stderr,"scsi_read error: sector=%ld length=%ld retry=%d\n", begin,sectors,retry_count); @@ -857,7 +893,7 @@ fprintf(stderr," Transport error: %s\n",strerror_tr[err]); fprintf(stderr," System error: %s\n",strerror(errno)); } -@@ -1120,10 +1261,11 @@ +@@ -1120,10 +1271,11 @@ static long scsi_read_map (cdrom_drive *d, void *p, long begin, long sectors, } sectors--; continue; @@ -870,7 +906,7 @@ default: if(sectors==1){ if(errno==EIO) -@@ -1587,6 +1729,7 @@ +@@ -1587,6 +1739,7 @@ static void check_cache(cdrom_drive *d){ } } @@ -878,7 +914,7 @@ static int check_atapi(cdrom_drive *d){ int atapiret=-1; int fd = d->cdda_fd; /* check the device we'll actually be using to read */ -@@ -1618,6 +1761,47 @@ +@@ -1618,6 +1771,47 @@ static int check_atapi(cdrom_drive *d){ } } @@ -926,7 +962,7 @@ static int check_mmc(cdrom_drive *d){ unsigned char *b; cdmessage(d,"\nChecking for MMC style command set...\n"); -@@ -1664,6 +1848,7 @@ +@@ -1664,6 +1858,7 @@ static void check_exceptions(cdrom_drive *d,exception *list){ } } @@ -934,7 +970,7 @@ /* request vendor brand and model */ unsigned char *scsi_inquiry(cdrom_drive *d){ unsigned char sense[SG_MAX_SENSE]; -@@ -1675,6 +1860,7 @@ +@@ -1675,6 +1870,7 @@ unsigned char *scsi_inquiry(cdrom_drive *d){ } return (d->private_data->sg_buffer); } @@ -942,7 +978,7 @@ int scsi_init_drive(cdrom_drive *d){ int ret; -@@ -1742,8 +1928,12 @@ +@@ -1742,8 +1938,12 @@ int scsi_init_drive(cdrom_drive *d){ check_cache(d); d->error_retry=1; @@ -955,6 +991,8 @@ d->report_all=1; return(0); } +diff --git a/interface/utils.h b/interface/utils.h +index c9647da..1d7225c 100644 --- a/interface/utils.h +++ b/interface/utils.h @@ -1,4 +1,9 @@ @@ -967,9 +1005,11 @@ #include #include #include +diff --git a/main.c b/main.c +index 24d6ca3..ed485d2 100644 --- a/main.c +++ b/main.c -@@ -1365,7 +1365,11 @@ +@@ -1365,7 +1365,11 @@ int main(int argc,char *argv[]){ if(err)free(err); if(mes)free(mes); if(readbuf==NULL){ @@ -982,9 +1022,11 @@ report("\nparanoia_read: CDROM drive unavailable, bailing.\n"); exit(1); } +diff --git a/paranoia/paranoia.c b/paranoia/paranoia.c +index 07b0322..c8b0d6a 100644 --- a/paranoia/paranoia.c +++ b/paranoia/paranoia.c -@@ -2439,6 +2439,7 @@ +@@ -2439,6 +2439,7 @@ c_block *i_read_c_block(cdrom_paranoia *p,long beginword,long endword, secread)) -Description: Rerun autoconf for support for GNU/kFreeBSD. +From: Petr Salinger +Date: Tue, 30 Jan 2018 13:51:00 +0900 +Subject: Rerun autoconf for support for GNU/kFreeBSD. +--- + configure | 7336 ++++++++++++++++++++++++++----------------------------------- + 1 file changed, 3148 insertions(+), 4188 deletions(-) + +diff --git a/configure b/configure +index 16f92ef..daf2d76 100755 --- a/configure +++ b/configure @@ -1,81 +1,413 @@ @@ -457,7 +464,7 @@ # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +415,107 @@ +@@ -83,146 +415,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -677,7 +684,7 @@ # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +524,24 @@ +@@ -231,38 +524,24 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -719,7 +726,7 @@ # Identity of this package. PACKAGE_NAME= -@@ -270,51 +549,133 @@ +@@ -270,51 +549,133 @@ PACKAGE_TARNAME= PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= @@ -867,7 +874,7 @@ # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null -@@ -337,34 +698,48 @@ +@@ -337,34 +698,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. @@ -923,7 +930,7 @@ -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -@@ -386,33 +761,59 @@ +@@ -386,33 +761,59 @@ do --config-cache | -C) cache_file=config.cache ;; @@ -1001,7 +1008,7 @@ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -439,6 +840,12 @@ +@@ -439,6 +840,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; @@ -1014,7 +1021,7 @@ -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -@@ -463,13 +870,16 @@ +@@ -463,13 +870,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; @@ -1035,7 +1042,7 @@ localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -534,6 +944,16 @@ +@@ -534,6 +944,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; @@ -1052,7 +1059,7 @@ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; -@@ -584,26 +1004,36 @@ +@@ -584,26 +1004,36 @@ do ac_init_version=: ;; -with-* | --with-*) @@ -1104,7 +1111,7 @@ --x) # Obsolete; use --with-x. -@@ -623,26 +1053,25 @@ +@@ -623,26 +1053,25 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -1140,7 +1147,7 @@ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; -@@ -651,31 +1080,36 @@ +@@ -651,31 +1080,36 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -1195,7 +1202,7 @@ done # There might be people who depend on the old broken behavior: `$host' -@@ -689,7 +1123,7 @@ +@@ -689,7 +1123,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -1204,7 +1211,7 @@ If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes -@@ -702,74 +1136,72 @@ +@@ -702,74 +1136,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null @@ -1336,7 +1343,7 @@ # # Report the --help message. -@@ -798,14 +1230,11 @@ +@@ -798,14 +1230,11 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] @@ -1353,7 +1360,7 @@ By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -815,18 +1244,25 @@ +@@ -815,18 +1244,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: @@ -1391,7 +1398,7 @@ _ACEOF cat <<\_ACEOF -@@ -846,167 +1282,610 @@ +@@ -846,167 +1282,610 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory @@ -1507,8 +1514,7 @@ + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - +- - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then @@ -1521,6 +1527,8 @@ - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then @@ -1561,14 +1569,13 @@ - -It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was -- -- $ $0 $@ --_ACEOF +- $ $0 $@ +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## -+ + +-_ACEOF +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. @@ -1578,15 +1585,6 @@ -## --------- ## -## Platform. ## -## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -- --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" @@ -1613,28 +1611,27 @@ + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval --_ASUNAME +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +} # ac_fn_c_try_compile --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -1664,14 +1661,23 @@ +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-_ASUNAME + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval -+ + +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- echo "PATH: $as_dir" +-done +} # ac_fn_c_try_cpp -+ + +-} >&5 +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -1706,16 +1712,18 @@ + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 --} >&5 +-cat >&5 <<_ACEOF + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval --cat >&5 <<_ACEOF +} # ac_fn_c_try_run +-## ----------- ## +-## Core tests. ## +-## ----------- ## +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes @@ -1734,10 +1742,7 @@ +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 - --## ----------- ## --## Core tests. ## --## ----------- ## ++ + ; + return 0; +} @@ -2124,7 +2129,7 @@ _ACEOF -@@ -1019,7 +1898,6 @@ +@@ -1019,7 +1898,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= @@ -2132,7 +2137,7 @@ ac_must_keep_next=false for ac_pass in 1 2 do -@@ -1030,13 +1908,13 @@ +@@ -1030,13 +1908,13 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; @@ -2150,7 +2155,7 @@ if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else -@@ -1052,21 +1930,19 @@ +@@ -1052,21 +1930,19 @@ do -* ) ac_must_keep_next=true ;; esac fi @@ -2177,7 +2182,7 @@ trap 'exit_status=$? # Save into config.log some information that might help in debugging. { -@@ -1079,20 +1955,35 @@ +@@ -1079,20 +1955,35 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, @@ -2223,7 +2228,7 @@ echo cat <<\_ASBOX -@@ -1103,22 +1994,28 @@ +@@ -1103,22 +1994,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do @@ -2259,7 +2264,7 @@ done | sort echo fi -@@ -1130,26 +2027,26 @@ +@@ -1130,26 +2027,26 @@ _ASBOX ## ----------- ## _ASBOX echo @@ -2296,7 +2301,7 @@ # Predefined preprocessor variables. -@@ -1157,40 +2054,46 @@ +@@ -1157,40 +2054,46 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF @@ -2333,6 +2338,8 @@ - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +-fi +-for ac_site_file in $CONFIG_SITE; do +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE @@ -2344,8 +2351,7 @@ +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do ++fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue @@ -2357,7 +2363,7 @@ sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi -@@ -1200,69 +2103,79 @@ +@@ -1200,69 +2103,79 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then @@ -2454,23 +2460,98 @@ - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } --fi + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+fi + fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -1272,103 +2185,101 @@ +@@ -1272,103 +2185,101 @@ 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 ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done ++done ++if test -z "$ac_aux_dir"; then ++ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++fi + ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + ++# Make sure we can run config.sub. ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } ++if test "${ac_cv_build+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++esac ++build=$ac_cv_build ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } ++if test "${ac_cv_host+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++fi + - - - @@ -2481,17 +2562,10 @@ - - - +-cp $srcdir/configure.guess $srcdir/config.guess +-cp $srcdir/configure.sub $srcdir/config.sub - -- -- -- -- -- -- - cp $srcdir/configure.guess $srcdir/config.guess - cp $srcdir/configure.sub $srcdir/config.sub - - ac_aux_dir= +-ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir @@ -2506,16 +2580,8 @@ - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ for ac_t in install-sh install.sh shtool; do -+ if test -f "$ac_dir/$ac_t"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/$ac_t -c" -+ break 2 -+ fi -+ done - done - if test -z "$ac_aux_dir"; then +-done +-if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } @@ -2523,19 +2589,8 @@ -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Make sure we can run config.sub. +- +-# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} @@ -2557,33 +2612,11 @@ - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - +- -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if test "${ac_cv_build+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; -+esac - build=$ac_cv_build +-build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` @@ -2601,44 +2634,22 @@ - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if test "${ac_cv_host+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi +- +-fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +-host=$ac_cv_host +-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift @@ -2653,7 +2664,7 @@ -@@ -1381,10 +2292,10 @@ +@@ -1381,10 +2292,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -2668,7 +2679,7 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1394,35 +2305,37 @@ +@@ -1394,35 +2305,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2718,7 +2729,7 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1432,39 +2345,50 @@ +@@ -1432,39 +2345,50 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2784,7 +2795,7 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1474,77 +2398,37 @@ +@@ -1474,77 +2398,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2876,7 +2887,7 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1555,18 +2439,19 @@ +@@ -1555,18 +2439,19 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2900,7 +2911,7 @@ if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. -@@ -1584,24 +2469,25 @@ +@@ -1584,24 +2469,25 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2935,7 +2946,7 @@ else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1611,39 +2497,41 @@ +@@ -1611,39 +2497,41 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2990,7 +3001,7 @@ else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1653,183 +2541,227 @@ +@@ -1653,183 +2541,227 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3320,7 +3331,7 @@ # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -1837,38 +2769,31 @@ +@@ -1837,38 +2769,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3371,7 +3382,7 @@ /* end confdefs.h. */ int -@@ -1880,45 +2805,46 @@ +@@ -1880,45 +2805,46 @@ main () } _ACEOF rm -f conftest.o conftest.obj @@ -3443,7 +3454,7 @@ /* end confdefs.h. */ int -@@ -1932,55 +2858,34 @@ +@@ -1932,55 +2858,34 @@ main () return 0; } _ACEOF @@ -3519,7 +3530,7 @@ /* end confdefs.h. */ int -@@ -1991,39 +2896,49 @@ +@@ -1991,39 +2896,49 @@ main () return 0; } _ACEOF @@ -3597,7 +3608,7 @@ if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then -@@ -2039,18 +2954,14 @@ +@@ -2039,18 +2954,14 @@ else CFLAGS= fi fi @@ -3622,7 +3633,7 @@ /* end confdefs.h. */ #include #include -@@ -2078,12 +2989,17 @@ +@@ -2078,12 +2989,17 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated @@ -3642,7 +3653,7 @@ int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; -@@ -2098,205 +3014,37 @@ +@@ -2098,205 +3014,37 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF @@ -3867,7 +3878,7 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2307,10 +3055,10 @@ +@@ -2307,10 +3055,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -3882,7 +3893,7 @@ else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2320,35 +3068,37 @@ +@@ -2320,35 +3068,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3932,7 +3943,7 @@ else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2358,38 +3108,48 @@ +@@ -2358,38 +3108,48 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3995,7 +4006,7 @@ else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -2399,32 +3159,34 @@ +@@ -2399,32 +3159,34 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4042,7 +4053,7 @@ else if test -n "$INSTALL"; then ac_cv_prog_INSTALL="$INSTALL" # Let the user override the test. -@@ -2434,27 +3196,29 @@ +@@ -2434,27 +3196,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4080,7 +4091,7 @@ if test -z "$GCC"; then DEBUG="-g" OPT="-O" -@@ -2475,15 +3239,15 @@ +@@ -2475,15 +3239,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -4100,7 +4111,7 @@ else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2497,11 +3261,7 @@ +@@ -2497,11 +3261,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -4113,7 +4124,7 @@ /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -2510,68 +3270,24 @@ +@@ -2510,68 +3270,24 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF @@ -4187,7 +4198,7 @@ # Passes both tests. ac_preproc_ok=: break -@@ -2581,7 +3297,7 @@ +@@ -2581,7 +3297,7 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext @@ -4196,7 +4207,7 @@ break fi -@@ -2593,8 +3309,8 @@ +@@ -2593,8 +3309,8 @@ fi else ac_cv_prog_CPP=$CPP fi @@ -4207,7 +4218,7 @@ ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do -@@ -2604,11 +3320,7 @@ +@@ -2604,11 +3320,7 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -4220,7 +4231,7 @@ /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -2617,68 +3329,24 @@ +@@ -2617,68 +3329,24 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF @@ -4294,7 +4305,7 @@ # Passes both tests. ac_preproc_ok=: break -@@ -2688,14 +3356,13 @@ +@@ -2688,14 +3356,13 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext @@ -4315,7 +4326,7 @@ fi ac_ext=c -@@ -2705,32 +3372,143 @@ +@@ -2705,31 +3372,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -4323,15 +4334,14 @@ -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 -+else + else +- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST @@ -4407,7 +4417,6 @@ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else @@ -4476,11 +4485,10 @@ + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ #include #include - #include -@@ -2744,51 +3522,23 @@ +@@ -2744,51 +3522,23 @@ main () return 0; } _ACEOF @@ -4538,7 +4546,7 @@ else ac_cv_header_stdc=no fi -@@ -2798,18 +3548,14 @@ +@@ -2798,18 +3548,14 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -4560,7 +4568,7 @@ else ac_cv_header_stdc=no fi -@@ -2819,16 +3565,13 @@ +@@ -2819,16 +3565,13 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -4580,7 +4588,7 @@ #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -2848,110 +3591,41 @@ +@@ -2848,110 +3591,41 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) @@ -4709,7 +4717,7 @@ _ACEOF fi -@@ -2959,1657 +3633,137 @@ +@@ -2959,1657 +3633,137 @@ fi done @@ -4980,7 +4988,15 @@ - break - fi - ac_mid=`expr 2 '*' $ac_mid` --fi ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (short) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_short=0 ++ fi + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done -else @@ -5038,9 +5054,9 @@ -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + -ac_lo=`expr '(' $ac_mid ')' + 1` --fi + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in @@ -5073,7 +5089,9 @@ -int -main () -{ -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 ++$as_echo "$ac_cv_sizeof_short" >&6; } + - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); @@ -5092,7 +5110,7 @@ - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); -- + - ; - return 0; -} @@ -5113,7 +5131,7 @@ - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 -See \`config.log' for more details." >&5 @@ -5131,11 +5149,11 @@ -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 --cat >>confdefs.h <<_ACEOF --#define SIZEOF_SHORT $ac_cv_sizeof_short --_ACEOF -- -- + cat >>confdefs.h <<_ACEOF + #define SIZEOF_SHORT $ac_cv_sizeof_short + _ACEOF + + -echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 -if test "${ac_cv_type_int+set}" = set; then @@ -5187,15 +5205,7 @@ -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_int=no -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "cannot compute sizeof (short) -+See \`config.log' for more details." "$LINENO" 5; }; } -+ else -+ ac_cv_sizeof_short=0 -+ fi - fi +-fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 @@ -6223,26 +6233,16 @@ -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` - fi +-fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -+$as_echo "$ac_cv_sizeof_short" >&6; } -+ -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_SHORT $ac_cv_sizeof_short -+_ACEOF -+ -+ +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -6474,7 +6474,7 @@ cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long _ACEOF -@@ -4627,478 +3781,98 @@ +@@ -4627,478 +3781,98 @@ case 4 in $ac_cv_sizeof_long) SIZE32="long";; esac @@ -7000,7 +7000,7 @@ /* end confdefs.h. */ int -@@ -5108,10 +3882,10 @@ +@@ -5108,10 +3882,10 @@ main () #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; @@ -7014,7 +7014,7 @@ /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; -@@ -5120,16 +3894,17 @@ +@@ -5120,16 +3894,17 @@ main () an arm of an if-expression whose if-part is not a constant expression */ const char *g = "string"; @@ -7036,7 +7036,7 @@ } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; -@@ -5148,51 +3923,27 @@ +@@ -5148,51 +3923,27 @@ main () } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -7096,7 +7096,7 @@ fi -@@ -5204,7 +3955,9 @@ +@@ -5204,7 +3955,9 @@ fi @@ -7107,7 +7107,7 @@ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -@@ -5223,39 +3976,59 @@ +@@ -5223,39 +3976,59 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. @@ -7185,7 +7185,7 @@ fi fi rm -f confcache -@@ -5264,63 +4037,54 @@ +@@ -5264,63 +4037,54 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -7282,7 +7282,7 @@ done LIBOBJS=$ac_libobjs -@@ -5329,11 +4093,13 @@ +@@ -5329,11 +4093,13 @@ LTLIBOBJS=$ac_ltlibobjs : ${CONFIG_STATUS=./config.status} @@ -7299,17 +7299,20 @@ #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -5343,81 +4109,252 @@ +@@ -5343,81 +4109,252 @@ cat >$CONFIG_STATUS <<_ACEOF debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - +- -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## + +-# Be Bourne compatible +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF @@ -7317,9 +7320,7 @@ +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : @@ -7378,14 +7379,8 @@ + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false ++fi ++ +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: @@ -7394,10 +7389,15 @@ + PATH_SEPARATOR=';' + } fi +-DUALCASE=1; export DUALCASE # for MKS sh +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. @@ -7416,7 +7416,9 @@ + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS -+ + +-# Work around bugs in pre-3.0 UWIN ksh. +-$as_unset ENV MAIL MAILPATH + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' @@ -7451,8 +7453,6 @@ - eval $as_var=C; export $as_var - else - $as_unset $as_var -- fi --done +LC_ALL=C +export LC_ALL +LANGUAGE=C @@ -7473,7 +7473,8 @@ + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -+ fi + fi +-done + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error @@ -7596,7 +7597,7 @@ # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -5425,148 +4362,123 @@ +@@ -5425,148 +4362,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -7846,7 +7847,7 @@ # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -5575,31 +4487,20 @@ +@@ -5575,31 +4487,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" @@ -7860,13 +7861,14 @@ -$as_unset CDPATH - exec 6>&1 +- +-# Open the log real soon, to keep \$[0] and so on meaningful, and to +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to ++ +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their @@ -7888,7 +7890,7 @@ CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -5607,124 +4508,106 @@ +@@ -5607,124 +4508,106 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ @@ -8061,7 +8063,7 @@ esac shift -@@ -5738,32 +4621,46 @@ +@@ -5738,32 +4621,46 @@ if $ac_cs_silent; then fi _ACEOF @@ -8122,7 +8124,7 @@ # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely -@@ -5773,344 +4670,403 @@ +@@ -5773,344 +4670,403 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree @@ -8381,9 +8383,29 @@ -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF -- + -_ACEOF -- ++eval set X " :F $CONFIG_FILES " ++shift ++for ac_tag ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; ++ esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift + - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. @@ -8416,28 +8438,6 @@ - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` -+ -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ + case $ac_mode in + :L) ac_source=$1;; + :[FH]) @@ -8605,8 +8605,15 @@ - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in @@ -8644,15 +8651,7 @@ - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - +-esac + case $ac_mode in + :F) @@ -8660,6 +8659,8 @@ + # CONFIG_FILE + # ++_ACEOF + - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} @@ -8675,8 +8676,7 @@ - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." -+_ACEOF - +- - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: @@ -8787,9 +8787,7 @@ +which seems to be undefined. Please make sure it is defined." >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} - --done --_ACEOF ++ + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; @@ -8797,16 +8795,18 @@ + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; -+ -+ -+ -+ esac -+ -+done # for ac_tag + +-done +-_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -{ (exit 0); exit 0; } ++ esac ++ ++done # for ac_tag ++ ++ +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS @@ -8818,7 +8818,7 @@ # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -6130,6 +5086,10 @@ +@@ -6130,6 +5086,10 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff -Nru cdparanoia-3.10.2+debian/debian/patches/07-jpmanfix.patch cdparanoia-3.10.2+debian/debian/patches/07-jpmanfix.patch --- cdparanoia-3.10.2+debian/debian/patches/07-jpmanfix.patch 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/07-jpmanfix.patch 2018-01-30 05:28:04.000000000 +0000 @@ -1,6 +1,16 @@ +From: Optical Media Tools Team +Date: Tue, 30 Jan 2018 13:51:00 +0900 +Subject: jpmanfix + +--- + cdparanoia.1.jp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cdparanoia.1.jp b/cdparanoia.1.jp +index 97d205f..07545ad 100644 --- a/cdparanoia.1.jp +++ b/cdparanoia.1.jp -@@ -151,7 +151,7 @@ +@@ -151,7 +151,7 @@ CD .TP .B \-Z --disable-paranoia ¥Ç¡¼¥¿¾È¹ç¤ÈÄûÀµµ¡Ç½¤ò diff -Nru cdparanoia-3.10.2+debian/debian/patches/cdparanoia-force-progress-bar.diff cdparanoia-3.10.2+debian/debian/patches/cdparanoia-force-progress-bar.diff --- cdparanoia-3.10.2+debian/debian/patches/cdparanoia-force-progress-bar.diff 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/cdparanoia-force-progress-bar.diff 2018-01-30 05:28:04.000000000 +0000 @@ -1,13 +1,16 @@ -Author: Frank Heckenbach -Reviewed-by: Rogério Theodoro de Brito -Bug-Debian: http://bugs.debian.org/589112 -Forwarded: no +From: Optical Media Tools Team +Date: Tue, 30 Jan 2018 13:51:00 +0900 Subject: New option "--force-progress-bar" -Last-Update: 2010-11-06 +--- + main.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/main.c b/main.c +index ed485d2..d7b4b09 100644 --- a/main.c +++ b/main.c -@@ -213,6 +213,8 @@ +@@ -213,6 +213,8 @@ VERSION"\n" " -q --quiet : quiet operation\n" " -e --stderr-progress : force output of progress information to\n" " stderr (for wrapper scripts)\n" @@ -16,7 +19,7 @@ " -l --log-summary [] : save result summary to file, default\n" " filename cdparanoia.log\n" " -L --log-debug [] : save detailed device autosense and\n" -@@ -341,6 +343,7 @@ +@@ -341,6 +343,7 @@ VERSION"\n" long callbegin; long callend; long callscript=0; @@ -24,7 +27,7 @@ static char *callback_strings[16]={"wrote", "finished", -@@ -407,13 +410,13 @@ +@@ -407,13 +410,13 @@ static void callback(long inpos, int function){ } } @@ -40,7 +43,7 @@ printit=1; }else{ printit=0; -@@ -607,10 +610,11 @@ +@@ -607,10 +610,11 @@ static void callback(long inpos, int function){ memset(dispcache,' ',graph); } @@ -53,7 +56,7 @@ {"search-for-drive",no_argument,NULL,'s'}, {"force-cdrom-little-endian",no_argument,NULL,'c'}, {"force-cdrom-big-endian",no_argument,NULL,'C'}, -@@ -786,6 +790,9 @@ +@@ -786,6 +790,9 @@ int main(int argc,char *argv[]){ callscript=1; fprintf(stderr,"Sending all callbacks to stderr for wrapper script\n"); break; diff -Nru cdparanoia-3.10.2+debian/debian/patches/series cdparanoia-3.10.2+debian/debian/patches/series --- cdparanoia-3.10.2+debian/debian/patches/series 2017-11-17 20:50:08.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/patches/series 2018-01-30 05:28:04.000000000 +0000 @@ -6,3 +6,4 @@ 06-autoconf.patch 07-jpmanfix.patch cdparanoia-force-progress-bar.diff +0009-dh-autoconf-generate-config-files.patch diff -Nru cdparanoia-3.10.2+debian/debian/rules cdparanoia-3.10.2+debian/debian/rules --- cdparanoia-3.10.2+debian/debian/rules 2017-11-17 20:53:02.000000000 +0000 +++ cdparanoia-3.10.2+debian/debian/rules 2018-01-30 05:28:04.000000000 +0000 @@ -1,82 +1,23 @@ #!/usr/bin/make -f -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -export CFLAGS += -Wall -export LDFLAGS += -Wl,--as-needed -Wl,-O1 -Wl,-z,defs - - -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) - CROSS=--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -else - CROSS= -endif - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - rm -f config.guess config.sub - - [ ! -f Makefile ] || $(MAKE) distclean - - dh_clean - -config.status: configure - dh_testdir - -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess configure.guess -endif -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub configure.sub -endif - - ./configure $(CROSS) --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --prefix=/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)" - -build: build-stamp -build-stamp: config.status - dh_testdir - - $(MAKE) - - touch build-stamp - -install: build - dh_testdir - dh_testroot - dh_prep - - $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr - - install -D -m 644 cdparanoia.1.jp debian/cdparanoia/usr/share/man/ja/man1/cdparanoia.1 - -binary: binary-arch - -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_install --fail-missing --sourcedir=debian/tmp - dh_lintian - dh_strip --dbg-package=cdparanoia-dbg - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps -ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) - dh_gencontrol -- -Varch-os-dev="libcam-dev" -else - dh_gencontrol -endif - dh_md5sums - dh_builddeb +export CFLAGS += -fPIC -g +export LDFLAGS += -fPIC -binary-indep: +%: + dh $@ --no-parallel -.PHONY: clean build install binary binary-arch binary-indep +override_dh_update_autotools_config: + cp configure.guess config.guess + cp configure.sub config.sub + dh_update_autotools_config + +override_dh_auto_install: + dh_auto_install -- prefix=$(CURDIR)/debian/tmp/usr + install -D -m 644 cdparanoia.1.jp $(CURDIR)/debian/cdparanoia/usr/share/man/ja/man1/cdparanoia.1 + + +#ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) +# dh_gencontrol -- -Varch-os-dev="libcam-dev" +#else +# dh_gencontrol +#endif