Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2023-03-07 16:48:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscreensaver" Tue Mar 7 16:48:15 2023 rev:74 rq:1069498 version:6.06 Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2023-01-05 14:59:57.648769997 +0100 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new.31432/xscreensaver.changes 2023-03-07 16:48:16.436933981 +0100 @@ -1,0 +2,14 @@ +Mon Mar 6 00:44:00 UTC 2023 - Jason Sikes <[email protected]> + +- Added spec file changes to handle hard-coded PAM directories. + * bsc#1204744 + +------------------------------------------------------------------- +Thu Feb 23 04:29:22 UTC 2023 - Jason Sikes <[email protected]> + +- Added fix for configuration reading + * Added xscreensaver-bsc1204744.patch + * bsc#1204744 + * Patch provided by Jaroslav Jindrak + +------------------------------------------------------------------- New: ---- xscreensaver-bsc1204744.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.0IEiUA/_old 2023-03-07 16:48:17.492939538 +0100 +++ /var/tmp/diff_new_pack.0IEiUA/_new 2023-03-07 16:48:17.500939580 +0100 @@ -46,6 +46,7 @@ Patch45: xscreensaver-bug-reports.patch # PATCH-FIX-OPENSUSE xscreensaver-unrecognized-opts.patch [email protected] -- Ignore selected unbrecognized options generated by %%configure. Patch46: xscreensaver-unrecognized-opts.patch +Patch47: xscreensaver-bsc1204744.patch BuildRequires: automake BuildRequires: bc BuildRequires: gdmflexiserver @@ -162,11 +163,19 @@ %patch43 -p1 %patch45 -p1 %patch46 -p1 +%patch47 -p1 # KDE, GNOME and MATE have there own screensavers: #echo 'NotShowIn=KDE;GNOME;MATE;' >> driver/screensaver-properties.desktop.in cp -f %{SOURCE4} xscreensaver-desktops-generate chmod a+x xscreensaver-desktops-generate +# /etc directories are hardcoded everywhere +# Move xscreensaver's PAM files. +%if 0%{?suse_version} > 1500 +sed -i 's|/etc/pam.d|%{_pam_vendordir}|g' configure driver/passwd-pam.c xscreensaver.spec configure.ac driver/xscreensaver.man +sed -i 's|= /etc|= /usr/lib|g' driver/Makefile.in +%endif + %build # Fix man pages header: find hacks -name '*.man' -print0 | xargs -0 sed -ie 's/TH XScreenSaver 1/TH XScreenSaver 6/' @@ -211,6 +220,12 @@ %install rm -f hacks/config/vidwhacker.xml mkdir -p %{buildroot}/tmp/bin/ + +# Another hack for pam +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_pam_vendordir} +%endif + make install_prefix=%{buildroot} \ KDEDIR=/tmp \ DESTDIR=%{buildroot} \ ++++++ xscreensaver-bsc1204744.patch ++++++ Index: xscreensaver-6.03/driver/xscreensaver.c =================================================================== --- xscreensaver-6.03.orig/driver/xscreensaver.c +++ xscreensaver-6.03/driver/xscreensaver.c @@ -782,6 +782,8 @@ static void init_line_handler (int linen const char *key, const char *val, void *closure) { + if (*key == '*') + key++; if (!strcmp (key, "verbose")) verbose_p = !strcasecmp (val, "true"); else if (!strcmp (key, "splash")) splash_p = !strcasecmp (val, "true"); else if (!strcmp (key, "lock")) lock_p = !strcasecmp (val, "true");
