From f31aa276d313a7e2026b9d436a06571272b9153cfb2888a2397fa7642237f759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 3 May 2017 18:12:33 +0000 Subject: [PATCH] Accepting request 491917 from home:sbrabec:branches:X11:Utilities - Add a fix for double entering of password in non-English locales (boo#1035688, xlockmore-pam.patch). - Update to version 5.53: * dclock fix for led bounce. * Install changes for fortune. * strange mode updates. * life3d updates. * messagefont fix. * Changed default message font. * spiral erase mode changed. * Fix for kumppa -speed 0.2. * new website at http://www.sillycycle.com * xmb fonts fix. * fixed xjack mode. * Updated language use. - Refresh xlockmore-bitmaps.patch, xlockmore-ttf_dir.patch, xlockmore-extend-freetype-include-search.patch. - Re-enable PAM (boo#1035688). - Disable obsolete --enable-use-mb. OBS-URL: https://build.opensuse.org/request/show/491917 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=36 --- xlockmore-5.45.tar.bz2 | 3 -- xlockmore-5.45.tar.bz2.asc | 7 --- xlockmore-5.53.tar.xz | 3 ++ xlockmore-5.53.tar.xz.asc | 6 +++ xlockmore-bitmaps.patch | 8 +-- ...kmore-extend-freetype-include-search.patch | 15 +++--- xlockmore-pam.patch | 49 +++++++++++++++++++ xlockmore-ttf_dir.patch | 30 ++++++------ xlockmore.changes | 27 ++++++++++ xlockmore.spec | 14 ++++-- 10 files changed, 121 insertions(+), 41 deletions(-) delete mode 100644 xlockmore-5.45.tar.bz2 delete mode 100644 xlockmore-5.45.tar.bz2.asc create mode 100644 xlockmore-5.53.tar.xz create mode 100644 xlockmore-5.53.tar.xz.asc create mode 100644 xlockmore-pam.patch diff --git a/xlockmore-5.45.tar.bz2 b/xlockmore-5.45.tar.bz2 deleted file mode 100644 index f5be827..0000000 --- a/xlockmore-5.45.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7 -size 1968176 diff --git a/xlockmore-5.45.tar.bz2.asc b/xlockmore-5.45.tar.bz2.asc deleted file mode 100644 index 13db7dd..0000000 --- a/xlockmore-5.45.tar.bz2.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlR+bKwACgkQzxWXBzd5Ga4N6wCfXWEZIqecDE9189lrVP3D+79v -8AMAnjJNHn/J8L4tXn8jFZ4yaDrJ5ItQ -=+H9W ------END PGP SIGNATURE----- diff --git a/xlockmore-5.53.tar.xz b/xlockmore-5.53.tar.xz new file mode 100644 index 0000000..3ed97eb --- /dev/null +++ b/xlockmore-5.53.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4973659c3b1d9747e79e29f3e5a5d04f3a0cb36f35ba88507c69be2e04db4967 +size 1621432 diff --git a/xlockmore-5.53.tar.xz.asc b/xlockmore-5.53.tar.xz.asc new file mode 100644 index 0000000..e02e510 --- /dev/null +++ b/xlockmore-5.53.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAlj9Q+IACgkQzxWXBzd5Ga79rgCggDd6Kc0pMDKmCKwRpAVecDnR +GIwAnRzJvsDoMVCR/c0g8oiAOnWwKMow +=/hew +-----END PGP SIGNATURE----- diff --git a/xlockmore-bitmaps.patch b/xlockmore-bitmaps.patch index f08685d..620a915 100644 --- a/xlockmore-bitmaps.patch +++ b/xlockmore-bitmaps.patch @@ -1,9 +1,9 @@ Index: xlock/XLock.ad =================================================================== ---- xlock/XLock.ad.orig 2009-08-27 22:42:04.000000000 +0200 -+++ xlock/XLock.ad 2010-12-14 12:19:00.772719051 +0100 -@@ -76,8 +76,8 @@ XLock.program: fortune -s - !XLock.messagefont: -*-times-*-*-*-*-18-*-*-*-*-*-*-* +--- xlock/XLock.ad.orig ++++ xlock/XLock.ad +@@ -79,8 +79,8 @@ XLock.messagefont: -*-times-*-*-*-*-18-* + !XLock.messagefont: *8x16* ! For modes with images -!XLock.*.bitmap: bitmaps/m-xlock.xbm diff --git a/xlockmore-extend-freetype-include-search.patch b/xlockmore-extend-freetype-include-search.patch index e35dfbc..0dc3aff 100644 --- a/xlockmore-extend-freetype-include-search.patch +++ b/xlockmore-extend-freetype-include-search.patch @@ -1,16 +1,17 @@ -diff -Naur xlockmore-5.43/configure.in xlockmore-5.43.new/configure.in ---- xlockmore-5.43/configure.in 2013-02-21 17:32:25.000000000 +0100 -+++ xlockmore-5.43.new/configure.in 2013-12-15 20:09:47.668438807 +0100 -@@ -1914,7 +1914,7 @@ - AC_DEFUN(AC_PATH_FREETYPE_DIRECT, +Index: xlockmore-5.53/configure.ac +=================================================================== +--- xlockmore-5.53.orig/configure.ac ++++ xlockmore-5.53/configure.ac +@@ -1912,7 +1912,7 @@ dnl freetype FREETYPE + AC_DEFUN([AC_PATH_FREETYPE_DIRECT], [test -z "$freetype_direct_test_library" && freetype_direct_test_library=freetype test -z "$freetype_direct_test_function" && freetype_direct_test_function=FT_Init_FreeType --test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/freetype/freetype.h +-test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/freetype.h +test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype.h for ac_dir in \ /usr/X11R6.5.1/include \ /usr/X11R6.4/include \ -@@ -1974,11 +1974,14 @@ +@@ -1972,11 +1972,14 @@ test -z "$freetype_direct_test_include" /usr/openwin/share/include \ /usr/openwin/include \ \ diff --git a/xlockmore-pam.patch b/xlockmore-pam.patch new file mode 100644 index 0000000..1c6e59e --- /dev/null +++ b/xlockmore-pam.patch @@ -0,0 +1,49 @@ +This is more a hack than a correct fix. + +Instead of hadcoded expecting of "Password" prompt as a first PAM query, just +expect that it asks for password (xlock hardcodes "Password" as a first query in +the GUI). + +It will unbreak xlock with non-English locales, but it will still swallow the +first prompt from PAM. In most cases, it is just translated "Password" string, +but in some cases it can be a different question. + +To fully fix the problem, GUI needs to be redone. Instead of hardcoded +"Password" prompt in the initial phase of authentication, get all prompts from +PAM. + +Index: xlockmore-5.53/xlock/passwd.c +=================================================================== +--- xlockmore-5.53.orig/xlock/passwd.c ++++ xlockmore-5.53/xlock/passwd.c +@@ -335,29 +335,19 @@ PAM_conv(int num_msg, + #ifdef DEBUG + (void) printf( " + Message style: PAM_PROMPT_ECHO_OFF\n" ); + #endif +- if( strstr( msg[replies]->msg, "Password" ) == NULL ) { +- PAM_putText( msg[replies], &reply[replies], False ); +- } else { +- reply[replies].resp = COPY_STRING(PAM_password); +- } ++ reply[replies].resp = COPY_STRING(PAM_password); + /* PAM frees resp */ + break; + case PAM_TEXT_INFO: + #ifdef DEBUG + (void) printf( " + Message style: PAM_TEXT_INFO\n" ); + #endif +- if( strstr( msg[replies]->msg, "Password" ) == NULL ) { +- PAM_putText( msg[replies], &reply[replies], False ); +- } + /* PAM frees resp */ + break; + case PAM_ERROR_MSG: + #ifdef DEBUG + (void) printf( " + Message style: PAM_ERROR_MSG\n" ); + #endif +- if( strstr( msg[replies]->msg, "Password" ) == NULL ) { +- PAM_putText( msg[replies], &reply[replies], False ); +- } + /* PAM frees resp */ + break; + default: diff --git a/xlockmore-ttf_dir.patch b/xlockmore-ttf_dir.patch index d7ace12..f3b6afb 100644 --- a/xlockmore-ttf_dir.patch +++ b/xlockmore-ttf_dir.patch @@ -1,28 +1,28 @@ -Index: configure.in +Index: configure.ac =================================================================== ---- configure.in.orig 2010-01-28 00:30:40.000000000 +0100 -+++ configure.in 2010-12-14 12:19:00.863842724 +0100 -@@ -1585,9 +1585,9 @@ else +--- configure.ac.orig ++++ configure.ac +@@ -1686,9 +1686,9 @@ else ttf=yes - AC_DEFINE(HAVE_TTF) + AC_DEFINE([HAVE_TTF], [1], [True Text Font]) if test "x$prefix" = "xNONE"; then -- AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/xlock/fonts/") -+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/share/fonts/truetype/") +- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/lib/X11/xlock/fonts/"], [True Text Font]) ++ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font]) else -- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/") -+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/share/fonts/truetype/") +- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/lib/X11/xlock/fonts/"], [True Text Font]) ++ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font]) fi XLOCKLIBS="${XLOCKLIBS} -lttf" test "x$ttf_includes" = xNONE && ttf_includes=$ac_ttf_includes -@@ -1985,9 +1985,9 @@ else +@@ -2086,9 +2086,9 @@ else freetype=yes - AC_DEFINE(HAVE_FREETYPE) + AC_DEFINE([HAVE_FREETYPE], [1], [Free Type]) if test "x$prefix" = "xNONE"; then -- AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/xlock/fonts/") -+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/share/fonts/truetype/") +- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/lib/X11/xlock/fonts/"], [True Text Font]) ++ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font]) else -- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/") -+ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/share/fonts/truetype/") +- AC_DEFINE_UNQUOTED([DEF_TTFONT], ["${prefix}/lib/X11/xlock/fonts/"], [True Text Font]) ++ AC_DEFINE_UNQUOTED([DEF_TTFONT], ["/usr/share/fonts/truetype/"], [True Text Font]) fi XLOCKLIBS="${XLOCKLIBS} -lfreetype" test "x$freetype_includes" = xNONE && freetype_includes=$ac_freetype_includes diff --git a/xlockmore.changes b/xlockmore.changes index 1f2e7c3..0d78faa 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Fri Apr 28 19:33:08 CEST 2017 - sbrabec@suse.com + +- Add a fix for double entering of password in non-English locales + (boo#1035688, xlockmore-pam.patch). + +------------------------------------------------------------------- +Wed Apr 26 17:20:02 CEST 2017 - sbrabec@suse.com + +- Update to version 5.53: + * dclock fix for led bounce. + * Install changes for fortune. + * strange mode updates. + * life3d updates. + * messagefont fix. + * Changed default message font. + * spiral erase mode changed. + * Fix for kumppa -speed 0.2. + * new website at http://www.sillycycle.com + * xmb fonts fix. + * fixed xjack mode. + * Updated language use. +- Refresh xlockmore-bitmaps.patch, xlockmore-ttf_dir.patch, + xlockmore-extend-freetype-include-search.patch. +- Re-enable PAM (boo#1035688). +- Disable obsolete --enable-use-mb. + ------------------------------------------------------------------- Tue Mar 28 11:08:41 UTC 2017 - lnussel@suse.de diff --git a/xlockmore.spec b/xlockmore.spec index f98610f..e2e7adc 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -17,17 +17,17 @@ Name: xlockmore -Version: 5.45 +Version: 5.53 Release: 0 Summary: Screen Saver and Locker for the X Window System License: MIT Group: System/X11/Utilities -Url: http://www.tux.org/~bagleyd/xlockmore.html -Source: http://www.tux.org/~bagleyd/xlock/%{name}-%{version}/%{name}-%{version}.tar.bz2 +Url: http://sillycycle.com/xlockmore.html +Source: http://sillycycle.com/xlock/%{name}-%{version}.tar.xz Source1: xlock.pamd Source2: xlock-wrapper Source3: xlock-wrapper_xorg6 -Source4: http://www.tux.org/~bagleyd/xlock/%{name}-%{version}/%{name}-%{version}.tar.bz2.asc +Source4: http://www.tux.org/~bagleyd/xlock/%{name}-%{version}/%{name}-%{version}.tar.xz.asc Source5: %{name}.keyring # apply even patches when X.org < 7.0 else apply odd patches Patch1: %{name}-bitmaps.patch @@ -39,6 +39,8 @@ Patch7: xlockmore-strict-aliasing.patch # extended list of directories where could freetype be found Patch9: xlockmore-extend-freetype-include-search.patch Patch10: xlockmore-nose_mode_crash.patch +# PATCH-HACK-OPENSUSE xlockmore-pam.patch boo1035688 -- Do not hardcode "Password" string. Breaks LANG != en. +Patch11: xlockmore-pam.patch BuildRequires: ImageMagick-devel BuildRequires: automake BuildRequires: bc @@ -54,6 +56,7 @@ BuildRequires: libXinerama-devel BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: libdrm-devel +BuildRequires: pam-devel BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,6 +85,7 @@ chmod -x README docs/Revisions %patch7 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build aclocal @@ -99,8 +103,8 @@ export CXXFLAGS="%{optflags}" --without-gtk\ --without-motif\ --disable-bomb\ + --enable-pam\ --enable-vtlock\ - --enable-use-mb\ --disable-allow-root\ --x-includes=%{_xorg7_prefix}/include\ --x-libraries=%{_xorg7_prefix}/%{_lib}