Date: Wednesday, June 6, 2018 @ 21:21:35 Author: arojas Revision: 326084
archrelease: copy trunk to extra-x86_64 Added: libid3tag/repos/extra-x86_64/10_utf16.diff (from rev 326083, libid3tag/trunk/10_utf16.diff) libid3tag/repos/extra-x86_64/11_unknown_encoding.diff (from rev 326083, libid3tag/trunk/11_unknown_encoding.diff) libid3tag/repos/extra-x86_64/CVE-2008-2109.patch (from rev 326083, libid3tag/trunk/CVE-2008-2109.patch) libid3tag/repos/extra-x86_64/PKGBUILD (from rev 326083, libid3tag/trunk/PKGBUILD) libid3tag/repos/extra-x86_64/id3tag.pc (from rev 326083, libid3tag/trunk/id3tag.pc) libid3tag/repos/extra-x86_64/libid3tag-gperf.patch (from rev 326083, libid3tag/trunk/libid3tag-gperf.patch) Deleted: libid3tag/repos/extra-x86_64/10_utf16.diff libid3tag/repos/extra-x86_64/11_unknown_encoding.diff libid3tag/repos/extra-x86_64/CVE-2008-2109.patch libid3tag/repos/extra-x86_64/PKGBUILD libid3tag/repos/extra-x86_64/id3tag.pc --------------------------+ 10_utf16.diff | 96 ++++++++++++++++++++++----------------------- 11_unknown_encoding.diff | 74 +++++++++++++++++----------------- CVE-2008-2109.patch | 22 +++++----- PKGBUILD | 84 ++++++++++++++++++++++----------------- id3tag.pc | 20 ++++----- libid3tag-gperf.patch | 26 ++++++++++++ 6 files changed, 179 insertions(+), 143 deletions(-) Deleted: 10_utf16.diff =================================================================== --- 10_utf16.diff 2018-06-06 21:20:48 UTC (rev 326083) +++ 10_utf16.diff 2018-06-06 21:21:35 UTC (rev 326084) @@ -1,48 +0,0 @@ -#! /bin/sh -e -## 10_utf16.dpatch by <k...@roeckx.be> -## -## 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; - } Copied: libid3tag/repos/extra-x86_64/10_utf16.diff (from rev 326083, libid3tag/trunk/10_utf16.diff) =================================================================== --- 10_utf16.diff (rev 0) +++ 10_utf16.diff 2018-06-06 21:21:35 UTC (rev 326084) @@ -0,0 +1,48 @@ +#! /bin/sh -e +## 10_utf16.dpatch by <k...@roeckx.be> +## +## 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; + } Deleted: 11_unknown_encoding.diff =================================================================== --- 11_unknown_encoding.diff 2018-06-06 21:20:48 UTC (rev 326083) +++ 11_unknown_encoding.diff 2018-06-06 21:21:35 UTC (rev 326084) @@ -1,37 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_unknown_encoding.dpatch by Andreas Henriksson <andr...@fatal.se> -## -## 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) { Copied: libid3tag/repos/extra-x86_64/11_unknown_encoding.diff (from rev 326083, libid3tag/trunk/11_unknown_encoding.diff) =================================================================== --- 11_unknown_encoding.diff (rev 0) +++ 11_unknown_encoding.diff 2018-06-06 21:21:35 UTC (rev 326084) @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_unknown_encoding.dpatch by Andreas Henriksson <andr...@fatal.se> +## +## 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) { Deleted: CVE-2008-2109.patch =================================================================== --- CVE-2008-2109.patch 2018-06-06 21:20:48 UTC (rev 326083) +++ CVE-2008-2109.patch 2018-06-06 21:21:35 UTC (rev 326084) @@ -1,11 +0,0 @@ ---- field.c.orig 2008-05-05 09:49:15.000000000 -0400 -+++ field.c 2008-05-05 09:49:25.000000000 -0400 -@@ -291,7 +291,7 @@ - - end = *ptr + length; - -- while (end - *ptr > 0) { -+ while (end - *ptr > 0 && **ptr != '\0') { - ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0); - if (ucs4 == 0) - goto fail; Copied: libid3tag/repos/extra-x86_64/CVE-2008-2109.patch (from rev 326083, libid3tag/trunk/CVE-2008-2109.patch) =================================================================== --- CVE-2008-2109.patch (rev 0) +++ CVE-2008-2109.patch 2018-06-06 21:21:35 UTC (rev 326084) @@ -0,0 +1,11 @@ +--- field.c.orig 2008-05-05 09:49:15.000000000 -0400 ++++ field.c 2008-05-05 09:49:25.000000000 -0400 +@@ -291,7 +291,7 @@ + + end = *ptr + length; + +- while (end - *ptr > 0) { ++ while (end - *ptr > 0 && **ptr != '\0') { + ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0); + if (ucs4 == 0) + goto fail; Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-06 21:20:48 UTC (rev 326083) +++ PKGBUILD 2018-06-06 21:21:35 UTC (rev 326084) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=libid3tag -pkgver=0.15.1b -pkgrel=8 -pkgdesc="library for id3 tagging" -arch=('i686' 'x86_64') -url="http://www.underbit.com/products/mad/" -license=('GPL') -depends=('zlib') -makedepends=('gperf') -source=("ftp://ftp.mars.org/pub/mpeg/${pkgname}-${pkgver}.tar.gz" - 'id3tag.pc' - '10_utf16.diff' '11_unknown_encoding.diff' 'CVE-2008-2109.patch') -md5sums=('e5808ad997ba32c498803822078748c3' - '8bb41fd814fafcc37ec8bc88f5545a4a' - '4f9df4011e6a8c23240fff5de2d05f6e' - '3ca856b97924d48a0fdfeff0bd83ce7d' - 'c51822ea6301b1ca469975f0c9ee8e34') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/10_utf16.diff - patch -p1 -i ${srcdir}/11_unknown_encoding.diff - patch -Np0 -i ${srcdir}/CVE-2008-2109.patch - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/id3tag.pc" "${pkgdir}/usr/lib/pkgconfig/id3tag.pc" -} Copied: libid3tag/repos/extra-x86_64/PKGBUILD (from rev 326083, libid3tag/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-06 21:21:35 UTC (rev 326084) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=libid3tag +pkgver=0.15.1b +pkgrel=9 +pkgdesc="library for id3 tagging" +arch=('x86_64') +url="http://www.underbit.com/products/mad/" +license=('GPL') +depends=('zlib') +makedepends=('gperf') +source=("ftp://ftp.mars.org/pub/mpeg/${pkgname}-${pkgver}.tar.gz" + 'id3tag.pc' + '10_utf16.diff' '11_unknown_encoding.diff' 'CVE-2008-2109.patch' libid3tag-gperf.patch) +md5sums=('e5808ad997ba32c498803822078748c3' + '8bb41fd814fafcc37ec8bc88f5545a4a' + '4f9df4011e6a8c23240fff5de2d05f6e' + '3ca856b97924d48a0fdfeff0bd83ce7d' + 'c51822ea6301b1ca469975f0c9ee8e34' + '85502349069e61eaeea4610b1ea6cb56' + 'f1c84edb7e363dacd3e4871f8513c0a2' + '07d07472c6ef7ed5df3069fddbed0e63') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ${srcdir}/10_utf16.diff + patch -p1 -i ${srcdir}/11_unknown_encoding.diff + patch -Np0 -i ${srcdir}/CVE-2008-2109.patch + patch -p1 -i ../libid3tag-gperf.patch # Fedora patch + + rm compat.c frametype.c # regenerate them from gperf sources +} + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/id3tag.pc" "${pkgdir}/usr/lib/pkgconfig/id3tag.pc" +} Deleted: id3tag.pc =================================================================== --- id3tag.pc 2018-06-06 21:20:48 UTC (rev 326083) +++ id3tag.pc 2018-06-06 21:21:35 UTC (rev 326084) @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr/bin -libdir=/usr/lib -includedir=/usr/include - -Name: ID3TAG -Description: libid3tag - ID3 tag manipulation library -Version: 0.15.0b -Libs: -L${libdir} -lid3tag -lz -Cflags: Copied: libid3tag/repos/extra-x86_64/id3tag.pc (from rev 326083, libid3tag/trunk/id3tag.pc) =================================================================== --- id3tag.pc (rev 0) +++ id3tag.pc 2018-06-06 21:21:35 UTC (rev 326084) @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=/usr/bin +libdir=/usr/lib +includedir=/usr/include + +Name: ID3TAG +Description: libid3tag - ID3 tag manipulation library +Version: 0.15.0b +Libs: -L${libdir} -lid3tag -lz +Cflags: Copied: libid3tag/repos/extra-x86_64/libid3tag-gperf.patch (from rev 326083, libid3tag/trunk/libid3tag-gperf.patch) =================================================================== --- libid3tag-gperf.patch (rev 0) +++ libid3tag-gperf.patch 2018-06-06 21:21:35 UTC (rev 326084) @@ -0,0 +1,26 @@ +Index: libid3tag-0.15.1b/frametype.h +=================================================================== +--- libid3tag-0.15.1b.orig/frametype.h ++++ libid3tag-0.15.1b/frametype.h +@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_fr + extern struct id3_frametype const id3_frametype_obsolete; + + struct id3_frametype const *id3_frametype_lookup(register char const *, +- register unsigned int); ++ register size_t); + + # endif +Index: libid3tag-0.15.1b/compat.h +=================================================================== +--- libid3tag-0.15.1b.orig/compat.h ++++ libid3tag-0.15.1b/compat.h +@@ -34,7 +34,7 @@ struct id3_compat { + }; + + struct id3_compat const *id3_compat_lookup(register char const *, +- register unsigned int); ++ register size_t); + + int id3_compat_fixup(struct id3_tag *); + +