[Pkg-xfce-commits] [Git][xfce-extras-team/light-locker][debian/master] 7 commits: d/patches: fallback to XDG_SESSION_ID if sd_session_id is NULL
Yves-Alexis Perez
gitlab at salsa.debian.org
Mon Jan 28 13:23:26 GMT 2019
Yves-Alexis Perez pushed to branch debian/master at Xfce external packages / light-locker
Commits:
f34b2a0b by Yves-Alexis Perez at 2019-01-28T13:17:53Z
d/patches: fallback to XDG_SESSION_ID if sd_session_id is NULL
closes: #892290
- - - - -
13fa577f by Yves-Alexis Perez at 2019-01-28T13:18:04Z
d/patches: print an error if session_id is NULL
It would crash light-locker later when sending dbus calls
- - - - -
f31006cf by Yves-Alexis Perez at 2019-01-28T13:18:04Z
d/control: update standards version to 4.3.0
- - - - -
7f7ad7cd by Yves-Alexis Perez at 2019-01-28T13:18:04Z
drop consolekit support since it's not in Debian anymore
- - - - -
06f4e01e by Yves-Alexis Perez at 2019-01-28T13:18:04Z
d/docs: add upstream README
closes: #920666
- - - - -
64a08cba by Yves-Alexis Perez at 2019-01-28T13:18:18Z
finalize changelog
- - - - -
06581f2c by Yves-Alexis Perez at 2019-01-28T13:18:31Z
upload light-locker 1.8.0-3 to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/control
- + debian/docs
- + debian/patches/0001-Fallback-to-XDG_SESSION_ID-if-sd_pid_get_session-fai.patch
- + debian/patches/0002-Print-an-error-if-session_id-is-NULL.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+light-locker (1.8.0-3) unstable; urgency=medium
+
+ * d/patches: fallback to XDG_SESSION_ID if sd_session_id is NULL
+ (closes: #892290)
+ * d/patches: print an error if session_id is NULL
+ * d/control: update standards version to 4.3.0
+ * drop consolekit support since it's not in Debian anymore
+ * d/docs: add upstream README (closes: #920666)
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 28 Jan 2019 14:18:26 +0100
+
light-locker (1.8.0-2) unstable; urgency=medium
* Moved the package to git on salsa.debian.org
=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 10),
libxss-dev,
pkg-config,
xfce4-dev-tools
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
Homepage: https://github.com/the-cavalry/light-locker/
Vcs-Git: https://salsa.debian.org/xfce-extras-team/light-locker.git
Vcs-Browser: https://salsa.debian.org/xfce-extras-team/light-locker
@@ -27,4 +27,4 @@ Description: simple screen locker for lightDM display manager
desktop-specific dependencies.
.
It relies on lightdm for locking and unlocking your session via
- ConsoleKit/UPower or logind/systemd.
+ logind/systemd.
=====================================
debian/docs
=====================================
@@ -0,0 +1 @@
+README
=====================================
debian/patches/0001-Fallback-to-XDG_SESSION_ID-if-sd_pid_get_session-fai.patch
=====================================
@@ -0,0 +1,24 @@
+From: Yves-Alexis Perez <corsac at debian.org>
+Date: Thu, 3 Jan 2019 11:00:47 +0100
+Subject: Fallback to XDG_SESSION_ID if sd_pid_get_session fails
+
+---
+ src/gs-listener-dbus.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 1fe952c..e0ba004 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -2204,6 +2204,11 @@ init_session_id (GSListener *listener)
+ #ifdef WITH_SYSTEMD
+ g_free (listener->priv->sd_session_id);
+ listener->priv->sd_session_id = query_sd_session_id (listener);
++ if (listener->priv->sd_session_id == NULL)
++ {
++ gs_debug ("Falling back to XDG_SESSION_ID environment variable");
++ listener->priv->sd_session_id = g_strdup(getenv("XDG_SESSION_ID"));
++ }
+ gs_debug ("Got sd-session-id: %s", listener->priv->sd_session_id);
+ #endif
+ }
=====================================
debian/patches/0002-Print-an-error-if-session_id-is-NULL.patch
=====================================
@@ -0,0 +1,24 @@
+From: Yves-Alexis Perez <corsac at debian.org>
+Date: Thu, 3 Jan 2019 11:54:28 +0100
+Subject: Print an error if session_id is NULL
+
+---
+ src/gs-listener-dbus.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index e0ba004..129f901 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -2199,7 +2199,10 @@ init_session_id (GSListener *listener)
+ {
+ g_free (listener->priv->session_id);
+ listener->priv->session_id = query_session_id (listener);
+- gs_debug ("Got session-id: %s", listener->priv->session_id);
++ if (listener->priv->session_id == NULL)
++ g_error ("session_id is not set, is /proc mounted with hidepid>0?");
++ else
++ gs_debug ("Got session-id: %s", listener->priv->session_id);
+
+ #ifdef WITH_SYSTEMD
+ g_free (listener->priv->sd_session_id);
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+0001-Fallback-to-XDG_SESSION_ID-if-sd_pid_get_session-fai.patch
+0002-Print-an-error-if-session_id-is-NULL.patch
=====================================
debian/rules
=====================================
@@ -13,7 +13,7 @@ override_dh_auto_configure:
dh_auto_configure -- \
$(SYSTEMD_ENABLE) \
--with-upower \
- --with-console-kit \
+ --with-console-kit=no \
--with-mit-ext
%:
View it on GitLab: https://salsa.debian.org/xfce-extras-team/light-locker/compare/6971c67ee3f2693f656f64b7ad01816cafae4904...06581f2c684afedf8e35bb5ce543e7644ef8c63f
--
View it on GitLab: https://salsa.debian.org/xfce-extras-team/light-locker/compare/6971c67ee3f2693f656f64b7ad01816cafae4904...06581f2c684afedf8e35bb5ce543e7644ef8c63f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20190128/b25f4ebb/attachment-0001.html>
More information about the Pkg-xfce-commits
mailing list