Re: [OE-core] [PATCH 04/29] libid3tag: move to meta-oe
It has already landed there a few days ago :)
Alex
On Thu, 9 Dec 2021 at 00:02, Khem Raj wrote:
> yeah perhaps meta-multimedia is better for it.
>
> On Wed, Dec 8, 2021 at 2:00 PM Alexander Kanavin
> wrote:
> >
> > There are no consumers in oe-core; years ago it used to be gstreamer.
> >
> > Signed-off-by: Alexander Kanavin
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 -
> > .../0001-Fix-gperf-3.1-incompatibility.patch | 40 -
> > .../libid3tag/libid3tag/10_utf16.patch| 34 ---
> > .../libid3tag/libid3tag/addpkgconfig.patch| 43 ---
> > .../libid3tag/libid3tag/cflags_filter.patch | 19
> > .../libid3tag/obsolete_automake_macros.patch | 15 ---
> > .../libid3tag/unknown-encoding.patch | 39 -
> > .../libid3tag/libid3tag_0.15.1b.bb| 28
> > 8 files changed, 219 deletions(-)
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
> > delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
> > delete mode 100644 meta/recipes-multimedia/libid3tag/
> libid3tag_0.15.1b.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> > index cedf1ef937..8e86ea45d2 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -344,7 +344,6 @@ RECIPE_MAINTAINER:pn-libgudev = "Ross Burton <
> ross.bur...@arm.com>"
> > RECIPE_MAINTAINER:pn-libhandy = "Alexander Kanavin <
> alex.kana...@gmail.com>"
> > RECIPE_MAINTAINER:pn-libical = "Ross Burton "
> > RECIPE_MAINTAINER:pn-libice = "Unassigned >"
> > -RECIPE_MAINTAINER:pn-libid3tag = "Unassigned <
> unassig...@yoctoproject.org>"
> > RECIPE_MAINTAINER:pn-libidn2 = "Ross Burton "
> > RECIPE_MAINTAINER:pn-libinput = "Ross Burton "
> > RECIPE_MAINTAINER:pn-libjitterentropy = "Ross Burton <
> ross.bur...@arm.com>"
> > 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..00
> > ---
> a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> > +++ /dev/null
> > @@ -1,40 +0,0 @@
> > -From 91fcf66b9182c75cd2b96d88991d5a1c6307d4b4 Mon Sep 17 00:00:00 2001
> > -From: Alexander Kanavin
> > -Date: Wed, 2 Aug 2017 16:27:52 +0300
> > -Subject: [PATCH] Fix gperf 3.1 incompatibility.
> > -
> > -Upstream-Status: Pending
> > -Signed-off-by: Alexander Kanavin
> >
> > - compat.h| 2 +-
> > - frametype.h | 2 +-
> > - 2 files changed, 2 insertions(+), 2 deletions(-)
> > -
> > -diff --git a/compat.h b/compat.h
> > -index 8af71ec..b3d80d9 100644
> > a/compat.h
> > -+++ b/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 *);
> > -
> > -diff --git a/frametype.h b/frametype.h
> > -index dd064b2..b5b7593 100644
> > a/frametype.h
> > -+++ b/frametype.h
> > -@@ -37,6 +37,6 @@ extern struct id3_frametype const
> id3_frametype_unknown;
> > - 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
> > ---
> > -2.13.2
> > -
> > 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..00
> > --- a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> > +++ /dev/null
> > @@ -1,34 +0,0 @@
> > -libid3tag: patch for CVE-2004-2779
> > -
> > -The patch comes from
> > -https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch
> > -
> > -Upstream-Status: Pending
> > -
> > -CVE: CVE-2004-2779
> > -CVE: CVE-2017-11551
> > -
> > -Signed-off-by: Changqing Li
> > -
> > -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.0 +0100
> > -+++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13
> 15:27:19.0
Re: [OE-core] [PATCH 04/29] libid3tag: move to meta-oe
yeah perhaps meta-multimedia is better for it.
On Wed, Dec 8, 2021 at 2:00 PM Alexander Kanavin wrote:
>
> There are no consumers in oe-core; years ago it used to be gstreamer.
>
> Signed-off-by: Alexander Kanavin
> ---
> meta/conf/distro/include/maintainers.inc | 1 -
> .../0001-Fix-gperf-3.1-incompatibility.patch | 40 -
> .../libid3tag/libid3tag/10_utf16.patch| 34 ---
> .../libid3tag/libid3tag/addpkgconfig.patch| 43 ---
> .../libid3tag/libid3tag/cflags_filter.patch | 19
> .../libid3tag/obsolete_automake_macros.patch | 15 ---
> .../libid3tag/unknown-encoding.patch | 39 -
> .../libid3tag/libid3tag_0.15.1b.bb| 28
> 8 files changed, 219 deletions(-)
> delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
> delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
> delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
> delete mode 100644
> meta/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch
> delete mode 100644 meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index cedf1ef937..8e86ea45d2 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -344,7 +344,6 @@ RECIPE_MAINTAINER:pn-libgudev = "Ross Burton
> "
> RECIPE_MAINTAINER:pn-libhandy = "Alexander Kanavin "
> RECIPE_MAINTAINER:pn-libical = "Ross Burton "
> RECIPE_MAINTAINER:pn-libice = "Unassigned "
> -RECIPE_MAINTAINER:pn-libid3tag = "Unassigned "
> RECIPE_MAINTAINER:pn-libidn2 = "Ross Burton "
> RECIPE_MAINTAINER:pn-libinput = "Ross Burton "
> RECIPE_MAINTAINER:pn-libjitterentropy = "Ross Burton "
> 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..00
> ---
> a/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -From 91fcf66b9182c75cd2b96d88991d5a1c6307d4b4 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin
> -Date: Wed, 2 Aug 2017 16:27:52 +0300
> -Subject: [PATCH] Fix gperf 3.1 incompatibility.
> -
> -Upstream-Status: Pending
> -Signed-off-by: Alexander Kanavin
>
> - compat.h| 2 +-
> - frametype.h | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/compat.h b/compat.h
> -index 8af71ec..b3d80d9 100644
> a/compat.h
> -+++ b/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 *);
> -
> -diff --git a/frametype.h b/frametype.h
> -index dd064b2..b5b7593 100644
> a/frametype.h
> -+++ b/frametype.h
> -@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_frametype_unknown;
> - 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
> ---
> -2.13.2
> -
> 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..00
> --- a/meta/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -libid3tag: patch for CVE-2004-2779
> -
> -The patch comes from
> -https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch
> -
> -Upstream-Status: Pending
> -
> -CVE: CVE-2004-2779
> -CVE: CVE-2017-11551
> -
> -Signed-off-by: Changqing Li
> -
> -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.0 +0100
> -+++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13 15:27:19.0
> +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
> -+ *
