Commits:
-
f273cfc1
by Mike Gabriel at 2023-04-25T16:33:30+02:00
debian/patches: Trivial rebase of 001_prefer-x-terminal-emulator.patch.
-
9294e377
by Mike Gabriel at 2023-04-25T16:35:38+02:00
debian/patches: Add patches 0001 and 0002. Fix two memory leaks. Add patch 0003 fix use-after-free issue. (Closes: #1033719).
-
8d56e077
by Mike Gabriel at 2023-04-25T14:48:06+00:00
debian/control: In bin:pkg libmate-desktop-dev switch from libgdk-pixbuf2.0-dev (deprecated) to libgdk-pixbuf-2.0-dev. Thanks, lintian.
-
877264a7
by Mike Gabriel at 2023-04-25T14:49:25+00:00
debian/copyright: Update copyright attribution for debian/ folder.
-
fb639f65
by Mike Gabriel at 2023-04-25T16:54:19+02:00
upload to unstable (debian/1.26.0-2)
8 changed files:
Changes:
debian/changelog
|
|
1
|
+mate-desktop (1.26.0-2) unstable; urgency=medium
|
|
|
2
|
+
|
|
|
3
|
+ * debian/patches:
|
|
|
4
|
+ + Trivial rebase of 001_prefer-x-terminal-emulator.patch.
|
|
|
5
|
+ + Add patches 0001 and 0002. Fix two memory leaks.
|
|
|
6
|
+ + Add patch 0003 fix use-after-free issue. (Closes: #1033719).
|
|
|
7
|
+ * debian/control:
|
|
|
8
|
+ + In bin:pkg libmate-desktop-dev switch from libgdk-pixbuf2.0-dev
|
|
|
9
|
+ (deprecated) to libgdk-pixbuf-2.0-dev. Thanks, lintian.
|
|
|
10
|
+ * debian/copyright:
|
|
|
11
|
+ + Update copyright attribution for debian/ folder.
|
|
|
12
|
+
|
|
|
13
|
+ -- Mike Gabriel <sunweaver@debian.org> Tue, 25 Apr 2023 16:35:44 +0200
|
|
|
14
|
+
|
|
1
|
15
|
mate-desktop (1.26.0-1) unstable; urgency=medium
|
|
2
|
16
|
|
|
3
|
17
|
[ Martin Wimpress ]
|
debian/control
| ... |
... |
@@ -100,7 +100,7 @@ Section: libdevel |
|
100
|
100
|
Architecture: any
|
|
101
|
101
|
Multi-Arch: same
|
|
102
|
102
|
Depends: libdconf-dev,
|
|
103
|
|
- libgdk-pixbuf2.0-dev,
|
|
|
103
|
+ libgdk-pixbuf-2.0-dev,
|
|
104
|
104
|
libgtk-3-dev,
|
|
105
|
105
|
libmate-desktop-2-17 (= ${binary:Version}),
|
|
106
|
106
|
libstartup-notification0-dev,
|
debian/copyright
| ... |
... |
@@ -232,7 +232,7 @@ License: public-domain |
|
232
|
232
|
|
|
233
|
233
|
Files: debian/*
|
|
234
|
234
|
Copyright: 2011-2013, Stefano Karapetsas <stefano@karapetsas.com>
|
|
235
|
|
- 2013-2015, Mike Gabriel <sunweaver@debian.org>
|
|
|
235
|
+ 2013-2023, Mike Gabriel <sunweaver@debian.org>
|
|
236
|
236
|
License: GPL-2+ or LGPL-2+ or Expat
|
|
237
|
237
|
|
|
238
|
238
|
License: GPL-2+
|
debian/patches/0001_mate-bg-fix-memory-leak.patch
|
|
1
|
+From 2fbe25e7ad9c7678db2f3e34f76c9ee4e37d80d9 Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: rbuj <robert.buj@gmail.com>
|
|
|
3
|
+Date: Mon, 8 Nov 2021 12:44:21 +0100
|
|
|
4
|
+Subject: [PATCH] mate-bg: fix memory leak
|
|
|
5
|
+
|
|
|
6
|
+---
|
|
|
7
|
+ libmate-desktop/mate-bg.c | 10 +++++++---
|
|
|
8
|
+ 1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
9
|
+
|
|
|
10
|
+diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
|
|
|
11
|
+index e5119759e..62cc5e59e 100644
|
|
|
12
|
+--- a/libmate-desktop/mate-bg.c
|
|
|
13
|
++++ b/libmate-desktop/mate-bg.c
|
|
|
14
|
+@@ -3197,9 +3197,13 @@ mate_bg_changes_with_time (MateBG *bg)
|
|
|
15
|
+ if (!bg->filename)
|
|
|
16
|
+ return FALSE;
|
|
|
17
|
+
|
|
|
18
|
+- show = get_as_slideshow (bg, bg->filename);
|
|
|
19
|
+- if (show)
|
|
|
20
|
+- return g_queue_get_length (show->slides) > 1;
|
|
|
21
|
++ if ((show = get_as_slideshow (bg, bg->filename)) != NULL) {
|
|
|
22
|
++ gboolean result;
|
|
|
23
|
++
|
|
|
24
|
++ result = (g_queue_get_length (show->slides) > 1) ? TRUE : FALSE;
|
|
|
25
|
++ slideshow_unref (show);
|
|
|
26
|
++ return result;
|
|
|
27
|
++ }
|
|
|
28
|
+
|
|
|
29
|
+ return FALSE;
|
|
|
30
|
+ } |
debian/patches/0002_mate-desktop-thumbnail-fix-memory-leak.patch
|
|
1
|
+From 7f9225f08b84d58ccddbc88c7c4cc176c151fdb9 Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: rbuj <robert.buj@gmail.com>
|
|
|
3
|
+Date: Fri, 22 Oct 2021 18:26:52 +0200
|
|
|
4
|
+Subject: [PATCH] mate-desktop-thumbnail: fix memory leak
|
|
|
5
|
+
|
|
|
6
|
+---
|
|
|
7
|
+ libmate-desktop/mate-desktop-thumbnail.c | 1 +
|
|
|
8
|
+ 1 file changed, 1 insertion(+)
|
|
|
9
|
+
|
|
|
10
|
+diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
|
|
|
11
|
+index 8d2670631..885ff420a 100644
|
|
|
12
|
+--- a/libmate-desktop/mate-desktop-thumbnail.c
|
|
|
13
|
++++ b/libmate-desktop/mate-desktop-thumbnail.c
|
|
|
14
|
+@@ -954,6 +954,7 @@ expand_thumbnailing_script (const char *script,
|
|
|
15
|
+
|
|
|
16
|
+ g_ptr_array_add (array, expanded);
|
|
|
17
|
+ }
|
|
|
18
|
++ g_strfreev (script_elems);
|
|
|
19
|
+
|
|
|
20
|
+ if (!got_in)
|
|
|
21
|
+ { |
debian/patches/0003_revert-small-cleanup.patch
|
|
1
|
+From 6fcc78cd8e5aa807fa9d254d2e61a302096559cf Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Colomban Wendling <cwendling@hypra.fr>
|
|
|
3
|
+Date: Mon, 7 Nov 2022 11:57:51 +0100
|
|
|
4
|
+Subject: [PATCH] Revert "[mate-bg] small cleanup"
|
|
|
5
|
+
|
|
|
6
|
+It is not possible to use the `list` pointer after it has been deleted,
|
|
|
7
|
+so the "cleanup" this commit made lead to using freed memory if any
|
|
|
8
|
+item actually got clean up.
|
|
|
9
|
+
|
|
|
10
|
+This "cleanup" also don't seem meaningful to me, as all it does
|
|
|
11
|
+otherwise is trade an assignation for a redundant test -- either of
|
|
|
12
|
+which the compiler might happily optimize out.
|
|
|
13
|
+
|
|
|
14
|
+This reverts commit 47426c90d10e9f738ecf89f35db94ca8deff55e0.
|
|
|
15
|
+---
|
|
|
16
|
+ libmate-desktop/mate-bg.c | 17 ++++++++---------
|
|
|
17
|
+ 1 file changed, 8 insertions(+), 9 deletions(-)
|
|
|
18
|
+
|
|
|
19
|
+diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
|
|
|
20
|
+index 62cc5e59e..5cf2daf3a 100644
|
|
|
21
|
+--- a/libmate-desktop/mate-bg.c
|
|
|
22
|
++++ b/libmate-desktop/mate-bg.c
|
|
|
23
|
+@@ -2016,19 +2016,18 @@ static gboolean
|
|
|
24
|
+ blow_expensive_caches (gpointer data)
|
|
|
25
|
+ {
|
|
|
26
|
+ MateBG *bg = data;
|
|
|
27
|
+- GList *list;
|
|
|
28
|
++ GList *list, *next;
|
|
|
29
|
+
|
|
|
30
|
+ bg->blow_caches_id = 0;
|
|
|
31
|
+
|
|
|
32
|
+- if (bg->file_cache) {
|
|
|
33
|
+- for (list = bg->file_cache; list != NULL; list = list->next) {
|
|
|
34
|
+- FileCacheEntry *ent = list->data;
|
|
|
35
|
++ for (list = bg->file_cache; list != NULL; list = next) {
|
|
|
36
|
++ FileCacheEntry *ent = list->data;
|
|
|
37
|
++ next = list->next;
|
|
|
38
|
+
|
|
|
39
|
+- if (ent->type == PIXBUF) {
|
|
|
40
|
+- file_cache_entry_delete (ent);
|
|
|
41
|
+- bg->file_cache = g_list_delete_link (bg->file_cache,
|
|
|
42
|
+- list);
|
|
|
43
|
+- }
|
|
|
44
|
++ if (ent->type == PIXBUF) {
|
|
|
45
|
++ file_cache_entry_delete (ent);
|
|
|
46
|
++ bg->file_cache = g_list_delete_link (bg->file_cache,
|
|
|
47
|
++ list);
|
|
|
48
|
+ }
|
|
|
49
|
+ }
|
|
|
50
|
+ |
debian/patches/2001_prefer-x-terminal-emulator.patch
| ... |
... |
@@ -3,7 +3,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> |
|
3
|
3
|
|
|
4
|
4
|
--- a/libmate-desktop/mate-desktop-utils.c
|
|
5
|
5
|
+++ b/libmate-desktop/mate-desktop-utils.c
|
|
6
|
|
-@@ -136,6 +136,8 @@
|
|
|
6
|
+@@ -137,6 +137,8 @@
|
|
7
|
7
|
term_argv[1] = g_strdup ("-x");
|
|
8
|
8
|
} else {
|
|
9
|
9
|
if (check == NULL)
|
debian/patches/series
|
1
|
1
|
2001_prefer-x-terminal-emulator.patch
|
|
|
2
|
+0001_mate-bg-fix-memory-leak.patch
|
|
|
3
|
+0002_mate-desktop-thumbnail-fix-memory-leak.patch
|
|
|
4
|
+0003_revert-small-cleanup.patch |
|