From 49baf1f211b206646cefa8ee18064256a84f016cac06ccfb7ee49583ab14b1c9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 20 Apr 2021 09:17:42 +0000 Subject: [PATCH 1/2] Accepting request 886823 from home:susnux:branches:filesystems - Update to 3.2.5 * Added Vala bindings * Display a warning when ISRC validation fails * Fix crash caused by buffer overrun - Fixed broken URL - Dropped upstream fixed 0001-libMirage-utils.h-added-missing-extern-specifiers.patch - Dropped upstream fixed CVE-2019-15757.patch (fixed since 3.2.3, commit bf3f346) OBS-URL: https://build.opensuse.org/request/show/886823 OBS-URL: https://build.opensuse.org/package/show/filesystems/libmirage?expand=0&rev=66 --- ...ls.h-added-missing-extern-specifiers.patch | 34 ------------------ CVE-2019-15757.patch | 24 ------------- libmirage-3.2.4.tar.bz2 | 3 -- libmirage-3.2.5.tar.xz | 3 ++ libmirage.changes | 13 +++++++ libmirage.spec | 35 +++++++++++++------ 6 files changed, 41 insertions(+), 71 deletions(-) delete mode 100644 0001-libMirage-utils.h-added-missing-extern-specifiers.patch delete mode 100644 CVE-2019-15757.patch delete mode 100644 libmirage-3.2.4.tar.bz2 create mode 100644 libmirage-3.2.5.tar.xz diff --git a/0001-libMirage-utils.h-added-missing-extern-specifiers.patch b/0001-libMirage-utils.h-added-missing-extern-specifiers.patch deleted file mode 100644 index 166efc9..0000000 --- a/0001-libMirage-utils.h-added-missing-extern-specifiers.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001 -From: Rok Mandeljc -Date: Sat, 2 May 2020 17:37:34 +0200 -Subject: [PATCH] libMirage: utils.h: added missing extern specifiers - -The lack thereof seems to be causing errors with gcc 10 on Fedora 32. ---- - mirage/utils.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: libmirage-3.2.4/mirage/utils.h -=================================================================== ---- libmirage-3.2.4.orig/mirage/utils.h -+++ libmirage-3.2.4/mirage/utils.h -@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c - gboolean mirage_helper_validate_isrc (const gchar *isrc); - - /* CRC utility functions */ --guint16 *crc16_1021_lut; --guint32 *crc32_d8018001_lut; -+extern guint16 *crc16_1021_lut; -+extern guint32 *crc32_d8018001_lut; - - guint16 *mirage_helper_init_crc16_lut (guint16 genpoly); - guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices); -@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from - - - /* ECMA-130 Annex B sector data scrambler */ --guint8 *ecma_130_scrambler_lut; -+extern guint8 *ecma_130_scrambler_lut; - - guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void); - diff --git a/CVE-2019-15757.patch b/CVE-2019-15757.patch deleted file mode 100644 index acbc696..0000000 --- a/CVE-2019-15757.patch +++ /dev/null @@ -1,24 +0,0 @@ -Origin: https://gist.github.com/andreafioraldi/343d9ba64060b548c02362a5e61ec932 - ---- - images/image-nrg/parser.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -Index: libmirage-3.2.3/images/image-nrg/parser.c -=================================================================== ---- libmirage-3.2.3.orig/images/image-nrg/parser.c -+++ libmirage-3.2.3/images/image-nrg/parser.c -@@ -987,6 +987,13 @@ static MirageDisc *mirage_parser_nrg_loa - /* Set CD-ROM as default medium type, will be changed accordingly if there - is a MTYP block provided */ - mirage_disc_set_medium_type(self->priv->disc, MIRAGE_MEDIUM_CD); -+ /* Length integrity check */ -+ if (self->priv->nrg_data_length == 0) { -+ MIRAGE_DEBUG(self, MIRAGE_DEBUG_WARNING, "%s: rg_data_length must be greater than 0!\n", __debug__); -+ g_set_error(error, MIRAGE_ERROR, MIRAGE_ERROR_IMAGE_FILE_ERROR, Q_("nrg_data_length must be greater than 0!")); -+ succeeded = FALSE; -+ goto end; -+ } - - /* Validate data length */ - if (self->priv->nrg_data_length == 0) { diff --git a/libmirage-3.2.4.tar.bz2 b/libmirage-3.2.4.tar.bz2 deleted file mode 100644 index 1620dd8..0000000 --- a/libmirage-3.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc5b3b8acd40d63c6194fba65c841b906a8074e89b14a10bf76f35d1c371a355 -size 234530 diff --git a/libmirage-3.2.5.tar.xz b/libmirage-3.2.5.tar.xz new file mode 100644 index 0000000..f3267b4 --- /dev/null +++ b/libmirage-3.2.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d50d97e15f180f99fddcdf388b0d9fec073fb8fe080ba6c69cd3674214141139 +size 229380 diff --git a/libmirage.changes b/libmirage.changes index 69e4936..8a3f7e8 100644 --- a/libmirage.changes +++ b/libmirage.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 20 03:24:48 UTC 2021 - Ferdinand Thiessen + +- Update to 3.2.5 + * Added Vala bindings + * Display a warning when ISRC validation fails + * Fix crash caused by buffer overrun +- Fixed broken URL +- Dropped upstream fixed + 0001-libMirage-utils.h-added-missing-extern-specifiers.patch +- Dropped upstream fixed CVE-2019-15757.patch + (fixed since 3.2.3, commit bf3f346) + ------------------------------------------------------------------- Sun Jun 7 00:01:27 UTC 2020 - Jan Engelhardt diff --git a/libmirage.spec b/libmirage.spec index 2be452d..fc19f59 100644 --- a/libmirage.spec +++ b/libmirage.spec @@ -1,7 +1,7 @@ # # spec file for package libmirage # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,15 +22,12 @@ Name: libmirage Summary: A CD-ROM image access library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Version: 3.2.4 +Version: 3.2.5 Release: 0 -URL: http://cdemu.sf.net/about/libmirage/ - -#Git-Clone: git://git.code.sf.net/p/cdemu/code -Source: https://downloads.sf.net/cdemu/%name-%version.tar.bz2 -Patch1: 0001-libMirage-utils.h-added-missing-extern-specifiers.patch -Patch3: CVE-2019-15757.patch -BuildRequires: cmake >= 2.8.5 +URL: https://cdemu.sourceforge.io/about/libmirage/ +#Git-Clone: https://github.com/cdemu/cdemu.git +Source: http://downloads.sourceforge.net/cdemu/%name-%version.tar.xz +BuildRequires: cmake >= 3.7 BuildRequires: intltool >= 0.21 BuildRequires: pkg-config >= 0.16 BuildRequires: pkgconfig(bzip2) >= 1.0.0 @@ -45,6 +42,7 @@ BuildRequires: pkgconfig(samplerate) >= 0.1.0 BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sndfile) >= 1.0.0 BuildRequires: pkgconfig(zlib) >= 1.2.4 +BuildRequires: pkgconfig(vapigen) Recommends: %name-lang %description @@ -120,6 +118,17 @@ file. This package contains the MIME type definitions and documentation. +%package vala +Summary: Vala bindings to libmirage +BuildArch: noarch + +%description vala +libmirage provides uniform access to the data stored in different +image formats by creating a representation of disc stored in image +file. + +This package contains the Vala bindings to libmirage + %package -n typelib-1_0-libmirage-%pname Summary: Introspection bindings for the libmirage CD-ROM image access library Group: System/Libraries @@ -135,7 +144,9 @@ This package provides the GObject Introspection bindings for libmirage. %autosetup -p1 %build -%cmake -DCMAKE_MODULE_LINKER_FLAGS="" +%cmake \ + -DCMAKE_MODULE_LINKER_FLAGS="" \ + -DVAPI_ENABLED=ON make %{?_smp_mflags} %install @@ -167,6 +178,10 @@ make %{?_smp_mflags} %_libdir/pkgconfig/libmirage.pc %_datadir/gir-1.0 +%files vala +%dir %_datadir/vala/vapi +%_datadir/vala/vapi/%name.vapi + %files lang -f %name.lang %files -n typelib-1_0-libmirage-%pname From 1cf1ad2298e1b567dcca8bf70bc9da0f4d9661e14315145dce8ac856ceb2fb97 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 20 Apr 2021 09:18:23 +0000 Subject: [PATCH 2/2] use %cmake_build since it exists OBS-URL: https://build.opensuse.org/package/show/filesystems/libmirage?expand=0&rev=67 --- libmirage.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libmirage.spec b/libmirage.spec index fc19f59..7e63536 100644 --- a/libmirage.spec +++ b/libmirage.spec @@ -41,8 +41,8 @@ BuildRequires: pkgconfig(liblzma) >= 5.0.0 BuildRequires: pkgconfig(samplerate) >= 0.1.0 BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sndfile) >= 1.0.0 -BuildRequires: pkgconfig(zlib) >= 1.2.4 BuildRequires: pkgconfig(vapigen) +BuildRequires: pkgconfig(zlib) >= 1.2.4 Recommends: %name-lang %description @@ -108,7 +108,7 @@ This package contains files needed to develop with libmirage. Summary: MIME type definitions and documentation for libmirage Group: Development/Libraries/C and C++ Requires(post): shared-mime-info -Requires(postun): shared-mime-info +Requires(postun):shared-mime-info BuildArch: noarch %description data @@ -147,7 +147,7 @@ This package provides the GObject Introspection bindings for libmirage. %cmake \ -DCMAKE_MODULE_LINKER_FLAGS="" \ -DVAPI_ENABLED=ON -make %{?_smp_mflags} +%cmake_build %install %cmake_install