[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/mate-session-manager][master] 7 commits: debian/patches: Cherry-pick upstream double-free fix:...



Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-session-manager

Commits:

  • 453ddd99
    by Mike Gabriel at 2023-06-19T13:53:35+02:00
    debian/patches: Cherry-pick upstream double-free fix: 0009_main-fix-double-free-on-gl_renderer.patch.
    
  • cc980099
    by Mike Gabriel at 2023-06-19T13:55:00+02:00
    debian/patches: Trivial rebase of 0005_lock-session-before-user-switch.patch.
    
  • 5a348ac0
    by Mike Gabriel at 2023-06-19T14:02:12+02:00
    debian/default-settings/X11/Xsession.d/99mate-environment: Allow clutter backends other than x11 (while preferring x11). (Closes: #954783).
    
  • a60dcfa2
    by Mike Gabriel at 2023-06-19T14:08:05+02:00
    debian/copyright: Update copyright attribution for debian/ folder.
    
  • 72ae344d
    by Mike Gabriel at 2023-06-19T14:08:25+02:00
    debian/control: Bump Standards-Version: to 4.6.2. No changes needed.
    
  • 7eca3187
    by Mike Gabriel at 2023-06-19T14:09:24+02:00
    debian/rules: Set libexecdir to /usr/libexec/mate-session-manager.
    
  • 6f68f0a7
    by Mike Gabriel at 2023-06-19T14:13:04+02:00
    upload to unstable (debian/1.26.1-1)
    

8 changed files:

Changes:

  • debian/changelog
    1
    +mate-session-manager (1.26.1-1) unstable; urgency=medium
    
    2
    +
    
    3
    +  * New upstream release. (Closes: #1038638).
    
    4
    +    - mate-session-check-accelerated*.c: Fix memory leaks.
    
    5
    +    - mate-session/{main.c,gsm-manager.c}: Fix memory leaks.
    
    6
    +  * debian/patches:
    
    7
    +    + Cherry-pick upstream double-free fix: 0009_main-fix-double-free-on-
    
    8
    +      gl_renderer.patch.
    
    9
    +    + Trivial rebase of 0005_lock-session-before-user-switch.patch.
    
    10
    +  * debian/default-settings/X11/Xsession.d/99mate-environment:
    
    11
    +    + Allow clutter backends other than x11 (while preferring x11). (Closes:
    
    12
    +      #954783).
    
    13
    +  * debian/control:
    
    14
    +    + Bump Standards-Version: to 4.6.2. No changes needed.
    
    15
    +  * debian/rules:
    
    16
    +    + Set libexecdir to /usr/libexec/mate-session-manager.
    
    17
    +  * debian/copyright:
    
    18
    +    + Update copyright attribution for debian/ folder.
    
    19
    +
    
    20
    + -- Mike Gabriel <sunweaver@debian.org>  Mon, 19 Jun 2023 13:53:53 +0200
    
    21
    +
    
    1 22
     mate-session-manager (1.26.0-1) unstable; urgency=medium
    
    2 23
     
    
    3 24
       [ Martin Wimpress ]
    

  • debian/control
    ... ... @@ -6,8 +6,6 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>,
    6 6
                John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
    
    7 7
                Stefano Karapetsas <stefano@karapetsas.com>,
    
    8 8
                Vangelis Mouhtsis <vangelis@gnugr.org>,
    
    9
    -Standards-Version: 4.6.0
    
    10
    -Rules-Requires-Root: no
    
    11 9
     Build-Depends: autoconf-archive,
    
    12 10
                    debhelper-compat (= 13),
    
    13 11
                    dpkg-dev (>= 1.16.1.1),
    
    ... ... @@ -30,6 +28,8 @@ Build-Depends: autoconf-archive,
    30 28
                    mate-submodules-source (>= 0.0~git20210623.f3091f9),
    
    31 29
                    xmlto,
    
    32 30
                    xsltproc,
    
    31
    +Standards-Version: 4.6.2
    
    32
    +Rules-Requires-Root: no
    
    33 33
     Homepage: http://www.mate-desktop.org/
    
    34 34
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-session-manager
    
    35 35
     Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-session-manager.git
    

  • debian/copyright
    ... ... @@ -246,7 +246,7 @@ License: public-domain
    246 246
     Files: debian/*
    
    247 247
     Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
    
    248 248
                2014-2015, Martin Wimpress <code@flexion.org>
    
    249
    -           2014-2021, Mike Gabriel <sunweaver@debian.org>
    
    249
    +           2014-2023, Mike Gabriel <sunweaver@debian.org>
    
    250 250
     License: GPL-2+ or LGPL-2+
    
    251 251
     
    
    252 252
     License: GPL-2+
    

  • debian/default-settings/X11/Xsession.d/99mate-environment
    ... ... @@ -33,6 +33,6 @@ if [ "x$DESKTOP_SESSION" = "xmate" ] || [ "x$XDG_SESSION_DESKTOP" = "xmate" ]; t
    33 33
         #  - Telegram doesn't work with QT_STYLE_OVERRIDE=gtk
    
    34 34
         # export QT_STYLE_OVERRIDE=gtk
    
    35 35
     
    
    36
    -    # Workaround clutter issue (LP: #1462445)
    
    37
    -    export CLUTTER_BACKEND=x11
    
    36
    +    # Workaround clutter issue (LP: #1462445, Debian #954783)
    
    37
    +    export CLUTTER_BACKEND="x11,*"
    
    38 38
     fi

  • debian/patches/0005_lock-session-before-user-switch.patch
    ... ... @@ -6,7 +6,7 @@ Date: Wed Dec 9 13:52:31 2015 +0100
    6 6
     
    
    7 7
     --- a/mate-session/gsm-manager.c
    
    8 8
     +++ b/mate-session/gsm-manager.c
    
    9
    -@@ -3429,6 +3429,19 @@
    
    9
    +@@ -3433,6 +3433,19 @@
    
    10 10
              case GTK_RESPONSE_DELETE_EVENT:
    
    11 11
                      break;
    
    12 12
              case GSM_LOGOUT_RESPONSE_SWITCH_USER:
    

  • debian/patches/0009_main-fix-double-free-on-gl_renderer.patch
    1
    +From 1deb34ac81817da45b1e1d0c80f2bb4954a4253e Mon Sep 17 00:00:00 2001
    
    2
    +From: Jan Palus <jpalus@fastmail.com>
    
    3
    +Date: Sun, 21 May 2023 00:30:29 +0200
    
    4
    +Subject: [PATCH] main: fix double free on gl_renderer
    
    5
    +
    
    6
    +Fixes: 1263384 ("mate-session: fix memory leak")
    
    7
    +Fixes: #304
    
    8
    +Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    
    9
    +---
    
    10
    + mate-session/main.c | 1 -
    
    11
    + 1 file changed, 1 deletion(-)
    
    12
    +
    
    13
    +diff --git a/mate-session/main.c b/mate-session/main.c
    
    14
    +index fc2148e..68e3864 100644
    
    15
    +--- a/mate-session/main.c
    
    16
    ++++ b/mate-session/main.c
    
    17
    +@@ -759,7 +759,6 @@ int main(int argc, char** argv)
    
    18
    + 
    
    19
    + 	gsm_xsmp_server_start(xsmp_server);
    
    20
    + 	_gsm_manager_set_renderer (manager, gl_renderer);
    
    21
    +-	g_free (gl_renderer);
    
    22
    + 	gsm_manager_start(manager);
    
    23
    + 
    
    24
    + 	gtk_main();
    
    25
    +-- 
    
    26
    +2.39.2
    
    27
    +

  • debian/patches/series
    1 1
     0005_lock-session-before-user-switch.patch
    
    2 2
     0006_util-Blacklist-some-session-specific-variables.patch
    
    3
    +0009_main-fix-double-free-on-gl_renderer.patch

  • debian/rules
    ... ... @@ -36,7 +36,7 @@ override_dh_auto_configure:
    36 36
     	dh_auto_configure $(DHFLAGS) -- \
    
    37 37
     		--disable-silent-rules \
    
    38 38
     		--localstatedir=/var/lib \
    
    39
    -		--libexecdir=/usr/lib \
    
    39
    +		--libexecdir=/usr/libexec/mate-session-manager \
    
    40 40
     		$(SYSTEMD_OPTS)
    
    41 41
     
    
    42 42
     get-orig-source:
    


  • Reply to: