Hello community, here is the log from the commit of package xrdp for openSUSE:Factory checked in at 2019-11-13 13:29:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrdp (Old) and /work/SRC/openSUSE:Factory/.xrdp.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp" Wed Nov 13 13:29:12 2019 rev:30 rq:748048 version:0.9.11 Changes: -------- --- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2019-10-14 13:41:52.233345136 +0200 +++ /work/SRC/openSUSE:Factory/.xrdp.new.2990/xrdp.changes 2019-11-13 13:29:12.799753251 +0100 @@ -1,0 +2,8 @@ +Wed Nov 13 03:23:15 UTC 2019 - Yifan Jiang <[email protected]> + +- Make mkpamrules additionally support SUSE's usage of + /usr/etc/pam.d (boo#1156094, gh#neutrinolabs/xrdp!1442): + * xrdp-mkpamrules-support-usr-etc-distconfdir.patch + https://lists.opensuse.org/opensuse-factory/2019-08/msg00113.html + +------------------------------------------------------------------- New: ---- xrdp-mkpamrules-support-usr-etc-distconfdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrdp.spec ++++++ --- /var/tmp/diff_new_pack.ITgK2Q/_old 2019-11-13 13:29:13.455753938 +0100 +++ /var/tmp/diff_new_pack.ITgK2Q/_new 2019-11-13 13:29:13.459753942 +0100 @@ -54,6 +54,8 @@ Patch14: xrdp-fate318398-change-expired-password.patch # PATCH-FEATURE-SLE xrdp-fate319683-allow-vnc-resizing.patch fate#319683 bsc#948062 - [email protected] -- allow resizing in VNC sessions. Patch15: xrdp-fate319683-allow-vnc-resizing.patch +# PATCH-FIX-UPSTREAM xrdp-mkpamrules-support-usr-etc-distconfdir.patch boo#1156094 gh#neutrinolabs/xrdp!1442 - [email protected] -- Probe both /usr/etc/pam.d and /etc/pam.d when generating the xrdp-sesman pam rule. +Patch16: xrdp-mkpamrules-support-usr-etc-distconfdir.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -112,6 +114,7 @@ %patch14 -p1 %patch15 -p1 %endif +%patch16 -p1 %build sh ./bootstrap ++++++ xrdp-mkpamrules-support-usr-etc-distconfdir.patch ++++++ Index: xrdp-0.9.11/instfiles/pam.d/mkpamrules =================================================================== --- xrdp-0.9.11.orig/instfiles/pam.d/mkpamrules +++ xrdp-0.9.11/instfiles/pam.d/mkpamrules @@ -8,6 +8,7 @@ outfile="$3" service="xrdp-sesman" pamdir="/etc/pam.d" +pamdir_suse="/usr/etc/pam.d" guess_rules () { @@ -16,6 +17,11 @@ guess_rules () return fi + if test -s "$pamdir_suse/common-account"; then + rules="suse" + return + fi + if test -s "$pamdir/common-account"; then if grep "^@include" "$pamdir/passwd" >/dev/null 2>&1; then rules="debian"
