--- libid3tag-0.15.1b.orig/debian/rules +++ libid3tag-0.15.1b/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f +# makefile for libid3tag - using cdbs + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_DH_MAKESHLIBS_ARGS_libid3tag0 = -V 'libid3tag0 (>= 0.15.1b)' + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/dpatch.mk + + +DEB_CONFIGURE_EXTRA_FLAGS=--enable-shared +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +DEB_CONFIGURE_EXTRA_FLAGS += --enable-profiling --enable-debugging +else +DEB_CONFIGURE_EXTRA_FLAGS += --disable-profiling --disable-debugging +endif + +clean:: + # annoying lintian errors + rm -f config.cache libz/config.log \ + libz/config.status compat.c frametype.c --- libid3tag-0.15.1b.orig/debian/control +++ libid3tag-0.15.1b/debian/control @@ -0,0 +1,28 @@ +Source: libid3tag +Priority: optional +Section: sound +Build-Depends: cdbs, dpatch, debhelper (>= 4.1.0), gettext, zlib1g-dev, gperf +Maintainer: Mad Maintainers +Uploaders: Sam Clegg , Kurt Roeckx , Clément Stenac +Standards-Version: 3.6.1 + +Package: libid3tag0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Description: ID3 tag reading library from the MAD project + ID3 tag manipulation library with full support for reading ID3v1, ID3v1.1, + ID3v2.2, ID3v2.3, and ID3v2.4 tags, as well as support for writing ID3v1, + ID3v1.1, and ID3v2.4 tags. + +Package: libid3tag0-dev +Architecture: any +Section: libdevel +Depends: libid3tag0 (=${Source-Version}), pkg-config, zlib1g-dev +Description: ID3 tag reading library from the MAD project + ID3 tag manipulation library with full support for reading ID3v1, ID3v1.1, + ID3v2.2, ID3v2.3, and ID3v2.4 tags, as well as support for writing ID3v1, + ID3v1.1, and ID3v2.4 tags. + . + This is the package you need to develop or compile applications that + use id3tag. --- libid3tag-0.15.1b.orig/debian/libid3tag0-dev.docs +++ libid3tag-0.15.1b/debian/libid3tag0-dev.docs @@ -0,0 +1,3 @@ +CREDITS +README +TODO --- libid3tag-0.15.1b.orig/debian/id3tag.pc +++ libid3tag-0.15.1b/debian/id3tag.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: id3tag +Description: ID3 tag reading library +Requires: +Version: 0.15.0b +Libs: -L${libdir} -lid3tag -lz +Cflags: -I${includedir} --- libid3tag-0.15.1b.orig/debian/changelog +++ libid3tag-0.15.1b/debian/changelog @@ -0,0 +1,306 @@ +libid3tag (0.15.1b-10build1) karmic; urgency=low + + * No-change rebuild to gain FORTIFY defaults. + + -- Kees Cook Mon, 11 May 2009 12:07:30 -0700 + +libid3tag (0.15.1b-10) unstable; urgency=low + + * Reupload with the the CVS directories. + + -- Kurt Roeckx Sat, 20 Jan 2007 16:57:31 +0000 + +libid3tag (0.15.1b-9) unstable; urgency=high + + * Handle unknown/invalid encodings in id3_compat_fixup(). + id3_parse_string() returns NULL in that case and then we got + a segfault in id3_ucs4_length(). (Closes: #405801) + Thanks to Andreas Henriksson + + -- Kurt Roeckx Sun, 14 Jan 2007 14:46:12 +0000 + +libid3tag (0.15.1b-8) unstable; urgency=low + + * Change 10_utf16.dpatch so that it doesn't return an error in case + an utf16 string with an odd number of bytes and just tells that it + parsed them. + + -- Kurt Roeckx Mon, 13 Jan 2006 15:32:41 +0100 + +libid3tag (0.15.1b-7) unstable; urgency=low + + * Set the shlibs again. It was lost in the coversion to cdbs. + (Closes: #311544) + + -- Kurt Roeckx Mon, 23 May 2005 19:12:10 +0200 + +libid3tag (0.15.1b-6) unstable; urgency=low + + * Clément Stenac: + * debian/control: set new Maintainer: and Uploaders: + pkg-mad-maintainers@lists.alioth.debian.org (Closes: #300098) + * Convert to CDBS and use latest debhelper + * Convert changelog and control to UTF8 + * Better copyright file + * Sam Clegg: + * debian/libid3tag0.postinst: removed since debhelper runs ldconfig + for us. + * debian/libid3tag0-dev.install: install the pkg-config file. + * debian/rules: remove rule for installing pkg-config file. + * Kurt Roeckx + * Add watch file. + + -- Sam Clegg Sat, 7 May 2005 15:19:11 +0100 + +libid3tag (0.15.1b-5) unstable; urgency=low + + * QA upload. + * 12_endless_loop: Fix endless loop in utf16.c (patch by Ronald Bultje). + Closes: #304913. + * Switch to debhelper 4. + * debian/rules: + - Remove support for DEB_BUILD_OPTIONS=debug. + - Add support for DEB_BUILD_OPTIONS=noopt. + + -- Matej Vela Tue, 26 Apr 2005 18:26:14 +0200 + +libid3tag (0.15.1b-4.1) unstable; urgency=low + + * Orphaning this package, setting maintainer to QA. + + -- Kyle McMartin Thu, 17 Mar 2005 10:59:11 -0500 + +libid3tag (0.15.1b-4) unstable; urgency=low + + * Remove patch 11_id3v1. The patch was causing undesireable behaviour + by displaying only v1 tags when v2 tags exist. (closes: #278891) + + -- Kyle McMartin Thu, 17 Feb 2005 21:05:19 -0500 + +libid3tag (0.15.1b-3) unstable; urgency=medium + + * Missing Build-Depends on gperf results in frametype.c + and compat.c being generated empty. This ends up creating + an incompatible change in the shared object. Sorry. + (closes: #270449, #270450, #270378) + + -- Kyle McMartin Tue, 7 Sep 2004 12:07:11 -0400 + +libid3tag (0.15.1b-2) unstable; urgency=low + + * Switch to using dpatch. + - 10_a_capella: Identify 'a capella' like other libraries. + - 11_id3v1: Don't lose id3v1 tag info, if id3v2 tag also + present. (closes: #267785) + + -- Kyle McMartin Mon, 6 Sep 2004 09:53:12 -0400 + +libid3tag (0.15.1b-1) unstable; urgency=low + + * New upstream version. + * Included misspelled 'a capella' patch from previous NMU. + (closes: #235828) + + -- Kyle McMartin Sat, 5 Jun 2004 19:10:19 -0400 + +libid3tag (0.15.0b-3.1) unstable; urgency=low + + * Non-maintainer upload + * Closes: #235828: misspelled 'a capella' (patch included) + + -- Adam Kessel Sun, 14 Mar 2004 13:01:23 -0500 + +libid3tag (0.15.0b-3) unstable; urgency=low + + * Updated section from devel to libdevel as per mail. + + -- Kyle McMartin Tue, 21 Oct 2003 22:40:08 -0400 + +libid3tag (0.15.0b-2) unstable; urgency=low + + * Updated pkgconfig Version entry for id3tag. + + -- Kyle McMartin Tue, 21 Oct 2003 22:09:04 -0400 + +libid3tag (0.15.0b-1) unstable; urgency=low + + * New upstream version(s). + * Split package into each library, as upstream has done. + + -- Kyle McMartin Sat, 21 Jun 2003 14:21:42 -0400 + +mad (0.14.2b-7) unstable; urgency=low + + * Clean up some lintian warnings. + * Fixed id3tag.pc, accidently had -L instead of -I. + + -- Kyle McMartin Tue, 28 Jan 2003 09:45:02 -0500 + +mad (0.14.2b-6) unstable; urgency=medium + + * Updated config.* (closes: #168663) + + -- Kyle McMartin Thu, 14 Nov 2002 18:41:29 -0500 + +mad (0.14.2b-5) unstable; urgency=medium + + * Added build-dep on libesd0-dev, this should fix some + problems people have been having when using esd as the + output device... (closes: #150823) + + -- Kyle McMartin Wed, 06 Nov 2002 18:20:18 -0500 + +mad (0.14.2b-4) unstable; urgency=low + + * added pkgconfig entry, and dependancy on pkg-config. (closes: #144481) + + -- Kyle McMartin Mon, 05 Aug 2002 14:37:00 -0400 + +mad (0.14.2b-3) unstable; urgency=high + + * updated libid3tag0-dev depends to account for zlib1g-dev (closes: #142611) + + -- Kyle McMartin Thu, 18 Apr 2002 19:37:00 -0500 + +mad (0.14.2b-2) unstable; urgency=high + + * fix for the shlibs rc bug (closes: #136196) + + -- Kyle McMartin Thu, 28 Feb 2002 18:21:40 -0500 + +mad (0.14.2b-1) unstable; urgency=low + + * new upstream version + * new maintainer + * new version fixes enum (closes: #129178) + * closing old fixed bug [missing symlink to libmad.so.0] (closes: #119350) + + -- Kyle McMartin Wed, 16 Jan 2002 22:09:58 -0500 + +mad (0.14.1b-4) unstable; urgency=low + + * yet another stupid maintainer mistakes release + * fix the call to dh_makeshlibs, I neglected to add proper + arguments for the new libid3tag0 library (closes: #119146) + * now that the shlibs are sorted out, madplay will have the correct depends + (closes: #119792) + + -- Sean 'Shaleh' Perry Thu, 15 Nov 2001 22:11:24 -0800 + +mad (0.14.1b-3) unstable; urgency=medium + + * duh, id3tag's headers ended up in libmad-dev. Closes: #118625. + + -- Sean 'Shaleh' Perry Wed, 7 Nov 2001 13:45:53 -0800 + +mad (0.14.1b-2) unstable; urgency=medium + + * Added versioned depends info for piecemeal updaters. (Closes: #117646) + + -- Sean 'Shaleh' Perry Wed, 7 Nov 2001 08:10:42 -0800 + +mad (0.14.1b-1) unstable; urgency=low + + * reverted package name to libmad0(-dev). The upstream fixed it's SONAME + issues, yay. + * added libid3tag(-dev), the upstream now supports the installation of this + as a separate entity (closes: #116321) + * -dev packages are now in Section: devel (closes: #116710) + * supports DEB_BUILD_OPTIONS for debug (closes: #104013) + + -- Sean 'Shaleh' Perry Tue, 23 Oct 2001 11:08:53 -0700 + +mad (0.14.0b-3) unstable; urgency=low + + * added a conflicts on libmad0 to the lib and -dev packages, closes: #116581 + * updated config.{sub,guess}, closes: #116577 + + -- Sean 'Shaleh' Perry Sun, 21 Oct 2001 16:26:39 -0700 + +mad (0.14.0b-2) unstable; urgency=low + + * D'oh, not binary compatible. The every changing SONAME problem. + * chnaged library package name to match SONAME. This is horrible because + now I have to change the package name for every release. However there + is no alternative. closes: 116305. + + -- Sean 'Shaleh' Perry Fri, 19 Oct 2001 14:30:29 -0700 + +mad (0.14.0b-1) unstable; urgency=low + + * New upstream release + * source now build-depends on zlib + + -- Sean 'Shaleh' Perry Thu, 18 Oct 2001 21:59:28 -0700 + +mad (0.13.0b-2.1) unstable; urgency=low + * Run libtoolize to get support for new architectures. Closes: #96616 + + -- LaMont Jones Mon, 9 Jul 2001 21:39:34 -0600 + +mad (0.13.0b-2) unstable; urgency=low + + * Now build-depend on gettext (closes: #94964) + + -- Sean 'Shaleh' Perry Mon, 23 Apr 2001 11:29:21 -0700 + +mad (0.13.0b-1) unstable; urgency=low + + * new upstream release + * manpage cleaned up, Closes: #87165 + + -- Sean 'Shaleh' Perry Wed, 11 Apr 2001 18:40:08 -0700 + +mad (0.12.5b-1) unstable; urgency=low + + * New upstream, closes: #92825 + * updated upstream changelog + + -- Sean 'Shaleh' Perry Tue, 3 Apr 2001 15:11:05 -0700 + +mad (0.12.4b-1) unstable; urgency=low + + * New upstream version + + -- Sean 'Shaleh' Perry Mon, 12 Feb 2001 14:16:21 -0800 + +mad (0.12.3b-2) unstable; urgency=low + + * Oops, wrong section + * left off the Closes: #84103 + + -- Sean 'Shaleh' Perry Thu, 8 Feb 2001 12:17:12 -0800 + +mad (0.12.3b-1) unstable; urgency=low + + * New upstream version + * added a madplay package + + -- Sean 'Shaleh' Perry Wed, 7 Feb 2001 12:04:28 -0800 + +mad (0.11.4b-1) unstable; urgency=low + + * New upstream release + * added libmad0 package containing the shared library + + -- Sean 'Shaleh' Perry Mon, 2 Oct 2000 17:38:01 -0700 + +mad (0.11.0b-0) unstable; urgency=low + + * New upstream release + + -- Sean 'Shaleh' Perry Mon, 5 Jun 2000 14:25:39 -0700 + +mad (0.10.3b-0) unstable; urgency=low + + * New upstream release + + -- Sean 'Shaleh' Perry Thu, 1 Jun 2000 15:05:02 -0700 + +mad (0.10.2b-0) unstable; urgency=low + + * Initial Release. + + -- Sean 'Shaleh' Perry Tue, 23 May 2000 12:25:00 -0700 + + --- libid3tag-0.15.1b.orig/debian/copyright +++ libid3tag-0.15.1b/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Sean 'Shaleh' Perry on +Tue, 23 May 2000 12:25:00 -0700. + +It was downloaded from http://www.underbit.com/products/mad/ + +Upstream Author: Robert Leslie + +Copyright (C) 2000-2004 Underbit Technologies, Inc. + +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, +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. + +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 + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- libid3tag-0.15.1b.orig/debian/libid3tag0-dev.install +++ libid3tag-0.15.1b/debian/libid3tag0-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/id3tag.h /usr/include +debian/tmp/usr/lib/libid3tag.a /usr/lib +debian/tmp/usr/lib/libid3tag.la /usr/lib +debian/tmp/usr/lib/libid3tag.so /usr/lib +debian/id3tag.pc /usr/lib/pkgconfig --- libid3tag-0.15.1b.orig/debian/libid3tag0.docs +++ libid3tag-0.15.1b/debian/libid3tag0.docs @@ -0,0 +1,3 @@ +CREDITS +README +TODO --- libid3tag-0.15.1b.orig/debian/libid3tag0.install +++ libid3tag-0.15.1b/debian/libid3tag0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libid3tag.so.* /usr/lib --- libid3tag-0.15.1b.orig/debian/compat +++ libid3tag-0.15.1b/debian/compat @@ -0,0 +1 @@ +4 --- libid3tag-0.15.1b.orig/debian/watch +++ libid3tag-0.15.1b/debian/watch @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.mars.org/mpeg/libid3tag-(.*)\.tar\.gz debian uupdate --- libid3tag-0.15.1b.orig/debian/patches/00list +++ libid3tag-0.15.1b/debian/patches/00list @@ -0,0 +1,3 @@ +10_a_capella +10_utf16 +11_unknown_encoding --- libid3tag-0.15.1b.orig/debian/patches/11_unknown_encoding.dpatch +++ libid3tag-0.15.1b/debian/patches/11_unknown_encoding.dpatch @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_unknown_encoding.dpatch by Andreas Henriksson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: In case of an unknown/invalid encoding, id3_parse_string() will +## DP: return NULL, but the return value wasn't checked resulting +## DP: in segfault in id3_ucs4_length(). This is the only place +## DP: the return value wasn't checked. + +@DPATCH@ +diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf +--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000 +@@ -236,6 +236,10 @@ + + encoding = id3_parse_uint(&data, 1); + string = id3_parse_string(&data, end - data, encoding, 0); ++ if (!string) ++ { ++ continue; ++ } + + if (id3_ucs4_length(string) < 4) { + free(string); +diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c +--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000 +@@ -165,6 +165,9 @@ + case ID3_FIELD_TEXTENCODING_UTF_8: + ucs4 = id3_utf8_deserialize(ptr, length); + break; ++ default: ++ /* FIXME: Unknown encoding! Print warning? */ ++ return NULL; + } + + if (ucs4 && !full) { --- libid3tag-0.15.1b.orig/debian/patches/10_a_capella.dpatch +++ libid3tag-0.15.1b/debian/patches/10_a_capella.dpatch @@ -0,0 +1,60 @@ +#! /bin/sh -e +## 10_a_capella.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix typo in A Capella genre + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid3tag-0.15.1b/genre.dat +--- /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat 2004-02-16 21:34:39.000000000 -0500 ++++ libid3tag-0.15.1b/genre.dat 2004-09-06 09:50:33.000000000 -0400 +@@ -277,8 +277,8 @@ + { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 }; + static id3_ucs4_t const genre_DRUM_SOLO[] = + { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 }; +-static id3_ucs4_t const genre_A_CAPPELLA[] = +- { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 }; ++static id3_ucs4_t const genre_A_CAPELLA[] = ++ { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 }; + static id3_ucs4_t const genre_EURO_HOUSE[] = + { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 }; + static id3_ucs4_t const genre_DANCE_HALL[] = +@@ -452,7 +452,7 @@ + genre_DUET, + genre_PUNK_ROCK, + genre_DRUM_SOLO, +- genre_A_CAPPELLA, ++ genre_A_CAPELLA, + genre_EURO_HOUSE, + genre_DANCE_HALL, + genre_GOA, +diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat.in libid3tag-0.15.1b/genre.dat.in +--- /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat.in 2004-01-23 04:41:32.000000000 -0500 ++++ libid3tag-0.15.1b/genre.dat.in 2004-09-06 09:50:33.000000000 -0400 +@@ -153,7 +153,7 @@ + Duet + Punk Rock + Drum Solo +-A Cappella ++A Capella + Euro-House + Dance Hall + Goa --- libid3tag-0.15.1b.orig/debian/patches/10_utf16.dpatch +++ libid3tag-0.15.1b/debian/patches/10_utf16.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh -e +## 10_utf16.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Handle bogus UTF16 sequences that have a length that is not +## DP: an even number of 8 bit characters. + +if [ $# -lt 1 ]; then + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" + +case "$1" in + -patch) patch -p1 ${patch_opts} < $0;; + -unpatch) patch -R -p1 ${patch_opts} < $0;; + *) + echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad libid3tag-0.15.1b/utf16.c /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c +--- libid3tag-0.15.1b/utf16.c 2006-01-13 15:26:29.000000000 +0100 ++++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13 15:27:19.000000000 +0100 +@@ -282,5 +282,18 @@ + + free(utf16); + ++ if (end == *ptr && length % 2 != 0) ++ { ++ /* We were called with a bogus length. It should always ++ * be an even number. We can deal with this in a few ways: ++ * - Always give an error. ++ * - Try and parse as much as we can and ++ * - return an error if we're called again when we ++ * already tried to parse everything we can. ++ * - tell that we parsed it, which is what we do here. ++ */ ++ (*ptr)++; ++ } ++ + return ucs4; + }