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

[Git][debian-mate-team/mate-session-manager][master] 11 commits: Revert "debian/changelog: New upstream release."

Title: GitLab

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

Commits:

8 changed files:

Changes:

  • debian/changelog
    1 
    -mate-session-manager (1.26.0-1) UNRELEASED; urgency=medium
    1 
    +mate-session-manager (1.26.0-1) unstable; urgency=medium
    2 2
    3 
    -  * New upstream maintenance release.
    3 
    +  [ Martin Wimpress ]
    4 4 
       * New upstream release.
    5 5
    6 
    - -- Martin Wimpress <code@wimpress.io>  Sat, 21 Aug 2021 18:01:50 +0100
    6 
    +  [ Mike Gabriel ]
    7 
    +  * debian/patches:
    8 
    +    + Trivial rebase of 0005_lock-session-before-user-switch.patch and
    9 
    +      0006_util-Blacklist-some-session-specific-variables.patch.
    10 
    +  * debian/control:
    11 
    +    + Add B-D: mate-submodules-source (>= 0.0~git20210623.f3091f9).
    12 
    +    + Bump Standards-Version: to 4.6.0. No changes needed.
    13 
    +    debian/rules:
    14 
    +    + Unpack libegg (mate-submodules) at the beginning of dh_auto_configure.
    15 
    +  * debian/watch:
    16 
    +    + Use format version 4.
    17 
    +  * debian/copyright:
    18 
    +    + Update copyright attributions.
    19 
    +
    20 
    + -- Mike Gabriel <sunweaver@debian.org>  Sat, 11 Dec 2021 17:47:23 +0100
    21 
    +
    22 
    +mate-session-manager (1.24.1-2) unstable; urgency=medium
    23 
    +
    24 
    +  * debian/patches:
    25 
    +    + Add 0006_util-Blacklist-some-session-specific-variables.patch. Fix
    26 
    +      systemd-logind originated problems when unlocking screen saver.
    27 
    +      (Closes: #986100). Thanks to Simon McVittie and Iain Lane for
    28 
    +      digging into this.
    29 
    +
    30 
    + -- Mike Gabriel <sunweaver@debian.org>  Mon, 17 May 2021 00:11:38 +0200
    7 31
    8 32 
     mate-session-manager (1.24.1-1) unstable; urgency=medium
    9 33

  • debian/control
    ... ... @@ -6,7 +6,7 @@ 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.5.0
    9 
    +Standards-Version: 4.6.0
    10 10 
     Rules-Requires-Root: no
    11 11 
     Build-Depends: autoconf-archive,
    12 12 
                    debhelper-compat (= 13),
    ... ... @@ -27,6 +27,7 @@ Build-Depends: autoconf-archive,
    27 27 
                    libxtst-dev,
    28 28 
                    libgles-dev [hurd-any kfreebsd-any],
    29 29 
                    mate-common (>= 1.18),
    30 
    +               mate-submodules-source (>= 0.0~git20210623.f3091f9),
    30 31 
                    xmlto,
    31 32 
                    xsltproc,
    32 33 
     Homepage: http://www.mate-desktop.org/

  • debian/copyright
    ... ... @@ -13,7 +13,8 @@ Files: mate-session/gs-idle-monitor.c
    13 13 
            mate-session/gsm-presence.h
    14 14 
            mate-session/test-client-dbus.c
    15 15 
            mate-session/test-inhibit.c
    16 
    -Copyright: 2008-2009 Red Hat, Inc.
    16 
    +Copyright: 2008-2009, Red Hat, Inc.
    17 
    +           2012-2021, MATE Developers
    17 18 
     License: GPL-2+
    18 19
    19 20 
     Files: mate-session/gsm-app.c
    ... ... @@ -24,8 +25,9 @@ Files: mate-session/gsm-app.c
    24 25 
            mate-session/gsm-client.h
    25 26 
            mate-session/gsm-xsmp-client.c
    26 27 
            mate-session/main.c
    27 
    -Copyright: 2006-2007 Novell, Inc.
    28 
    +Copyright: 2006-2007, Novell, Inc.
    28 29 
                2008, Red Hat, Inc.
    30 
    +           2012-2021, MATE Developers
    29 31 
     License: GPL-2+
    30 32
    31 33 
     Files: mate-session/gsm-inhibit-dialog.c
    ... ... @@ -35,7 +37,8 @@ Files: mate-session/gsm-inhibit-dialog.c
    35 37 
            mate-session/mdm-log.c
    36 38 
            mate-session/mdm-log.h
    37 39 
            mate-session/mdm-signal-handler.h
    38 
    -Copyright: 2007-2008 William Jon McCann <mccann@jhu.edu>
    40 
    +Copyright: 2007-2008, William Jon McCann <mccann@jhu.edu>
    41 
    +           2012-2021, MATE Developers
    39 42 
     License: GPL-2+
    40 43
    41 44 
     Files: capplet/gsm-properties-dialog.c
    ... ... @@ -44,9 +47,10 @@ Files: capplet/gsm-properties-dialog.c
    44 47 
            capplet/gsp-app.c
    45 48 
            capplet/gsp-app.h
    46 49 
     Copyright: 1999, Free Software Foundation, Inc.
    47 
    -           2007-2009 Vincent Untz
    50 
    +           2007-2009, Vincent Untz
    48 51 
                2008, Lucas Rocha
    49 52 
                2008, William Jon McCann <jmccann@redhat.com>
    53 
    +           2012-2021, MATE Developers
    50 54 
     License: GPL-2+
    51 55
    52 56 
     Files: capplet/gsm-app-dialog.c
    ... ... @@ -55,6 +59,7 @@ Files: capplet/gsm-app-dialog.c
    55 59 
            mate-session/gsm-manager.h
    56 60 
            mate-session/gsm-xsmp-server.h
    57 61 
     Copyright: 2008, William Jon McCann <jmccann@redhat.com>
    62 
    +           2012-2021, MATE Developers
    58 63 
     License: GPL-2+
    59 64
    60 65 
     Files: mate-session/gsm-session-save.c
    ... ... @@ -62,24 +67,20 @@ Files: mate-session/gsm-session-save.c
    62 67 
            mate-session/gsm-util.c
    63 68 
            mate-session/gsm-util.h
    64 69 
     Copyright: 2008, Lucas Rocha
    70 
    +           2012-2021, MATE Developers
    65 71 
     License: GPL-2+
    66 72
    67 
    -Files: egg/eggdesktopfile.h
    68 
    -       egg/eggsmclient-private.h
    69 
    -       egg/eggsmclient.c
    70 
    -       egg/eggsmclient.h
    71 
    -Copyright: 2007, Novell, Inc.
    72 
    -License: LGPL-2+
    73 
    -
    74 73 
     Files: capplet/gsp-keyfile.c
    75 74 
            capplet/gsp-keyfile.h
    76 75 
            mate-session/gsm-xsmp-client.h
    77 
    -Copyright: 2007-2009 Novell, Inc.
    76 
    +Copyright: 2007-2009, Novell, Inc.
    77 
    +           2012-2021, MATE Developers
    78 78 
     License: GPL-2+
    79 79
    80 80 
     Files: mate-session/msm-gnome.c
    81 81 
            mate-session/msm-gnome.h
    82 
    -Copyright: 2004-2005 Benedikt Meurer <benny@xfce.org>
    82 
    +Copyright: 2004-2005, Benedikt Meurer <benny@xfce.org>
    83 
    +           2012-2021, MATE Developers
    83 84 
     License: GPL-2+
    84 85
    85 86 
     Files: mate-session/mdm.c
    ... ... @@ -88,11 +89,13 @@ Copyright: 2001, Queen of England
    88 89 
                2002-2003, George Lebl
    89 90 
                2005, Raffaele Sandrini
    90 91 
                2005, Red Hat, Inc.
    92 
    +           2012-2021, MATE Developers
    91 93 
     License: GPL-2+
    92 94
    93 95 
     Files: mate-session/gsm-consolekit.c
    94 96 
            mate-session/gsm-consolekit.h
    95 97 
     Copyright: 2008, Jon McCann <jmccann@redhat.com>
    98 
    +           2012-2021, MATE Developers
    96 99 
     License: GPL-2+
    97 100
    98 101 
     Files: mate-session/gsm-manager.c
    ... ... @@ -100,57 +103,49 @@ Files: mate-session/gsm-manager.c
    100 103 
     Copyright: 2007, Novell, Inc.
    101 104 
                2008, Red Hat, Inc.
    102 105 
                2008, William Jon McCann <jmccann@redhat.com>
    106 
    +           2012-2021, MATE Developers
    103 107 
     License: GPL-2+
    104 108
    105 109 
     Files: capplet/main.c
    106 110 
     Copyright: 1999, Free Software Foundation, Inc.
    107 111 
                2008, Lucas Rocha
    112 
    +           2012-2021, MATE Developers
    108 113 
     License: GPL-2+
    109 114
    110 115 
     Files: tools/mate-session-save.c
    111 116 
     Copyright: 1998, Tom Tromey
    112 117 
                2008, Red Hat, Inc.
    118 
    +           2012-2021, MATE Developers
    113 119 
     License: GPL-2+
    114 120
    115 121 
     Files: tools/mate-session-inhibit.c
    116 122 
     Copyright: 2012, Red Hat, Inc.
    123 
    +           2012-2021, MATE Developers
    117 124 
     License: GPL-2+
    118 125
    119 126 
     Files: mate-session/gsm-logout-dialog.c
    120 127 
     Copyright: 2006, Vincent Untz
    121 128 
                2008, Red Hat, Inc.
    129 
    +           2012-2021, MATE Developers
    122 130 
     License: GPL-2+
    123 131
    124 132 
     Files: mate-session/mdm-signal-handler.c
    125 133 
     Copyright: 2006, Red Hat, Inc.
    126 134 
                2007, William Jon McCann <mccann@jhu.edu>
    135 
    +           2012-2021, MATE Developers
    127 136 
     License: GPL-2+
    128 137
    129 138 
     Files: mate-session/gsm-systemd.c
    130 139 
            mate-session/gsm-systemd.h
    131 140 
     Copyright: 2013, Stefano Karapetsas
    132 
    -License: GPL-2+
    133 
    -
    134 
    -Files: ./mate-session/gsm-systemd.c
    135 
    -Copyright: 2013, Stefano Karapetsas <stefano@karapetsas.com>
    141 
    +           2013-2021, MATE Developers
    136 142 
     License: GPL-2+
    137 143
    138 144 
     Files: mate-session/gsm-logout-dialog.h
    139 145 
     Copyright: 2006, Vincent Untz
    146 
    +           2012-2021, MATE Developers
    140 147 
     License: GPL-2+
    141 148
    142 
    -Files: egg/eggsmclient-xsmp.c
    143 
    -Copyright: 1998, Carsten Schaar
    144 
    -           1998, The Open Group
    145 
    -           2007, Novell, Inc.
    146 
    -License: LGPL-2+
    147 
    -
    148 
    -Files: egg/eggdesktopfile.c
    149 
    -Copyright: 1999-2000, Red Hat Inc.
    150 
    -           2001, George Lebl
    151 
    -           2007, Novell, Inc.
    152 
    -License: LGPL-2+
    153 
    -
    154 149 
     Files: mate-session-manager.pot
    155 150 
            po/*.po
    156 151 
            po/gnome-copyrights.txt
    ... ... @@ -173,20 +168,25 @@ Comment:
    173 168
    174 169 
     Files: tools/mate-session-check-accelerated-common.h
    175 170 
     Copyright: 2013, SUSE LINUX Products GmbH, Nuernberg, Germany.
    171 
    +           2012-2021, MATE Developers
    176 172 
     License: GPL-2+
    177 173
    178 174 
     Files: tools/mate-session-check-accelerated-gl-helper.c
    179 175 
            tools/mate-session-check-accelerated.c
    180 
    -Copyright: 2006-2009 Red Hat, Inc.
    176 
    +Copyright: 2006-2009, Red Hat, Inc.
    181 177 
                2010-2001, Novell, Inc.
    178 
    +           2012-2021, MATE Developers
    182 179 
     License: GPL-2+
    183 180
    184 181 
     Files: tools/mate-session-check-accelerated-gles-helper.c
    185 182 
     Copyright: 2016, Endless Mobile, Inc
    183 
    +           2012-2021, MATE Developers
    186 184 
     License: GPL-2+
    187 185
    188 
    -Files: .github/issue_template.md
    186 
    +Files: .build.yml
    187 
    +       .github/issue_template.md
    189 188 
            .github/FUNDING.yml
    189 
    +       .gitmodules
    190 190 
            .tx/config
    191 191 
            .travis.yml
    192 192 
            data/*.ui
    ... ... @@ -222,7 +222,6 @@ Files: .github/issue_template.md
    222 222 
            doc/man/Makefile.am
    223 223 
            doc/Makefile.am
    224 224 
            doc/dbus/Makefile.am
    225 
    -       egg/Makefile.am
    226 225 
            AUTHORS
    227 226 
            ChangeLog
    228 227 
            HACKING
    ... ... @@ -239,10 +238,15 @@ License: GPL-2+
    239 238 
     Comment:
    240 239 
      Using license from COPYING file.
    241 240
    241 
    +Files: git.mk
    242 
    +Copyright: 2009, Red Hat, Inc.
    243 
    +  2010,2011,2012,2013, Behdad Esfahbod
    244 
    +License: public-domain
    245 
    +
    242 246 
     Files: debian/*
    243 247 
     Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
    244 248 
                2014-2015, Martin Wimpress <code@flexion.org>
    245 
    -           2014-2015, Mike Gabriel <sunweaver@debian.org>
    249 
    +           2014-2021, Mike Gabriel <sunweaver@debian.org>
    246 250 
     License: GPL-2+ or LGPL-2+
    247 251
    248 252 
     License: GPL-2+
    ... ... @@ -277,5 +281,10 @@ License: LGPL-2+
    277 281 
      License along with this library; if not, write to the Free Software
    278 282 
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    279 283 
      .
    280 
    - On Debian systems, the complete text of the GNU General
    281 
    - Public License version LGPL-2 can be found in "/usr/share/common-licenses/LGPL-2".
    284 
    + On Debian systems, the complete text of the GNU General Public License
    285 
    + version LGPL-2 can be found in "/usr/share/common-licenses/LGPL-2".
    286 
    +
    287 
    +License: public-domain
    288 
    + Copying and distribution of this file, with or without modification,
    289 
    + is permitted in any medium without royalty provided the copyright
    290 
    + notice and this notice are preserved.

  • 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 
    -@@ -3415,6 +3415,19 @@
    9 
    +@@ -3429,6 +3429,19 @@
    10 10 
              case GTK_RESPONSE_DELETE_EVENT:
    11 11 
                      break;
    12 12 
              case GSM_LOGOUT_RESPONSE_SWITCH_USER:

  • debian/patches/0006_util-Blacklist-some-session-specific-variables.patch
    1 
    +From 29bd7ce251aa617d9f93c8ed95ee7ab49c8684ef Mon Sep 17 00:00:00 2001
    2 
    +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    +Date: Mon, 17 May 2021 00:05:16 +0200
    4 
    +Forwarded: https://github.com/mate-desktop/mate-session-manager/pull/282
    5 
    +Subject: [PATCH] util: Blacklist some session-specific variables
    6 
    +
    7 
    +Things like XDG_SESSION_ID should not be uploaded to the environment.
    8 
    +For example this is broken currently:
    9 
    +
    10 
    +  1. SSH to your machine
    11 
    +  2. Log in to MATE Shell
    12 
    +  3. Log out
    13 
    +  4. Log in again
    14 
    +  5. Lock the screen
    15 
    +  6. Try to unlock
    16 
    +
    17 
    +You can't, and this is because the XDG_SESSION_ID from the first session
    18 
    +(step 2) has leaked through to the second one (step 4), and so MATE
    19 
    +Shell is listening to the `logind` `UnlockSession` signal for the wrong
    20 
    +session. The SSH session established in step 1 serves to keep the
    21 
    +`systemd --user` instance alive, so that the state is not torn down
    22 
    +between logins.
    23 
    +
    24 
    +Original patch for GNOME by Iain Lane <iainl@gnome.org>.
    25 
    +
    26 
    +Patch ported over to MATE's session manager by Mike Gabriel
    27 
    +<sunweaver@debian.org>.
    28 
    +
    29 
    +---
    30 
    + mate-session/gsm-util.c | 17 ++++++++++++++++-
    31 
    + 1 file changed, 16 insertions(+), 1 deletion(-)
    32 
    +
    33 
    +--- a/mate-session/gsm-util.c
    34 
    ++++ b/mate-session/gsm-util.c
    35 
    +@@ -66,6 +66,13 @@
    36 
    +         return screen_locker_argv;
    37 
    + }
    38 
    +
    39 
    ++static const char * const variable_blacklist[] = {
    40 
    ++    "XDG_SEAT",
    41 
    ++    "XDG_SESSION_ID",
    42 
    ++    "XDG_VTNR",
    43 
    ++    NULL
    44 
    ++};
    45 
    ++
    46 
    + char *
    47 
    + gsm_util_find_desktop_file_for_app_name (const char *name,
    48 
    +                                          char      **autostart_dirs)
    49 
    +@@ -537,6 +544,9 @@
    50 
    +                 const char *entry_name = entry_names[i];
    51 
    +                 const char *entry_value = g_getenv (entry_name);
    52 
    +
    53 
    ++                if (g_strv_contains (variable_blacklist, entry_name))
    54 
    ++                    continue;
    55 
    ++
    56 
    +                 if (!g_utf8_validate (entry_name, -1, NULL))
    57 
    +                     continue;
    58 
    +
    59 
    +@@ -604,8 +614,13 @@
    60 
    +                 return FALSE;
    61 
    +         }
    62 
    +
    63 
    ++        entries = g_get_environ ();
    64 
    ++
    65 
    ++        for (; variable_blacklist[i] != NULL; i++)
    66 
    ++                entries = g_environ_unsetenv (entries, variable_blacklist[i]);
    67 
    ++
    68 
    +         g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
    69 
    +-        for (entries = g_get_environ (); entries[i] != NULL; i++) {
    70 
    ++        for (i = 0; entries[i] != NULL; i++) {
    71 
    +                 const char *entry = entries[i];
    72 
    +
    73 
    +                 if (!g_utf8_validate (entry, -1, NULL))

  • debian/patches/series
    1 1 
     0005_lock-session-before-user-switch.patch
    2 
    +0006_util-Blacklist-some-session-specific-variables.patch

  • debian/rules
    ... ... @@ -29,6 +29,8 @@ override_dh_auto_test:
    29 29 
     	DEB_BUILD_OPTIONS=nocheck dh_auto_test
    30 30
    31 31 
     override_dh_auto_configure:
    32 
    +	# we need libegg from mate-submodules
    33 
    +	cd mate-submodules/; tar xvJf /usr/src/mate-submodules-source.tar.xz
    32 34 
     	# upstream tarball is without configure. autogen.sh will create it
    33 35 
     	NOCONFIGURE=1 ./autogen.sh
    34 36 
     	dh_auto_configure $(DHFLAGS) -- \

  • debian/watch
    1 
    -version=3
    1 
    +version=4
    2 2 
     https://git.mate-desktop.org/mate-session-manager/ \
    3 3 
         snapshot/mate-session-manager-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: