Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libmirage for openSUSE:Factory checked in at 2022-02-05 23:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmirage (Old) and /work/SRC/openSUSE:Factory/.libmirage.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmirage" Sat Feb 5 23:23:12 2022 rev:25 rq:951726 version:3.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libmirage/libmirage.changes 2021-04-27 21:34:38.799982257 +0200 +++ /work/SRC/openSUSE:Factory/.libmirage.new.1898/libmirage.changes 2022-02-05 23:23:47.623674144 +0100 @@ -1,0 +2,7 @@ +Sat Feb 5 12:46:06 UTC 2022 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 3.2.6 + * Improve error messages during plugin loading + * Remove two-character patterns from apple disk image MIME + +------------------------------------------------------------------- Old: ---- libmirage-3.2.5.tar.xz New: ---- libmirage-3.2.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmirage.spec ++++++ --- /var/tmp/diff_new_pack.iYDO46/_old 2022-02-05 23:23:48.091670943 +0100 +++ /var/tmp/diff_new_pack.iYDO46/_new 2022-02-05 23:23:48.095670916 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmirage # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Summary: A CD-ROM image access library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Version: 3.2.5 +Version: 3.2.6 Release: 0 URL: https://cdemu.sourceforge.io/about/libmirage/ #Git-Clone: https://github.com/cdemu/cdemu.git @@ -64,8 +64,8 @@ %package -n %lname Summary: A CD-ROM image access library -# Technically Suggests:, but pretty useless without Group: System/Libraries +# Technically Suggests:, but pretty useless without Requires: libmirage-%pname >= %version %description -n %lname ++++++ libmirage-3.2.5.tar.xz -> libmirage-3.2.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/CMakeLists.txt new/libmirage-3.2.6/CMakeLists.txt --- old/libmirage-3.2.5/CMakeLists.txt 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/CMakeLists.txt 2021-12-18 12:18:52.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.7) -project(libmirage VERSION 3.2.5 LANGUAGES C) +project(libmirage VERSION 3.2.6 LANGUAGES C) # Semantic versioning 2.0.0 (semver.org): # MAJOR is increased when backwards-incompatible changes are made to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/README new/libmirage-3.2.6/README --- old/libmirage-3.2.5/README 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/README 2021-12-18 12:18:52.000000000 +0100 @@ -1,5 +1,5 @@ libMirage -3.2.5 +3.2.6 ~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/debian/changelog new/libmirage-3.2.6/debian/changelog --- old/libmirage-3.2.5/debian/changelog 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/debian/changelog 2021-12-18 12:18:52.000000000 +0100 @@ -1,3 +1,3 @@ -libmirage (3.2.5-1) debian; urgency=low +libmirage (3.2.6-1) debian; urgency=low * Initial Release. Closes: #705409 -- Henrik Stokseth <hstok...@users.sourceforge.net> Sat, 05 Apr 2014 12:00:00 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/filters/filter-dmg/resource-fork.c new/libmirage-3.2.6/filters/filter-dmg/resource-fork.c --- old/libmirage-3.2.5/filters/filter-dmg/resource-fork.c 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/filters/filter-dmg/resource-fork.c 2021-12-18 12:18:52.000000000 +0100 @@ -259,7 +259,11 @@ /* Add the data to the ref */ rsrc_ref->data_length = dest_str->len; if (dest_str->len > 0) { +#if GLIB_CHECK_VERSION(2, 68, 0) + rsrc_ref->data = g_memdup2(dest_str->str, dest_str->len); +#else rsrc_ref->data = g_memdup(dest_str->str, dest_str->len); +#endif g_assert(rsrc_ref->data); } else { rsrc_ref->data = NULL; @@ -358,7 +362,11 @@ rsrc_fork = g_try_new0(rsrc_fork_t, 1); if (!rsrc_fork) return NULL; +#if GLIB_CHECK_VERSION(2, 68, 0) + raw_data = g_memdup2(bin_data, bin_length); +#else raw_data = g_memdup(bin_data, bin_length); +#endif if (!raw_data) return NULL; /* Read and fixup header */ @@ -427,7 +435,11 @@ //g_message(" Attrs: 0x%02x Data length: %u offset: 0x%x", ref_list[r].attrs, *rsrc_data_length, rsrc_data_offset); if (*rsrc_data_length > 0) { +#if GLIB_CHECK_VERSION(2, 68, 0) + ref_entry.data = g_memdup2(rsrc_data_ptr, *rsrc_data_length); +#else ref_entry.data = g_memdup(rsrc_data_ptr, *rsrc_data_length); +#endif if (!ref_entry.data) return NULL; } else { ref_entry.data = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/images/image-harddisk/libmirage-apple.xml.in new/libmirage-3.2.6/images/image-harddisk/libmirage-apple.xml.in --- old/libmirage-3.2.5/images/image-harddisk/libmirage-apple.xml.in 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/images/image-harddisk/libmirage-apple.xml.in 2021-12-18 12:18:52.000000000 +0100 @@ -13,14 +13,5 @@ <magic priority="50"> <match value="koly" type="string" offset="0"/> </magic> - - <magic priority="20"> - <match value="ER" type="string" offset="0"/> - <match value="PM" type="string" offset="512"/> - - <match value="BD" type="string" offset="1024"/> - <match value="H+" type="string" offset="1024"/> - <match value="HX" type="string" offset="1024"/> - </magic> </mime-type> </mime-info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/mirage/cdtext-coder.c new/libmirage-3.2.6/mirage/cdtext-coder.c --- old/libmirage-3.2.5/mirage/cdtext-coder.c 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/mirage/cdtext-coder.c 2021-12-18 12:18:52.000000000 +0100 @@ -413,7 +413,11 @@ pack_data->block_number = block; pack_data->pack_type = type; pack_data->track_number = track; +#if GLIB_CHECK_VERSION(2, 68, 0) + pack_data->data = g_memdup2(data, data_len); +#else pack_data->data = g_memdup(data, data_len); +#endif pack_data->data_len = data_len; /* Add internal representation to ordered list... */ @@ -626,7 +630,11 @@ pack_data->block_number = block; pack_data->pack_type = self->priv->cur_pack->pack_type; pack_data->track_number = cur_track; +#if GLIB_CHECK_VERSION(2, 68, 0) + pack_data->data = g_memdup2(tmp_buffer, tmp_len); +#else pack_data->data = g_memdup(tmp_buffer, tmp_len); +#endif pack_data->data_len = tmp_len; self->priv->blocks[block].packs_list = g_list_insert_sorted(self->priv->blocks[block].packs_list, pack_data, (GCompareFunc)sort_pack_data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/mirage/language.c new/libmirage-3.2.6/mirage/language.c --- old/libmirage-3.2.5/mirage/language.c 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/mirage/language.c 2021-12-18 12:18:52.000000000 +0100 @@ -149,7 +149,11 @@ /* Set pack data only if length is not 0; if it is, assume caller wants to clear pack data... */ if (length) { +#if GLIB_CHECK_VERSION(2, 68, 0) + pack->data = g_memdup2(pack_data, length); +#else pack->data = g_memdup(pack_data, length); +#endif pack->length = length; pack->set = TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmirage-3.2.5/mirage/plugin.c new/libmirage-3.2.6/mirage/plugin.c --- old/libmirage-3.2.5/mirage/plugin.c 2021-04-17 13:19:54.000000000 +0200 +++ new/libmirage-3.2.6/mirage/plugin.c 2021-12-18 12:18:52.000000000 +0100 @@ -98,6 +98,7 @@ in the plugin, we want the loading to fail immediately */ self->priv->library = g_module_open(self->priv->filename, G_MODULE_BIND_LOCAL); if (!self->priv->library) { + g_warning("%s: plugin %s\n", __func__, g_module_error()); return FALSE; } @@ -126,9 +127,14 @@ } /* Make sure that the loaded library contains the required methods */ - if (!g_module_symbol(self->priv->library, "mirage_plugin_load_plugin", (gpointer *)&self->priv->mirage_plugin_load_plugin) || - !g_module_symbol(self->priv->library, "mirage_plugin_unload_plugin", (gpointer *)&self->priv->mirage_plugin_unload_plugin)) { + if (!g_module_symbol(self->priv->library, "mirage_plugin_load_plugin", (gpointer *)&self->priv->mirage_plugin_load_plugin)) { + g_warning("%s: plugin %s: does not implement 'mirage_plugin_load_plugin'!\n", __func__, self->priv->filename); + g_module_close(self->priv->library); + return FALSE; + } + if (!g_module_symbol(self->priv->library, "mirage_plugin_unload_plugin", (gpointer *)&self->priv->mirage_plugin_unload_plugin)) { + g_warning("%s: plugin %s: does not implement 'mirage_plugin_unload_plugin'!\n", __func__, self->priv->filename); g_module_close(self->priv->library); return FALSE; }
