Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xrdp for openSUSE:Factory checked in at 2022-11-08 10:55:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrdp (Old) and /work/SRC/openSUSE:Factory/.xrdp.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp" Tue Nov 8 10:55:11 2022 rev:46 rq:1034448 version:0.9.20 Changes: -------- --- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2022-11-02 12:47:50.493781240 +0100 +++ /work/SRC/openSUSE:Factory/.xrdp.new.1597/xrdp.changes 2022-11-08 10:56:15.857954737 +0100 @@ -1,0 +2,7 @@ +Mon Nov 7 10:48:57 UTC 2022 - Daike Yu <yu.da...@suse.com> + +- Add xrdp-update-pam.d-path.patch (bsc#1203468) + + Update pam.d path in install scripts to allow correct rule + guess. + +------------------------------------------------------------------- New: ---- xrdp-update-pam.d-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdp.spec ++++++ --- /var/tmp/diff_new_pack.AIY81z/_old 2022-11-08 10:56:16.529956318 +0100 +++ /var/tmp/diff_new_pack.AIY81z/_new 2022-11-08 10:56:16.533956328 +0100 @@ -52,6 +52,8 @@ Patch13: xrdp-bsc965647-allow-admin-choose-desktop.patch # PATCH-FEATURE-SLE xrdp-fate318398-change-expired-password.patch fate#318398 - fezh...@suse.com -- enable user to update expired password via PAM Patch14: xrdp-fate318398-change-expired-password.patch +# PATCH-FIX-UPSTREAM xrdp-update-pam.d-path.patch bsc#1203468 - yu.da...@suse.com -- update install script to accommodate with pam.d path move +Patch15: xrdp-update-pam.d-path.patch BuildRequires: autoconf BuildRequires: automake @@ -109,6 +111,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %endif %build ++++++ xrdp-update-pam.d-path.patch ++++++ >From 76716169e3fe95b14c75b5571717b148b524909c Mon Sep 17 00:00:00 2001 From: Daike Yu <yu.da...@suse.com> Date: Mon, 7 Nov 2022 18:27:07 +0800 Subject: [PATCH] Update pamdir_suse to accommodate with TW pam.d move References: bsc#1203468 Upstream: submitted On newer builds of openSUSE tumbleweed the path of pam.d has moved from /usr/etc/pam.d to /usr/lib/pam.d, which prevents install script to correctly guess pam rules. Updating path in mkpamrules solves the problem. --- instfiles/pam.d/mkpamrules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/instfiles/pam.d/mkpamrules b/instfiles/pam.d/mkpamrules index 989a52f4..230d92be 100755 --- a/instfiles/pam.d/mkpamrules +++ b/instfiles/pam.d/mkpamrules @@ -8,7 +8,11 @@ outfile="$3" service="xrdp-sesman" pamdir="/etc/pam.d" -pamdir_suse="/usr/etc/pam.d" +pamdir_suse="/usr/lib/pam.d" +if [ ! -d $pamdir_suse ]; then + # Older SUSE distros uses /usr/etc/pam.d + pamdir_suse="/usr/etc/pam.d" +fi # Modules needed by xrdp-sesman.unix, if we get to that unix_modules_needed="pam_unix.so pam_env.so pam_nologin.so" -- 2.35.3
