rpms/libcdio-paranoia
5
0
Fork 0
Code Issues Pull Requests Releases Activity

updated to 10.2+0.94+2

Browse Source
This commit is contained in:
Adrian Reber 2018-01-25 09:51:37 +01:00
parent fe2883767d
commit bf66cd72e8
Failed to extract signature
7 changed files with 8 additions and 852 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/libcdio-paranoia-10.2+0.90+1.tar.gz /libcdio-paranoia-10.2+0.90+1.tar.gz
/libcdio-paranoia-10.2+0.93+1.tar.gz /libcdio-paranoia-10.2+0.93+1.tar.gz
/libcdio-paranoia-10.2+0.93+1.tar.gz.sig /libcdio-paranoia-10.2+0.93+1.tar.gz.sig
/libcdio-paranoia-10.2+0.94+2.tar.gz

310
5f8c33d04fcf7b4cede360e79cc3806e9139127f.patch
View File

@ -1,310 +0,0 @@
From 5f8c33d04fcf7b4cede360e79cc3806e9139127f Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Sun, 4 Nov 2012 22:55:53 +0100
Subject: [PATCH] Fixup license headers (again)
Like said in previous commit, but this time for real:
After the libcdio - libcdio-paranoia split many license headers
were wrong. The original cdparanoia library is LGPLv2+ and the
binaries are GPLv2+. This changes all GPLv3 headers from the
libcdio split back to GPLv2+ and the files in lib/paranoia to
LGPLv2+.
---
lib/paranoia/gap.c | 22 +++++++++++-----------
lib/paranoia/gap.h | 22 +++++++++++-----------
lib/paranoia/isort.c | 22 +++++++++++-----------
lib/paranoia/isort.h | 20 ++++++++++----------
lib/paranoia/overlap.c | 22 +++++++++++-----------
lib/paranoia/overlap.h | 22 +++++++++++-----------
lib/paranoia/p_block.h | 20 ++++++++++----------
lib/paranoia/paranoia.c | 22 +++++++++++-----------
8 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/lib/paranoia/gap.c b/lib/paranoia/gap.c
index 1f5f95b..5e83856 100644
--- a/lib/paranoia/gap.c
+++ b/lib/paranoia/gap.c
@@ -1,20 +1,20 @@
/*
Copyright (C) 2004, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
/***
* Gap analysis support code for paranoia
diff --git a/lib/paranoia/gap.h b/lib/paranoia/gap.h
index 3185695..1d15f84 100644
--- a/lib/paranoia/gap.h
+++ b/lib/paranoia/gap.h
@@ -1,20 +1,20 @@
/*
Copyright (C) 2004, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
#ifndef _GAP_H_
diff --git a/lib/paranoia/isort.c b/lib/paranoia/isort.c
index b80005b..0825f50 100644
--- a/lib/paranoia/isort.c
+++ b/lib/paranoia/isort.c
@@ -1,20 +1,20 @@
/*
Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
/* sorted vector abstraction for paranoia */
diff --git a/lib/paranoia/isort.h b/lib/paranoia/isort.h
index a1eace5..842260e 100644
--- a/lib/paranoia/isort.h
+++ b/lib/paranoia/isort.h
@@ -4,19 +4,19 @@
Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ 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 program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
#ifndef _ISORT_H_
diff --git a/lib/paranoia/overlap.c b/lib/paranoia/overlap.c
index 7301e7f..d4e7473 100644
--- a/lib/paranoia/overlap.c
+++ b/lib/paranoia/overlap.c
@@ -1,20 +1,20 @@
/*
Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
/***
diff --git a/lib/paranoia/overlap.h b/lib/paranoia/overlap.h
index e2a3fa8..2760692 100644
--- a/lib/paranoia/overlap.h
+++ b/lib/paranoia/overlap.h
@@ -1,20 +1,20 @@
/*
Copyright (C) 2004, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
#ifndef _OVERLAP_H_
diff --git a/lib/paranoia/p_block.h b/lib/paranoia/p_block.h
index f1e325f..165dae5 100644
--- a/lib/paranoia/p_block.h
+++ b/lib/paranoia/p_block.h
@@ -2,19 +2,19 @@
Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) by Monty (xiphmont@mit.edu)
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ 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 program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
#ifndef _P_BLOCK_H_
diff --git a/lib/paranoia/paranoia.c b/lib/paranoia/paranoia.c
index 3af7f16..4ecfcdf 100644
--- a/lib/paranoia/paranoia.c
+++ b/lib/paranoia/paranoia.c
@@ -1,20 +1,20 @@
/*
Copyright (C) 2004, 2005, 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ 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 General Public License for more details.
+ 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 General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
*/
/***
* Toplevel file for the paranoia abstraction over the cdda lib
--
1.7.10

32
libcdio-NULL-pointer-dereference.patch
View File

@ -1,32 +0,0 @@
From 91637c8319202758f52c6bd31d7264d6b6a74ee1 Mon Sep 17 00:00:00 2001
From: PHO <pho@cielonegro.org>
Date: Fri, 2 Oct 2015 09:31:46 +0900
Subject: [PATCH] Fix NULL pointer dereference that occurs when byte swapping
is needed
cdrom_cache_handler() calls cdio_cddap_read_timed() with buffer == NULL. When this happens on a platform where byte swapping is needed, the latter crashes for dereferencing a NULL pointer.
---
configure.ac | 14 ++++++----
lib/cdda_interface/interface.c | 2 +-
test/.gitignore | 5 ++++
test/Makefile.am | 4 +--
test/endian.sh.in | 59 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 76 insertions(+), 8 deletions(-)
create mode 100644 test/endian.sh.in
diff --git a/lib/cdda_interface/interface.c b/lib/cdda_interface/interface.c
index 08a96f3..bfb9ac3 100644
--- a/lib/cdda_interface/interface.c
+++ b/lib/cdda_interface/interface.c
@@ -155,7 +155,7 @@ cdio_cddap_read_timed(cdrom_drive_t *d, void *buffer, lsn_t beginsector,
if ( d->bigendianp == -1 ) /* not determined yet */
d->bigendianp = data_bigendianp(d);
- if ( d->b_swap_bytes && d->bigendianp != bigendianp() ) {
+ if ( buffer && d->b_swap_bytes && d->bigendianp != bigendianp() ) {
int i;
uint16_t *p=(uint16_t *)buffer;
long els=sectors*CDIO_CD_FRAMESIZE_RAW/2;
--
2.14.2

11
libcdio-paranoia.spec
View File

@ -1,13 +1,12 @@
Name: libcdio-paranoia Name: libcdio-paranoia
Version: 10.2+0.93+1 Version: 10.2+0.94+2
Release: 11%{?dist} Release: 1%{?dist}
Summary: CD paranoia on top of libcdio Summary: CD paranoia on top of libcdio
Group: System Environment/Libraries Group: System Environment/Libraries
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/libcdio/ URL: http://www.gnu.org/software/libcdio/
Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-%{version}.tar.gz Source0: http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-%{version}.tar.gz
Patch0: libcdio-paranoia-manpage.patch Patch0: libcdio-paranoia-manpage.patch
Patch1: libcdio-NULL-pointer-dereference.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: chrpath BuildRequires: chrpath
@ -39,7 +38,6 @@ This package contains header files and libraries for %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
# fix pkgconfig files # fix pkgconfig files
sed -i -e 's,-I${includedir},-I${includedir}/cdio,g' libcdio_paranoia.pc.in sed -i -e 's,-I${includedir},-I${includedir}/cdio,g' libcdio_paranoia.pc.in
@ -81,7 +79,7 @@ make %{?_smp_mflags} check
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license COPYING %license COPYING
%doc AUTHORS NEWS README THANKS %doc AUTHORS NEWS README.md THANKS
%{_bindir}/* %{_bindir}/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_mandir}/man1/* %{_mandir}/man1/*
@ -97,6 +95,9 @@ make %{?_smp_mflags} check
%changelog %changelog
* Thu Jan 25 2018 Adrian Reber <adrian@lisas.de> - 10.2+0.94+2-1
- updated to 10.2+0.94+2
* Tue Oct 17 2017 Marek Kasik <mkasik@redhat.com> - 10.2+0.93+1-11 * Tue Oct 17 2017 Marek Kasik <mkasik@redhat.com> - 10.2+0.93+1-11
- Enable unit tests - Enable unit tests
- Backport fix for a NULL pointer dereference - Backport fix for a NULL pointer dereference

219
most-of-4c30a84f7899ff63c9bbc39563099f98752c83d6.patch
View File

@ -1,219 +0,0 @@
diff --git a/libcdio_cdda.pc.in b/libcdio_cdda.pc.in
index 314f5ec..26ea142 100644
--- a/libcdio_cdda.pc.in
+++ b/libcdio_cdda.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libcdio_cdda
Description: CD paranoia CD-DA library from libcdio
Version: @PACKAGE_VERSION@
-#Requires: glib-2.0
+Requires: libcdio
Libs: -L${libdir} -lcdio_cdda -lcdio @COS_LIB@
Cflags: -I${includedir}
diff --git a/libcdio_paranoia.pc.in b/libcdio_paranoia.pc.in
index d273ed5..380fc77 100644
--- a/libcdio_paranoia.pc.in
+++ b/libcdio_paranoia.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libcdio_paranoia
Description: CD paranoia library from libcdio
Version: @PACKAGE_VERSION@
-#Requires: glib-2.0
+Requires: libcdio
Libs: -L${libdir} -lcdio_paranoia -lcdio_cdda -lcdio
Cflags: -I${includedir}
diff --git a/src/getopt.h b/src/getopt.h
index 348e0fe..e10b038 100644
--- a/src/getopt.h
+++ b/src/getopt.h
@@ -1,26 +1,49 @@
/* Declarations for getopt.
- Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009,2010
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
- NOTE: The canonical source of this file is maintained with the GNU C Library.
- Bugs can be reported to bug-glibc@gnu.org.
+ The GNU C 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 program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- This program is distributed in the hope that it will be useful,
+ The GNU C 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 General Public License for more details.
+ 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 General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#ifndef _GETOPT_H
-#define _GETOPT_H 1
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+ standalone, or this is the first header included in the source file.
+ If we are being used with glibc, we need to include <features.h>, but
+ that does not exist if we are standalone. So: if __GNU_LIBRARY__ is
+ not defined, include <ctype.h>, which will pull in <features.h> for us
+ if it's from glibc. (Why ctype.h? It's guaranteed to exist and it
+ doesn't flood the namespace with stuff the way some other headers do.) */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+# define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+# define __THROW throw ()
+# else
+# define __THROW
+# endif
+#endif
#ifdef __cplusplus
extern "C" {
@@ -57,6 +80,7 @@
extern int optopt;
+#ifndef __need_getopt
/* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
of `struct option' terminated by an element containing a name which is
@@ -80,11 +104,7 @@
struct option
{
-#if defined (__STDC__) && __STDC__
const char *name;
-#else
- char *name;
-#endif
/* has_arg can't be an enum because some compilers complain about
type mismatches in all the code that assumes it is an int. */
int has_arg;
@@ -94,33 +114,79 @@ struct option
/* Names for the values of the `has_arg' field of `struct option'. */
-#define no_argument 0
-#define required_argument 1
-#define optional_argument 2
-
-#if defined (__STDC__) && __STDC__
-extern int getopt (int argc, char *const *argv, const char *optstring);
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
- const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
- const char *shortopts,
- const struct option *longopts, int *longind);
-
-/* Internal only. Users should not call this directly. */
-extern int _getopt_internal (int argc, char *const *argv,
- const char *shortopts,
- const struct option *longopts, int *longind,
- int long_only);
-#else /* not __STDC__ */
+# define no_argument 0
+# define required_argument 1
+# define optional_argument 2
+#endif /* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+ arguments in ARGV (ARGC of them, minus the program name) for
+ options given in OPTS.
+
+ Return the option character from OPTS just read. Return -1 when
+ there are no more options. For unrecognized options, or options
+ missing arguments, `optopt' is set to the option letter, and '?' is
+ returned.
+
+ The OPTS string is a list of characters which are recognized option
+ letters, optionally followed by colons, specifying that that letter
+ takes an argument, to be placed in `optarg'.
+
+ If a letter in OPTS is followed by two colons, its argument is
+ optional. This behavior is specific to the GNU `getopt'.
+
+ The argument `--' causes premature termination of argument
+ scanning, explicitly telling `getopt' that there are no more
+ options.
+
+ If OPTS begins with `--', then non-option arguments are treated as
+ arguments to the option '\0'. This behavior is specific to the GNU
+ `getopt'. */
+
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+ differences in the consts, in stdlib.h. To avoid compilation
+ errors, only prototype getopt for the GNU C library. */
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+ __THROW;
+
+# if defined __need_getopt && defined __USE_POSIX2 \
+ && !defined __USE_POSIX_IMPLICITLY && !defined __USE_GNU
+/* The GNU getopt has more functionality than the standard version. The
+ additional functionality can be disable at runtime. This redirection
+ helps to also do this at runtime. */
+# ifdef __REDIRECT
+ extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
+ const char *__shortopts),
+ __posix_getopt);
+# else
+extern int __posix_getopt (int ___argc, char *const *___argv,
+ const char *__shortopts) __THROW;
+# define getopt __posix_getopt
+# endif
+# endif
+#else /* not __GNU_LIBRARY__ */
extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
+#endif /* __GNU_LIBRARY__ */
+
+#ifndef __need_getopt
+extern int getopt_long (int ___argc, char *const *___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind)
+ __THROW;
+extern int getopt_long_only (int ___argc, char *const *___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind)
+ __THROW;
-extern int _getopt_internal ();
-#endif /* __STDC__ */
+#endif
#ifdef __cplusplus
}
#endif
+/* Make sure we later can get all the definitions and declarations. */
+#undef __need_getopt
+
#endif /* getopt.h */
--
1.7.10

284
most-of-a500a7037729aaeaba9bfda9c007d598e8fa8adc.patch
View File

@ -1,284 +0,0 @@
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index b70fbe8..0eaee82 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -2,9 +2,9 @@
#
# Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
#
-# This program is free software: you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -12,8 +12,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
manfiles = cd-paranoia.1
man_MANS = $(manfiles)
diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am
index bf4f717..8652b93 100644
--- a/doc/ja/Makefile.am
+++ b/doc/ja/Makefile.am
@@ -2,9 +2,9 @@
#
# Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
#
-# This program is free software: you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -12,8 +12,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
mansubdir=/jp/man1
manfiles = cd-paranoia.1
diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am
index 957828f..f77fdb0 100644
--- a/example/C++/Makefile.am
+++ b/example/C++/Makefile.am
@@ -1,8 +1,8 @@
# Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
#
-# This program is free software: you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -10,8 +10,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
##########################################################
# Sample C++ programs using libcdio (without OO wrapper)
diff --git a/example/C++/paranoia.cpp b/example/C++/paranoia.cpp
index 17d93d4..29102f1 100644
--- a/example/C++/paranoia.cpp
+++ b/example/C++/paranoia.cpp
@@ -1,9 +1,9 @@
/*
Copyright (C) 2005, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
-
- This program is free software: you can redistribute it and/or modify
+
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -11,8 +11,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* Simple program to show using libcdio's version of the CD-DA paranoia.
diff --git a/example/paranoia.c b/example/paranoia.c
index dd17b41..7a82cfa 100644
--- a/example/paranoia.c
+++ b/example/paranoia.c
@@ -2,9 +2,9 @@
Copyright (C) 2005, 2006, 2008, 2009, 2010, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
- This program is free software: you can redistribute it and/or modify
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -12,8 +12,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* Simple program to show using libcdio's version of the CD-DA paranoia.
diff --git a/example/paranoia2.c b/example/paranoia2.c
index e0a14a4..7474813 100644
--- a/example/paranoia2.c
+++ b/example/paranoia2.c
@@ -1,9 +1,9 @@
/*
Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
- This program is free software: you can redistribute it and/or modify
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -11,8 +11,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* Simple program to show using libcdio's version of the CD-DA
diff --git a/lib/paranoia/Makefile.am b/lib/paranoia/Makefile.am
index 4007b52..c538bf4 100644
--- a/lib/paranoia/Makefile.am
+++ b/lib/paranoia/Makefile.am
@@ -1,8 +1,8 @@
# Copyright (C) 2004, 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
#
-# This program is free software: you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -10,8 +10,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
########################################################
# Things to make the libcdio_paranoia library
diff --git a/lib/paranoia/isort.h b/lib/paranoia/isort.h
index 8479f84..a1eace5 100644
--- a/lib/paranoia/isort.h
+++ b/lib/paranoia/isort.h
@@ -3,10 +3,10 @@
Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1998 Monty xiphmont@mit.edu
-
- This program is free software: you can redistribute it and/or modify
+
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,8 +14,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _ISORT_H_
diff --git a/src/pod2c.pl b/src/pod2c.pl
index a37d2a2..f1dc254 100755
--- a/src/pod2c.pl
+++ b/src/pod2c.pl
@@ -18,9 +18,9 @@
print "/*
Copyright (C) 1999, 2005, 2007, 2008 Rocky Bernstein
- This program is free software: you can redistribute it and/or modify
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -28,8 +28,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
static const char ${name}_help[] =\n";
while(<STDIN>) {
diff --git a/test/testparanoia.c b/test/testparanoia.c
index 54e1980..9b1545f 100644
--- a/test/testparanoia.c
+++ b/test/testparanoia.c
@@ -1,9 +1,9 @@
/*
Copyright (C) 2005, 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
- This program is free software: you can redistribute it and/or modify
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -11,8 +11,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/* Simple program to show using libcdio's version of cdparanoia. */
--
1.7.10

3
sources
View File

@ -1,2 +1 @@
4fb07fa47db24b71d315d40c9c6cecfb libcdio-paranoia-10.2+0.93+1.tar.gz SHA512 (libcdio-paranoia-10.2+0.94+2.tar.gz) = 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
a13a07476d8351588904fcf0e1602ba7 libcdio-paranoia-10.2+0.93+1.tar.gz.sig