Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xrdp for openSUSE:Factory checked in
at 2023-03-10 22:06:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xrdp (Old)
and /work/SRC/openSUSE:Factory/.xrdp.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrdp"
Fri Mar 10 22:06:57 2023 rev:51 rq:1070579 version:0.9.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/xrdp/xrdp.changes 2023-02-20
17:46:17.863582112 +0100
+++ /work/SRC/openSUSE:Factory/.xrdp.new.31432/xrdp.changes 2023-03-10
22:07:10.345075819 +0100
@@ -1,0 +2,14 @@
+Wed Mar 8 07:06:01 UTC 2023 - Yifan Jiang <yfji...@suse.com>
+
+- Enable --with-pamconfdir=/usr/lib/pam.d on Tumbleweed
+ (gh#neutrinolabs/xrdp!2552 bsc#1208121).
+
+-------------------------------------------------------------------
+Wed Mar 8 06:51:28 UTC 2023 - Yifan Jiang <yfji...@suse.com>
+
+- Add xrdp-make-pamconfdir-configurable.patch: Apply upstream
+ implementation and introduce --with-pamconfdir at build time
+ (gh#neutrinolabs/xrdp!2552 bsc#1208121).
+- Drop xrdp-fix-search-pam-vendor-dir.patch
+
+-------------------------------------------------------------------
Old:
----
xrdp-fix-search-pam-vendor-dir.patch
New:
----
xrdp-make-pamconfdir-configurable.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrdp.spec ++++++
--- /var/tmp/diff_new_pack.q6y2jt/_old 2023-03-10 22:07:11.193079679 +0100
+++ /var/tmp/diff_new_pack.q6y2jt/_new 2023-03-10 22:07:11.197079698 +0100
@@ -38,8 +38,6 @@
Source100: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE xrdp-pam.patch - hfigui...@novell.com refreshed by
ft...@geeko.jp
Patch1: xrdp-pam.patch
-# PATCH-FIX-OPENSUSE xrdp-fix-search-pam-vendor-dir.patch bsc#1208121 -
yfji...@suse.com -- Search pam configuration file in the vendor directory
/usr/lib/pam.d/
-Patch2: xrdp-fix-search-pam-vendor-dir.patch
# PATCH-FIX-OPENSUSE xrdp-disable-8-bpp-vnc-support.patch bsc#991059 -
fezh...@suse.com -- disable 8 bpp support for vnc connections
Patch4: xrdp-disable-8-bpp-vnc-support.patch
# PATCH-FIX-OPENSUSE xrdp-support-KillDisconnected-for-Xvnc.patch boo#1101506
- fezh...@suse.com -- Support the KillDisconnected option for TigerVNC Xvnc
sessions
@@ -68,6 +66,9 @@
Patch16: xrdp-CVE-2022-23493.patch
# PATCH-FIX-UPSTREAM xrdp-CVE-2022-23477.patch bsc#1206301 - yu.da...@suse.com
-- Buffer over flow in audin_send_open() function
Patch17: xrdp-CVE-2022-23477.patch
+# PATCH-FIX-UPSTREAM xrdp-make-pamconfdir-configurable.patch
gh#neutrinolabs/xrdp!2552 bsc#1208121 - yfji...@suse.com -- Configure pam.d
directory at build time
+Patch18: xrdp-make-pamconfdir-configurable.patch
+
# Keep SLE only patches on the bottom starting from patch number 1001
# PATCH-FEATURE-SLE xrdp-avahi.diff bnc#586785 - hfigui...@novell.com -- Add
Avahi support.
Patch1001: xrdp-avahi.diff
@@ -126,7 +127,6 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -141,6 +141,7 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
%if 0%{?sle_version}
%patch1001 -p1
%patch1002 -p1
@@ -154,6 +155,9 @@
--enable-ipv6 \
--enable-painter \
--with-systemdsystemunitdir=%{_unitdir} \
+%if 0%{?suse_version} > 1500
+ --with-pamconfdir=%{_pam_vendordir} \
+%endif
--enable-vsock \
--enable-fuse
make %{?_smp_mflags} V=1
@@ -175,11 +179,6 @@
# use certification file created at the post phase
rm -f %{buildroot}/%{_sysconfdir}/xrdp/{cert,key}.pem
-%if 0%{?suse_version} > 1500
-mkdir -p %{buildroot}%{_pam_vendordir}
-mv %{buildroot}%{_sysconfdir}/pam.d/xrdp-sesman %{buildroot}%{_pam_vendordir}
-%endif
-
%fdupes -s %{buildroot}
%pre
++++++ xrdp-make-pamconfdir-configurable.patch ++++++
>From 8be6bc137e44939d15a8b28eff4df53c961ca84c Mon Sep 17 00:00:00 2001
From: Yifan J <yifanj2...@gmail.com>
Date: Tue, 21 Feb 2023 09:50:46 +0800
Subject: [PATCH] Make pam.d directory configurable
---
configure.ac | 7 +++++++
instfiles/pam.d/Makefile.am | 2 +-
sesman/Makefile.am | 1 +
sesman/tools/Makefile.am | 1 +
sesman/verify_user_pam.c | 10 +++++++++-
5 files changed, 19 insertions(+), 2 deletions(-)
Index: xrdp-0.9.20/configure.ac
===================================================================
--- xrdp-0.9.20.orig/configure.ac
+++ xrdp-0.9.20/configure.ac
@@ -464,6 +464,12 @@ if test "x$enable_strict_locations" != "
localstatedir="/var";
fi
+AC_ARG_WITH([pamconfdir],
+ [AS_HELP_STRING([--with-pamconfdir=DIR],
+ [Use directory for pam.d config (default: /etc/pam.d)])],
+ [], [with_pamconfdir="$sysconfdir/pam.d"])
+AC_SUBST([pamconfdir], [$with_pamconfdir])
+
PKG_INSTALLDIR
AC_CHECK_HEADERS([sys/prctl.h])
@@ -542,6 +548,7 @@ echo " exec_prefix $exec_pr
echo " libdir $libdir"
echo " bindir $bindir"
echo " sysconfdir $sysconfdir"
+echo " pamconfdir $pamconfdir"
echo ""
echo " unit tests performable $perform_unit_tests"
echo ""
Index: xrdp-0.9.20/instfiles/pam.d/Makefile.am
===================================================================
--- xrdp-0.9.20.orig/instfiles/pam.d/Makefile.am
+++ xrdp-0.9.20/instfiles/pam.d/Makefile.am
@@ -25,7 +25,7 @@ endif
endif
endif
-pamddir = $(sysconfdir)/pam.d
+pamddir = $(pamconfdir)
pamd_DATA = \
$(PAMFILE)
Index: xrdp-0.9.20/sesman/Makefile.am
===================================================================
--- xrdp-0.9.20.orig/sesman/Makefile.am
+++ xrdp-0.9.20/sesman/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_SOCKET_PATH=\"${socketdir}\" \
+ -DXRDP_PAMCONF_PATH=\"${pamconfdir}\" \
-I$(top_srcdir)/common \
-I$(top_srcdir)/sesman/libscp
Index: xrdp-0.9.20/sesman/tools/Makefile.am
===================================================================
--- xrdp-0.9.20.orig/sesman/tools/Makefile.am
+++ xrdp-0.9.20/sesman/tools/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
-DXRDP_SOCKET_PATH=\"${socketdir}\" \
+ -DXRDP_PAMCONF_PATH=\"${pamconfdir}\" \
-I$(top_srcdir)/common \
-I$(top_srcdir)/sesman/libscp \
-I$(top_srcdir)/sesman
Index: xrdp-0.9.20/sesman/verify_user_pam.c
===================================================================
--- xrdp-0.9.20.orig/sesman/verify_user_pam.c
+++ xrdp-0.9.20/sesman/verify_user_pam.c
@@ -197,7 +197,15 @@ get_service_name(char *service_name)
service_name[0] = 0;
if (g_file_exist("/etc/pam.d/xrdp-sesman") ||
- g_file_exist(XRDP_SYSCONF_PATH "/pam.d/xrdp-sesman"))
+#ifdef __LINUX_PAM__
+ /* /usr/lib/pam.d is hardcoded into Linux-PAM */
+ g_file_exist("/usr/lib/pam.d/xrdp-sesman") ||
+#endif
+#ifdef OPENPAM_VERSION
+ /* /usr/local/etc/pam.d is hardcoded into OpenPAM */
+ g_file_exist("/usr/local/etc/pam.d/xrdp-sesman") ||
+#endif
+ g_file_exist(XRDP_PAMCONF_PATH "/xrdp-sesman"))
{
g_strncpy(service_name, "xrdp-sesman", 255);
}
