Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2021-12-22 20:17:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscreensaver" Wed Dec 22 20:17:45 2021 rev:64 rq:941739 version:6.02 Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2021-03-02 12:25:49.875337314 +0100 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new.2520/xscreensaver.changes 2021-12-22 20:18:06.539848242 +0100 @@ -1,0 +2,52 @@ +Tue Dec 21 02:58:51 UTC 2021 - Stanislav Brabec <[email protected]> + +- Do not own /usr/share/fonts. It belongs to filesystem. + +------------------------------------------------------------------- +Sat Nov 13 03:02:40 UTC 2021 - Stanislav Brabec <[email protected]> + +- Update to version 6.02: + * New hacks, `marbling' and `binaryhorizon'. + * `atlantis' behaviors are more random and lifelike. + * `headroom' is now Mask Headroom. + * `fontglide' skips fonts that can't display ASCII. + * Use asterisks in the password dialog if the system fonts don't + have bullets in them. + * "Disable Screen Saver" was behaving like "Blank Screen Only". +- Fix compilation with older versions of gcc and on aarch64 + (xscreensaver-6.02-marbling-std-c.patch). + +------------------------------------------------------------------- +Mon Aug 30 23:37:13 UTC 2021 - Stanislav Brabec <[email protected]> + +- Update to version 6.01: + * Major refactor of the `xscreensaver' daemon for improved + security, dividing it into three programs: `xscreensaver', + `xscreensaver-gfx' and `xscreensaver-auth'. + * Renamed `xscreensaver-demo' to `xscreensaver-settings'. + * Unlock dialog has user-selectable color schemes. + * Everything uses XFreeType for fonts now. + * Install a few custom fonts needed by some savers. + * Properly disable the server's built-in screen saver. + * The passwdTimeout option was being ignored. + * The display of the unlock thermometer was weird. + * Fixed password entry on old-school multi-screen setups (:0.1). + * Worked around a KDE 5 compositor bug that caused the desktop + to momentarily become visible when cycling. + * Fixed possible high CPU usage in `xscreensaver-systemd'. + * Fixed some spurious warnings in `xscreensaver-text'. + * Warn when Wayland is in use, since it makes both screen saving + and locking impossible. + * Dropped support for systems older than X11R7 (2009). + * Fading works on systems without gamma (e.g. Raspberry Pi). + * Use EGL instead of GLX when available. + * `xscreensaver-systemd' now detects when a video player has + inhibited screen blanking and then exits without uninhibiting. + * Improved GLSL and GLES3 support: Phong shading in `etruscanvenus', + `hypertorus', `klein', `projectiveplane',`romanboy' and + `sphereeversion'. + * Updates to `cubicgrid'. +- Refresh xscreensaver-disable-upgrade-nagging-message.patch. +- Use default libexecdir. + +------------------------------------------------------------------- Old: ---- xscreensaver-5.45.tar.gz New: ---- xscreensaver-6.02-marbling-std-c.patch xscreensaver-6.02.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.MNaSAK/_old 2021-12-22 20:18:07.327848612 +0100 +++ /var/tmp/diff_new_pack.MNaSAK/_new 2021-12-22 20:18:07.335848615 +0100 @@ -17,7 +17,7 @@ Name: xscreensaver -Version: 5.45 +Version: 6.02 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause AND GPL-2.0-or-later @@ -44,6 +44,8 @@ Patch43: xscreensaver-disable-upgrade-nagging-message.patch # PATCH-FEATURE-OPENSUSE xscreensaver-bug-reports.patch bnc890595 [email protected] -- Ask reporters to upgrade before reporting bugs. Patch45: xscreensaver-bug-reports.patch +# PATCH-FIX-UPSTREAM xscreensaver-6.02-marbling-std-c.patch [email protected] -- Fix compilation with older gcc and on aarch64. +Patch46: xscreensaver-6.02-marbling-std-c.patch BuildRequires: automake BuildRequires: bc BuildRequires: gdmflexiserver @@ -159,6 +161,7 @@ %patch42 %patch43 -p1 %patch45 -p1 +%patch46 -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 @@ -183,11 +186,8 @@ export ac_cv_gcc_accepts_std=no # Disable direct PAM use and shadow (both needs suid). %configure \ - --with-hackdir=%{_libdir}/xscreensaver \ - --with-x-app-defaults=%{_datadir}/X11/app-defaults \ --with-configdir=%{_sysconfdir}/xscreensaver \ --without-kerberos \ - --with-passwd-helper=/sbin/unix2_chkpwd \ --with-gl \ --with-gle \ --with-pixbuf \ @@ -236,13 +236,13 @@ [ -f %{buildroot}%{_mandir}/man6/$hack.6* ] && echo "%doc %{_mandir}/man6/$hack.6*" >> %{name}-data.lst [ -f %{buildroot}%{_sysconfdir}/xscreensaver/$hack.xml ] && echo "%config %{_sysconfdir}/xscreensaver/$hack.xml" >> %{name}-data.lst [ -f %{buildroot}%{_datadir}/applications/screensavers/$hack.desktop ] && echo "%{_datadir}/applications/screensavers/$hack.desktop" >> %{name}-data.lst - echo "%{_libdir}/xscreensaver/$hack" >> %{name}-data.lst + echo "%{_libexecdir}/xscreensaver/$hack" >> %{name}-data.lst done for hack in $(grep -v '#' %{SOURCE3}); do [ -f %{buildroot}%{_mandir}/man6/$hack.6* ] && echo "%doc %{_mandir}/man6/$hack.6*" >> %{name}-data-extra.lst [ -f %{buildroot}%{_sysconfdir}/xscreensaver/$hack.xml ] && echo "%config %{_sysconfdir}/xscreensaver/$hack.xml" >> %{name}-data-extra.lst [ -f %{buildroot}%{_datadir}/applications/screensavers/$hack.desktop ] && echo "%{_datadir}/applications/screensavers/$hack.desktop" >> %{name}-data-extra.lst - echo "%{_libdir}/xscreensaver/$hack" >> %{name}-data-extra.lst + echo "%{_libexecdir}/xscreensaver/$hack" >> %{name}-data-extra.lst done %files @@ -250,19 +250,26 @@ %{_bindir}/xscreensaver %{_bindir}/xscreensaver-command %{_bindir}/xscreensaver-demo -%{_bindir}/xscreensaver-gl-helper -%{_bindir}/xscreensaver-systemd +%{_bindir}/xscreensaver-settings %{_datadir}/applications/xscreensaver-properties.desktop +%{_datadir}/fonts/xscreensaver %{_datadir}/pixmaps/xscreensaver.xpm %dir %{_datadir}/xscreensaver %{_datadir}/xscreensaver/ui +%{_libexecdir}/xscreensaver/xscreensaver-auth +%{_libexecdir}/xscreensaver/xscreensaver-gfx +%{_libexecdir}/xscreensaver/xscreensaver-gl-visual +%{_libexecdir}/xscreensaver/xscreensaver-systemd %dir %{_prefix}/lib/X11/app-defaults %{_prefix}/lib/X11/app-defaults/XScreenSaver %{_mandir}/man1/xscreensaver.* %{_mandir}/man1/xscreensaver-command.* %{_mandir}/man1/xscreensaver-demo.* -%{_mandir}/man6/xscreensaver-gl-helper.* -%{_mandir}/man1/xscreensaver-systemd.* +%{_mandir}/man1/xscreensaver-settings.* +%{_mandir}/man6/xscreensaver-auth.* +%{_mandir}/man6/xscreensaver-gfx.* +%{_mandir}/man6/xscreensaver-gl-visual.* +%{_mandir}/man6/xscreensaver-systemd.* %config %{_sysconfdir}/pam.d/xscreensaver %dir %{_sysconfdir}/xscreensaver/ %config %{_sysconfdir}/xscreensaver/README @@ -270,22 +277,22 @@ %files lang -f %{name}.lang %files data -f %{name}-data.lst -%dir %{_libdir}/xscreensaver/ +%dir %{_libexecdir}/xscreensaver/ %dir %{_sysconfdir}/xscreensaver/ %dir %{_datadir}/applications/screensavers/ %files data-extra -f %{name}-data-extra.lst -%dir %{_libdir}/xscreensaver/ +%dir %{_libexecdir}/xscreensaver/ +%{_libexecdir}/xscreensaver/xscreensaver-getimage +%{_libexecdir}/xscreensaver/xscreensaver-getimage-file +%{_libexecdir}/xscreensaver/xscreensaver-getimage-video +%{_libexecdir}/xscreensaver/xscreensaver-text %dir %{_sysconfdir}/xscreensaver/ %dir %{_datadir}/applications/screensavers/ # Screensavers using those utilities are in this package. -%{_bindir}/xscreensaver-getimage -%{_bindir}/xscreensaver-getimage-file -%{_bindir}/xscreensaver-getimage-video -%{_bindir}/xscreensaver-text -%{_mandir}/man1/xscreensaver-getimage.* -%{_mandir}/man1/xscreensaver-getimage-file.* -%{_mandir}/man1/xscreensaver-getimage-video.* -%{_mandir}/man1/xscreensaver-text.* +%{_mandir}/man6/xscreensaver-getimage.* +%{_mandir}/man6/xscreensaver-getimage-file.* +%{_mandir}/man6/xscreensaver-getimage-video.* +%{_mandir}/man6/xscreensaver-text.* %changelog ++++++ xscreensaver-6.02-marbling-std-c.patch ++++++ --- xscreensaver-6.02/hacks/marbling.c.orig 2021-10-05 01:20:23.052312294 +0200 +++ xscreensaver-6.02/hacks/marbling.c 2021-11-12 16:49:01.360986689 +0100 @@ -44,6 +44,13 @@ #include "thread_util.h" #include "xshm.h" +#if defined __GNUC__ || defined __clang__ || \ + defined __STDC_VERSION__ && __STDC_VERSION__ > 199901L +# define INLINE inline +#else +# define INLINE +#endif + /* Use GCC/Clang's vector SIMD extensions, when possible. https://gcc.gnu.org/onlinedocs/gcc/Vector-Extensions.html */ @@ -59,17 +66,21 @@ */ # if defined __AVX2__ # define VSIZE 16 -# define IMUL_HI __builtin_ia32_pmulhw256 -# define MUL_HI __builtin_ia32_pmulhuw256 +# define IMUL_HI_OP __builtin_ia32_pmulhw256 +# define MUL_HI_OP __builtin_ia32_pmulhuw256 # elif defined __SSE2__ # define VSIZE 8 -# define IMUL_HI __builtin_ia32_pmulhw128 -# define MUL_HI __builtin_ia32_pmulhuw128 +# define IMUL_HI_OP __builtin_ia32_pmulhw128 +# define MUL_HI_OP __builtin_ia32_pmulhuw128 # endif # ifdef VSIZE -typedef int16_t v_uhi __attribute__((vector_size(VSIZE * 2))); +typedef uint16_t v_uhi __attribute__((vector_size(VSIZE * 2))); typedef int16_t v_hi __attribute__((vector_size(VSIZE * 2))); + +static INLINE v_hi IMUL_HI(v_hi a, v_hi b) { return IMUL_HI_OP(a, b); } +static INLINE v_uhi MUL_HI(v_uhi a, v_uhi b) { return (v_uhi)MUL_HI_OP((v_hi)a, (v_hi)b); } + # endif # endif @@ -114,13 +125,6 @@ # define VEC_INDEX(v, i) ((v)[i]) #endif -#if defined __GNUC__ || defined __clang__ || \ - defined __STDC_VERSION__ && __STDC_VERSION__ > 199901L -# define INLINE inline -#else -# define INLINE -#endif - struct state { Display *dpy; Window window; @@ -156,18 +160,20 @@ #endif /* == 8 for x86 and scalar. (Nice.) */ -const unsigned noise_out_bits = noise_work_bits - 3 * lerp_loss + 1; +/* const unsigned noise_out_bits = noise_work_bits - 3 * lerp_loss + 1; */ +#define noise_out_bits ((noise_work_bits - 3) * (lerp_loss + 1)) const unsigned noise_in_bits = 8; -static INLINE v_hi +static INLINE v_uhi broadcast (int16_t x) { #if VSIZE == 1 - return x; + v_hi r = x; #else v_hi r = {0}; - return r + x; + r = r + x; #endif + return (v_uhi)r; } static INLINE v_uhi @@ -175,11 +181,22 @@ { const uint16_t F = 256; + /* This whole thing is playing fast and loose with signdedness, mostly + because __builtin_ia32_pmulhuw256 is an unsigned op that requires signed + params, and Android's clang doesn't seem to care about signed vs. + unsigned vector variables. + + The multiplications below should be unsigned, but the result is the same + either way, because it's getting the low 16 bits (not the high 16). + */ #if __ARM_NEON - v_uhi t2 = (t * t) >> 1; - return - vqdmulhq_s16(t2, 10 * t - vqdmulhq_s16(t2, (uint16_t)(15 * F) - t * 6)) << + v_uhi ut2 = (t * t) >> 1; + v_hi it2 = (v_hi)ut2; + v_hi it = (v_hi)t; + v_hi iret = + vqdmulhq_s16(it2, 10 * it - vqdmulhq_s16(it2, (int16_t)(15 * F) - it * 6)) << (noise_work_bits - noise_in_bits + 1); + return (v_uhi)iret; #else v_uhi t2 = t * t; return @@ -239,7 +256,7 @@ { const v_uhi one = broadcast(1 << noise_work_bits); v_uhi X, Y, Z, A, B, AA, AB, BA, BB; - v_uhi u, v, w; + v_hi u, v, w; v_hi c0, c1, c2, c3, c4, c5, c6, c7; X = x >> noise_in_bits; /* FIND UNIT CUBE THAT */ Y = y >> noise_in_bits; /* CONTAINS POINT. */ @@ -247,9 +264,9 @@ x &= (uint16_t)((1 << noise_in_bits) - 1); /* FIND RELATIVE X,Y,Z */ y &= (uint16_t)((1 << noise_in_bits) - 1); /* OF POINT IN CUBE. */ z &= (uint16_t)((1 << noise_in_bits) - 1); - u = fade(x); /* COMPUTE FADE CURVES */ - v = fade(y); /* FOR EACH OF X,Y,Z. */ - w = fade(z); + u = (v_hi)fade(x); /* COMPUTE FADE CURVES */ + v = (v_hi)fade(y); /* FOR EACH OF X,Y,Z. */ + w = (v_hi)fade(z); A = noise_rand(X)+Y, AA = P(A)+Z, AB = P(A+1)+Z; /* HASH COORDINATES OF */ B = P(X+1)+Y, BA = P(B)+Z, BB = P(B+1)+Z; /* THE 8 CUBE CORNERS, */ @@ -265,7 +282,8 @@ c6 = grad(P(AB+1), x, y-one, z-one ); c7 = grad(P(BB+1), x-one, y-one, z-one ); - return SCALE(LERP(w, LERP(v, LERP(u, c0, c1), /* AND ADD BLENDED */ + return + (v_uhi)SCALE(LERP(w, LERP(v, LERP(u, c0, c1), /* AND ADD BLENDED */ LERP(u, c2, c3)), /* RESULTS FROM 8 */ LERP(v, LERP(u, c4, c5), /* CORNERS OF CUBE */ LERP(u, c6, c7)))); @@ -292,7 +310,7 @@ for (i = 0; i < octaves; i++) { #if __ARM_NEON - t += vqdmulhq_n_s16(noise (f*x, f*y, f*z), a); + t += (v_uhi)vqdmulhq_n_s16((v_hi)noise (f*x, f*y, f*z), a); a = ((uint32_t)a * iG) >> 16; #else t += MUL_HI(noise (f*x, f*y, f*z), a); ++++++ xscreensaver-5.45.tar.gz -> xscreensaver-6.02.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-5.45.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new.2520/xscreensaver-6.02.tar.gz differ: char 5, line 1 ++++++ xscreensaver-bug-reports.patch ++++++ --- /var/tmp/diff_new_pack.MNaSAK/_old 2021-12-22 20:18:07.399848646 +0100 +++ /var/tmp/diff_new_pack.MNaSAK/_new 2021-12-22 20:18:07.403848647 +0100 @@ -1,25 +1,8 @@ -Index: xscreensaver-5.40/driver/windows.c +Index: xscreensaver-6.01/driver/xscreensaver.c =================================================================== ---- xscreensaver-5.40.orig/driver/windows.c -+++ xscreensaver-5.40/driver/windows.c -@@ -898,7 +898,11 @@ saver_exit (saver_info *si, int status, - if (bugp) - fprintf(real_stderr, - "%s: see https://www.jwz.org/xscreensaver/bugs.html\n"; -- "\t\t\tfor bug reporting information.\n\n", -+ "\t\t\tfor bug reporting information.\n\n" -+ "Before reporting any bugs to the upstream,\n" -+ "please check it in the latest version.\n" -+ "If it is fixed there, please report it to\n" -+ "https://bugzilla.opensuse.org/.\n\n";, - blurb()); - - # if defined(HAVE_GETCWD) -Index: xscreensaver-5.40/driver/xscreensaver.c -=================================================================== ---- xscreensaver-5.40.orig/driver/xscreensaver.c -+++ xscreensaver-5.40/driver/xscreensaver.c -@@ -431,6 +431,10 @@ saver_ehandler (Display *dpy, XErrorEven +--- xscreensaver-6.01.orig/driver/xscreensaver.c ++++ xscreensaver-6.01/driver/xscreensaver.c +@@ -811,6 +811,10 @@ error_handler (Display *dpy, XErrorEvent " The more information you can provide, the better. But please\n" " report this bug, regardless!\n" "\n" @@ -30,18 +13,18 @@ "#######################################################################\n" "\n" "\n"); -Index: xscreensaver-5.40/driver/xscreensaver.man +Index: xscreensaver-6.01/driver/xscreensaver.man =================================================================== ---- xscreensaver-5.40.orig/driver/xscreensaver.man -+++ xscreensaver-5.40/driver/xscreensaver.man -@@ -373,6 +373,9 @@ and - Bugs? There are no bugs. Ok, well, maybe. If you find one, please let - me know. https://www.jwz.org/xscreensaver/bugs.html explains how to - construct the most useful bug reports. -+ +--- xscreensaver-6.01.orig/driver/xscreensaver.man ++++ xscreensaver-6.01/driver/xscreensaver.man +@@ -985,6 +985,9 @@ power-management-related activity detect + https://www.jwz.org/xscreensaver/bugs.html explains how to write the most + useful bug reports. If you find a bug, please let me know! + +Before reporting any bugs to the upstream, please check it in the latest +version. If it is fixed there, please report it to https://bugzilla.opensuse.org/. ++ + .SH ENVIRONMENT .PP - .TP 4 - .B Locking and root logins + .TP 8 ++++++ xscreensaver-data-extra.list ++++++ --- /var/tmp/diff_new_pack.MNaSAK/_old 2021-12-22 20:18:07.439848664 +0100 +++ /var/tmp/diff_new_pack.MNaSAK/_new 2021-12-22 20:18:07.443848666 +0100 @@ -12,6 +12,7 @@ atunnel barcode beats +binaryhorizon binaryring blaster blinkbox @@ -127,10 +128,10 @@ lament lavalite lcdscrub -ljlatest lockward loop m6502 +marbling maze maze3d memscroller ++++++ xscreensaver-default-screensaver.patch ++++++ --- /var/tmp/diff_new_pack.MNaSAK/_old 2021-12-22 20:18:07.467848677 +0100 +++ /var/tmp/diff_new_pack.MNaSAK/_new 2021-12-22 20:18:07.471848679 +0100 @@ -2,7 +2,7 @@ =================================================================== --- driver/XScreenSaver_ad.h.orig +++ driver/XScreenSaver_ad.h -@@ -1,36 +1,36 @@ +@@ -1,35 +1,35 @@ "#error Do not run app-defaults files through xrdb!", "#error That does not do what you might expect.", "#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.", @@ -33,9 +33,8 @@ -"*lock: False", +"*lock: True", "*verbose: False", - "*timestamp: True", "*fade: True", - "*unfade: False", + "*unfade: True", "*fadeSeconds: 0:00:03", "*fadeTicks: 20", -"*splash: True", @@ -51,7 +50,7 @@ "*textLiteral: XScreenSaver", "*textFile: ", "*textProgram: fortune", -@@ -235,7 +235,7 @@ +@@ -323,7 +323,7 @@ GL: gleidescope -root \\n\ GL: glknots -root \\n\ GL: glmatrix -root \\n\ @@ -64,7 +63,7 @@ =================================================================== --- driver/XScreenSaver.ad.in.orig +++ driver/XScreenSaver.ad.in -@@ -28,38 +28,38 @@ +@@ -28,7 +28,7 @@ ! /* (xrdb prevention kludge: whole file) @@ -73,10 +72,7 @@ *timeout: 0:10:00 *cycle: 0:10:00 *lockTimeout: 0:00:00 - *passwdTimeout: 0:00:30 --*dpmsEnabled: False -+*dpmsEnabled: True - *dpmsQuickoffEnabled: False +@@ -38,27 +38,27 @@ *dpmsStandby: 2:00:00 *dpmsSuspend: 2:00:00 *dpmsOff: 4:00:00 @@ -92,9 +88,8 @@ -*lock: False +*lock: True *verbose: False - *timestamp: True *fade: True - *unfade: False + *unfade: True *fadeSeconds: 0:00:03 *fadeTicks: 20 -*splash: True @@ -111,18 +106,7 @@ *textLiteral: XScreenSaver *textFile: @DEFAULT_TEXT_FILE@ *textProgram: fortune -@@ -68,8 +68,8 @@ - ! When a saver writes an error message to stdout/stderr, it can be printed - ! on the screen. - ! --*captureStderr: True --*overlayStderr: True -+*captureStderr: False -+*overlayStderr: False - *overlayTextForeground: #FFFF00 - *overlayTextBackground: #000000 - *font: *-medium-r-*-140-*-m-* -@@ -486,7 +486,7 @@ XScreenSaver.bourneShell: /bin/sh +@@ -468,7 +468,7 @@ XScreenSaver.bourneShell: /bin/sh @GL_KLUDGE@ GL: gleidescope -root \n\ @GL_KLUDGE@ GL: glknots -root \n\ @GL_KLUDGE@ GL: glmatrix -root \n\ ++++++ xscreensaver-disable-upgrade-nagging-message.patch ++++++ --- /var/tmp/diff_new_pack.MNaSAK/_old 2021-12-22 20:18:07.487848686 +0100 +++ /var/tmp/diff_new_pack.MNaSAK/_new 2021-12-22 20:18:07.491848688 +0100 @@ -1,10 +1,10 @@ -Index: xscreensaver-5.40/driver/prefs.c +Index: xscreensaver-6.02/driver/prefsw.c =================================================================== ---- xscreensaver-5.40.orig/driver/prefs.c -+++ xscreensaver-5.40/driver/prefs.c -@@ -1735,36 +1735,5 @@ senesculent_p (void) - upgrading it again -- which would be the worst possible outcome for - everyone involved, most especially the users. +--- xscreensaver-6.02.orig/driver/prefsw.c ++++ xscreensaver-6.02/driver/prefsw.c +@@ -1520,36 +1520,5 @@ senescent_p (void) + security-critical software that they are running is dangerously out + of date. */ - - time_t now = time ((time_t *) 0); /* d */ ++++++ xscreensaver-ignore-no-pwent-password.patch ++++++ --- /var/tmp/diff_new_pack.MNaSAK/_old 2021-12-22 20:18:07.515848700 +0100 +++ /var/tmp/diff_new_pack.MNaSAK/_new 2021-12-22 20:18:07.519848702 +0100 @@ -6,13 +6,13 @@ =================================================================== --- driver/passwd-pwent.c.orig +++ driver/passwd-pwent.c -@@ -200,7 +200,7 @@ get_encrypted_passwd(const char *user) - *s = 0; - } +@@ -187,7 +187,7 @@ get_encrypted_passwd (const char *user) --#ifndef HAVE_PAM -+#if 0 - /* We only issue this warning if not compiled with support for PAM. - If we're using PAM, it's not unheard of that normal pwent passwords - would be unavailable. */ + if (!result && + (verbose_p +-# ifdef HAVE_PAM ++# if 1 + || 0 + # else + || 1
