--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: mate-ut...@packages.debian.org
Control: affects -1 + src:mate-utils
While preparing a new upstream release upload of mate-utils, a
bookworm-pu has been prepared cherry-picking various memory leak fixes
from upstream.
[ Reason ]
(a) Fixing various memleaks in mate utils.
(b) Fixing package name in upstream changelog.
[ Impact ]
If this pu won't get accepted, memleaks in mate-utils in bookworm remain.
[ Tests ]
Manually.
[ Risks ]
MATE users could be affected by regression. The various tools in mate-utils
supplement MATE desktop's functionality scope with minor tools (diskusage,
screenshot, dictionary, etc.).
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
+ * debian/patches:
+ + Add 0000_Fix-News.patch. Fix wrong package name in upstream NEWS file
+ (i.e. our upstream ChangeLog).
+ + Add patches 0001 - 0006 fixing various memleaks in mate-utils (closes:
+ #1052579), cherry-picked from v1.26.1: 0001_mate-screenshot-fix-memory-
+ leak.patch, 0002_mate-disk-image-mounter-fix-memory-leak.patch,
0003_mate-
+ dictionary-fix-memory-leak.patch, 0004_gsearchtool-fix-memory-leak.patch,
+ 0005_mate-dictionary-fix-memory-leak.patch, 0006_mate-dictionary-fix-
+ memory-leak.patch.
[ Other info ]
None.
diff -Nru mate-utils-1.26.0/debian/changelog mate-utils-1.26.0/debian/changelog
--- mate-utils-1.26.0/debian/changelog 2021-12-13 08:11:24.000000000 +0100
+++ mate-utils-1.26.0/debian/changelog 2023-12-30 11:48:33.000000000 +0100
@@ -1,3 +1,17 @@
+mate-utils (1.26.0-1+deb12u1) bookworm; urgency=medium
+
+ * debian/patches:
+ + Add 0000_Fix-News.patch. Fix wrong package name in upstream NEWS file
+ (i.e. our upstream ChangeLog).
+ + Add patches 0001 - 0006 fixing various memleaks in mate-utils (closes:
+ #1052579), cherry-picked from v1.26.1: 0001_mate-screenshot-fix-memory-
+ leak.patch, 0002_mate-disk-image-mounter-fix-memory-leak.patch,
0003_mate-
+ dictionary-fix-memory-leak.patch, 0004_gsearchtool-fix-memory-leak.patch,
+ 0005_mate-dictionary-fix-memory-leak.patch, 0006_mate-dictionary-fix-
+ memory-leak.patch.
+
+ -- Mike Gabriel <sunwea...@debian.org> Sat, 30 Dec 2023 11:48:33 +0100
+
mate-utils (1.26.0-1) unstable; urgency=medium
[ Martin Wimpress ]
diff -Nru mate-utils-1.26.0/debian/patches/0000_Fix-News.patch
mate-utils-1.26.0/debian/patches/0000_Fix-News.patch
--- mate-utils-1.26.0/debian/patches/0000_Fix-News.patch 1970-01-01
01:00:00.000000000 +0100
+++ mate-utils-1.26.0/debian/patches/0000_Fix-News.patch 2023-12-30
11:38:14.000000000 +0100
@@ -0,0 +1,55 @@
+From 3d70c8ec7b5b3847fe906974dc178d03a05bdaf7 Mon Sep 17 00:00:00 2001
+From: raveit65 <m...@raveit.de>
+Date: Thu, 5 Aug 2021 22:45:07 +0200
+Subject: [PATCH] Fix News
+
+closes annoying report https://github.com/mate-desktop/mate-utils/issues/318
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ NEWS | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 3d677c09..da91780c 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,9 +1,9 @@
+-### mate-notification-daemon 1.26.0
++### mate-utils 1.26.0
+
+ * Translations update
+ * update copyright to 2021
+
+-### mate-notification-daemon 1.25.1
++### mate-utils 1.25.1
+
+ * Translations update
+ * Remove warnings about missing prototypes
+@@ -33,7 +33,7 @@
+ * Warn about accessing an undefined property of the object
+ * gsearchtool: Fix "open with" behavior
+
+-### mate-notification-daemon 1.25.0
++### mate-utils 1.25.0
+
+ * Translations update
+ * gdict-pref-dialog: Simplify notebook scroll event
+@@ -67,12 +67,12 @@
+ * baobab: Remove unused variable ‘uri_list’
+ * mate-screenshot: do not use stock icons in mate-screenshot.ui
+
+-### mate-notification-daemon 1.24.0
++### mate-utils 1.24.0
+
+ * Translations update
+ * Fix build using gcc 10 -fno-common flag
+
+-### mate-notification-daemon 1.23.2
++### mate-utils 1.23.2
+
+ * Translations update
+ * gettext: Fix locale dir
+--
+2.39.2
+
diff -Nru
mate-utils-1.26.0/debian/patches/0001_mate-screenshot-fix-memory-leak.patch
mate-utils-1.26.0/debian/patches/0001_mate-screenshot-fix-memory-leak.patch
--- mate-utils-1.26.0/debian/patches/0001_mate-screenshot-fix-memory-leak.patch
1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.26.0/debian/patches/0001_mate-screenshot-fix-memory-leak.patch
2023-12-30 11:38:46.000000000 +0100
@@ -0,0 +1,29 @@
+From 74646513584b8bcbea61b37ddb3e75a5a206605c Mon Sep 17 00:00:00 2001
+From: rbuj <robert....@gmail.com>
+Date: Mon, 8 Nov 2021 15:26:58 +0100
+Subject: [PATCH 1/6] mate-screenshot: fix memory leak
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ mate-screenshot/src/mate-screenshot.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/mate-screenshot/src/mate-screenshot.c
b/mate-screenshot/src/mate-screenshot.c
+index e88fc6c4..de959406 100644
+--- a/mate-screenshot/src/mate-screenshot.c
++++ b/mate-screenshot/src/mate-screenshot.c
+@@ -1180,8 +1180,10 @@ load_options (void)
+ /* Find various dirs */
+ last_save_dir = g_settings_get_string (settings,
+ LAST_SAVE_DIRECTORY_KEY);
+- if (!last_save_dir || !last_save_dir[0])
++
++ if (*last_save_dir == '\0')
+ {
++ g_free (last_save_dir);
+ last_save_dir = get_desktop_dir ();
+ }
+ else if (last_save_dir[0] == '~')
+--
+2.39.2
+
diff -Nru
mate-utils-1.26.0/debian/patches/0002_mate-disk-image-mounter-fix-memory-leak.patch
mate-utils-1.26.0/debian/patches/0002_mate-disk-image-mounter-fix-memory-leak.patch
---
mate-utils-1.26.0/debian/patches/0002_mate-disk-image-mounter-fix-memory-leak.patch
1970-01-01 01:00:00.000000000 +0100
+++
mate-utils-1.26.0/debian/patches/0002_mate-disk-image-mounter-fix-memory-leak.patch
2023-12-30 11:38:46.000000000 +0100
@@ -0,0 +1,28 @@
+From cb4703ed7214fd5366ee1837c63fd2bcdf21319c Mon Sep 17 00:00:00 2001
+From: rbuj <robert....@gmail.com>
+Date: Thu, 21 Oct 2021 22:28:48 +0200
+Subject: [PATCH 2/6] mate-disk-image-mounter: fix memory leak
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ mate-disk-image-mounter/src/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mate-disk-image-mounter/src/main.c
b/mate-disk-image-mounter/src/main.c
+index b4f4d221..fc65b2d5 100644
+--- a/mate-disk-image-mounter/src/main.c
++++ b/mate-disk-image-mounter/src/main.c
+@@ -191,8 +191,10 @@ main (int argc, char *argv[])
+ s = g_option_context_get_help (o, FALSE, NULL);
+ g_printerr ("%s", s);
+ g_free (s);
++ g_option_context_free (o);
+ goto out;
+ }
++ g_option_context_free (o);
+
+ if (argc > 1)
+ {
+--
+2.39.2
+
diff -Nru
mate-utils-1.26.0/debian/patches/0003_mate-dictionary-fix-memory-leak.patch
mate-utils-1.26.0/debian/patches/0003_mate-dictionary-fix-memory-leak.patch
--- mate-utils-1.26.0/debian/patches/0003_mate-dictionary-fix-memory-leak.patch
1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.26.0/debian/patches/0003_mate-dictionary-fix-memory-leak.patch
2023-12-30 11:38:46.000000000 +0100
@@ -0,0 +1,25 @@
+From 6e1f199608ad5622507816f00ac22a0a8990ed4c Mon Sep 17 00:00:00 2001
+From: rbuj <robert....@gmail.com>
+Date: Thu, 21 Oct 2021 22:02:14 +0200
+Subject: [PATCH 3/6] mate-dictionary: fix memory leak
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ mate-dictionary/src/gdict-app.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mate-dictionary/src/gdict-app.c b/mate-dictionary/src/gdict-app.c
+index 03f9cd6a..3d82a037 100644
+--- a/mate-dictionary/src/gdict-app.c
++++ b/mate-dictionary/src/gdict-app.c
+@@ -359,6 +359,7 @@ gdict_init (int *argc, char ***argv)
+
+ exit (1);
+ }
++ g_option_context_free (context);
+
+ g_set_application_name (_("Dictionary"));
+ gtk_window_set_default_icon_name ("accessories-dictionary");
+--
+2.39.2
+
diff -Nru
mate-utils-1.26.0/debian/patches/0004_gsearchtool-fix-memory-leak.patch
mate-utils-1.26.0/debian/patches/0004_gsearchtool-fix-memory-leak.patch
--- mate-utils-1.26.0/debian/patches/0004_gsearchtool-fix-memory-leak.patch
1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.26.0/debian/patches/0004_gsearchtool-fix-memory-leak.patch
2023-12-30 11:38:46.000000000 +0100
@@ -0,0 +1,30 @@
+From 34e381a2f7b7319d0befa3040a5c3b5db900f49d Mon Sep 17 00:00:00 2001
+From: rbuj <robert....@gmail.com>
+Date: Thu, 21 Oct 2021 19:38:43 +0200
+Subject: [PATCH 4/6] gsearchtool: fix memory leak
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ gsearchtool/src/gsearchtool-support.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gsearchtool/src/gsearchtool-support.c
b/gsearchtool/src/gsearchtool-support.c
+index adffd25f..7e4745fe 100644
+--- a/gsearchtool/src/gsearchtool-support.c
++++ b/gsearchtool/src/gsearchtool-support.c
+@@ -446,10 +446,10 @@ get_file_type_description (const gchar * file,
+ }
+
+ if (content_type == NULL || g_content_type_is_unknown (content_type) ==
TRUE) {
+- return g_strdup (g_content_type_get_description
("application/octet-stream"));
++ return g_content_type_get_description
("application/octet-stream");
+ }
+
+- desc = g_strdup (g_content_type_get_description (content_type));
++ desc = g_content_type_get_description (content_type);
+
+ if (g_file_info_get_is_symlink (file_info) == TRUE) {
+
+--
+2.39.2
+
diff -Nru
mate-utils-1.26.0/debian/patches/0005_mate-dictionary-fix-memory-leak.patch
mate-utils-1.26.0/debian/patches/0005_mate-dictionary-fix-memory-leak.patch
--- mate-utils-1.26.0/debian/patches/0005_mate-dictionary-fix-memory-leak.patch
1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.26.0/debian/patches/0005_mate-dictionary-fix-memory-leak.patch
2023-12-30 11:38:46.000000000 +0100
@@ -0,0 +1,34 @@
+From 2e6ed9adabe4d139706e6b637078451769ad4692 Mon Sep 17 00:00:00 2001
+From: rbuj <robert....@gmail.com>
+Date: Sat, 1 Jan 2022 11:23:13 +0100
+Subject: [PATCH 5/6] mate-dictionary: fix memory leak
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ mate-dictionary/libgdict/gdict-defbox.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mate-dictionary/libgdict/gdict-defbox.c
b/mate-dictionary/libgdict/gdict-defbox.c
+index 247bf8e9..8f6e0d23 100644
+--- a/mate-dictionary/libgdict/gdict-defbox.c
++++ b/mate-dictionary/libgdict/gdict-defbox.c
+@@ -200,6 +200,8 @@ gdict_defbox_dispose (GObject *gobject)
+ priv->regular_cursor = NULL;
+ }
+
++ g_clear_pointer (&priv->word, g_free);
++
+ G_OBJECT_CLASS (gdict_defbox_parent_class)->dispose (gobject);
+ }
+
+@@ -2548,6 +2550,7 @@ gdict_defbox_lookup (GdictDefbox *defbox,
+ G_CALLBACK (error_cb),
+ defbox);
+
++ g_free (priv->word);
+ priv->word = g_strdup (word);
+ g_object_notify (G_OBJECT (defbox), "word");
+
+--
+2.39.2
+
diff -Nru
mate-utils-1.26.0/debian/patches/0006_mate-dictionary-fix-memory-leak.patch
mate-utils-1.26.0/debian/patches/0006_mate-dictionary-fix-memory-leak.patch
--- mate-utils-1.26.0/debian/patches/0006_mate-dictionary-fix-memory-leak.patch
1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.26.0/debian/patches/0006_mate-dictionary-fix-memory-leak.patch
2023-12-30 11:38:46.000000000 +0100
@@ -0,0 +1,34 @@
+From d7626da004ccd4464169f35a41984be366edfed2 Mon Sep 17 00:00:00 2001
+From: rbuj <robert....@gmail.com>
+Date: Sat, 1 Jan 2022 11:04:26 +0100
+Subject: [PATCH 6/6] mate-dictionary: fix memory leak
+
+Signed-off-by: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
+---
+ mate-dictionary/src/gdict-window.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/mate-dictionary/src/gdict-window.c
b/mate-dictionary/src/gdict-window.c
+index 067a2534..96168286 100644
+--- a/mate-dictionary/src/gdict-window.c
++++ b/mate-dictionary/src/gdict-window.c
+@@ -130,7 +130,6 @@ gdict_window_dispose (GObject *gobject)
+ if (window->settings != NULL)
+ {
+ g_object_unref (window->settings);
+-
+ window->settings = NULL;
+ }
+
+@@ -189,6 +188,8 @@ gdict_window_dispose (GObject *gobject)
+ window->busy_cursor = NULL;
+ }
+
++ g_clear_pointer (&window->sidebar_page, g_free);
++
+ G_OBJECT_CLASS (gdict_window_parent_class)->dispose (gobject);
+ }
+
+--
+2.39.2
+
diff -Nru mate-utils-1.26.0/debian/patches/series
mate-utils-1.26.0/debian/patches/series
--- mate-utils-1.26.0/debian/patches/series 2021-12-13 08:11:24.000000000
+0100
+++ mate-utils-1.26.0/debian/patches/series 2023-12-30 11:48:33.000000000
+0100
@@ -1 +1,8 @@
1001_fix-gsearchtool-pt-help-translation.patch
+0000_Fix-News.patch
+0001_mate-screenshot-fix-memory-leak.patch
+0002_mate-disk-image-mounter-fix-memory-leak.patch
+0003_mate-dictionary-fix-memory-leak.patch
+0004_gsearchtool-fix-memory-leak.patch
+0005_mate-dictionary-fix-memory-leak.patch
+0006_mate-dictionary-fix-memory-leak.patch
--- End Message ---
