punt versions affected by GLSA-200709-06

Package-Manager: portage-2.1.3.15

6 files changed, 20 insertions, 323 deletions

diff --git a/media-sound/flac123/ChangeLog b/media-sound/flac123/ChangeLog
index bdccbdcb2d2c..0b385aa6363e 100644
--- a/media-sound/flac123/ChangeLog
+++ b/media-sound/flac123/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/flac123
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/ChangeLog,v 1.23 2007/08/29 10:07:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/ChangeLog,v 1.24 2007/10/23 15:47:38 aballier Exp $
+
+  23 Oct 2007; Alexis Ballier <aballier@gentoo.org>
+  -files/flac123-0.0.9+flac-1.1.3.patch,
+  -files/flac123-0.0.9-asneeded.patch, -flac123-0.0.9.ebuild:
+  punt versions affected by  GLSA-200709-06
 
   29 Aug 2007; Markus Rothe <corsair@gentoo.org> flac123-0.0.11.ebuild:
   Stable on ppc64; bug #186220
diff --git a/media-sound/flac123/Manifest b/media-sound/flac123/Manifest
index f4429998b73e..ed223fdd94a5 100644
--- a/media-sound/flac123/Manifest
+++ b/media-sound/flac123/Manifest
@@ -1,25 +1,15 @@
-AUX flac123-0.0.9+flac-1.1.3.patch 8333 RMD160 6f5f4a399967bdd532aa875a5bbc41ad891b2012 SHA1 42b598b2305105cb860370ecda64ab0b4ba9583b SHA256 16fd53f4234a7a6f0755c5a289c319cf6d38220e29420bf332a6d17f3c18b1c0
-MD5 86ff81e020932890e2fa92f2f679fcab files/flac123-0.0.9+flac-1.1.3.patch 8333
-RMD160 6f5f4a399967bdd532aa875a5bbc41ad891b2012 files/flac123-0.0.9+flac-1.1.3.patch 8333
-SHA256 16fd53f4234a7a6f0755c5a289c319cf6d38220e29420bf332a6d17f3c18b1c0 files/flac123-0.0.9+flac-1.1.3.patch 8333
-AUX flac123-0.0.9-asneeded.patch 334 RMD160 0d57e7e6ed583da3b1a9eabc3c4a7bb7c0ebd958 SHA1 8c26ec3b1f3626b7adf2056f992c8c70f1038add SHA256 858d81cd70d3767cd126ad41838a6c74b697c92f948d6683e6c9521586da3923
-MD5 d8b59495fec258977c30bfaf5e71f69d files/flac123-0.0.9-asneeded.patch 334
-RMD160 0d57e7e6ed583da3b1a9eabc3c4a7bb7c0ebd958 files/flac123-0.0.9-asneeded.patch 334
-SHA256 858d81cd70d3767cd126ad41838a6c74b697c92f948d6683e6c9521586da3923 files/flac123-0.0.9-asneeded.patch 334
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST flac123-0.0.11.tar.gz 71244 RMD160 b12800b31aeb4438643cf1bf1f3c1a2abb0e062c SHA1 a713097bb55e4c9998df32a0a33042f8a79bc6d4 SHA256 2f96da02c28730fcc2c71e9e6975268a4b01b0a298f1bea58a5543192f972b66
-DIST flac123-0.0.9.tar.gz 69647 RMD160 f84a0373f86322d419487492858fb0973e3accfb SHA1 54784aeda6c016759007e02e51076c0ea0b937ed SHA256 9aa3f6e9a3e809a8414158b0234e0a4a26ed39a4a8e02b790d5bf78cc9310ddf
 EBUILD flac123-0.0.11.ebuild 685 RMD160 10fd3afd193e2fad3ff0298048da9e526998a32f SHA1 0e00cba6bb08ef42ef46a56d478c4dce6fd3324d SHA256 cb27a569696cc28c50ea65ebb25c2889896a6124a78185d8df6bc86a74dfd5da
 MD5 eb131d37179b280095c07413ae51daa1 flac123-0.0.11.ebuild 685
 RMD160 10fd3afd193e2fad3ff0298048da9e526998a32f flac123-0.0.11.ebuild 685
 SHA256 cb27a569696cc28c50ea65ebb25c2889896a6124a78185d8df6bc86a74dfd5da flac123-0.0.11.ebuild 685
-EBUILD flac123-0.0.9.ebuild 832 RMD160 a4ecc2118afeeae61bccd0ca5f15b38c09cc47bc SHA1 855b48f8b4d2618fefca3942973338ebee232f11 SHA256 b63e61ef6bfc01086398fe8e86c48062c584d3c1370c02dc72dea83d7a0091c0
-MD5 749502d8c9dd375c215d0f80a8189d57 flac123-0.0.9.ebuild 832
-RMD160 a4ecc2118afeeae61bccd0ca5f15b38c09cc47bc flac123-0.0.9.ebuild 832
-SHA256 b63e61ef6bfc01086398fe8e86c48062c584d3c1370c02dc72dea83d7a0091c0 flac123-0.0.9.ebuild 832
-MISC ChangeLog 3020 RMD160 733b5206b7d50b1304675733bc8ffe9643482961 SHA1 ee96b031e6ffb91ef0066fceacc84593d6886a60 SHA256 72f625399f23e83aa1055a11417fc3f96dc5585707eee7a91571d849dc96fca2
-MD5 031b98f394c7c17ef67496207c23f910 ChangeLog 3020
-RMD160 733b5206b7d50b1304675733bc8ffe9643482961 ChangeLog 3020
-SHA256 72f625399f23e83aa1055a11417fc3f96dc5585707eee7a91571d849dc96fca2 ChangeLog 3020
+MISC ChangeLog 3221 RMD160 314d910d2978f8baf6720589733a6b9876353b2b SHA1 b0699be1aeb913a2cd1cd59f5d80e942a4be2e74 SHA256 3483b17487fd3f895bde6ae183dbde1a3cbc5981b57b67d70270a6a2e3842223
+MD5 0544a3b4f18d2d5bcf5c65f5095fb2b5 ChangeLog 3221
+RMD160 314d910d2978f8baf6720589733a6b9876353b2b ChangeLog 3221
+SHA256 3483b17487fd3f895bde6ae183dbde1a3cbc5981b57b67d70270a6a2e3842223 ChangeLog 3221
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -27,6 +17,10 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 9baaf5127baffed4dd4f95259489ece8 files/digest-flac123-0.0.11 241
 RMD160 5d9416becf134bc740b14c286dbb521566e3529d files/digest-flac123-0.0.11 241
 SHA256 622c56c1e90545b168a683b58a6d2e26ae469c45ed1e6efc8555189735c319b7 files/digest-flac123-0.0.11 241
-MD5 dadd20536367fd0e972d3a9f9333c776 files/digest-flac123-0.0.9 238
-RMD160 8a6e77fee4e461e4d96daeaadaa61e987ed58827 files/digest-flac123-0.0.9 238
-SHA256 a54b4b3844fa218fd039740bfe27a45d63e75fd15d16fe917c736703f8c13392 files/digest-flac123-0.0.9 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHHhfJvFcC4BYPU0oRAmEjAJoCdEYdp0ym3it5g8CdCpt/3wL30ACZAS6a
+ipGQcAyuhAyk2Piuj4rGTX8=
+=nOgz
+-----END PGP SIGNATURE-----
diff --git a/media-sound/flac123/files/digest-flac123-0.0.9 b/media-sound/flac123/files/digest-flac123-0.0.9
deleted file mode 100644
index 9a3dd1e11200..000000000000
--- a/media-sound/flac123/files/digest-flac123-0.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1614e1d1fe5b427ffd5988ea766abcf4 flac123-0.0.9.tar.gz 69647
-RMD160 f84a0373f86322d419487492858fb0973e3accfb flac123-0.0.9.tar.gz 69647
-SHA256 9aa3f6e9a3e809a8414158b0234e0a4a26ed39a4a8e02b790d5bf78cc9310ddf flac123-0.0.9.tar.gz 69647
diff --git a/media-sound/flac123/files/flac123-0.0.9+flac-1.1.3.patch b/media-sound/flac123/files/flac123-0.0.9+flac-1.1.3.patch
deleted file mode 100644
index 91a22e555a88..000000000000
--- a/media-sound/flac123/files/flac123-0.0.9+flac-1.1.3.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -ru flac123-0.0.9/configure.ac flac123-0.0.9-b2/configure.ac
---- flac123-0.0.9/configure.ac	2005-05-07 16:05:24.000000000 -0700
-+++ flac123-0.0.9-b2/configure.ac	2006-10-31 00:03:09.000000000 -0800
-@@ -40,9 +40,9 @@
- AC_PROG_CC
- 
- # Checks for libraries.
--AC_CHECK_LIB(FLAC, FLAC__file_decoder_new, [haveflac=yes], [haveflac=no], -lm)
-+AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, [haveflac=yes], [haveflac=no], -lm)
- if test "$haveflac" = "yes"; then
--	FLAC_LIBS="-lFLAC -lm"
-+	FLAC_LIBS="-lFLAC -logg -lm"
- 	AC_SUBST(FLAC_LIBS)
- else
- 	AC_MSG_ERROR(FLAC required!)
-diff -ru flac123-0.0.9/flac123.c flac123-0.0.9-b2/flac123.c
---- flac123-0.0.9/flac123.c	2005-05-08 21:25:20.000000000 -0700
-+++ flac123-0.0.9-b2/flac123.c	2006-10-31 00:06:06.000000000 -0800
-@@ -49,12 +49,17 @@
- 
- static void play_file(const char *);
- static void play_remote_file(void);
--void flac_error_hdl(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus,
-- void *);
--void flac_metadata_hdl(const FLAC__FileDecoder *, const FLAC__StreamMetadata *,
-- void *);
-+#ifdef LEGACY_FLAC
-+void flac_error_hdl(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus, void *);
-+void flac_metadata_hdl(const FLAC__FileDecoder *, const FLAC__StreamMetadata *, void *);
- FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__FileDecoder *,
- 	const FLAC__Frame *, const FLAC__int32 * const buf[], void *);
-+#else
-+void flac_error_hdl(const FLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus, void *);
-+void flac_metadata_hdl(const FLAC__StreamDecoder *, const FLAC__StreamMetadata *, void *);
-+FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__StreamDecoder *,
-+	const FLAC__Frame *, const FLAC__int32 * const buf[], void *);
-+#endif
- 
- static void signal_handler(int);
- static int quit_now = 0;
-@@ -190,6 +195,7 @@
-     file_info.year[VORBIS_YEAR_LEN] = '\0';
- 
-     /* create and initialize flac decoder object */
-+#ifdef LEGACY_FLAC
-     file_info.decoder = FLAC__file_decoder_new();
-     FLAC__file_decoder_set_md5_checking(file_info.decoder, true);
-     FLAC__file_decoder_set_filename(file_info.decoder, filename);
-@@ -210,13 +216,29 @@
- 	FLAC__file_decoder_delete(file_info.decoder);
- 	return false;
-     }
-+#else
-+    file_info.decoder = FLAC__stream_decoder_new();
-+    FLAC__stream_decoder_set_md5_checking(file_info.decoder, true);
-+
-+    /* read metadata */
-+    if ((FLAC__stream_decoder_init_file(file_info.decoder, filename, flac_write_hdl, flac_metadata_hdl, flac_error_hdl, (void *)&file_info) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+	|| (!FLAC__stream_decoder_process_until_end_of_metadata(file_info.decoder)))
-+    {
-+	FLAC__stream_decoder_delete(file_info.decoder);
-+	return false;
-+    }
-+#endif
- 
-     /* open libao output device */
-     if (cli_args.wavfile) {
- 	if (!(file_info.ao_dev = ao_open_file(ao_driver_id("wav"), cli_args.wavfile, /*overwrite*/ 1, &(file_info.ao_fmt), NULL)))
- 	{
- 	    fprintf(stderr, "Error opening wav file %s\n", cli_args.wavfile);
-+#ifdef LEGACY_FLAC
- 	    FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+	    FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
- 	    return false;
- 	}
-     }
-@@ -224,7 +246,11 @@
- 	if (!(file_info.ao_dev = ao_open_live(ao_output_id, &(file_info.ao_fmt), NULL)))
- 	{
- 	    fprintf(stderr, "Error opening ao device %d\n", ao_output_id);
-+#ifdef LEGACY_FLAC
- 	    FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+	    FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
- 	    return false;
- 	}
-     }
-@@ -237,7 +263,11 @@
- 	if (!(file_info.ao_dev = ao_open_live(ao_output_id, &(file_info.ao_fmt), NULL)))
- 	{
- 	    fprintf(stderr, "Error opening ao device %d\n", ao_output_id);
-+#ifdef LEGACY_FLAC
- 	    FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+	    FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
- 	    return false;
- 	}
-     }
-@@ -257,8 +287,13 @@
- 
- void decoder_destructor(void)
- {
-+#ifdef LEGACY_FLAC
-     FLAC__file_decoder_finish(file_info.decoder);
-     FLAC__file_decoder_delete(file_info.decoder);
-+#else
-+    FLAC__stream_decoder_finish(file_info.decoder);
-+    FLAC__stream_decoder_delete(file_info.decoder);
-+#endif
-     file_info.is_loaded  = false;
-     file_info.is_playing = false;
-     file_info.filename[0] = '\0';
-@@ -272,9 +307,15 @@
- 	return;
-     }
- 
-+#ifdef LEGACY_FLAC
-     while (FLAC__file_decoder_process_single(file_info.decoder) == true &&
- 	   FLAC__file_decoder_get_state(file_info.decoder) == 
- 	   FLAC__FILE_DECODER_OK && !interrupted)
-+#else
-+    while (FLAC__stream_decoder_process_single(file_info.decoder) == true &&
-+	   FLAC__stream_decoder_get_state(file_info.decoder) <
-+	   FLAC__STREAM_DECODER_END_OF_STREAM && !interrupted)
-+#endif
-     {
-     }
-     interrupted = 0; /* more accurate feedback if placed after loop */
-@@ -292,13 +333,22 @@
-     {
- 	if (file_info.is_playing == true)
- 	{
-+#ifdef LEGACY_FLAC
- 	    if (FLAC__file_decoder_get_state(file_info.decoder) ==
- 		FLAC__FILE_DECODER_END_OF_FILE) 
-+#else
-+	    if (FLAC__stream_decoder_get_state(file_info.decoder) ==
-+		FLAC__STREAM_DECODER_END_OF_STREAM) 
-+#endif
- 	    {
- 		decoder_destructor();
- 		printf("@P 0\n");
- 	    }
-+#ifdef LEGACY_FLAC
- 	    else if (!FLAC__file_decoder_process_single(file_info.decoder)) 
-+#else
-+	    else if (!FLAC__stream_decoder_process_single(file_info.decoder)) 
-+#endif
- 	    {
- 		fprintf(stderr, "error decoding single frame!\n");
- 	    }
-@@ -314,14 +364,24 @@
-     }
- }
- 
-+#ifdef LEGACY_FLAC
- void flac_error_hdl(const FLAC__FileDecoder *dec, 
- 		    FLAC__StreamDecoderErrorStatus status, void *data)
-+#else
-+void flac_error_hdl(const FLAC__StreamDecoder *dec, 
-+		    FLAC__StreamDecoderErrorStatus status, void *data)
-+#endif
- {
-     fprintf(stderr, "error handler called!\n");
- }
- 
-+#ifdef LEGACY_FLAC
- void flac_metadata_hdl(const FLAC__FileDecoder *dec, 
- 		       const FLAC__StreamMetadata *meta, void *data)
-+#else
-+void flac_metadata_hdl(const FLAC__StreamDecoder *dec, 
-+		       const FLAC__StreamMetadata *meta, void *data)
-+#endif
- {
-     file_info_struct *p = (file_info_struct *) data;
- 
-@@ -344,10 +404,17 @@
-     }
- }
- 
-+#ifdef LEGACY_FLAC
- FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__FileDecoder *dec, 
- 					      const FLAC__Frame *frame, 
- 					      const FLAC__int32 * const buf[], 
- 					      void *data)
-+#else
-+FLAC__StreamDecoderWriteStatus flac_write_hdl(const FLAC__StreamDecoder *dec, 
-+					      const FLAC__Frame *frame, 
-+					      const FLAC__int32 * const buf[], 
-+					      void *data)
-+#endif
- {
-     int sample, channel, i;
-     uint_32 samples = frame->header.blocksize;
-diff -ru flac123-0.0.9/flac123.h flac123-0.0.9-b2/flac123.h
---- flac123-0.0.9/flac123.h	2005-02-24 21:52:02.000000000 -0800
-+++ flac123-0.0.9-b2/flac123.h	2006-10-30 17:23:56.000000000 -0800
-@@ -22,13 +22,24 @@
- #include <limits.h>
- #include <FLAC/all.h>
- 
-+/* by LEGACY_FLAC we mean pre-1.1.3 before FLAC__FileDecoder was merged into FLAC__StreamDecoder */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- /* string widths for printing ID3 (vorbis) data in remote mode */
- #define VORBIS_TAG_LEN 30
- #define VORBIS_YEAR_LEN 4
- 
- /* the main data structure of the program */
- typedef struct {
-+#ifdef LEGACY_FLAC
-     FLAC__FileDecoder *decoder;
-+#else
-+    FLAC__StreamDecoder *decoder;
-+#endif
- 
-     /* bits, rate, channels, byte_format */
-     ao_sample_format sam_fmt; /* input sample's true format */
-diff -ru flac123-0.0.9/remote.c flac123-0.0.9-b2/remote.c
---- flac123-0.0.9/remote.c	2005-02-24 21:50:41.000000000 -0800
-+++ flac123-0.0.9-b2/remote.c	2006-10-30 17:24:28.000000000 -0800
-@@ -150,8 +150,13 @@
- 		    file_info.current_sample += delta_frames;
- 		}
- 
-+#ifdef LEGACY_FLAC
- 		FLAC__file_decoder_seek_absolute(file_info.decoder,
- 						 file_info.current_sample);
-+#else
-+		FLAC__stream_decoder_seek_absolute(file_info.decoder,
-+						 file_info.current_sample);
-+#endif
-             }
- 	    /* absolute seek */
-             else
-@@ -161,7 +166,11 @@
- 		file_info.elapsed_time = absolute_time;
- 		file_info.current_sample = absolute_frame;
- 
-+#ifdef LEGACY_FLAC
- 		FLAC__file_decoder_seek_absolute(file_info.decoder, absolute_frame);
-+#else
-+		FLAC__stream_decoder_seek_absolute(file_info.decoder, absolute_frame);
-+#endif
-             }
- 
-         }
diff --git a/media-sound/flac123/files/flac123-0.0.9-asneeded.patch b/media-sound/flac123/files/flac123-0.0.9-asneeded.patch
deleted file mode 100644
index 35936ea18b3b..000000000000
--- a/media-sound/flac123/files/flac123-0.0.9-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flac123-0.0.9/Makefile.am.old	2006-11-18 12:27:32.000000000 +0100
-+++ flac123-0.0.9/Makefile.am	2006-11-18 12:27:41.000000000 +0100
-@@ -7,7 +7,7 @@
- 	version.h \
- 	vorbiscomment.c
- 
--flac123_LDFLAGS = @FLAC_LIBS@ @POPT_LIBS@ @AO_LIBS@
-+flac123_LDADD = @FLAC_LIBS@ @POPT_LIBS@ @AO_LIBS@
- 
- EXTRA_DIST = README.remote BUGS reconf
- 
diff --git a/media-sound/flac123/flac123-0.0.9.ebuild b/media-sound/flac123/flac123-0.0.9.ebuild
deleted file mode 100644
index 13bbfee8954e..000000000000
--- a/media-sound/flac123/flac123-0.0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flac123/flac123-0.0.9.ebuild,v 1.11 2007/02/21 02:49:46 vapier Exp $
-
-WANT_AUTOMAKE=1.6
-
-inherit eutils autotools
-
-DESCRIPTION="console app for playing FLAC audio files"
-HOMEPAGE="http://flac-tools.sourceforge.net"
-SRC_URI="mirror://sourceforge/flac-tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 sh sparc x86"
-IUSE=""
-
-DEPEND="media-libs/flac
-	media-libs/libao
-	media-libs/libogg"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
-}