Browse Source

d/patches: import patches in gbp pq

tags/debian/1.26.0-4
Yves-Alexis Perez 2 years ago
parent
commit
71d48277ef
7 changed files with 135 additions and 32 deletions
  1. +17
    -5
      debian/patches/01_set-default-path.patch
  2. +25
    -11
      debian/patches/02_fix-apparmor-profile.patch
  3. +11
    -0
      debian/patches/03_liblightdm-qt3-add-header-visibility.patch
  4. +28
    -12
      debian/patches/05_debianize-pam-files.patch
  5. +22
    -1
      debian/patches/06_change-user-dirs.patch
  6. +22
    -3
      debian/patches/08_reset-SIGPIPE-before-exec.patch
  7. +10
    -0
      debian/patches/09_hide_systemd_nologin.patch

+ 17
- 5
debian/patches/01_set-default-path.patch View File

@@ -1,10 +1,20 @@
Author: Yves-Alexis Perez <corsac@debian.org>
Author: Lionel Le Folgoc <mrpouit@gmail.com>
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 22 Feb 2019 17:10:57 +0100
Subject: Fix default PATH environment variable

Use the Debian default PATH when needed

Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
Description: Fix default PATH environment variable
---
src/seat.c | 5 +++++
src/session-child.c | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/seat.c b/src/seat.c
index 775ddbb..4c0149b 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -361,6 +361,11 @@ run_script (Seat *seat, DisplayServer *d
@@ -361,6 +361,11 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name,
process_set_env (script, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
if (g_getenv ("PATH"))
process_set_env (script, "PATH", g_getenv ("PATH"));
@@ -16,9 +26,11 @@ Description: Fix default PATH environment variable
/* Variables required for regression tests */
if (g_getenv ("LIGHTDM_TEST_ROOT"))
diff --git a/src/session-child.c b/src/session-child.c
index 5d77c5a..7d0c7fd 100644
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -393,7 +393,10 @@ session_child_run (int argc, char **argv
@@ -393,7 +393,10 @@ session_child_run (int argc, char **argv)
else
{
/* Set POSIX variables */


+ 25
- 11
debian/patches/02_fix-apparmor-profile.patch View File

@@ -1,3 +1,28 @@
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 22 Feb 2019 17:15:33 +0100
Subject: fix apparmor profile for guest session

Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780456
---
data/apparmor/abstractions/lightdm | 2 +-
data/apparmor/abstractions/lightdm_chromium-browser | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/apparmor/abstractions/lightdm b/data/apparmor/abstractions/lightdm
index 4be3d4a..1e64fd2 100644
--- a/data/apparmor/abstractions/lightdm
+++ b/data/apparmor/abstractions/lightdm
@@ -32,7 +32,7 @@
owner /dev/shm/** rmw,
/etc/ r,
/etc/** rmk,
- /etc/gdm/Xsession ix,
+ /etc/X11/Xsession ix,
/etc/X11/xdm/** ix, # needed for openSUSE's default session-wrapper
/etc/X11/xinit/** ix, # needed for openSUSE's default session-wrapper
/lib/ r,
diff --git a/data/apparmor/abstractions/lightdm_chromium-browser b/data/apparmor/abstractions/lightdm_chromium-browser
index 930c87e..c8d6e6e 100644
--- a/data/apparmor/abstractions/lightdm_chromium-browser
+++ b/data/apparmor/abstractions/lightdm_chromium-browser
@@ -10,6 +10,7 @@
@@ -16,14 +41,3 @@
/usr/lib/chromium-browser/chromium-browser-sandbox ix,
/usr/lib/@{multiarch}/oxide-qt/chrome-sandbox ix,
/opt/google/chrome-*/chrome-sandbox ix,
--- a/data/apparmor/abstractions/lightdm
+++ b/data/apparmor/abstractions/lightdm
@@ -32,7 +32,7 @@
owner /dev/shm/** rmw,
/etc/ r,
/etc/** rmk,
- /etc/gdm/Xsession ix,
+ /etc/X11/Xsession ix,
/etc/X11/xdm/** ix, # needed for openSUSE's default session-wrapper
/etc/X11/xinit/** ix, # needed for openSUSE's default session-wrapper
/lib/ r,

+ 11
- 0
debian/patches/03_liblightdm-qt3-add-header-visibility.patch View File

@@ -1,3 +1,14 @@
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 22 Feb 2019 17:13:29 +0100
Subject: liblightdm-qt3: explicitly add symbol visibility

Fix build when symbols are marked hidden by default
---
liblightdm-qt/QLightDM/power.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liblightdm-qt/QLightDM/power.h b/liblightdm-qt/QLightDM/power.h
index 44d9e2c..cb1e14f 100644
--- a/liblightdm-qt/QLightDM/power.h
+++ b/liblightdm-qt/QLightDM/power.h
@@ -16,7 +16,7 @@


+ 28
- 12
debian/patches/05_debianize-pam-files.patch View File

@@ -1,3 +1,15 @@
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 22 Feb 2019 17:16:09 +0100
Subject: debianize pam files

---
data/pam/lightdm | 38 +++++++++++++++++++++++++++-----------
data/pam/lightdm-autologin | 31 ++++++++++++++++++++++++-------
data/pam/lightdm-greeter | 3 ++-
3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/data/pam/lightdm b/data/pam/lightdm
index fed8a9b..f7f77d4 100644
--- a/data/pam/lightdm
+++ b/data/pam/lightdm
@@ -1,20 +1,36 @@
@@ -48,18 +60,8 @@
+-session optional pam_gnome_keyring.so auto_start
+
+@include common-password
--- a/data/pam/lightdm-greeter
+++ b/data/pam/lightdm-greeter
@@ -1,7 +1,8 @@
#%PAM-1.0
# Load environment from /etc/environment and ~/.pam_environment
-auth required pam_env.so
+session required pam_env.so readenv=1
+session required pam_env.so readenv=1 envfile=/etc/default/locale
# Always let the greeter start without authentication
auth required pam_permit.so
diff --git a/data/pam/lightdm-autologin b/data/pam/lightdm-autologin
index ba7a68c..ad9c4ef 100644
--- a/data/pam/lightdm-autologin
+++ b/data/pam/lightdm-autologin
@@ -1,20 +1,37 @@
@@ -107,3 +109,17 @@
-session required pam_unix.so
-session optional pam_systemd.so
+@include common-password
diff --git a/data/pam/lightdm-greeter b/data/pam/lightdm-greeter
index 9a6862b..6343cc2 100644
--- a/data/pam/lightdm-greeter
+++ b/data/pam/lightdm-greeter
@@ -1,7 +1,8 @@
#%PAM-1.0
# Load environment from /etc/environment and ~/.pam_environment
-auth required pam_env.so
+session required pam_env.so readenv=1
+session required pam_env.so readenv=1 envfile=/etc/default/locale
# Always let the greeter start without authentication
auth required pam_permit.so

+ 22
- 1
debian/patches/06_change-user-dirs.patch View File

@@ -1,3 +1,20 @@
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 22 Feb 2019 17:17:56 +0100
Subject: move lightdm users dir to /var/lib/lightdm/data

Make sure the directory exists and reduce clutter by sharing a top
directory in /var/lib

Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749243
Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767359
---
src/Makefile.am | 2 +-
src/Makefile.in | 2 +-
src/shared-data-manager.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index e450197..5dc543a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,7 +84,7 @@ lightdm_CFLAGS = \
@@ -9,6 +26,8 @@
-DLOG_DIR=\"$(localstatedir)/log/lightdm\" \
-DRUN_DIR=\"$(localstatedir)/run/lightdm\" \
-DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \
diff --git a/src/Makefile.in b/src/Makefile.in
index 3428543..e7b76bc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -499,7 +499,7 @@ lightdm_CFLAGS = \
@@ -20,9 +39,11 @@
-DLOG_DIR=\"$(localstatedir)/log/lightdm\" \
-DRUN_DIR=\"$(localstatedir)/run/lightdm\" \
-DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \
diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c
index e493e58..160b0ac 100644
--- a/src/shared-data-manager.c
+++ b/src/shared-data-manager.c
@@ -84,7 +84,7 @@ shared_data_manager_ensure_user_dir (Sha
@@ -84,7 +84,7 @@ shared_data_manager_ensure_user_dir (SharedDataManager *manager, const gchar *us
g_debug ("Creating shared data directory %s", path);
g_autoptr(GError) error = NULL;


+ 22
- 3
debian/patches/08_reset-SIGPIPE-before-exec.patch View File

@@ -1,4 +1,19 @@
=== modified file 'src/lightdm.c'
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 22 Feb 2019 17:19:10 +0100
Subject: reset SIGPIPE before exec

Prevent having complete session with SIGPIPE ignored

Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823460
Bug: https://bugs.launchpad.net/lightdm/+bug/1579867
---
src/lightdm.c | 6 ++++++
src/process.c | 3 +++
src/session-child.c | 3 +++
3 files changed, 12 insertions(+)

diff --git a/src/lightdm.c b/src/lightdm.c
index c54f1ba..0724669 100644
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -551,6 +551,12 @@ main (int argc, char **argv)
@@ -14,9 +29,11 @@
/* When lightdm starts sessions it needs to run itself in a new mode */
if (argc >= 2 && strcmp (argv[1], "--session-child") == 0)
return session_child_run (argc, argv);
diff --git a/src/process.c b/src/process.c
index 549ccd9..f121cc7 100644
--- a/src/process.c
+++ b/src/process.c
@@ -235,6 +235,9 @@ process_start (Process *process, gboolea
@@ -235,6 +235,9 @@ process_start (Process *process, gboolean block)
/* Reset SIGPIPE handler so the child has default behaviour (we disabled it at LightDM start) */
signal (SIGPIPE, SIG_DFL);
@@ -26,9 +43,11 @@
execvp (argv[0], argv);
_exit (EXIT_FAILURE);
}
diff --git a/src/session-child.c b/src/session-child.c
index 7d0c7fd..d3ebfae 100644
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -669,6 +669,9 @@ session_child_run (int argc, char **argv
@@ -669,6 +669,9 @@ session_child_run (int argc, char **argv)
/* Reset SIGPIPE handler so the child has default behaviour (we disabled it at LightDM start) */
signal (SIGPIPE, SIG_DFL);


+ 10
- 0
debian/patches/09_hide_systemd_nologin.patch View File

@@ -1,3 +1,13 @@
From: Yves-Alexis Perez <corsac@debian.org>
Date: Fri, 22 Feb 2019 17:23:09 +0100
Subject: add /sbin/nologin to shells of ignored users

---
data/users.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/users.conf b/data/users.conf
index e4948a6..5c01993 100644
--- a/data/users.conf
+++ b/data/users.conf
@@ -11,4 +11,4 @@


Loading…
Cancel
Save