From 0acb0a9fc76b4bc5fc36c8393170283239a3ade88fa93ba7b1ecaa0976bb39a0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 2 Dec 2024 08:46:44 +0000 Subject: [PATCH] - Update to 5.81: * Fixed life3d mode when running by itself as it would not pick up allGliders rules on refresh. * Fixed building for CDE for Linux. In general, for Linux, the build now uses -R for linking like BSD. OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xlockmore?expand=0&rev=72 --- .gitattributes | 23 + .gitignore | 1 + xlock-wrapper | 17 + xlock-wrapper_xorg6 | 17 + xlock.pamd | 5 + xlockmore-5.78.tar.xz | 3 + xlockmore-5.78.tar.xz.asc | 6 + xlockmore-5.79.tar.xz | 3 + xlockmore-5.79.tar.xz.asc | 6 + xlockmore-5.80.tar.xz | 3 + xlockmore-5.80.tar.xz.asc | 6 + xlockmore-5.81.tar.xz | 3 + xlockmore-5.81.tar.xz.asc | 6 + xlockmore-bitmaps.patch | 15 + xlockmore-cast-function-pointers.patch | 22 + ...kmore-extend-freetype-include-search.patch | 29 + xlockmore-nose_mode_crash.patch | 16 + xlockmore-strict-aliasing.patch | 13 + xlockmore-ttf_dir.patch | 28 + xlockmore.changes | 998 ++++++++++++++++++ xlockmore.keyring | 34 + xlockmore.spec | 154 +++ 22 files changed, 1408 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 xlock-wrapper create mode 100644 xlock-wrapper_xorg6 create mode 100644 xlock.pamd create mode 100644 xlockmore-5.78.tar.xz create mode 100644 xlockmore-5.78.tar.xz.asc create mode 100644 xlockmore-5.79.tar.xz create mode 100644 xlockmore-5.79.tar.xz.asc create mode 100644 xlockmore-5.80.tar.xz create mode 100644 xlockmore-5.80.tar.xz.asc create mode 100644 xlockmore-5.81.tar.xz create mode 100644 xlockmore-5.81.tar.xz.asc create mode 100644 xlockmore-bitmaps.patch create mode 100644 xlockmore-cast-function-pointers.patch create mode 100644 xlockmore-extend-freetype-include-search.patch create mode 100644 xlockmore-nose_mode_crash.patch create mode 100644 xlockmore-strict-aliasing.patch create mode 100644 xlockmore-ttf_dir.patch create mode 100644 xlockmore.changes create mode 100644 xlockmore.keyring create mode 100644 xlockmore.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/xlock-wrapper b/xlock-wrapper new file mode 100644 index 0000000..03186b9 --- /dev/null +++ b/xlock-wrapper @@ -0,0 +1,17 @@ +#! /bin/bash +# Copyright (c) 1995-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Tomas Crhak +# +# xlock wrapper, that will restart xlock in case it terminates +# unexpectedly (some modes can segfault) + +trap '' `seq 1 63` +trap SIGCHLD + +/usr/lib/xlock/xlock "$@" +status=$? +test $status -gt 128 -a $status -lt 192 \ + && exec /usr/bin/xlock -mode blank +exit $status diff --git a/xlock-wrapper_xorg6 b/xlock-wrapper_xorg6 new file mode 100644 index 0000000..b5de944 --- /dev/null +++ b/xlock-wrapper_xorg6 @@ -0,0 +1,17 @@ +#! /bin/bash +# Copyright (c) 1995-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Tomas Crhak +# +# xlock wrapper, that will restart xlock in case it terminates +# unexpectedly (some modes can segfault) + +trap '' `seq 1 63` +trap SIGCHLD + +/usr/X11R6/lib/xlock/xlock "$@" +status=$? +test $status -gt 128 -a $status -lt 192 \ + && exec /usr/bin/xlock -mode blank +exit $status diff --git a/xlock.pamd b/xlock.pamd new file mode 100644 index 0000000..fef9dd4 --- /dev/null +++ b/xlock.pamd @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include common-auth +account include common-account +password include common-password +session include common-session diff --git a/xlockmore-5.78.tar.xz b/xlockmore-5.78.tar.xz new file mode 100644 index 0000000..9e3dec1 --- /dev/null +++ b/xlockmore-5.78.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0c9674221787a330558948e59ef4437dd483cc81b0285cd45e1e06a8bebfa91 +size 2061676 diff --git a/xlockmore-5.78.tar.xz.asc b/xlockmore-5.78.tar.xz.asc new file mode 100644 index 0000000..8ac08ce --- /dev/null +++ b/xlockmore-5.78.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCZk/mlwAKCRDPFZcHN3kZ +roy0AJ9Gdu0hYL/odwZhcaPqIVGbDqiDNACfZrdE6kj9vMZ0Eib0GWc28p1RsXY= +=GuM4 +-----END PGP SIGNATURE----- diff --git a/xlockmore-5.79.tar.xz b/xlockmore-5.79.tar.xz new file mode 100644 index 0000000..e9422a2 --- /dev/null +++ b/xlockmore-5.79.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d02791db9aa4998109370fd90b916c386b9e551c999f872d043f345b7877e47 +size 2063048 diff --git a/xlockmore-5.79.tar.xz.asc b/xlockmore-5.79.tar.xz.asc new file mode 100644 index 0000000..9090bea --- /dev/null +++ b/xlockmore-5.79.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCZuJZWgAKCRDPFZcHN3kZ +ro2YAJ0dZsqfyZHvizawGVmRx9k8qyEYBACeOhKl5dllsDQj85ZZkC0oasIe+Cs= +=3j7V +-----END PGP SIGNATURE----- diff --git a/xlockmore-5.80.tar.xz b/xlockmore-5.80.tar.xz new file mode 100644 index 0000000..197be81 --- /dev/null +++ b/xlockmore-5.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:502d765368d36d814ecb777fd439c759790b3dd34d5ee35f74807f71baa47621 +size 2061496 diff --git a/xlockmore-5.80.tar.xz.asc b/xlockmore-5.80.tar.xz.asc new file mode 100644 index 0000000..545c26a --- /dev/null +++ b/xlockmore-5.80.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCZvShywAKCRDPFZcHN3kZ +rjUdAKCJ4XBSD7e7+lH7kYdi5C27kBkw5gCfdGUoTx4cBjPZMd1y5189C7Nxfo4= +=n8Xd +-----END PGP SIGNATURE----- diff --git a/xlockmore-5.81.tar.xz b/xlockmore-5.81.tar.xz new file mode 100644 index 0000000..ffcb703 --- /dev/null +++ b/xlockmore-5.81.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0530181328a7c668b6d7b24c0cfa32aa93b4bbae23c0c4f09f1d3b347ec98a97 +size 2060904 diff --git a/xlockmore-5.81.tar.xz.asc b/xlockmore-5.81.tar.xz.asc new file mode 100644 index 0000000..71b4f29 --- /dev/null +++ b/xlockmore-5.81.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQbechHjyNtza3A1qzPFZcHN3kZrgUCZ0Yb+wAKCRDPFZcHN3kZ +rvVyAJ9neEEMv6zpYLsyLZdzGQMmyv8z9wCfapshKT8qxPc6mOHaZSOLV5gzJMc= +=Ph/P +-----END PGP SIGNATURE----- diff --git a/xlockmore-bitmaps.patch b/xlockmore-bitmaps.patch new file mode 100644 index 0000000..620a915 --- /dev/null +++ b/xlockmore-bitmaps.patch @@ -0,0 +1,15 @@ +Index: xlock/XLock.ad +=================================================================== +--- 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 +-!XLock.*.bitmap: pixmaps/m-xlock.xpm ++XLock.*.bitmap: /usr/include/X11/bitmaps/m-xlock.xbm ++XLock.*.bitmap: /usr/include/X11/pixmaps/m-xlock.xpm + !XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps + + ! For mailbox check application diff --git a/xlockmore-cast-function-pointers.patch b/xlockmore-cast-function-pointers.patch new file mode 100644 index 0000000..67eef2d --- /dev/null +++ b/xlockmore-cast-function-pointers.patch @@ -0,0 +1,22 @@ +Index: b/xlock/vtlock_proc.c +=================================================================== +--- a/xlock/vtlock_proc.c ++++ b/xlock/vtlock_proc.c +@@ -188,7 +188,7 @@ find_x_proc(int disp_nr, dev_t lxdev, in + lencmd = strlen(xcmd_ref); + if ( stat( PROCDIR, &stbuf ) == -1 ) return( (pid_t)-1 ); + namelist = (struct dirent **) malloc(sizeof (struct dirent *)); +- if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, alphasort)) == -1 ) ++ if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, (int (*)(const void *, const void *)) alphasort)) == -1 ) + { + free(namelist); + return( (pid_t)-1 ); +@@ -301,7 +301,7 @@ scan_x_fds( struct inode_ref *inotab, in + + (void) sprintf(xfddir, PROCDIR "/%d/fd", proc); + namelist = (struct dirent **) malloc(sizeof (struct dirent *)); +- if (scan_dir(xfddir, &namelist, NULL, alphasort) == -1) { ++ if (scan_dir(xfddir, &namelist, NULL, (int (*)(const void *, const void *)) alphasort) == -1) { + free(namelist); + return 0; + } diff --git a/xlockmore-extend-freetype-include-search.patch b/xlockmore-extend-freetype-include-search.patch new file mode 100644 index 0000000..0dc3aff --- /dev/null +++ b/xlockmore-extend-freetype-include-search.patch @@ -0,0 +1,29 @@ +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.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 \ +@@ -1972,11 +1972,14 @@ test -z "$freetype_direct_test_include" + /usr/openwin/share/include \ + /usr/openwin/include \ + \ ++ /usr/include/freetype2 \ ++ /usr/include/freetype2/freetype \ ++ \ + $extra_include \ + ; \ + do + if test -r "$ac_dir/$freetype_direct_test_include"; then +- no_freetype= ac_freetype_includes=$ac_dir/freetype2 ++ no_freetype= ac_freetype_includes=$ac_dir + break + fi + done diff --git a/xlockmore-nose_mode_crash.patch b/xlockmore-nose_mode_crash.patch new file mode 100644 index 0000000..f9360f6 --- /dev/null +++ b/xlockmore-nose_mode_crash.patch @@ -0,0 +1,16 @@ +Index: xlockmore-5.43/modes/nose.c +=================================================================== +--- xlockmore-5.43.orig/modes/nose.c 2013-02-18 15:53:14.000000000 +0100 ++++ xlockmore-5.43/modes/nose.c 2015-03-10 20:44:01.731745516 +0100 +@@ -584,6 +584,11 @@ talk(ModeInfo * mi, Bool force_erase) + register char *p, *p2; + char buf[BUFSIZ], args[MAXLINES][MAXWIDTH]; + ++ /* don't try to talk without a graphics context */ ++ if (!np->text_bg_gc) { ++ return; ++ } ++ + /* clear what we've written */ + if (np->talking || force_erase) { + if (!np->talking) diff --git a/xlockmore-strict-aliasing.patch b/xlockmore-strict-aliasing.patch new file mode 100644 index 0000000..d208920 --- /dev/null +++ b/xlockmore-strict-aliasing.patch @@ -0,0 +1,13 @@ +Index: xlock/vroot.h +=================================================================== +--- xlock/vroot.h.orig 2007-10-28 02:49:36.000000000 +0100 ++++ xlock/vroot.h 2010-12-14 12:19:00.878842537 +0100 +@@ -108,7 +108,7 @@ VirtualRootWindowOfScreen(Screen * s) + __SWM_VROOT, 0, 1, False, XA_WINDOW, + &actual_type, &actual_format, + &nitems, &bytesafter, +- (unsigned char **) &newRoot) == Success && newRoot) { ++ &newRoot) == Success && newRoot) { + root = *newRoot; + break; + } diff --git a/xlockmore-ttf_dir.patch b/xlockmore-ttf_dir.patch new file mode 100644 index 0000000..f3b6afb --- /dev/null +++ b/xlockmore-ttf_dir.patch @@ -0,0 +1,28 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -1686,9 +1686,9 @@ else + ttf=yes + AC_DEFINE([HAVE_TTF], [1], [True Text Font]) + if test "x$prefix" = "xNONE"; then +- 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/"], [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 +@@ -2086,9 +2086,9 @@ else + freetype=yes + AC_DEFINE([HAVE_FREETYPE], [1], [Free Type]) + if test "x$prefix" = "xNONE"; then +- 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/"], [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 new file mode 100644 index 0000000..61c9960 --- /dev/null +++ b/xlockmore.changes @@ -0,0 +1,998 @@ +------------------------------------------------------------------- +Sun Dec 1 16:46:04 UTC 2024 - Antonio Teixeira + +- Update to 5.81: + * Fixed life3d mode when running by itself as it would not pick up + allGliders rules on refresh. + * Fixed building for CDE for Linux. In general, for Linux, the build + now uses -R for linking like BSD. + +------------------------------------------------------------------- +Mon Sep 30 12:32:40 UTC 2024 - Antonio Teixeira + +- Update to 5.80: + * pyraminx and oct mode extended now to any size > 1, also some hard + coding of size removed and fixed some drawing errors. + +------------------------------------------------------------------- +Sun Sep 15 13:53:22 UTC 2024 - Antonio Teixeira + +- Update to 5.79: + * pyraminx and oct mode extended to size 6 also some hardcoding of size + removed and fixed some drawing errors. +- Fix builds + * Remove xlockmore-strict-aliasing.patch + * Add xlockmore-cast-function-pointers.patch + +------------------------------------------------------------------- +Tue Jun 11 18:37:11 UTC 2024 - Antonio Teixeira + +- Update to 5.78: + * mball mode added simulating a Masterball puzzle. The original has + 8 wedges and 4 bands, this version has 2 to 12 (even) wedges + and usually 2 to 6 bands. + * Fixed oct, pyraminx, bevel, dino, and skewb to show less silly + moves, i.e. a move of a certain piece to the left and then to + the right. + * Added bean bags (rounded octahedrons) for juggler3d (like my own + juggling balls). + * A fix for random mode and in debug to show proper modes in list. +- 5.77 changelog: + * Added period 2 edge turning to pyraminx. + * pyraminx and oct mode extended to size 5 also some hardcoding of size + removed. + +------------------------------------------------------------------- +Wed Mar 27 16:10:58 UTC 2024 - Antonio Teixeira + +- Update to 5.76: + * oct mode added. Sizes 2-4. Period 3 (face turning) and Period 4 + (corner turning) implemented also a "sticky" mode is implemented + for both where the middle pieces turn together. + * pyraminx code was reorganized and now scale the size of puzzle. +- 5.75 changelog: + * pyraminx mode added. Sizes 2-4. With a "sticky" mode where its + a size 4 but only certain turns are permitted. So far only the + normal Period 3 turning is permitted (i.e. faces or corners turn + but not edges). Taken from xpyraminx and dino and rubik modes. + +------------------------------------------------------------------- +Mon Feb 26 12:16:42 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- +Wed Jan 3 08:35:58 UTC 2024 - ming li + +- Update to 5.74: + * dino mode center fix (probably never see error). + * bevel mode added. Better known as the Helicopter Cube. Currently, + it only supports the 180 degree turns. The ~71 degree turns would + be very challenging to simulate. Taken from an unreleased xbevel + puzzle (which I am currently creating) and the skewb mode. + +------------------------------------------------------------------- +Fri Oct 6 21:24:34 UTC 2023 - Antonio Teixeira + +- Update to 5.73: + * dino mode added, mostly built from xdino and skewb mode. + * fiberlamp mode fixed for multiscreen. + * boxed mode report that it may be trapped in an infinite loop, I could + not reproduce but added a hack so this will not happen. +- 5.72 changelog: + * Update for OpenVMS for x86_64, small change to xshm.h and new make.com + to work with clang and xmlock/xawlock thanks to Jouk Jansen. I hear + its now possible to get a virtual OpenVMS on your Linux machine. + * Update for xscreensaver-6.06 port to use grabclient instead of + grabscreen. + * configure now configures xmlock for Athena if you do not want Motif. + Should work with most popular versions of Athena. You may want + to change the name from xmlock to xawlock if you are using Athena. + xawlock directory removed and was not meant to be distributed. + +------------------------------------------------------------------- +Thu Jun 29 16:42:38 UTC 2023 - Antonio Teixeira + +- Update to 5.71: + * Patch for Theobromine, Niacin, and Cobalamin from Richard Narron, + richard AT aaazen.com. + * Added cuboctahedron from mxico to ico mode. + * xmlock updates for Athena for toggles. Fix also for Xaw3d. I think + it has most of the working parts to the Motif version now. +- 5.70 changelog: + * Patach for Cannabidiol and Fentanyl from Richard Narron, richard AT + aaazen.com. + * I was able to get DtScreen to work on Linux with CDE with slight + modification to Makefile (documented in README) with help from Per + Backman, 229pele AT tufftuff.net. + * xmlock updates for Athena. In generated Makefile will have to change + HAVE_MOTIF to HAVE_ATHENA and change -lXm to -lXaw or -lXaw3d. Just + bare bones right now. + * t3d.c: following recommendated change for configure "warning: Update your + code to rely only on HAVE_SYS_TIME_H". Also other assorted changes + in configure.ac when I ran autoupdate (did not accept everything as + it seemed to go wrong). + +------------------------------------------------------------------- +Tue Jan 3 15:28:45 UTC 2023 - Stefan Schubert + +- Migration of PAM settings to /usr/lib/pam.d. + +------------------------------------------------------------------- +Thu Dec 15 10:25:00 UTC 2022 - Daniel Garcia + +- Install resource files in /usr/lib/X11/app-defeaults/XLock instead of + /usr/share. + Fixes bsc#1204597 + +------------------------------------------------------------------- +Sun Mar 27 19:26:54 UTC 2022 - Dirk Müller + +- update to 5.69: + Patch for xkb groups thanks to Audrey Af, public.irkutsk AT gmail.com. + Minor touches for xscreensaver-6.03 port, life and life3d. + +------------------------------------------------------------------- +Tue Jan 25 15:38:09 UTC 2022 - Avinesh Kumar + +- update to 5.68: + * Updated xscreensaver port for xscreensaver-6.02. + * Various NetBsd install issues fixed including config.cygport. + * pam vulnerabiliy patch added thanks to Elmar Hoffmann, elho AT elho.net. + Card vulnerability may remain, see README. + * module fixes for deluxe, eyes, starfish, swirl, text3d2, module use is + still experimental. + * biof mode removed again (though was not building by default). + +------------------------------------------------------------------- +Sat Oct 16 12:09:39 UTC 2021 - Dirk Müller + +- update to 5.67: + * Fixing specified bound equals destination size warning in iostuff.c. + * Port updated for xscreensaver-6.01. With help from EoflaOE ViceCity. + * maze3d.c updated for VMS as CRTL now contains more standard functions + +------------------------------------------------------------------- +Fri Nov 20 02:55:13 UTC 2020 - Wang Jun + +- update to 5.66: + GL mode atunnels, juggler3d, atlantis, lament, invert, solitaire, text3d, + and text3d2 fixed up by EoflaOE ViceCity and myself to build in + xscreensaver. + bomb, helix, lightning, penrose, petal, scooter fixes for xscreensaver + port (clear screen issue). Clock fixed to run by changing a spot from + "Clock" to "CLOCK". + A few updates from xscreensaver-5.44/hacks/xlockmore.c for xscreensaver + port. + Duplicate resources and unloadable resources for xscreensaver port fixed + by EoflaOE. + Double free removed for xscreensaver port fixed by EoflaOE and myself. + Removed some warnings in xscreensaver port in fzort, rubik, skewb, and + sproingies. + Xpm textures added to xscreensaver ports that need them. + image, puzzle, decay, bat now work but use xscreensaver bitmap/pixmap + in xscreensaver port. + Bug fix in qix and toneclock for xscreensaver port, xlock was not + affected by negative NRAND input. + euler2d synced up with xscreensaver version. + Change to fzort to use __asm__ instead of asm as its probably more + likely to work. + Fixed solitaire so deckPile changes just a little bit as it doles + out cards. + Updated bomb to use size 18 font when USE_MB is not set as it seems + 34 is not widely available anymore. + pacman now has different colored ghosts (no green ghost) and also + oscillating dress and eyes. See README for a notice for this mode. + Fixed some bad drawings in solitaire and pacman noticed on + Windows side. + Warnings removed for -Wstrict-prototypes -Wmissing-prototypes + -Wdeclaration-after-statement + +------------------------------------------------------------------- +Thu Sep 10 17:32:32 UTC 2020 - Dirk Mueller + +- update to 5.65: + Fix from Jan Kratochvil and Adrian Reber, adrian AT lisas.de for Fedora. + xlock -startCmd true... would core on Fedora, exit() replaced with + _exit(). + Update for magick.c to use strncpy thanks to Jouk Jansen. + Fix for hyper mode from original author, for potential but not + likely memory leak and free(NULL) issue John Heidemann, johnh + AT isi.edu. + More buffer gcc warnings removed for dclock.c, image.c, and + scrnsave.c. + ras.c/magick.c gcc 10 fix from Adrian Reber, adrian AT lisas.de . + VMS already handles this in make.com. + Lots of spelling errors fixed due to codespell + https://manpages.debian.org/testing/codespell/codespell.1.en.html + A few more gl modes (molecule, invert) fixed up by + EoflaOE ViceCity to run in xscreensaver. + Added additional changes to solitaire and invert. invert will + build in xscreensaver with some coaxing, see README in + xscreensaver directory. + Removed buffer gcc warning about nose.c. + Fix from brett.diamond AT gmail.com to get "xlock -help" from + crashing. + As a Blake's 7 fan, I had to add the Liberator to star mode. + Same fix from Jouk Jansen and Adrian Reber, adrian AT lisas.de + for juggler3d.cc in previous release. + Change from Denys Vlasenko (thanks to Adrian Reber for pointing out) + https://bugzilla.redhat.com/show_bug.cgi?id=874484 + This helps xlock's parent process to know xlock crashed. + ico mode added truncated octahedron. + Another gl mode, sierpinski3d, fixed up by EoflaOE ViceCity to run + in xscreensaver. + Updated references to website to https. https://www.sillycycle.com + A few more gl modes (incl. maze3d, pipe, sproingies) fixed up by + EoflaOE ViceCity to run in xscreensaver. + Thanks to tobik, ohartmann AT walstatt.org, and Jason Helfman, + jgh AT FreeBSD.org for xglock fixes for "failed due to signal" for + clang. + Syncing with xscreensaver and many modes modified, more than + half working there. pacman and puzzle run but need some + obvious work, others run too fast or flash on the screen. + Various fixes from Jouk Jansen and EoflaOE ViceCity. + Updated GL modes also, inaddition to overlap: biof, skewb, and + fire (needs images). See xscreensaver/README for new directions. + Updated in linux to build with modules, must have broken somewhere + down the line. imake build fixed too. + bomb mode fixed for xlock. + Syncing with xscreensaver. Much has changed since last time this + was done and much left to do. Nonglx "a"'s and some "b"'s done + so far. Automata modes like ant.c should use automata.c and + automata.h supplied by xlockmore. + ball bat not working right there yet. Also bouboule to do right will + require changes to xlockmore files from xscreensaver. + See new xscreensaver/README for instructions. + While testing uncovered old security bug in anenome mode and fixed. + life updates to use a more standard notation for nontotalistic cellular + automata. + ax_pthread.m4 needed for autoconf, added back in, oops. + Removed VMS caddr_t fix from matrix.c, cage.c, gears.c, glplanet.c, + invert.c, juggler3d.c, lament.c, moebius.c, molecule.c, morph3d.c, + noof.c, pipes.c, rubik.c, sierpinski3d.c, skewb.c, stairs.c, + superquadrics.c as no longer needed. Thanks to Jouk Jansen. + boxed and maze3d modes added thanks mainly to Jouk Jansen. + boxed added to xlock95.scr. xlock95 Makefile now builds to 64 bit. + Thanks to Jason Helfman, jgh AT FreeBSD.org for sound installation fixes. + Thanks to Tobias Kortkamp, for his patch for glock compile issue with + CLANG 6.0.0. + Fixing warnings using clang for back.xpm, nose.c, passwd.c. + Fixing errors using g++ for deluxe.c, also various casting added. + Fixing potential some buffer overruns pointed out in mingw in + apollonian.c and hyper.c. + Fixing potential error of using null pointer thanks again to mingw in + xlock.c. + pyro2 was not showing anything on screen due to it not finding font, + changed it to default to mode_font if can not find. + Thanks to Dave Odell, dmo2118 AT gmail.com for his fzort mode update to + use the functions in xshm.c and fixes crash when running X11 over network. + Note from Dave Odell: + . MI_INIT() is + defined and documented in hacks/xlockmore.h, with related functions + defined in hacks/xlockmore.c. MI_INIT() currently takes three parameters: + the ModeInfo *, the state array, and a function pointer for the new free + hook. FWIW, it could instead be just the first two parameters, with the + free hook being set up like the other ModeHooks; this would be a bit + nicer, I think. But I was going for something that could be applied + incrementally to individual screenhacks in XScreenSaver, and could -- in + theory -- be brought back to xlockmore with minimal impact. + ant mode resync'd with xscreensaver... Thanks to David Odell redoing my + sad attempt. + -sound configuration changed around so it should work on more machines, + now uses DEF_PLAY and play.sh by default. + Thanks to Stanislav Brabec, sbrabec AT suse.cz for his "hack" to fix for + PAM with non-English locales. He notes to fix properly a "Password" + prompt list should be obtained at the initial phase of authentication. + Added PAM_PASSWORD_PROMPT for using old way. + Fixed leak in scooter thanks to Valgrind. +- remove xlockmore-pam.patch (upstream/obsolete) + +------------------------------------------------------------------- +Mon Apr 23 22:40:34 UTC 2018 - astieger@suse.com + +- remove dependency on gpg-offline, part of source services now + +------------------------------------------------------------------- +Tue Dec 12 14:34:29 UTC 2017 - crrodriguez@opensuse.org + +- Remove unused build require on gltt-devel, this allows to drop + gltt and ancient freetype 1.x too. + +------------------------------------------------------------------- +Wed May 31 17:14:54 CEST 2017 - sbrabec@suse.com + +- Update to version 5.54: + * strange mode updates. + +------------------------------------------------------------------- +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 + +- don't require pam-modules and unix2_chkpwd anymore. We use + pam_unix noways which transparently manages access to /etc/shadow + +------------------------------------------------------------------- +Wed Feb 8 12:25:25 UTC 2017 - dimstar@opensuse.org + +- Drop esound-devel BuildRequires: the distro moved away from + esound some years ago. +- Drop xlockmore-no-copy-dt-needed-entries.patch: as esd is no + longer being built, we also don't need to link it anymore. + +------------------------------------------------------------------- +Tue Mar 10 17:12:23 UTC 2015 - vcizek@suse.com + +- fix a crash in nose mode (bnc#882747) + * added xlockmore-nose_mode_crash.patch + +------------------------------------------------------------------- +Tue Mar 10 08:27:10 UTC 2015 - pgajdos@suse.com + +- removed GPL-2.0+ from license string [bnc#734014] + +------------------------------------------------------------------- +Wed Jan 28 20:09:36 CET 2015 - sbrabec@suse.cz + +- Update to version 5.45: + * Prevent pyro2 from X error. + * Fix pentomino undefined behavior. + * dilemma, voters, wator size fix for neighbors = 6. + * Proper crediting for High Life part of life mode. + * A few new gliders and patterns for life and life3d. +- Enable Xinerama support (bsc#911133), gltt, xpm and ImageMagick + support. + +------------------------------------------------------------------- +Mon Dec 16 12:00:12 EET 2013 - cougar@random.ee + +- Added "pam-modules" dependency: xlockmore uses /sbin/unix2_chkpwd + for password check. Without this binary it is not possible + to unlock your X Window System session. + +------------------------------------------------------------------- +Sun Dec 15 18:57:59 UTC 2013 - hrvoje.senjan@gmail.com + +- Added xlockmore-extend-freetype-include-search.patch: search only + for freetype.h, not the half path. Also, extended list of + directories where could freetype be found +- Pass $(freetype-config --cflags) to exported CPPFLAGS for potential + future changes of freetype headers (as xlockmore uses hardcoded + paths instead of a saner buildsystem) + +------------------------------------------------------------------- +Thu Jul 18 17:14:27 CEST 2013 - sbrabec@suse.cz + +- Update to version 5.43: + * many fixes and improvements, see Revisions for more. + * Fix potential crash (CVE-2013-4143, bnc#829859) +- Remove ancient Provides/Obsoletes. +- Verify GPG signature. + +------------------------------------------------------------------- +Mon Apr 22 20:07:48 UTC 2013 - dimstar@opensuse.org + +- Add libXdmcp-devel and libXt-devel BuildRequires: we include + headers from the respective toolkits / libraries and as + such it's only correct to BuildRequire the -devel package + bringing these headers to us. + +------------------------------------------------------------------- +Fri Feb 1 12:00:26 UTC 2013 - coolo@suse.com + +- update license to new format + +------------------------------------------------------------------- +Thu Feb 23 11:36:38 UTC 2012 - coolo@suse.com + +- own app-defaults directory to fix build on factory + +------------------------------------------------------------------- +Wed Dec 21 10:31:55 UTC 2011 - coolo@suse.com + +- remove call to suse_update_config (very old work around) + +------------------------------------------------------------------- +Wed Nov 30 14:06:45 UTC 2011 - coolo@suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Tue Aug 30 12:49:59 UTC 2011 - pgajdos@suse.com + +- build with --no-copy-dt-needed-entries + * no-copy-dt-needed-entries.patch +- updated to 5.34: + * DPMS changed from 30 sec to 5 sec. Define -DMIN_DPMS=3 at compile-time + if you would like to change it to be sooner. + * life mode fix for hexagons, life forms would not map certain screen sizes + * life mode: Added new neighbor 9 ship, added asym ships for neighbor 12 + S356/B46, and added some new oscillators including a neighbor 6 p16. + Now (mostly) use generated file from java app and life2d.xml. + * life3d mode: Added new some new oscillators including a neighbor 12 p10 + S456/B3. Also new puffers and gliders found. Now use generated file + from java app and life3d.xml. + * loop mode: made new small loops less frequent + +------------------------------------------------------------------- +Tue Dec 14 11:25:05 UTC 2010 - coolo@novell.com + +- update to 5.32 + * life3d update for -neighbors 14, new truncated octahedral life form. + * ant & demon updates for -neighbors 5 or 7 + * -xinerama option added off by default. + * skewb mode now scrambles, taken out of unstable category. + * juggler3d mode stolen from xscreensaver with help from Tim Auckland. + * petri: crashed due to shift of int, fix from Dr Nigel Warr + * penrose should be working again. Other small fixes for life, etc. + * image: image set right away and added option -icononly to only display + image when in password window +- remove support for outdated libraries and versions + +------------------------------------------------------------------- +Tue Jul 28 18:20:46 CEST 2009 - sbrabec@suse.cz + +- Default to not accept root password to unlock (bnc#519637). + +------------------------------------------------------------------- +Thu Jun 11 17:16:36 CEST 2009 - sbrabec@suse.cz + +- Updated to version 5.28: + * Inrovements in modes: ant3d, life3d, life, + * FTGL library support. + * PAM_putText() fix. + * configure checks for libXdpms + +------------------------------------------------------------------- +Fri Nov 28 14:22:04 CET 2008 - sbrabec@suse.cz + +- Do not install compile time pixmaps (bnc#450061). + +------------------------------------------------------------------- +Wed Sep 3 14:24:03 CEST 2008 - sbrabec@suse.cz + +- Updated to version 5.26.1: + * PAM_putText() would set pointer resp->resp to buffer. + * "Esc" key now resets password entry. Do not put an escape in + your password. This should behave the same as Control-U. + * -showdate added. +showdate allows you to turn off date in + password window. + * Inverted bitmap for xlock. + * Updated the Java launcher in xlock. + * antic cleanups. + * New mode pyro2: -mode pyro2 -msg 'MSGSTR' -fnt 'FONT' + * Modifications for +install, -mono. + * New resource files for Chinese... + * Automata modes now have triangular tilings drawn with a black + triangle around it. + * Fix for xlock -resource in life.c. + * Added a compile-time option "-DNO_TIME if you dont want the + time in the password window. + +------------------------------------------------------------------- +Thu Jun 5 14:12:40 CEST 2008 - pgajdos@suse.cz + +- prevented against segfault when wrong locale selected [#90543] + (null-fontset.patch) + +------------------------------------------------------------------- +Tue Jun 3 11:26:09 CEST 2008 - pgajdos@suse.cz + +- removed mode text3d2 (xlockmore isn't linked against ftgl from + now) [bnc#352683] + +------------------------------------------------------------------- +Fri Apr 25 15:06:51 CEST 2008 - sbrabec@suse.cz + +- Updated to version 5.25: + * ant3d, ant, life1d now with better colors. + * rain a new mode from Frank Fesevur. + * Fix for xlock -resource in life.c. + * Added a compile-time option "-DNO_TIME if you dont want the + time in the password window. + +------------------------------------------------------------------- +Tue Aug 7 13:34:16 CEST 2007 - sbrabec@suse.cz + +- Updated to version 5.24: + * penrose added to xlock95. + * xcl added with a fix for DefaultScreen, which should not be + there since xlock is a multiscreen program. + * Patch for solitare and reducing binary size for xlock95. + * dilemma, voters, wator hexagonal/triangular drawing + improvements. + * More triangular/hexagonal life. + * Fixes for old options for command line -rule S2b34B2a and + -rule S2a2b4aB2a3a4b using -neighbors 6. + * Fixes for hexagonal diagonal shooters. + * Added new hexagonal life -rule S35B2 and S3B245. + * Added many new triangular life rules with gliders. + * Updated random soup to include multiple symmetries. + * Added options runtime -glidersearch and -patternsearch. + * Added -repeat num option to help find patterns that do not + repeat in num periods. + * Added -vertical option to more modules. + * DirectColor fixes for password window. +- Build with GLTT and FTGL modules. + +------------------------------------------------------------------- +Wed Nov 15 14:41:31 CET 2006 - dmueller@suse.de + +- build against freetype2, not freetype + +------------------------------------------------------------------- +Mon Oct 23 13:19:08 CEST 2006 - sbrabec@suse.cz + +- Updated to version 5.23: + * Bug fixes. + * Several new options. + * Memory leak fixes. + +------------------------------------------------------------------- +Wed Sep 13 16:00:31 CEST 2006 - sbrabec@suse.cz + +- Adjusted BuildRequires for ftgl. + +------------------------------------------------------------------- +Tue Sep 5 18:23:35 CEST 2006 - lmichnovic@suse.cz + +- fixed wrong path to the ttf fonts (ttf_dir*patch) [#153404] +- removed comments in xlockmore-bitmaps.patch +- file "xlock-wrapper_xorg6" created for use whith X.org <= 6.9 +- fixed build with X.org <= 6.9; patches 2, 4 applies; the names + ends with "xorg_6.patch"; patches 1, 3 applies if X.org >= 7.0 +- fixed X libraries and headers path + +------------------------------------------------------------------- +Wed Aug 9 11:02:35 CEST 2006 - sndirsch@suse.de + +- fixed paths in xlock wrapper script + +------------------------------------------------------------------- +Wed Aug 2 16:07:32 CEST 2006 - lmichnovic@suse.cz + +- distinguishing prefix in X.org instead of suse_version + +------------------------------------------------------------------- +Thu Jul 20 22:55:19 CEST 2006 - lmichnovic@suse.cz + +- fixed build for new X.org 7.x + +------------------------------------------------------------------- +Tue Jun 6 21:26:13 CEST 2006 - lmichnovic@suse.cz + +- Update to version 5.22 + - fiberlamp fix for array bounds read and leak fix for deluxe + - magick and raster file (ras) fixes for True Color by Jouk Jansen + - Removed some compiler/lint warnings. + - deluxe mode ported from xscreensaver by Jouk Jansen. + - anemone mode ported from xscreensaver by Jouk Jansen + - win32 changes from Petey Leinonen: + added XPutPixel() + pacman now works by changing the initialization and now can + create a 1 bit depth bitmap when asked for. + +------------------------------------------------------------------- +Wed Jan 25 21:43:12 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 11 18:14:28 CET 2006 - sbrabec@suse.cz + +- Updated to version 5.21. + +------------------------------------------------------------------- +Tue Nov 15 18:48:22 CET 2005 - uli@suse.de + +- build with -O1 on ARM (ICE workaround) + +------------------------------------------------------------------- +Thu Aug 4 12:23:19 CEST 2005 - sbrabec@suse.cz + +- Updated to version 5.18. + +------------------------------------------------------------------- +Tue May 24 11:20:15 CEST 2005 - mcihar@suse.cz + +- update to 5.17 + +------------------------------------------------------------------- +Wed May 11 12:11:11 CEST 2005 - mcihar@suse.cz + +- update to 5.16 +- dropped patch accepted by upstream + +------------------------------------------------------------------- +Fri Mar 11 16:03:28 CET 2005 - mcihar@suse.cz + +- fix reading resources (bug #72191) + +------------------------------------------------------------------- +Tue Mar 8 14:08:31 CET 2005 - mcihar@suse.cz + +- fix permissions + +------------------------------------------------------------------- +Mon Feb 14 17:49:55 CET 2005 - mcihar@suse.cz + +- update to 5.15 +- more fontset support merged upstream + +------------------------------------------------------------------- +Mon Dec 06 15:06:58 CET 2004 - mcihar@suse.cz + +- update to 5.14.1 + +------------------------------------------------------------------- +Mon Nov 15 15:07:49 CET 2004 - kukuk@suse.de + +- Use common-* PAM config files + +------------------------------------------------------------------- +Tue Sep 14 13:05:39 CEST 2004 - mcihar@suse.cz + +- work correctly with utf-8 (bug #45065): + - use multibyte X functions (--enable-use-mb) + - calculate correctly font height for multibyte (xlockmore-fonts.patch) + - use different fontset for signature (fixed) and messages (sans) (xlockmore-fonts.patch) + - set default fonts to one available in SUSE (xlockmore-fonts.patch) + +------------------------------------------------------------------- +Wed Aug 04 17:42:03 CEST 2004 - mcihar@suse.cz + +- update to 5.13 + +------------------------------------------------------------------- +Thu May 27 16:45:17 CEST 2004 - mcihar@suse.cz + +- update to 5.12 + +------------------------------------------------------------------- +Tue Apr 20 18:21:31 CEST 2004 - mcihar@suse.cz + +- enabled VT locking + +------------------------------------------------------------------- +Tue Feb 24 12:20:48 CET 2004 - mcihar@suse.cz + +- compile with -fno-strict-aliasing +- include more docs + +------------------------------------------------------------------- +Sun Jan 11 10:08:36 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Wed Jan 7 13:13:10 CET 2004 - schwab@suse.de + +- Don't hardcode SIGCHLD value. +- Fix quoting. + +------------------------------------------------------------------- +Wed Jan 07 12:21:41 CET 2004 - mcihar@suse.cz + +- updated to 5.11.1 +- removed patches accepted by author +- do not trap SIGCHLD in wrapper script - bug #32858 + +------------------------------------------------------------------- +Thu Nov 06 12:33:45 CET 2003 - mcihar@suse.cz + +- update to 5.10 + +------------------------------------------------------------------- +Wed Aug 06 16:09:03 CEST 2003 - mcihar@suse.cz + +- updated to 5.09 + +------------------------------------------------------------------- +Fri Jun 13 10:28:39 CEST 2003 - kukuk@suse.de + +- fix filelist + +------------------------------------------------------------------- +Wed Apr 30 14:31:55 CEST 2003 - mcihar@suse.cz + +- renamed to xlockmore +- updated to 5.07.1: + * Many buxfixes. + * Checks for OpenGL errors. + * Added a Caps Lock check. + +------------------------------------------------------------------- +Fri Mar 07 17:31:14 CET 2003 - tcrhak@suse.cz + +- restart xlock only when a signal was received, + not when xlock ended with an error, e.g. unknown mode + +------------------------------------------------------------------- +Mon Mar 03 21:06:20 CET 2003 - tcrhak@suse.cz + +- Added xlock wrapper (source xlock-wrapper), replacing + the original xlock. The wrapper restarts xlock whenever + it terminates unexpectedly, e.g. when the used module + segfaults. [bug #23091] + +------------------------------------------------------------------- +Fri Feb 7 14:07:12 CET 2003 - kukuk@suse.de + +- Use pam_unix2.so instead of pam_unix.so + +------------------------------------------------------------------- +Tue Feb 4 19:45:50 CET 2003 - pmladek@suse.cz + +- updated to version 5.06: + * new mode petri + * allow -erasemode to handle more complicated requests like + -erasemode all-circle_wipe + * and many bug fixes +- helper-bug.dif merged in helper.dif + +------------------------------------------------------------------- +Mon Nov 18 22:34:35 CET 2002 - ro@suse.de + +- removed duplication of AC_CONFIG_HEADER(config.h) + +------------------------------------------------------------------- +Thu Sep 19 12:19:48 CEST 2002 - pmladek@suse.cz + +- previous change fixes the bugs #18790, #14329 and not the bug #18774 + +------------------------------------------------------------------- +Tue Sep 03 18:34:06 CEST 2002 - pmladek@suse.cz + +- fixed helper patch, FALLBACK_XLOCKRC is still not needed because PAM + support is replaced by PASSWD_HELPER_PROGRAM [#18774] + +------------------------------------------------------------------- +Tue Aug 27 10:30:32 CEST 2002 - pmladek@suse.cz + +- used --with-libraries=%{_libdir} to fix for lib64 + +------------------------------------------------------------------- +Mon Aug 26 13:39:04 CEST 2002 - pmladek@suse.cz + +- pam module is accessed via new helper utility unix2_chkpw and xlock binary + do not need group id bit now, many thanks to Olaf Kirch + for hint and patch [#18132] + +------------------------------------------------------------------- +Mon Feb 18 15:56:43 CET 2002 - tcrhak@suse.cz + +- fixed application default resources (XLock.*.bitmap); bug #13347 + +------------------------------------------------------------------- +Tue Feb 12 13:19:58 CET 2002 - cihlar@suse.cz + +- removed sound support (it breaks Minimal+X11 selection) + +------------------------------------------------------------------- +Tue Feb 12 08:35:43 CET 2002 - cihlar@suse.cz + +- removed xlock-mesa due to problems with mesa + screensavers [#12944] + +------------------------------------------------------------------- +Tue Feb 5 13:57:20 CET 2002 - cihlar@suse.cz + +- update to version 5.03 +- added sound support (sound off by default) +- fixed to compile xlock without mesa and + xlock-mesa with mesa + +------------------------------------------------------------------- +Thu Nov 8 18:40:04 CET 2001 - ro@suse.de + +- use mesa-devel-packages in neededforbuild + +------------------------------------------------------------------- +Mon Oct 29 10:21:02 CET 2001 - dan@suse.cz + +- update to 5.02 version + +------------------------------------------------------------------- +Fri Aug 24 18:12:52 CEST 2001 - schwab@suse.de + +- Fix conflicting declaration. + +------------------------------------------------------------------- +Tue Aug 14 18:05:33 CEST 2001 - ro@suse.de + +- Don't use absolute paths to PAM modules in PAM config files + +------------------------------------------------------------------- +Thu Aug 9 13:10:06 CEST 2001 - dan@suse.cz + +- update to the latest stable (4.17.2) + +------------------------------------------------------------------- +Mon Jun 25 11:55:21 CEST 2001 - pblaha@suse.cz + +- remove mode cartoon due to a copyright problems + +------------------------------------------------------------------- +Tue May 8 21:15:12 CEST 2001 - mfabian@suse.de + +- bzip2 sources + +------------------------------------------------------------------- +Thu Mar 15 18:23:12 CET 2001 - ro@suse.de + +- changed neededforbuild to +- changed neededforbuild to + +------------------------------------------------------------------- +Wed Mar 7 16:58:41 CET 2001 - ro@suse.de + +- changed neededforbuild to + +------------------------------------------------------------------- +Wed Feb 7 15:27:55 CET 2001 - uli@suse.de + +- fixed for glibc 2.2.1 +- removed cracklib, pam from neededforbuild + +------------------------------------------------------------------- +Mon Jan 22 13:40:47 CET 2001 - schwab@suse.de + +- Fix conflicting declarations. +- Add %suse_update_config. + +------------------------------------------------------------------- +Thu Aug 17 13:40:23 CEST 2000 - smid@suse.cz + +- format string security bug fixed + +------------------------------------------------------------------- +Wed May 24 14:27:13 CEST 2000 - smid@suse.cz + +- mesadev added to needeforbuild + +------------------------------------------------------------------- +Tue Apr 18 12:10:11 CEST 2000 - smid@suse.cz + +- buildroot added +- upgrade to 4.16 + +------------------------------------------------------------------- +Thu Mar 23 19:08:28 CET 2000 - ro@suse.de + +- fixed to compile on both xf86 + +------------------------------------------------------------------- +Fri Jan 7 17:49:38 CET 2000 - kukuk@suse.de + +- Update to 4.15 + +------------------------------------------------------------------- +Sat Oct 16 18:07:09 MEST 1999 - kukuk@suse.de + +- Build one version with and one without Mesa. + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Thu Jul 1 15:12:00 MEST 1999 - kukuk@suse.de + +- Link against Mesa + +------------------------------------------------------------------- +Wed Jun 30 14:17:41 MEST 1999 - kukuk@suse.de + +- Don't give egid away, it's needed for reading shadow + +------------------------------------------------------------------- +Mon Jun 28 13:11:30 MEST 1999 - kukuk@suse.de + +- update to 4.14 + +------------------------------------------------------------------- +Tue Jun 8 18:43:50 MEST 1999 - kukuk@suse.de + +- update 4.12 -> 4.13.1 +- Compile with PAM + +------------------------------------------------------------------- +Tue Jan 12 14:08:36 MET 1999 - uli@suse.de + +- update 4.04 -> 4.12 + +------------------------------------------------------------------- +Tue Oct 14 18:54:26 MEST 1997 - ro@suse.de + +- updated file list + ready for autobuild + +---------------------------------------------------------------------------- +Fri Oct 10 16:29:44 MEST 1997 - florian@suse.de + + +- update to version 4.04 + + +---------------------------------------------------------------------------- +Sun Jun 22 18:57:49 MEST 1997 - florian@suse.de + + +- update to version 4.02.1 + + + +---------------------------------------------------------------------------- +Wed Apr 30 15:57:14 CEST 1997 - florian@suse.de + + +- make xlock sgid "shadow" and not suid "root" + + +---------------------------------------------------------------------------- +Sun Apr 27 13:27:44 CEST 1997 - bs@suse.de + +- update to new version 4.02 (security fix) + +---------------------------------------------------------------------------- +Sun Apr 13 23:04:29 MEST 1997 - florian@suse.de + + +- update to new version 4.01 + +- do not enable automatic logout button + + +---------------------------------------------------------------------------- +Sun Feb 2 19:42:46 CET 1997 - florian@suse.de + + +- update to new version 3.13 + + +---------------------------------------------------------------------------- +Sat Nov 16 20:28:43 CET 1996 - florian@suse.de + + +- update from beta-version to official 3.12 + + +---------------------------------------------------------------------------- +Wed Nov 6 00:13:26 CET 1996 - florian@suse.de + + +- update to newest version 3.12BETA due to security problems + + + +---------------------------------------------------------------------- +Sun Aug 25 19:28:50 MET DST 1996 - florian@suse.de + +update to new version 3.10 diff --git a/xlockmore.keyring b/xlockmore.keyring new file mode 100644 index 0000000..bdc5dd7 --- /dev/null +++ b/xlockmore.keyring @@ -0,0 +1,34 @@ +pub 1024D/377919AE 2007-09-14 +uid David A Bagley +sub 2048g/92A6F423 2007-09-14 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +mQGiBEbqo4ERBACGlNq5BP8AamzO5UzR5j5bpF+C0cvhhdoZ7Qv6mBvphNmO52AL +tNsYynV8+BeatNQrUVZqzNMiWwMYDcMdvHQHpdTz0LeZsCumaM1OKE5Pm55NWMNj +KhKUeQGQQsSFIVk4UvQaI0lyKv/oJhlhYQ1LYOkjQIMX+nfcdbgm1AApiwCglmW9 +tR6SGBbzioHuX0PQ4z2ZWt0D/1KZYdvbGjpv3JcJ+4VJ9C+TTp9mJXIY1S1tBNep +CmP5UTNA9QH7qrLDetVnhto4kxHUEHS8h84+0HsZgudR7kq2TVzNSsQte8rEMZzF +W/nMs896cuii9dKdlRHefdp9vx1WyIPryTIGsKziE7co4UhBUHyJv516Za0pFMgv +pUTUA/9u6npFpBU2naAL2yFMiZxzOfGdKw80RWrkMXwJcHNzvSCvcPbB8tgsGzWs +S1ooU8sp2TOoaF2CN68Sc0vo2IrT+bcv83CymQwOh2ELPyKC0dbvoF0CxOOTC+g+ +MaSmwSM5NPoBBginb4yt6Cn6bmpy8UaKweIFzWIW1BMQqql5C7QgRGF2aWQgQSBC +YWdsZXkgPGJhZ2xleWRAdHV4Lm9yZz6IYAQTEQIAIAUCRuqjgQIbAwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEM8Vlwc3eRmujIUAoIHmqtMOavNrQ5SGyXcIs8mu +9ZYPAJ43O0SxXjFjEaE+ojNBIi8aixBQSrkCDQRG6qOPEAgA1yejdLOYnhmoAjRm +DejtlWLuy/S3vB+HNpLEBVXn5sy2B2z5WI0EwthRyLjTFAlNBdNFv5YJ3cYBoVtJ +myv/VrPafLSidAzLTjQXwFJkKvTG0hh5lXINp8nXov7YBEjr1nXOPTzhf4SBT0rI +sy4b73M/WnJplHe7CcmCofYKazuiTn3wKbPdRO841YR54/i9akQHE2dhDxAHF2lX +yIfc78C0QCsmcb4v7NZpCZ4AXgQnfLubdqC9mC0zoNJWZ7UHzg1GqSWr4Qwk7RS5 +5A9iB5QVmeNCFZ393RSXdePhG/xPSXbmUeg6XbIbHkd0LAc1Ne+JKctQHYx0XEVm +tb36LwADBQf/aF9zPi3kSlSyjOk2xNTwbykxgNV6DNqrd87qnR2E7eduiFYqcc5x +7VA//e+edVWFg5ze2E/O7jGE+zx05CIyYGHGIFhXrq/LQ3CBkVF9WivD1ivsAv+U +7DRCAGorysyD8e2eLrEMVzCbPV3y7y4ardE2Zh+LcWv5s9Chg51r05cxwd92/x0g +L1PLgBd5S5DDUN53CdPWZEXinDZQWfNZlJnOeJhm9PN5X3F5sYUVpem5EqO6/8XP +G5SSgogcJvAtonbNC/YGIDZWQSGvI/jiEshG56JqFidOuEInDsrkpQQZADK3Apr/ +xj28JtKW8aJESSdHpOdUhLero4dFygGJK4hJBBgRAgAJBQJG6qOPAhsMAAoJEM8V +lwc3eRmue70An21cv2PQZFtnIzqmOOPLGYWa/3yCAJ9K4v3NKbQDPgo2ldLaBw8g +WaIUlw== +=8RT5 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/xlockmore.spec b/xlockmore.spec new file mode 100644 index 0000000..0fb4079 --- /dev/null +++ b/xlockmore.spec @@ -0,0 +1,154 @@ +# +# spec file for package xlockmore +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: xlockmore +Version: 5.81 +Release: 0 +Summary: Screen Saver and Locker for the X Window System +License: MIT +Group: System/X11/Utilities +URL: https://sillycycle.com/xlockmore.html +Source: https://sillycycle.com/xlock/%{name}-%{version}.tar.xz +Source1: xlock.pamd +Source2: xlock-wrapper +Source3: xlock-wrapper_xorg6 +Source4: http://sillycycle.com/xlock/%{name}-%{version}.tar.xz.asc +Source5: %{name}.keyring +# apply even patches when X.org < 7.0 else apply odd patches +Patch1: %{name}-bitmaps.patch +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch3: xlockmore-ttf_dir.patch +# end of X.org related patches +# PATCH-FIX-UPSTREAM xlockmore-extend-freetype-include-search.patch -- search only for freetype.h, not the half path. Also, +# extended list of directories where could freetype be found +Patch9: xlockmore-extend-freetype-include-search.patch +Patch10: xlockmore-nose_mode_crash.patch +Patch11: xlockmore-cast-function-pointers.patch +BuildRequires: ImageMagick-devel +BuildRequires: automake +BuildRequires: bc +BuildRequires: fdupes +BuildRequires: freeglut-devel +BuildRequires: freetype2-devel +BuildRequires: ftgl-devel +BuildRequires: gcc-c++ +BuildRequires: libXdmcp-devel +BuildRequires: libXinerama-devel +BuildRequires: libXpm-devel +BuildRequires: libXt-devel +BuildRequires: libdrm-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig + +%description +The xlock utility locks your X Window System session and runs a screen +saver until a password is entered. + +%define _xorg7libs %{_lib} +%define _xorg7libs32 lib +%define _xorg7bin bin +%define _xorg7_mandir %{_mandir} +%define _xorg7pixmaps include +%define _xorg7libshare lib +%define _xorg7_xkb %{_datadir}/X11/xkb +%define _xorg7_termcap %{_prefix}/lib/X11%{_sysconfdir} +%define _xorg7_serverincl %{_includedir}/xorg +%define _xorg7_fonts %{_datadir}/fonts +%define _xorg7_prefix %{_prefix} + +%prep +%setup -q +chmod -x README docs/Revisions +%patch -P 1 +%patch -P 3 +%patch -P 9 -p1 +%patch -P 10 -p1 +%patch -P 11 -p1 + +%build +aclocal +autoconf +export CPPFLAGS="-I/usr/include/FTGL $(freetype-config --cflags)" +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +./configure \ + --prefix=%{_xorg7_prefix}\ + --with-libraries=%{_libdir}\ + --with-magick\ + --with-xinerama\ + --with-xpm\ + --without-gtk\ + --without-motif\ + --disable-bomb\ + --enable-pam\ + --enable-vtlock\ + --disable-allow-root\ + --x-includes=%{_xorg7_prefix}/include\ + --x-libraries=%{_xorg7_prefix}/%{_lib} +%make_build + +%install +install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7bin}/ +install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/ +install -d -m 755 %{buildroot}%{_xorg7_mandir}/man1/ +install -d -m 755 %{buildroot}%{_prefix}/%{_xorg7libs32}/xlock +install -m 755 xlock/xlock %{buildroot}%{_prefix}/%{_xorg7libs32}/xlock/xlock +install -m 644 xlock/XLock.ad %{buildroot}%{_prefix}/%{_xorg7libshare}/X11/app-defaults/XLock +install -m 644 xlock/xlock.man %{buildroot}%{_xorg7_mandir}/man1/xlock.1x +%if 0%{?suse_version} > 1500 +install -d -m 755 %{buildroot}%{_pam_vendordir} +install -m 644 %{SOURCE1} %{buildroot}%{_pam_vendordir}/xlock +%else +install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/xlock +%endif + +%if "%(pkg-config --variable prefix x11 || echo %{_prefix}/X11R6)" == "%{_prefix}" +install -m 755 %{SOURCE2} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock +%else +install -m 755 %{SOURCE3} %{buildroot}%{_prefix}/%{_xorg7bin}/xlock +%endif +%fdupes %{buildroot}%{_prefix} + +%if 0%{?suse_version} > 1500 +%pre +# Prepare for migration to /usr/lib; save any old .rpmsave +for i in pam.d/xlock ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: +done + +%posttrans +# Migration to /usr/lib, restore just created .rpmsave +for i in pam.d/xlock ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: +done +%endif + +%files +%doc %{_xorg7_mandir}/man1/xlock.1x.gz +%doc README docs/3d.howto docs/Purify docs/Revisions docs/TODO docs/cell_automata +%if 0%{?suse_version} > 1500 +%{_pam_vendordir}/xlock +%else +%config %{_sysconfdir}/pam.d/xlock +%endif +%{_prefix}/%{_xorg7libshare}/X11/app-defaults +%{_prefix}/%{_xorg7bin}/xlock +%{_prefix}/%{_xorg7libs32}/xlock + +%changelog