summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libid3tag
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-12-08 22:59:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-09 10:33:26 +0000
commit43ee80e8b8a40811bfe248f2c62c52d04c34893c (patch)
tree147b440e1c383dfc734709235447bdbda6a61041 /meta/recipes-multimedia/libid3tag
parent74e02c5f0fe901250388a869f322c7bb31fc460e (diff)
downloadpoky-43ee80e8b8a40811bfe248f2c62c52d04c34893c.tar.gz
libid3tag: move to meta-oe
There are no consumers in oe-core; years ago it used to be gstreamer. (From OE-Core rev: 4bacb37e9fd55d8bf8ead8d6879e95b31e1dfb55) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libid3tag')
-rw-r--r--meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch40
-rw-r--r--meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch34
-rw-r--r--meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch43
-rw-r--r--meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch19
-rw-r--r--meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch39
-rw-r--r--meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb28
7 files changed, 0 insertions, 218 deletions
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch b/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
deleted file mode 100644
index 54f49f6f23..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 91fcf66b9182c75cd2b96d88991d5a1c6307d4b4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 2 Aug 2017 16:27:52 +0300
4Subject: [PATCH] Fix gperf 3.1 incompatibility.
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 compat.h | 2 +-
10 frametype.h | 2 +-
11 2 files changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/compat.h b/compat.h
14index 8af71ec..b3d80d9 100644
15--- a/compat.h
16+++ b/compat.h
17@@ -34,7 +34,7 @@ struct id3_compat {
18 };
19
20 struct id3_compat const *id3_compat_lookup(register char const *,
21- register unsigned int);
22+ register size_t);
23
24 int id3_compat_fixup(struct id3_tag *);
25
26diff --git a/frametype.h b/frametype.h
27index dd064b2..b5b7593 100644
28--- a/frametype.h
29+++ b/frametype.h
30@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_frametype_unknown;
31 extern struct id3_frametype const id3_frametype_obsolete;
32
33 struct id3_frametype const *id3_frametype_lookup(register char const *,
34- register unsigned int);
35+ register size_t);
36
37 # endif
38--
392.13.2
40
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch b/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
deleted file mode 100644
index 10e089018c..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1libid3tag: patch for CVE-2004-2779
2
3The patch comes from
4https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch
5
6Upstream-Status: Pending
7
8CVE: CVE-2004-2779
9CVE: CVE-2017-11551
10
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12
13diff -urNad libid3tag-0.15.1b/utf16.c /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c
14--- libid3tag-0.15.1b/utf16.c 2006-01-13 15:26:29.000000000 +0100
15+++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13 15:27:19.000000000 +0100
16@@ -282,5 +282,18 @@
17
18 free(utf16);
19
20+ if (end == *ptr && length % 2 != 0)
21+ {
22+ /* We were called with a bogus length. It should always
23+ * be an even number. We can deal with this in a few ways:
24+ * - Always give an error.
25+ * - Try and parse as much as we can and
26+ * - return an error if we're called again when we
27+ * already tried to parse everything we can.
28+ * - tell that we parsed it, which is what we do here.
29+ */
30+ (*ptr)++;
31+ }
32+
33 return ucs4;
34 }
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch b/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
deleted file mode 100644
index 38d40c3632..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libid3tag-0.15.1b/Makefile.am
4===================================================================
5--- libid3tag-0.15.1b.orig/Makefile.am 2009-07-29 09:29:20.000000000 +0100
6+++ libid3tag-0.15.1b/Makefile.am 2009-07-29 09:29:47.000000000 +0100
7@@ -27,6 +27,9 @@
8 lib_LTLIBRARIES = libid3tag.la
9 include_HEADERS = id3tag.h
10
11+pkgconfigdir = $(libdir)/pkgconfig
12+pkgconfig_DATA = id3tag.pc
13+
14 ## From the libtool documentation on library versioning:
15 ##
16 ## CURRENT
17Index: libid3tag-0.15.1b/configure.ac
18===================================================================
19--- libid3tag-0.15.1b.orig/configure.ac 2009-07-29 09:27:15.000000000 +0100
20+++ libid3tag-0.15.1b/configure.ac 2009-07-29 09:27:45.000000000 +0100
21@@ -201,5 +201,5 @@
22 dnl AC_SUBST(LTLIBOBJS)
23
24 AC_CONFIG_FILES([Makefile msvc++/Makefile \
25- libid3tag.list])
26+ libid3tag.list id3tag.pc])
27 AC_OUTPUT
28Index: libid3tag-0.15.1b/id3tag.pc.in
29===================================================================
30--- /dev/null 1970-01-01 00:00:00.000000000 +0000
31+++ libid3tag-0.15.1b/id3tag.pc.in 2009-07-29 09:29:10.000000000 +0100
32@@ -0,0 +1,11 @@
33+prefix=@prefix@
34+exec_prefix=@exec_prefix@
35+libdir=@libdir@
36+includedir=@includedir@
37+
38+Name: id3tag
39+Description: ID3 tag reading library
40+Requires:
41+Version: @VERSION@
42+Libs: -L${libdir} -lid3tag -lz
43+Cflags: -I${includedir}
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch b/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
deleted file mode 100644
index 1895748d1d..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1configure contains CFLAGS filtering code which was removing our prefix-map
2flags. We need those to generate reproducible binaries. Allow them through.
3
4Upstream-Status: Pending
5Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6
7--- a/configure.ac
8+++ b/configure.ac
9@@ -99,6 +99,10 @@ do
10 -mno-cygwin)
11 shift
12 ;;
13+ -fmacro-prefix-map*|-fdebug-prefix-map*|-ffile-prefix-map*)
14+ CFLAGS="$CFLAGS $1"
15+ shift
16+ ;;
17 -m*)
18 arch="$arch $1"
19 shift
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
deleted file mode 100644
index 2845fb1d3a..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3599280&group_id=12349&atid=112349]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libid3tag-0.15.1b/configure.ac libid3tag-0.15.1b/configure.ac
5--- libid3tag-0.15.1b/configure.ac 2004-01-24 01:22:46.000000000 +0200
6+++ libid3tag-0.15.1b/configure.ac 2013-01-03 06:41:02.734835014 +0200
7@@ -28,7 +28,7 @@
8
9-AM_INIT_AUTOMAKE
10+AM_INIT_AUTOMAKE([foreign])
11
12-AM_CONFIG_HEADER([config.h])
13+AC_CONFIG_HEADERS([config.h])
14
15 dnl System type.
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch b/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
deleted file mode 100644
index f0867b5f01..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1In case of an unknown/invalid encoding, id3_parse_string() will
2return NULL, but the return value wasn't checked resulting
3in segfault in id3_ucs4_length(). This is the only place
4the return value wasn't checked.
5
6Patch taken from Debian:
7https://sources.debian.org/patches/libid3tag/0.15.1b-14/11_unknown_encoding.dpatch/
8
9CVE: CVE-2017-11550
10Upstream-Status: Pending
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12
13diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
14--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000
15+++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000
16@@ -236,6 +236,10 @@
17
18 encoding = id3_parse_uint(&data, 1);
19 string = id3_parse_string(&data, end - data, encoding, 0);
20+ if (!string)
21+ {
22+ continue;
23+ }
24
25 if (id3_ucs4_length(string) < 4) {
26 free(string);
27diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c
28--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000
29+++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000
30@@ -165,6 +165,9 @@
31 case ID3_FIELD_TEXTENCODING_UTF_8:
32 ucs4 = id3_utf8_deserialize(ptr, length);
33 break;
34+ default:
35+ /* FIXME: Unknown encoding! Print warning? */
36+ return NULL;
37 }
38
39 if (ucs4 && !full) {
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
deleted file mode 100644
index 80581765ac..0000000000
--- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1SUMMARY = "Library for interacting with ID3 tags in MP3 files"
2HOMEPAGE = "http://sourceforge.net/projects/mad/"
3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://COPYRIGHT;md5=5e6279efb87c26c6e5e7a68317a6a87a \
7 file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63"
8SECTION = "libs"
9DEPENDS = "zlib gperf-native"
10PR = "r7"
11
12SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \
13 file://addpkgconfig.patch \
14 file://obsolete_automake_macros.patch \
15 file://0001-Fix-gperf-3.1-incompatibility.patch \
16 file://10_utf16.patch \
17 file://unknown-encoding.patch \
18 file://cflags_filter.patch \
19 "
20UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/"
21UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$"
22
23SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3"
24SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
25
26S = "${WORKDIR}/libid3tag-${PV}"
27
28inherit autotools pkgconfig