From 07695ddc69675ac7cc6eec758e122203020f6aaa37d70b5ad6097a6adb01f12e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Jan 2007 23:42:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=1 --- .gitattributes | 23 ++ .gitignore | 1 + ready | 0 xlock-wrapper | 17 ++ xlock-wrapper_xorg6 | 17 ++ xlock.pamd | 5 + xlockmore-5.23.tar.bz2 | 3 + xlockmore-bitmaps.patch | 13 + xlockmore-bitmaps_xorg6.patch | 13 + xlockmore-null.patch | 11 + xlockmore-ttf_dir.patch | 26 ++ xlockmore-ttf_dir_xorg6.patch | 26 ++ xlockmore.changes | 455 ++++++++++++++++++++++++++++++++++ xlockmore.spec | 361 +++++++++++++++++++++++++++ 14 files changed, 971 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 ready create mode 100644 xlock-wrapper create mode 100644 xlock-wrapper_xorg6 create mode 100644 xlock.pamd create mode 100644 xlockmore-5.23.tar.bz2 create mode 100644 xlockmore-bitmaps.patch create mode 100644 xlockmore-bitmaps_xorg6.patch create mode 100644 xlockmore-null.patch create mode 100644 xlockmore-ttf_dir.patch create mode 100644 xlockmore-ttf_dir_xorg6.patch create mode 100644 xlockmore.changes 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/ready b/ready new file mode 100644 index 0000000..473a0f4 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.23.tar.bz2 b/xlockmore-5.23.tar.bz2 new file mode 100644 index 0000000..ffb474f --- /dev/null +++ b/xlockmore-5.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3788eb9fa8d95e8be681508e980fa92d3001abed93b2e47e83cc3005c92d0c48 +size 1773160 diff --git a/xlockmore-bitmaps.patch b/xlockmore-bitmaps.patch new file mode 100644 index 0000000..3430295 --- /dev/null +++ b/xlockmore-bitmaps.patch @@ -0,0 +1,13 @@ +--- xlock/XLock.ad ++++ xlock/XLock.ad +@@ -74,8 +74,8 @@ + !XLock.messagefont: -*-times-*-*-*-*-18-*-*-*-*-*-*-* + + ! 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-bitmaps_xorg6.patch b/xlockmore-bitmaps_xorg6.patch new file mode 100644 index 0000000..eca3655 --- /dev/null +++ b/xlockmore-bitmaps_xorg6.patch @@ -0,0 +1,13 @@ +--- xlock/XLock.ad ++++ xlock/XLock.ad +@@ -75,8 +75,8 @@ + !XLock.messagefont: -*-times-*-*-*-*-18-*-*-*-*-*-*-* + + ! For modes with images +-!XLock.*.bitmap: bitmaps/m-xlock.xbm +-!XLock.*.bitmap: pixmaps/m-xlock.xpm ++XLock.*.bitmap: /usr/X11R6/include/X11/bitmaps/m-xlock.xbm ++XLock.*.bitmap: /usr/X11R6/include/X11/pixmaps/m-xlock.xpm + !XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps + + ! For mailbox check application diff --git a/xlockmore-null.patch b/xlockmore-null.patch new file mode 100644 index 0000000..be52c5d --- /dev/null +++ b/xlockmore-null.patch @@ -0,0 +1,11 @@ +--- xglock/xglock.c ++++ xglock/xglock.c +@@ -666,7 +666,7 @@ + else if ( numberprocess == 0 ) { + (void) execlp(XLOCK, XLOCK, "-parent", numberwidget, + MODE_STRING, LockProcs[mode].cmdline_arg, "-geometry", WINDOW_GEOMETRY, "-delay", "100000", +- "-nolock", "-inwindow", "+install", 0); ++ "-nolock", "-inwindow", "+install", NULL); + } + } + diff --git a/xlockmore-ttf_dir.patch b/xlockmore-ttf_dir.patch new file mode 100644 index 0000000..918dc32 --- /dev/null +++ b/xlockmore-ttf_dir.patch @@ -0,0 +1,26 @@ +--- configure.in ++++ configure.in +@@ -1574,9 +1574,9 @@ + ttf=yes + AC_DEFINE(HAVE_TTF) + 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/") + else +- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/") ++ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/share/fonts/truetype/") + fi + XLOCKLIBS="${XLOCKLIBS} -lttf" + test "x$ttf_includes" = xNONE && ttf_includes=$ac_ttf_includes +@@ -1970,9 +1970,9 @@ + freetype=yes + AC_DEFINE(HAVE_FREETYPE) + 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/") + else +- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/") ++ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/share/fonts/truetype/") + fi + XLOCKLIBS="${XLOCKLIBS} -lfreetype" + test "x$freetype_includes" = xNONE && freetype_includes=$ac_freetype_includes diff --git a/xlockmore-ttf_dir_xorg6.patch b/xlockmore-ttf_dir_xorg6.patch new file mode 100644 index 0000000..baf89f9 --- /dev/null +++ b/xlockmore-ttf_dir_xorg6.patch @@ -0,0 +1,26 @@ +--- configure.in ++++ configure.in +@@ -1574,9 +1574,9 @@ + ttf=yes + AC_DEFINE(HAVE_TTF) + if test "x$prefix" = "xNONE"; then +- AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/xlock/fonts/") ++ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/fonts/truetype/") + else +- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/") ++ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/fonts/truetype/") + fi + XLOCKLIBS="${XLOCKLIBS} -lttf" + test "x$ttf_includes" = xNONE && ttf_includes=$ac_ttf_includes +@@ -1970,9 +1970,9 @@ + freetype=yes + AC_DEFINE(HAVE_FREETYPE) + if test "x$prefix" = "xNONE"; then +- AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/xlock/fonts/") ++ AC_DEFINE_UNQUOTED(DEF_TTFONT, "/usr/lib/X11/fonts/truetype/") + else +- AC_DEFINE_UNQUOTED(DEF_TTFONT, "${prefix}/lib/X11/xlock/fonts/") ++ AC_DEFINE_UNQUOTED(DEF_TTFONT, "$/usr/lib/X11/fonts/truetype/") + 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..4cdc2d4 --- /dev/null +++ b/xlockmore.changes @@ -0,0 +1,455 @@ +------------------------------------------------------------------- +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.spec b/xlockmore.spec new file mode 100644 index 0000000..74aaa20 --- /dev/null +++ b/xlockmore.spec @@ -0,0 +1,361 @@ +# +# spec file for package xlockmore (Version 5.23) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: xlockmore +BuildRequires: bc esound-devel freeglut-devel freetype2-devel gcc-c++ libdrm-devel pkgconfig +%if %suse_version > 1010 +BuildRequires: ftgl-devel +%else +BuildRequires: ftgl +%endif +License: Other License(s), see package +Group: System/X11/Utilities +Provides: xlock +Obsoletes: xlock +Autoreqprov: on +Version: 5.23 +Release: 8 +Summary: Screen Saver and Locker for the X Window System +URL: http://www.tux.org/~bagleyd/xlockmore.html +Source: %{name}-%{version}.tar.bz2 +Source1: xlock.pamd +Source2: xlock-wrapper +Source3: xlock-wrapper_xorg6 +Patch: %{name}-null.patch +# apply even patches when X.org < 7.0 else apply odd patches +Patch1: %{name}-bitmaps.patch +Patch2: %{name}-bitmaps_xorg6.patch +Patch3: xlockmore-ttf_dir.patch +Patch4: xlockmore-ttf_dir_xorg6.patch +# end of X.org related patches +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +The xlock utility locks your X Window System session and runs a screen +saver until a password is entered. + + + +Authors: +-------- + David Albert Bagley + Patrick J. Naughton + +%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr" +%define _xorg7libs %_lib +%define _xorg7libs32 lib +%define _xorg7bin bin +%define _xorg7_mandir %_mandir +%define _xorg7pixmaps include +%define _xorg7libshare share +%define _xorg7_xkb /usr/share/X11/xkb +%define _xorg7_termcap /usr/lib/X11/etc +%define _xorg7_serverincl /usr/include/xorg +%define _xorg7_fonts /usr/share/fonts +%define _xorg7_prefix /usr +%else +%define _xorg7libs X11R6/%_lib +%define _xorg7libs32 X11R6/lib +%define _xorg7bin X11R6/bin +%define _xorg7_mandir /usr/X11R6/man +%define _xorg7pixmaps X11R6/include +%define _xorg7libshare X11R6/lib/ +%define _xorg7_xkb /etc/X11/xkb +%define _xorg7_termcap /usr/X11R6/lib/X11/etc +%define _xorg7_serverincl /usr/X11R6/lib/Server/include +%define _xorg7_fonts /usr/X11R6/lib/X11/fonts +%define _xorg7_prefix /usr/X11R6 +%endif +%prep +%setup -q +%patch +%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr" +%patch1 +%patch3 +%else +%patch2 +%patch4 +%endif + +%build +%{?suse_update_config:%{suse_update_config -f}} +aclocal +autoconf +export CPPFLAGS=-I/usr/include/FTGL +%ifarch %arm +# ICE workaround +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1" +%endif +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS" +./configure \ + --prefix=%{_xorg7_prefix} \ + --with-libraries=%{_libdir} \ + --without-motif \ + -without-gtk \ + -without-gtk2 \ + --with-passwd-helper=/sbin/unix2_chkpwd \ + --disable-bomb \ + --enable-vtlock \ + --disable-gtk \ + --enable-use-mb \ + --x-includes=%{_xorg7_prefix}/include \ + --x-libraries=%{_xorg7_prefix}/%_lib +make %{?jobs:-j%jobs} + +%install +install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d +install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/bitmaps/ +install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/ +install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7bin}/ +install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/app-defaults/ +install -d -m 755 $RPM_BUILD_ROOT%{_xorg7_mandir}/man1/ +install -d -m 755 $RPM_BUILD_ROOT/usr/%{_xorg7libs32}/xlock +install -m 644 bitmaps/*.xbm $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/bitmaps/ +install -m 644 pixmaps/*.xpm $RPM_BUILD_ROOT/usr/%{_xorg7pixmaps}/X11/pixmaps/ +install -m 755 xlock/xlock $RPM_BUILD_ROOT/usr/%{_xorg7libs32}/xlock/xlock +install -m 644 xlock/XLock.ad $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/app-defaults/XLock +install -m 644 xlock/xlock.man $RPM_BUILD_ROOT%{_xorg7_mandir}/man1/xlock.1x +install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/pam.d/xlock +%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr" +install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock +%else +install -m 755 %{S:3} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root) +%doc %{_xorg7_mandir}/man1/xlock.1x.gz +%doc README docs/cell_automata docs/Purify docs/Revisions docs/TODO +%config /etc/pam.d/xlock +%config /usr/%{_xorg7libshare}/X11/app-defaults/XLock +/usr/%{_xorg7bin}/xlock +/usr/%{_xorg7libs32}/xlock +/usr/%{_xorg7pixmaps}/X11/bitmaps/* +/usr/%{_xorg7pixmaps}/X11/pixmaps/* +%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr/X11R6" +%dir /usr/X11R6/include/X11/bitmaps +%dir /usr/X11R6/include/X11/pixmaps +%endif + +%changelog -n xlockmore +* Wed Nov 15 2006 - dmueller@suse.de +- build against freetype2, not freetype +* Mon Oct 23 2006 - sbrabec@suse.cz +- Updated to version 5.23: + * Bug fixes. + * Several new options. + * Memory leak fixes. +* Wed Sep 13 2006 - sbrabec@suse.cz +- Adjusted BuildRequires for ftgl. +* Tue Sep 05 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 09 2006 - sndirsch@suse.de +- fixed paths in xlock wrapper script +* Wed Aug 02 2006 - lmichnovic@suse.cz +- distinguishing prefix in X.org instead of suse_version +* Thu Jul 20 2006 - lmichnovic@suse.cz +- fixed build for new X.org 7.x +* Tue Jun 06 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 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Wed Jan 11 2006 - sbrabec@suse.cz +- Updated to version 5.21. +* Tue Nov 15 2005 - uli@suse.de +- build with -O1 on ARM (ICE workaround) +* Thu Aug 04 2005 - sbrabec@suse.cz +- Updated to version 5.18. +* Tue May 24 2005 - mcihar@suse.cz +- update to 5.17 +* Wed May 11 2005 - mcihar@suse.cz +- update to 5.16 +- dropped patch accepted by upstream +* Fri Mar 11 2005 - mcihar@suse.cz +- fix reading resources (bug #72191) +* Tue Mar 08 2005 - mcihar@suse.cz +- fix permissions +* Mon Feb 14 2005 - mcihar@suse.cz +- update to 5.15 +- more fontset support merged upstream +* Mon Dec 06 2004 - mcihar@suse.cz +- update to 5.14.1 +* Mon Nov 15 2004 - kukuk@suse.de +- Use common-* PAM config files +* Tue Sep 14 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 2004 - mcihar@suse.cz +- update to 5.13 +* Thu May 27 2004 - mcihar@suse.cz +- update to 5.12 +* Tue Apr 20 2004 - mcihar@suse.cz +- enabled VT locking +* Tue Feb 24 2004 - mcihar@suse.cz +- compile with -fno-strict-aliasing +- include more docs +* Sun Jan 11 2004 - adrian@suse.de +- build as user +* Wed Jan 07 2004 - schwab@suse.de +- Don't hardcode SIGCHLD value. +- Fix quoting. +* Wed Jan 07 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 2003 - mcihar@suse.cz +- update to 5.10 +* Wed Aug 06 2003 - mcihar@suse.cz +- updated to 5.09 +* Fri Jun 13 2003 - kukuk@suse.de +- fix filelist +* Wed Apr 30 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 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 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 07 2003 - kukuk@suse.de +- Use pam_unix2.so instead of pam_unix.so +* Tue Feb 04 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 2002 - ro@suse.de +- removed duplication of AC_CONFIG_HEADER(config.h) +* Thu Sep 19 2002 - pmladek@suse.cz +- previous change fixes the bugs #18790, #14329 and not the bug #18774 +* Tue Sep 03 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 2002 - pmladek@suse.cz +- used --with-libraries=%%{_libdir} to fix for lib64 +* Mon Aug 26 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 2002 - tcrhak@suse.cz +- fixed application default resources (XLock.*.bitmap); bug #13347 +* Tue Feb 12 2002 - cihlar@suse.cz +- removed sound support (it breaks Minimal+X11 selection) +* Tue Feb 12 2002 - cihlar@suse.cz +- removed xlock-mesa due to problems with mesa + screensavers [#12944] +* Tue Feb 05 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 08 2001 - ro@suse.de +- use mesa-devel-packages in neededforbuild +* Mon Oct 29 2001 - dan@suse.cz +- update to 5.02 version +* Fri Aug 24 2001 - schwab@suse.de +- Fix conflicting declaration. +* Tue Aug 14 2001 - ro@suse.de +- Don't use absolute paths to PAM modules in PAM config files +* Thu Aug 09 2001 - dan@suse.cz +- update to the latest stable (4.17.2) +* Mon Jun 25 2001 - pblaha@suse.cz +- remove mode cartoon due to a copyright problems +* Tue May 08 2001 - mfabian@suse.de +- bzip2 sources +* Thu Mar 15 2001 - ro@suse.de +- changed neededforbuild to +- changed neededforbuild to +* Wed Mar 07 2001 - ro@suse.de +- changed neededforbuild to +* Wed Feb 07 2001 - uli@suse.de +- fixed for glibc 2.2.1 +- removed cracklib, pam from neededforbuild +* Mon Jan 22 2001 - schwab@suse.de +- Fix conflicting declarations. +- Add %%suse_update_config. +* Thu Aug 17 2000 - smid@suse.cz +- format string security bug fixed +* Wed May 24 2000 - smid@suse.cz +- mesadev added to needeforbuild +* Tue Apr 18 2000 - smid@suse.cz +- buildroot added +- upgrade to 4.16 +* Thu Mar 23 2000 - ro@suse.de +- fixed to compile on both xf86 +* Fri Jan 07 2000 - kukuk@suse.de +- Update to 4.15 +* Sat Oct 16 1999 - kukuk@suse.de +- Build one version with and one without Mesa. +* Mon Sep 13 1999 - bs@suse.de +- ran old prepare_spec on spec file to switch to new prepare_spec. +* Thu Jul 01 1999 - kukuk@suse.de +- Link against Mesa +* Wed Jun 30 1999 - kukuk@suse.de +- Don't give egid away, it's needed for reading shadow +* Mon Jun 28 1999 - kukuk@suse.de +- update to 4.14 +* Tue Jun 08 1999 - kukuk@suse.de +- update 4.12 -> 4.13.1 +- Compile with PAM +* Tue Jan 12 1999 - uli@suse.de +- update 4.04 -> 4.12 +* Tue Oct 14 1997 - ro@suse.de +- updated file list + ready for autobuild +* Fri Oct 10 1997 - florian@suse.de +- update to version 4.04 +* Sun Jun 22 1997 - florian@suse.de +- update to version 4.02.1 +* Wed Apr 30 1997 - florian@suse.de +- make xlock sgid "shadow" and not suid "root" +* Sun Apr 27 1997 - bs@suse.de +- update to new version 4.02 (security fix) +* Sun Apr 13 1997 - florian@suse.de +- update to new version 4.01 +- do not enable automatic logout button +* Sun Feb 02 1997 - florian@suse.de +- update to new version 3.13 +* Thu Jan 02 1997 - florian@suse.de +- update from beta-version to official 3.12 +* Thu Jan 02 1997 - florian@suse.de +- update to newest version 3.12BETA due to security problems +* Thu Jan 02 1997 - florian@suse.de + update to new version 3.10