head 1.26; access; symbols pkgsrc-2021Q4:1.25.0.54 pkgsrc-2021Q4-base:1.25 pkgsrc-2021Q3:1.25.0.52 pkgsrc-2021Q3-base:1.25 pkgsrc-2021Q2:1.25.0.50 pkgsrc-2021Q2-base:1.25 pkgsrc-2021Q1:1.25.0.48 pkgsrc-2021Q1-base:1.25 pkgsrc-2020Q4:1.25.0.46 pkgsrc-2020Q4-base:1.25 pkgsrc-2020Q3:1.25.0.44 pkgsrc-2020Q3-base:1.25 pkgsrc-2020Q2:1.25.0.40 pkgsrc-2020Q2-base:1.25 pkgsrc-2020Q1:1.25.0.20 pkgsrc-2020Q1-base:1.25 pkgsrc-2019Q4:1.25.0.42 pkgsrc-2019Q4-base:1.25 pkgsrc-2019Q3:1.25.0.38 pkgsrc-2019Q3-base:1.25 pkgsrc-2019Q2:1.25.0.36 pkgsrc-2019Q2-base:1.25 pkgsrc-2019Q1:1.25.0.34 pkgsrc-2019Q1-base:1.25 pkgsrc-2018Q4:1.25.0.32 pkgsrc-2018Q4-base:1.25 pkgsrc-2018Q3:1.25.0.30 pkgsrc-2018Q3-base:1.25 pkgsrc-2018Q2:1.25.0.28 pkgsrc-2018Q2-base:1.25 pkgsrc-2018Q1:1.25.0.26 pkgsrc-2018Q1-base:1.25 pkgsrc-2017Q4:1.25.0.24 pkgsrc-2017Q4-base:1.25 pkgsrc-2017Q3:1.25.0.22 pkgsrc-2017Q3-base:1.25 pkgsrc-2017Q2:1.25.0.18 pkgsrc-2017Q2-base:1.25 pkgsrc-2017Q1:1.25.0.16 pkgsrc-2017Q1-base:1.25 pkgsrc-2016Q4:1.25.0.14 pkgsrc-2016Q4-base:1.25 pkgsrc-2016Q3:1.25.0.12 pkgsrc-2016Q3-base:1.25 pkgsrc-2016Q2:1.25.0.10 pkgsrc-2016Q2-base:1.25 pkgsrc-2016Q1:1.25.0.8 pkgsrc-2016Q1-base:1.25 pkgsrc-2015Q4:1.25.0.6 pkgsrc-2015Q4-base:1.25 pkgsrc-2015Q3:1.25.0.4 pkgsrc-2015Q3-base:1.25 pkgsrc-2015Q2:1.25.0.2 pkgsrc-2015Q2-base:1.25 pkgsrc-2015Q1:1.24.0.26 pkgsrc-2015Q1-base:1.24 pkgsrc-2014Q4:1.24.0.24 pkgsrc-2014Q4-base:1.24 pkgsrc-2014Q3:1.24.0.22 pkgsrc-2014Q3-base:1.24 pkgsrc-2014Q2:1.24.0.20 pkgsrc-2014Q2-base:1.24 pkgsrc-2014Q1:1.24.0.18 pkgsrc-2014Q1-base:1.24 pkgsrc-2013Q4:1.24.0.16 pkgsrc-2013Q4-base:1.24 pkgsrc-2013Q3:1.24.0.14 pkgsrc-2013Q3-base:1.24 pkgsrc-2013Q2:1.24.0.12 pkgsrc-2013Q2-base:1.24 pkgsrc-2013Q1:1.24.0.10 pkgsrc-2013Q1-base:1.24 pkgsrc-2012Q4:1.24.0.8 pkgsrc-2012Q4-base:1.24 pkgsrc-2012Q3:1.24.0.6 pkgsrc-2012Q3-base:1.24 pkgsrc-2012Q2:1.24.0.4 pkgsrc-2012Q2-base:1.24 pkgsrc-2012Q1:1.24.0.2 pkgsrc-2012Q1-base:1.24 pkgsrc-2011Q4:1.23.0.10 pkgsrc-2011Q4-base:1.23 pkgsrc-2011Q3:1.23.0.8 pkgsrc-2011Q3-base:1.23 pkgsrc-2011Q2:1.23.0.6 pkgsrc-2011Q2-base:1.23 pkgsrc-2011Q1:1.23.0.4 pkgsrc-2011Q1-base:1.23 pkgsrc-2010Q4:1.23.0.2 pkgsrc-2010Q4-base:1.23 pkgsrc-2010Q3:1.22.0.8 pkgsrc-2010Q3-base:1.22 pkgsrc-2010Q2:1.22.0.6 pkgsrc-2010Q2-base:1.22 pkgsrc-2010Q1:1.22.0.4 pkgsrc-2010Q1-base:1.22 pkgsrc-2009Q4:1.22.0.2 pkgsrc-2009Q4-base:1.22 pkgsrc-2009Q3:1.21.0.2 pkgsrc-2009Q3-base:1.21 pkgsrc-2009Q2:1.20.0.6 pkgsrc-2009Q2-base:1.20 pkgsrc-2009Q1:1.20.0.4 pkgsrc-2009Q1-base:1.20 pkgsrc-2008Q4:1.20.0.2 pkgsrc-2008Q4-base:1.20 pkgsrc-2008Q3:1.19.0.30 pkgsrc-2008Q3-base:1.19 cube-native-xorg:1.19.0.28 cube-native-xorg-base:1.19 pkgsrc-2008Q2:1.19.0.26 pkgsrc-2008Q2-base:1.19 cwrapper:1.19.0.24 pkgsrc-2008Q1:1.19.0.22 pkgsrc-2008Q1-base:1.19 pkgsrc-2007Q4:1.19.0.20 pkgsrc-2007Q4-base:1.19 pkgsrc-2007Q3:1.19.0.18 pkgsrc-2007Q3-base:1.19 pkgsrc-2007Q2:1.19.0.16 pkgsrc-2007Q2-base:1.19 pkgsrc-2007Q1:1.19.0.14 pkgsrc-2007Q1-base:1.19 pkgsrc-2006Q4:1.19.0.12 pkgsrc-2006Q4-base:1.19 pkgsrc-2006Q3:1.19.0.10 pkgsrc-2006Q3-base:1.19 pkgsrc-2006Q2:1.19.0.8 pkgsrc-2006Q2-base:1.19 pkgsrc-2006Q1:1.19.0.6 pkgsrc-2006Q1-base:1.19 pkgsrc-2005Q4:1.19.0.4 pkgsrc-2005Q4-base:1.19 pkgsrc-2005Q3:1.19.0.2 pkgsrc-2005Q3-base:1.19 pkgsrc-2005Q2:1.18.0.2 pkgsrc-2005Q2-base:1.18 pkgsrc-2005Q1:1.17.0.4 pkgsrc-2005Q1-base:1.17 pkgsrc-2004Q4:1.17.0.2 pkgsrc-2004Q4-base:1.17 pkgsrc-2004Q3:1.16.0.8 pkgsrc-2004Q3-base:1.16 pkgsrc-2004Q2:1.16.0.6 pkgsrc-2004Q2-base:1.16 pkgsrc-2004Q1:1.16.0.4 pkgsrc-2004Q1-base:1.16 pkgsrc-2003Q4:1.16.0.2 pkgsrc-2003Q4-base:1.16 netbsd-1-6-1:1.15.0.6 netbsd-1-6-1-base:1.15 netbsd-1-6:1.15.0.8 netbsd-1-6-RELEASE-base:1.15 pkgviews:1.15.0.4 pkgviews-base:1.15 buildlink2-base:1.15 buildlink2:1.15.0.2 netbsd-1-5-PATCH001:1.11 netbsd-1-5-RELEASE:1.9 netbsd-1-4-PATCH003:1.9 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.4 netbsd-1-4-RELEASE:1.4 FreeBSD-current-1997-11-01:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.26 date 2022.01.24.18.05.58; author micha; state dead; branches; next 1.25; commitid QsUEN9ztebcRKUpD; 1.25 date 2015.04.15.07.31.15; author spz; state Exp; branches; next 1.24; commitid E64oVS4cwnttPEhy; 1.24 date 2012.02.13.11.46.13; author drochner; state Exp; branches 1.24.26.1; next 1.23; 1.23 date 2010.12.08.12.54.32; author obache; state Exp; branches; next 1.22; 1.22 date 2009.10.15.21.24.26; author dsainty; state Exp; branches; next 1.21; 1.21 date 2009.09.30.14.59.06; author tnn; state Exp; branches; next 1.20; 1.20 date 2008.10.06.22.40.12; author hubertf; state Exp; branches; next 1.19; 1.19 date 2005.09.18.19.16.49; author minskim; state Exp; branches; next 1.18; 1.18 date 2005.06.07.23.35.16; author hubertf; state Exp; branches; next 1.17; 1.17 date 2004.11.27.00.15.22; author hubertf; state Exp; branches; next 1.16; 1.16 date 2003.06.30.07.45.50; author jlam; state Exp; branches; next 1.15; 1.15 date 2002.05.20.19.15.08; author cjep; state Exp; branches 1.15.2.1; next 1.14; 1.14 date 2002.05.16.22.19.55; author jschauma; state Exp; branches; next 1.13; 1.13 date 2001.10.10.02.41.16; author hubertf; state dead; branches; next 1.12; 1.12 date 2001.05.29.00.55.35; author hubertf; state Exp; branches; next 1.11; 1.11 date 2000.12.15.22.32.17; author hubertf; state Exp; branches; next 1.10; 1.10 date 2000.11.09.04.46.22; author hubertf; state Exp; branches; next 1.9; 1.9 date 2000.08.21.20.31.51; author hubertf; state Exp; branches; next 1.8; 1.8 date 2000.08.16.16.39.18; author tron; state Exp; branches; next 1.7; 1.7 date 2000.08.15.03.54.17; author hubertf; state Exp; branches; next 1.6; 1.6 date 2000.05.11.16.37.53; author hubertf; state Exp; branches; next 1.5; 1.5 date 2000.02.05.16.13.41; author wiz; state Exp; branches; next 1.4; 1.4 date 99.03.09.02.09.29; author hubertf; state Exp; branches; next 1.3; 1.3 date 99.01.04.23.30.35; author frueauf; state Exp; branches; next 1.2; 1.2 date 97.11.24.20.22.33; author explorer; state dead; branches; next 1.1; 1.1 date 97.11.03.00.50.26; author hubertf; state Exp; branches 1.1.1.1; next ; 1.24.26.1 date 2015.04.29.20.49.54; author tron; state Exp; branches; next ; commitid 8AOFTSI4OLnkOwjy; 1.15.2.1 date 2002.05.20.19.15.08; author jlam; state dead; branches; next 1.15.2.2; 1.15.2.2 date 2002.06.23.19.07.20; author jlam; state Exp; branches; next ; 1.1.1.1 date 97.11.03.00.50.26; author hubertf; state Exp; branches; next ; desc @@ 1.26 log @x11/xlockmore: Update to 5.68 This update should fix CVE-2006-0061 if option "pam" is disabled. OK from wiz@@. 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). 5.67 Fixing specified bound equals destination size warning in iostuff.c. Port updated for xscreensaver-6.01. With help from EoflaOE ViceCity. Also removed some warnings. maze3d.c updated for VMS as CRTL now contains more standard functions, thanks to Jouk Jansen. 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 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. 5.64 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. 5.63 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. 5.62 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. 5.61 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. 5.60 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. 5.59 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. 5.58 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. 5.57 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. 5.56 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. 5.55 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. 5.54 Thanks to Dave Odell, dmo2118 AT gmail.com for his strange mode updates to include aligned_malloc.[ch], thread_util.[ch], xshm.[ch], and visual_pixmap_depth() from XScreenSaver. Also updates for building macOS and Debian for crypt. Made safe for VMS by Jouk Jansen. juggle fixed for multiscreens. 5.53 Goofed on last VMS xmlock update. dclock fix for led bounce. :) Added to windows port but only graphical part. Windows port fixed petri black screen. Added anemone and deluxe but turned off double buffering to get default black screen. 5.52 Install changes for fortune. VMS xmlock build update. Thanks to Dave Odell, dmo2118 AT gmail.com for his strange mode updates. New options -points N and -curve N . Also now working for windows port (which led to bubble and ifs porting easily). 5.51 life3d updates including a distinct 18 neighborhood using rhombic dodecahedrons (neighoborhood -18 as there is already 18 neighborhood), and a 22 neighborhood using tetrahedrons, i.e. the tetrahedral part of alternated cubic honeycomb Less compile warnings and configure update. 5.50 -messagefont was broken if USE_MB set (default from 5.42). E.g.: -mode dclock -messagefont "-*-times-*-*-*-*-18-*-*-*-*-*-*-*" Changed default message font to above. Should now compile with less warnings. spiral erase mode changed from 100 iterations to 8. @ text @$NetBSD: patch-ab,v 1.25 2015/04/15 07:31:15 spz Exp $ --- configure.orig 2015-03-03 01:05:29.000000000 +0000 +++ configure @@@@ -9508,10 +9508,10 @@@@ $as_echo "#define LESS_THAN_AIX3_2 1" >> dirname=`which gcc` dirname=`dirname $dirname` dirname=`dirname $dirname`/lib - if test "$dirname" != "/lib"; then - XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" - XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" - fi +# if test "$dirname" != "/lib"; then +# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" +# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" +# fi fi XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}" XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}" @@@@ -9566,6 +9566,8 @@@@ _ACEOF if test "x$ac_cv_header_elf_h" = xyes; then : $as_echo "#define HAVE_SHADOW 1" >>confdefs.h +XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}" +XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}" fi @@@@ -9673,10 +9675,10 @@@@ $as_echo "#define SVR4 1" >>confdefs.h dirname=`which gcc` dirname=`dirname $dirname` dirname=`dirname $dirname`/lib - if test "$dirname" != "/lib"; then - XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" - XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" - fi +# if test "$dirname" != "/lib"; then +# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" +# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" +# fi fi XLOCKLDFLAGS="-R${XLOCK_LDFLAGS}" XMLOCKLDFLAGS="-R${XMLOCK_LDFLAGS}" @ 1.25 log @Update of xlockmore and xlockmore-lite to the latest version. Upstream changelog: xlockmore-5.46 as of 10 March 2015, the maintained version of xlock 5.46 xmb fonts messing up password screen since ascent was not being set correctly. Also fixed xjack mode. Updated language use in xlock.c, now removed to .h files. If I made some bad assumption about the language... let me know. BSD install fixes (DESTDIR, FreeType2, fortune) and switching to xz. Cygwin install fixes (cygport, xlockrc). 5.45 A bad value of fnt for pyro2 could cause to give an X error. Fixed to not free memory we are using and have a better default. 5.44 Fix for make_one_sided_pentomino was using 18 as basis for 2 sided pentominoes in loop. Found out about it by gcc 4.8.1 warning: iteration 12u invokes undefined behavior [-Waggressive-loop-optimizations]. dilemma, voters, wator size fix for neighbors = 6. Proper crediting of Nathan Thompson for discovering High Life part of life mode. A few new gliders and patterns for life and life3d. Updated win32 to use updated cygwin. Currently links are only satisfied using cygwin using 32-bit installation. For me, cross compiling using 64-bit gave undefined references in visgl.c and xlock.c. magick.c update for version 7, thanks to Jouk Jansen. 5.43 life3d: added new rule B58S58, which has a replicator. -e added to shell in Makefile.in, told it should now stop on build errors, rather than trying to continue which could be confusing. Thanks to Glyn Kennington . If crypt fails (which is possible with glibc2.17) it could cause xlock to get a signal 11. There is now protection around the strcmp() to prevent NULL poiter dereferences thanks to Mancha . 5.42 USE_MB now defined by default. If this is not defined it can only correctly display ASCII. There could be font issues which may lead one to want only ASCII (if so use configure --disable_mb). Also looked into Xutf8 but did not see any benefit this had over Xmb. Password window and the following modes: bomb,dclock,image,marquee,nose are affected. Fixed a few problems with marquee for width, height, and if a character needs more than 2 bytes. In Cygwin a seemingly unrelated fix where USE_MB gets defined in xlock.h. An #undef was added in xlock.h, if USE_MB gets defined in an internal include file. -lcrypt added to modes/Makefile.in. This is needed on my Linux Ubuntu and seems ok on Cygwin where it was not needed. (If this causes a problem remove from modes/Makefile). Also tested on FreeBSD. cppcheck fixes passwd.c: passcpy could be freed twice iostuff.c: could have left file open ras.c: leak if mem fails resource.c: check if malloc succeeded was in wrong spot sound.c: ESound, a redundant check memcheck.c: continuing after memory failure dclock: problem with parens in ifdefs rain: leak fix ( :) ) t3d: uninitialized time1 (unlikely but fixed anyway) molecule: leak if mem fails text3d: leak if nothing to draw @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.24 2012/02/13 11:46:13 drochner Exp $ @ 1.24 log @-update to 5.38 changes: minor fixes and feature additions (most notably: Added -mayan option to dclock to count down to end of world (2012 December 21)) pkgsrc changes: removed dependency on esound, added one on ImageMagick -added patch from Stefan Schaeckeler to fix dynamic linker search path on Linux (PR pkg/45993) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2011-11-10 16:08:45.000000000 +0000 d5 1 a5 1 @@@@ -9434,10 +9434,10 @@@@ case "${canonical}" in d20 1 a20 2 @@@@ -9486,6 +9486,8 @@@@ _ACEOF ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" d22 4 a25 3 $as_echo "#define HAVE_SHADOW 1" >>confdefs.h + XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}" + XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}" d29 1 a29 1 @@@@ -9581,10 +9583,10 @@@@ $as_echo "no" >&6; } @ 1.24.26.1 log @Pullup ticket #4697 - requested by spz x11/xlockmore: security update x11/xlockmore-lite: security update Revisions pulled up: - x11/xlockmore-lite/Makefile 1.21 - x11/xlockmore/Makefile 1.119 - x11/xlockmore/Makefile.common 1.73 - x11/xlockmore/distinfo 1.53 - x11/xlockmore/patches/patch-aa 1.7 - x11/xlockmore/patches/patch-ab 1.25 - x11/xlockmore/patches/patch-ac 1.13 - x11/xlockmore/patches/patch-ad 1.9 - x11/xlockmore/patches/patch-ae 1.8 - x11/xlockmore/patches/patch-config.cygport 1.1 --- Module Name: pkgsrc Committed By: spz Date: Wed Apr 15 07:31:15 UTC 2015 Modified Files: pkgsrc/x11/xlockmore: Makefile Makefile.common distinfo pkgsrc/x11/xlockmore-lite: Makefile pkgsrc/x11/xlockmore/patches: patch-aa patch-ab patch-ac patch-ad patch-ae Added Files: pkgsrc/x11/xlockmore/patches: patch-config.cygport Log Message: Update of xlockmore and xlockmore-lite to the latest version. Upstream changelog: xlockmore-5.46 as of 10 March 2015, the maintained version of xlock 5.46 xmb fonts messing up password screen since ascent was not being set correctly. Also fixed xjack mode. Updated language use in xlock.c, now removed to .h files. If I made some bad assumption about the language... let me know. BSD install fixes (DESTDIR, FreeType2, fortune) and switching to xz. Cygwin install fixes (cygport, xlockrc). 5.45 A bad value of fnt for pyro2 could cause to give an X error. Fixed to not free memory we are using and have a better default. 5.44 Fix for make_one_sided_pentomino was using 18 as basis for 2 sided pentominoes in loop. Found out about it by gcc 4.8.1 warning: iteration 12u invokes undefined behavior [-Waggressive-loop-optimizations]. dilemma, voters, wator size fix for neighbors = 6. Proper crediting of Nathan Thompson for discovering High Life part of life mode. A few new gliders and patterns for life and life3d. Updated win32 to use updated cygwin. Currently links are only satisfied using cygwin using 32-bit installation. For me, cross compiling using 64-bit gave undefined references in visgl.c and xlock.c. magick.c update for version 7, thanks to Jouk Jansen. 5.43 life3d: added new rule B58S58, which has a replicator. -e added to shell in Makefile.in, told it should now stop on build errors, rather than trying to continue which could be confusing. Thanks to Glyn Kennington . If crypt fails (which is possible with glibc2.17) it could cause xlock to get a signal 11. There is now protection around the strcmp() to prevent NULL poiter dereferences thanks to Mancha . 5.42 USE_MB now defined by default. If this is not defined it can only correctly display ASCII. There could be font issues which may lead one to want only ASCII (if so use configure --disable_mb). Also looked into Xutf8 but did not see any benefit this had over Xmb. Password window and the following modes: bomb,dclock,image,marquee,nose are affected. Fixed a few problems with marquee for width, height, and if a character needs more than 2 bytes. In Cygwin a seemingly unrelated fix where USE_MB gets defined in xlock.h. An #undef was added in xlock.h, if USE_MB gets defined in an internal include file. -lcrypt added to modes/Makefile.in. This is needed on my Linux Ubuntu and seems ok on Cygwin where it was not needed. (If this causes a problem remove from modes/Makefile). Also tested on FreeBSD. cppcheck fixes passwd.c: passcpy could be freed twice iostuff.c: could have left file open ras.c: leak if mem fails resource.c: check if malloc succeeded was in wrong spot sound.c: ESound, a redundant check memcheck.c: continuing after memory failure dclock: problem with parens in ifdefs rain: leak fix ( :) ) t3d: uninitialized time1 (unlikely but fixed anyway) molecule: leak if mem fails text3d: leak if nothing to draw @ text @d3 1 a3 1 --- configure.orig 2015-03-03 01:05:29.000000000 +0000 d5 1 a5 1 @@@@ -9508,10 +9508,10 @@@@ $as_echo "#define LESS_THAN_AIX3_2 1" >> d20 2 a21 1 @@@@ -9566,6 +9566,8 @@@@ _ACEOF d23 3 a25 4 $as_echo "#define HAVE_SHADOW 1" >>confdefs.h +XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}" +XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}" d29 1 a29 1 @@@@ -9673,10 +9675,10 @@@@ $as_echo "#define SVR4 1" >>confdefs.h @ 1.23 log @* exactly disable TTF detection. * tell Mesa, XPM, Xinerama and XDPMS manually instead of fancy configure. Then those features are enabled with native X. Those changes should resolve PR#40662. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.22 2009/10/15 21:24:26 dsainty Exp $ d3 1 a3 1 --- configure.orig 2008-08-29 01:55:43.000000000 +0200 d5 1 a5 1 @@@@ -10532,10 +10399,10 @@@@ _ACEOF d20 10 a29 1 @@@@ -10833,10 +10700,10 @@@@ _ACEOF @ 1.22 log @Fix execution of 'configure' under shells that dislike if-fi with no intermediate block (Linux here, but probably Solaris too). Whilst here, remove a cosmetic patch hunk. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.21 2009/09/30 14:59:06 tnn Exp $ a4 149 @@@@ -6763,139 +6763,6 @@@@ EOF cd .. rm -fr conftestdir fi - # Look for the directory under a standard set of common directories. - # Check X11 before X11Rn because it's often a symlink to the current release. - for ac_dir in \ - /lib/X11/app-defaults \ - /lib/app-defaults \ - /lib/X11R6.5.1/app-defaults \ - /lib/X11R6.5.1/X11/app-defaults \ - /lib/X11R6.4/app-defaults \ - /lib/X11R6.4/X11/app-defaults \ - /lib/X11R6.3/app-defaults \ - /lib/X11R6.3/X11/app-defaults \ - /lib/X11R6.2/app-defaults \ - /lib/X11R6.2/X11/app-defaults \ - /lib/X11R6.1/app-defaults \ - /lib/X11R6.1/X11/app-defaults \ - /lib/X11R6/app-defaults \ - /lib/X11R6/X11/app-defaults \ - /lib/X11R5/app-defaults \ - /lib/X11R5/X11/app-defaults \ - /lib/X11R4/app-defaults \ - /lib/X11R4/X11/app-defaults \ - ; \ - do - found="" - if test -d "${prefix}$ac_dir"; then - ac_x_app_defaults=\\\$\\\{prefix\\\}$ac_dir - found="1" - break - fi - done - if test -z "$found"; then - for ac_dir in \ - /usr/X11/lib/app-defaults \ - /lib/X11R6.5.1/lib/app-defaults \ - /lib/X11R6.5.1/lib/X11/app-defaults \ - /lib/X11R6.4/lib/app-defaults \ - /lib/X11R6.4/lib/X11/app-defaults \ - /usr/X11R6.3/lib/app-defaults \ - /usr/X11R6.3/lib/X11/app-defaults \ - /usr/X11R6.2/lib/app-defaults \ - /usr/X11R6.2/lib/X11/app-defaults \ - /usr/X11R6.1/lib/app-defaults \ - /usr/X11R6.1/lib/X11/app-defaults \ - /usr/X11R6/lib/app-defaults \ - /usr/X11R6/lib/X11/app-defaults \ - /usr/X11R5/lib/app-defaults \ - /usr/X11R5/lib/X11/app-defaults \ - /usr/X11R4/lib/app-defaults \ - /usr/X11R4/lib/X11/app-defaults \ - \ - /usr/lib/X11/app-defaults \ - /usr/lib/X11R6.5.1/app-defaults \ - /usr/lib/X11R6.4/app-defaults \ - /usr/lib/X11R6.3/app-defaults \ - /usr/lib/X11R6.2/app-defaults \ - /usr/lib/X11R6.1/app-defaults \ - /usr/lib/X11R6/app-defaults \ - /usr/lib/X11R5/app-defaults \ - /usr/lib/X11R4/app-defaults \ - \ - /usr/local/X11/lib/app-defaults \ - /usr/remote/X11/lib/app-defaults \ - /usr/local/X11R6.5.1/lib/app-defaults \ - /usr/local/X11R6.5.1/lib/X11/app-defaults \ - /usr/local/X11R6.4/lib/app-defaults \ - /usr/local/X11R6.4/lib/X11/app-defaults \ - /usr/local/X11R6.3/lib/app-defaults \ - /usr/local/X11R6.3/lib/X11/app-defaults \ - /usr/local/X11R6.2/lib/app-defaults \ - /usr/local/X11R6.2/lib/X11/app-defaults \ - /usr/local/X11R6.1/lib/app-defaults \ - /usr/local/X11R6.1/lib/X11/app-defaults \ - /usr/local/X11R6/lib/app-defaults \ - /usr/local/X11R6/lib/X11/app-defaults \ - /usr/local/X11R5/lib/app-defaults \ - /usr/local/X11R5/lib/X11/app-defaults \ - /usr/local/X11R4/lib/app-defaults \ - /usr/local/X11R4/lib/X11/app-defaults \ - \ - /usr/local/lib/X11/app-defaults \ - /usr/remote/lib/X11/app-defaults \ - /usr/local/lib/X11R6.5.1/app-defaults \ - /usr/local/lib/X11R6.5.1/X11/app-defaults \ - /usr/local/lib/X11R6.4/app-defaults \ - /usr/local/lib/X11R6.4/X11/app-defaults \ - /usr/local/lib/X11R6.3/app-defaults \ - /usr/local/lib/X11R6.3/X11/app-defaults \ - /usr/local/lib/X11R6.2/app-defaults \ - /usr/local/lib/X11R6.2/X11/app-defaults \ - /usr/local/lib/X11R6.1/app-defaults \ - /usr/local/lib/X11R6.1/X11/app-defaults \ - /usr/local/lib/X11R6/app-defaults \ - /usr/local/lib/X11R6/X11/app-defaults \ - /usr/local/lib/X11R5/app-defaults \ - /usr/local/lib/X11R5/X11/app-defaults \ - /usr/local/lib/X11R4/app-defaults \ - /usr/local/lib/X11R4/X11/app-defaults \ - \ - /usr/X386/lib/X11/app-defaults \ - /usr/x386/lib/X11/app-defaults \ - /usr/XFree86/lib/X11/app-defaults \ - /usr/pkg/lib/app-defaults \ - \ - /usr/lib/X11/app-defaults \ - /usr/unsupported/lib/X11/app-defaults \ - /usr/athena/lib/X11/app-defaults \ - /usr/local/x11r5/lib/X11/app-defaults \ - /usr/lpp/Xamples/lib/X11/app-defaults \ - /lib/usr/lib/X11/app-defaults \ - /usr/local/lib/app-defaults \ - /usr/remote/lib/app-defaults \ - \ - /usr/openwin/lib/app-defaults \ - /usr/openwin/lib/X11/app-defaults \ - /usr/openwin/share/lib/app-defaults \ - /usr/openwin/share/lib/X11/app-defaults \ - \ - /X11R6.5.1/lib/app-defaults \ - /X11R6.4/lib/app-defaults \ - /X11R6.3/lib/app-defaults \ - /X11R6.2/lib/app-defaults \ - /X11R6.1/lib/app-defaults \ - /X11R6/lib/app-defaults \ - /X11R5/lib/app-defaults \ - /X11R4/lib/app-defaults \ - ; \ - do - if test -d "$ac_dir"; then - ac_x_app_defaults=$ac_dir - break - fi - done - fi if test x"$ac_x_app_defaults" = x; then ac_cv_x_app_defaults="/usr/lib/X11/app-defaults" @@@@ -8838,7 +8705,7 @@@@ else #define USE_GL 1 _ACEOF - XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU" + XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU" test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries case "${canonical}" in @ 1.21 log @don't leak WRKDIR into run path. Bump revision. @ text @d1 1 a1 1 $NetBSD$ a4 9 @@@@ -6754,7 +6754,7 @@@@ else # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat > Imakefile <<'EOF' acfindx: - @@echo 'ac_x_app_defaults="${XAPPLOADDIR}"' + @@echo 'ac_x_app_defaults="${XAPPLOADDIR}"' EOF if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which'd confuse us. d154 2 a155 1 @@@@ -10533,8 +10400,8 @@@@ _ACEOF d158 1 a158 1 if test "$dirname" != "/lib"; then d161 5 a165 3 +# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" +# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" fi d168 3 a170 1 @@@@ -10834,8 +10701,8 @@@@ _ACEOF d173 1 a173 1 if test "$dirname" != "/lib"; then d176 5 a180 3 +# XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname" +# XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname" fi d183 1 @ 1.20 log @Update x11/xlockmore to 5.27. Changes: PAM_putText() would set pointer resp->resp to buffer. This will work until memory is reused. Thanks to Howard Kash . ico updated to show the two edge transitive Catalan solids, i.e. the rhombic dodecahedron and the rhombic triacontahedron. Added __linux__ to define list to allow newer sig masking to get rid of pesky deprecated message. configure checks for libXdpms libXext has the DPMS functionality on both XFree86 4 and X.org. (libXdpms may be Xfree86 3.x). Added /usr/pkg/lib and /usr/pkg/include to long list of paths it checks in. life added more life forms triangular life from Bays' paper and added S245B3 with glider (-neighbors 8) from Bays' paper. Found some patterns in S245B3 for the glider to crash into. life3d -rule S45/B4 -neighbors 18 and -rule S45/B4 -neighbors 20 from Bays' paper. Found some patterns for the gliders to crash into. life3d -search added. Need to add more symmetries for 3D. life3d -rule S3/B3 -neighbors 12 and -rule S456/B3 -neighbors 12. Added a bunch of patterns from Bays' papers but not all. -neighbors 12 now a rhombic dodecahedron instead of a cube. ant3d -neighbors 12 (3d bees). Added eyes option to this. Just noticed solitaire a mode I added was spelled wrong, ie it was spelled without the second "i". Fixed a goof in solitaire.cc. @ text @d163 22 @ 1.19 log @Make sure that configure finds the correct app-defaults directory. @ text @d3 1 a3 1 --- configure.orig 2005-07-24 08:22:34.000000000 -0700 d5 1 a5 1 @@@@ -6299,7 +6299,7 @@@@ else d14 1 a14 1 @@@@ -6308,138 +6308,6 @@@@ EOF d119 1 d154 1 a154 1 @@@@ -8364,7 +8232,7 @@@@ else @ 1.18 log @Update xlockmore to 5.18. Changes: toneclock coredump fix for 5.17 version thanks to Jouk Jansen. Invalid mode added. :) lock the screen if an invalid mode is specified "xlock -mode tom" like "xlock -modelist bug,tom" errno fix in passwd.c for DragonFly thanks to Joerg Sonnenberger . PAM fixes for when 1. TTY is not set to DISPLAY xlock can fail, 2. Tidy fixes for PAM_BAIL. Thanks to George D M Ross . Notes from Marcelo Vianna on morph3d added as comments to morph3d.c. @ text @d3 1 a3 1 --- configure.orig 2005-02-16 21:19:14.000000000 +0100 d5 149 a153 1 @@@@ -7856,7 +7856,7 @@@@ else @ 1.17 log @Update xlockmore and xlockmore-lite to 5.14.1. Changes: 5.14.1 Fixed PAM goof. 5.14 fadeplot,laser: do not clear so much with erase modes (void *) for (caddr_t *) in argtype to get rid of most gcc warnings. g++ cleanups for xglock, xmlock, flow, life, marqee, apollonian, pacman configure cleanups. Goof for random placement of labeling for life and life3d i.e. the S could burn in on those old monitors. flow mode improvements added thanks to Tim Auckland Replace 2D rendering of Periodic Attractors with a 3D 'interrupted' rendering. Replace "-/+allow2d" with "-/+periodic" Replace all ODE formulae with completely generic forms. Add '-search' option to perform background high-speed discovery for completely new attractors without impacting rendering performance. Use gaussian distribution for initial point positions and for parameter search. Add "+dbuf" option to allow Double-Buffering to be turned off on slow X servers. Remove redundant '-zoom' option. Now automatically zooms if both rotation and riding are permitted. Replace dynamic bounding box with static one pre-calculated during discovery phase. Simplify and fix bounding box clipping code. Should now be safe to run without double buffer on all XFree86 servers if desired. Sync'd up with xscreensaver version Orbital camera (-/+rotate) specify following bee (-/+ride) zoom between bee and orbit (-/+zoom) Bounding Box (-/+box) disable 2D Poincare' section flows (-/+allow2d). Also added basic double-buffering to avoid XFree86 'debris' problems when lines go out of bounds. A few more fixes from Eric Lassauge . gtk2/gtk detection in configure, automatically does a make for xglock xglock now uses GTK2 genlauncher fix for noof (used by xglock). life1d repeating patterns have a better chance of being caught. compile dependencies for ImageMagick for VMS thanks to Jouk Jansen. NICE_ONLY build option added. --enable-nice-only or --enable-blank-only nice modes also reevaluated thanks to Tom Schmidt. config.sub and config.guess updated from GNU. Changed PAM to USE_PAM to be consistent with imake. loop is more random when run as a single mode. -langton option added if one just wants Langton's Loops. atunnels resync with xsreensaver for new textures thanks to Eric Lassauge . @ text @d3 1 a3 1 --- configure.orig 2004-11-05 03:44:37.000000000 +0100 d5 1 a5 1 @@@@ -8364,7 +8364,7 @@@@ else @ 1.16 log @Update x11/xlockmore to 5.08.2. Changes from 5.08.1 include fixing the maze module for large resolutions (2560x1024) as is possible for dual-headed configurations. @ text @d3 1 a3 1 --- configure.orig Mon Mar 10 07:25:26 2003 d5 1 a5 1 @@@@ -7427,7 +7427,7 @@@@ else @ 1.15 log @Add NetBSD tag. @ text @d2 4 a5 3 --- configure.orig Thu May 16 17:35:54 2002 +++ configure Thu May 16 17:37:02 2002 @@@@ -7092,7 +7092,7 @@@@ @ 1.15.2.1 log @file patch-ab was added on branch buildlink2 on 2002-06-23 19:07:20 +0000 @ text @d1 12 @ 1.15.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 12 $NetBSD: patch-ab,v 1.15.2.1 2002/06/23 19:07:20 jlam Exp $ --- configure.orig Thu May 16 17:35:54 2002 +++ configure Thu May 16 17:37:02 2002 @@@@ -7092,7 +7092,7 @@@@ #define USE_GL 1 _ACEOF - XLOCKLIBS="${XLOCKLIBS} -lMesaGL -lMesaGLU" + XLOCKLIBS="${XLOCKLIBS} -lGL -lGLU" test "x$mesa_includes" = xNONE && mesa_includes=$ac_mesa_includes test "x$mesa_libraries" = xNONE && mesa_libraries=$ac_mesa_libraries case "${canonical}" in @ 1.14 log @Update to 5.04. Move patch-ac to patch-ab. New since last BETA2: + pacman AI update with trackmouse thanks to Edwin de Jong + C++ fixes, memcpy prefered over bcopy, random start. New since last BETA: * Changed delay on several GL modes. They were too fast on my GeForce4. * bounce drawing errors fixed on my nVidia fixed ant: fudged the truchet lines a bit more for squares and hexagons. molecule needs to be protected from pipes by a "glDrawBuffer(GL_BACK);" thanks to Jouk Jansen. molecule needs to be protected from pipes by a "glDrawBuffer(GL_BACK);" thanks to Jouk Jansen. Patch from Marcelo Vianna to get his modes (cage,moebius,morph3d,rubik) working on NVidia under XFree (NVidia has a policy to not release code open source and the bug crashes the system requiring a hard reset). Since skewb is similar that was done as well by maintainer. configure changes for 2.53, added option for .ad installation dir, check for xlockrc and pam. flag debugged for xpm, do not set byte order for ZPixmap. Flag ripples now flow left to right and from bottom to top. Combined XLock-jp.ad into XLock.ad fontset to use regular (not bold/italic) font/fontset as default, fix for sound.c using DEF_PLAY, and a fix for customName thanks to Shingo Yamaguchi . nice changes were causing problems, set_priority used instead thanks to Felicia Neff . (VMS still uses nice). noof mode added from GLUT demos thanks to Dave Riesz . USE_XPM changed to HAVE_XPM to be compatible with xscreensaver. @ text @d1 1 @ 1.13 log @Update xlockmore to 5.02. Changes: fire update for wandering and sball update, thanks to Eric Lassauge . text3d fix on a fix when a symbol.ttf or wingding.ttf is used (double free). Thanks to Tom Schmidt. apollonian mode thanks to a program by Allan R. Wilks . -1,2,2,3 are numbers that represent curvature (1 / radius) in Euclidean space. (-1,1,1,2 is in spherical space and -1,1,1,1 is in hyperbolic). Hyperbolic and spherical numbers now added for all but double bounded. Automatic generation of numbers with -count. Enforce a upper bound of outer circle at 99, since run time goes up polynomially by at least n^3. qix updated with -solid, got the idea from xscreensaver New "tetris -well", now uses generated images, also cleaned up some bugs too. Bug fix thanks to Tom Schmidt. gears added -size but defaults to 0, only -planetary will use up lots of CPU so added a -planetsize 400 which takes over if -size is 0 (full screen if both are 0). @ text @d1 11 a11 14 $NetBSD: patch-ab,v 1.12 2001/05/29 00:55:35 hubertf Exp $ --- xlock/xlock.c.orig Thu Apr 26 22:02:42 2001 +++ xlock/xlock.c @@@@ -614,7 +614,9 @@@@ #endif #else /* XFree86 < 4.x */ #include +#ifndef __NetBSD__ extern unsigned char DPMSQueryExtension(Display *, int *, int *); +#endif extern int DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *); extern int DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short); #endif @ 1.12 log @Updated xlockmore to 5.01.2. Changes: 5.01.2 dclock broken in 5.01.1 thanks to for Stephen Montgomery-Smith pointing it out. (5.01 dclock.c put back). 5.01.1 Missed a patch to config.h.in for Red Hat 7.1... thanks again to Tim Aukland . + New "tetris -well", now uses generated images, also cleaned up some + bugs too. Bug fix thanks to Tom Schmidt. New molecule to solve a random SEGV on Sun thanks to Tom Schmidt (it still crashes on my Sun with OpenGL but I think its an isolated case). Also cleaned up a few mistakes in the menus and resource file. OSF1_ENH_SEC passwd updated to handle passwords with more than eight characters using dispcrypt, thanks to Steve VanDevender . molecule fix in sscanf thanks to Jouk Jansen. scooter updated thanks to Sven Thoennissen . + Got rid of of some -Wall, lint, and C++ warnings (mostly the new 5.01 modes). + ecgs g++ warnings removed from solitare and all glx modes, regular modes + left for later (casting NULL). Fixed generated xlock.hlp. + gears added -size but defaults to 0, only -planetary will use up lots of + CPU so added a -planetsize 400 which takes over if -size is 0 (full screen + if both are 0). @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Update to xlockmore-5.00. Changes: Note that the main reason for version 5.0 were various security flaws in some of the blanker modules. 5.00 + Just about all modes are now updated. Numerous bug fixes added. + Modes modified for safer allocating. Part of fix to security flaw. + xlock was broken by using up all the virtual memory. + xlockdir may need more work. Multiscreen fixes added. + text3d, an unstable C++ mode, needs more work, for the calls to "new". + Tom Schmidt & Jouk Jansen caught numerous goofs. Assorted fixes when doing above like "discrete -mono", and lyapunov & mandelbrot now sometimes draw from the right side. tube, lyapunov, and mandelbrot now go through colormap changes forward and backward. * XFreeColors bug fix in colors.c thanks to Ian Collier * . * Enhanced xlock/util.c for SunOS 4.1.X and others that needed the * matherr() function defined. Now handles acos() and asin() DOMAIN * error messages. Thanks to Tom Schmidt . * SunOS 4.1.3_U1 did not have CLOCKS_PER_SEC defined. Thanks to Tom Schmidt * . pentomino mode added by Stephen Montgomery-Smith ... it includes a scalable 3d look. tetris mode now uses and older version of this scalable 3d look as well. fire, sballs, lament and atlantis updates by Eric Lassauge. SIA passwording for Tru64 help thanks to Octave Orgeron . ImageMagick stuff added by Jouk Jansen Setup to go only for VMS. SunC++ (Forte 6 U1) compatiblity changes. sball mode... new GL mode, converted by Eric Lassauge (one improvement I would like to see is to see balls at the corners of the 4 other platonic solids instead of just the cube). euler2d new mode option, eulerpower Added optimizations, rotation of region to maximize screen fill, and new algorithm for solving diff equation makes it twice as fast thanks to Stephen Montgomery-Smith . bubble3d, invert release fix fire mode... new GL mode converted by Eric Lassauge . Also had a few other mods including a solitare and new l-* icons in pixmaps. Tom Schmidt added a -size option similar to sproingies. tree stuff added lint cleanups cartoon and raster image removed, bat and bounce modes modified to do some of what it used to but not all... e-sound can now be turned off thanks to Mark Davies life patterns more random VMS edits thanks to Jouk Jansen . Dpms lib changes for configure for Solaris 8 and XFree86 4.0 (latter not tested). Also added a new Solaris xpm. kaleid: new spiral and spots options thanks Robert Adam, II (spiral looks best like: xlock -mode kaleid -spiral -alternate -size 20 -count 5 ). Configure update for Mesa thanks to Tom Schmidt . closedown patch thanks to Bernd 'Bing' Leibing . vtlock patches Eric Lassauge . VMS edits thanks to Jouk Jansen . Configure update for X11R6.4 and X11R6.5.1. Display error should be printed if SYSLOG defined thanks to Alexander Elgert . xlock -resources crash fixed on Solaris thanks to Alexander Elgert . coredump fix for GL modes cage, moebius, rubik, skewb, and stairs and Mesa3.1 thanks to Tom Schmidt . solitare.cc update for disable-interactive. xlock -resources crash fixed on Solaris thanks to Alexander Elgert . Security Focus found a security bug with display name passing "%d" as the display name. Thanks to Jeremy Buhler for the xlockmore patch. Environment configuration (--disable-interactive) logic was corrected (default was ok but you had to --enable-interactive to disable) thanks to Tom Schmidt . Man page changes. * New since last beta + Updated since last beta @ text @d3 1 a3 1 --- xlock/xlock.c.orig Tue Nov 28 18:44:01 2000 d5 1 a5 1 @@@@ -609,7 +609,9 @@@@ @ 1.10 log @If compiled with esound (or rather, esound is found at compilation time), and xlock is called with "+sound" to not play sound, actually do so. (Worked w/o esound). Patch submitted in PR 11185 by Mark Davies @ text @d3 1 a3 1 --- xlock/xlock.c.orig Mon Aug 21 16:14:05 2000 d5 2 a6 2 @@@@ -597,7 +597,9 @@@@ #include a14 10 @@@@ -3084,7 +3086,8 @@@@ #endif #if defined( USE_SOUND ) && defined( USE_ESOUND ) - sound =( init_sound() != -1 ); + /* only enable sound if not disabled - see NetBSD PR pkg/11185 */ + sound = sound && ( init_sound() != -1 ); #endif #ifdef USE_DTSAVER @ 1.9 log @Update to 4.17.1. Changes: !!! We already had the security-related changes in pkgsrc !!! * Security Focus found a security bug with display name passing "%d" as the * display name. Thanks to Jeremy Buhler for * the xlockmore patch. * Environment configuration (--disable-interactive) logic was corrected * (default was ok but you had to --enable-interactive to disable) thanks * to Tom Schmidt . * Man page changes. @ text @d4 1 a4 1 +++ xlock/xlock.c Mon Aug 21 22:26:06 2000 d15 10 @ 1.8 log @Fix possible vulnerability due to improper use of "syslog(3)" or "fprintf(3)". @ text @d3 2 a4 2 --- xlock/xlock.c.orig Mon Jul 10 17:46:19 2000 +++ xlock/xlock.c Wed Aug 16 18:38:01 2000 a14 18 @@@@ -953,7 +955,7 @@@@ #if defined( HAVE_SYSLOG_H ) && defined( USE_SYSLOG ) extern Display *dsp; - syslog(SYSLOG_WARNING, buf); + syslog(SYSLOG_WARNING, "%s", buf); if (!nolock) { if (strstr(buf, "unable to open display") == NULL) syslogStop(XDisplayString(dsp)); @@@@ -962,7 +964,7 @@@@ closelog(); } #else - (void) fprintf(stderr, buf); + (void) fprintf(stderr, "%s", buf); #endif exit(1); } @ 1.7 log @Updatej to 4.17. Changes: + euler2d, new mode thanks to Stephen Montgomery-Smith + also some work was done by Tim Auckland + . See euler2d.tex for theory. & XSync(dsp, True) should not be used in modes as it is hard to log in & when input password characters are randomly dropped. - tetris, you can now play with -trackmouse, row clearing fixed, bonus - pieces. Added a new look to pieces but must be compiled in with - -DBM_PLAIN. - Purify Uninitialized Memory Read found in euler2d, life, and swarm and - a memory leak in juggle. SunOS fix for xcl and juggle and gameless - environment configuration (--disable-interactive) thanks to Tom Schmidt - . bounce, bat, pacman, and braid should look better for password sized windows xcl, new mode control-line combat model race, conversion from xscreensaver thanks to its author Martin Berentsen . multi-byte character support for languages like Japanese. Fixed for bomb.c, nose.c, dclock.c, xlock.c, resource.c, iostuff.c, xmlock.c, and xglock.c. Also added new xmlock/XmLock-jp.ad. Thanks to Yokota Hiroshi . Maintainer (David Bagley) is a little confused about gettext and settext stuff. swarm improvements thanks to Juan Heguiabehere . Now do not fly at 45 degree angles most of the time and longer trails with -size. Noticed some drawing errors on some Sun displays with long trails, probably a Sun hardware problem. euler2d, new mode thanks to Stephen Montgomery-Smith also some work was done by Tim Auckland . See euler2d.tex for theory. added BLANK_ONLY #define if you only want the blank mode. VMS patch for sound thanks to Jouk Jansen . sco patch from Ronald Joe Record . Did not take the patches straight so there could be some problems still, but tried to address the issues. (etc/play.sh, spline.cc sqr, t3d.c time inc, and sysv5 build issues). configure should now find Mesa as opengl. Worked before for me... but may work for others now too. Minor warnings removed various files. loop.c now loops can go clockwise too. The program decides which set of rules to use. (Is handedness a requirement for life? (DNA for example has right-handed helices.)) Added some debugging for building rules easier, hexagonal life more fleshed out so RAND_RULES will work until about generation 540. ESound updates by Eric Lassauge . xcl, new mode control-line combat model race, conversion from xscreensaver thanks to its author Martin Berentsen . juggle.c: fix bug which caused crashes on some machines, less flashy arms, real-time, -pattern random (a true pattern generator), figure moved down and scaled, bouncing, more random, one ball juggling should not come up, and Sun CC 5.0 errors/warnings removed thanks to Tim Auckland . HP problems identified for life.c and shape.c, no code changes since it seems to be a strange bug in the HP cc compiler when using both -O and -g flags (default). HP CC warnings removed in solitare.cc, xlock.c, resource.c, dclock.c, decay.c, goop.c, ico.c, juggle.c, starfish.c, t3d.c, tetris.c, erase*.*. Updated configure and README for compiling and linking through HP's cc. Still some open problems. Some arbitrary sized arrays removed in xlock.c, resource.c, and mode.c, do not believe them to be security problems. HP_PASSWDETC - due to possible security problems this will no longer compile by default, pointed out by Theo de Raadt . Sun CC 5.0 warnings changes cover all modes with options. skewb mode added as an unstable GL mode. Its in development. Not much yet... I just have the corners drawn so far and no real movement yet. Its like a Rubik's Cube but with diagonal cuts that cut through the the center of the cube on a skewed angle. mult-byte character support for languages like Japanese. Fixed for bomb.c, nose.c, iostuff.c, xmlock.c, and xglock.c. Also added new xmlock/XmLock-jp.ad. Thanks to Yokota Hiroshi . Buffer overrun security fix does not allow root access directly but the encrypted password file may be found in memory. This vulnerability was discovered by Brock Tellier with additional research by Anthony Osborne at the COVERT Labs of PGP Security, Inc. Now allocate memory instead of an arbitrary limit on mode name length. run mode added, its a hack but it sort of works. :) Also changed resource.c to make a special case for it. would be nice if password window worked too... Will probably crash and burn on multiscreens, random mode, etc. run like: xlock -mode run -geometrystring geometry -runprogram xclock xlock -mode run -geometrystring g -runprogram xlogo xlock -mode run -geometrystring none -runprogram xfishtank (May be having a little problem with the none option...) _NOT_ a good idea to recursively run xlock Not fond of the name of the mode or its option names... so if you have better names in mind ... tell me. Moved to unstable (due to VMS and -debug problems). ico.c most flashing removed. FullRandom added and now rotates more randomly, rotates in the proper direction (looking at it from the top, I guess its wrong if you think it should be on a glass table and the view is underneath...) and changes when it hits the end of the screen. and changes when it hits the end of the screen. Linewidth and points added as well. rubik.c update for stickers and cube roundness variables now set in macro, considering creating a new skewb mode (its a like a rubik's cube but with diagonal cuts). XFree86 4.0 fixes for DPMS and XCloseDisplay thanks to Jeremy Buhler . Call to XCloseDisplay was causing problems, removing it should not, right? More fixes for DPMS, this time for NetBSD. Thanks to solitare.cc Solaris CC warnings removed and fixed shapes when in password window. xalock removed from distribution + Updated since BETA1 & New since BETA - Updated since BETA @ text @d4 1 a4 1 +++ xlock/xlock.c Tue Aug 15 05:38:20 2000 d15 18 @ 1.6 log @Add "lsall" and "lsbest" commands to pkg_admin, to find all/best package matching a certain pattern. Examples: yui# cd /usr/pkgsrc/packages/i386ELF/All/ yui# ls unzip* unzip-5.40.tgz unzip-5.41.tgz yui# pkg_admin lsall 'unzip*' unzip-5.40.tgz unzip-5.41.tgz yui# pkg_admin lsall 'unzip>=5.40' unzip-5.40.tgz unzip-5.41.tgz yui# pkg_admin lsall 'unzip>=5.41' unzip-5.41.tgz yui# pkg_admin lsbest 'unzip>=5.40' unzip-5.41.tgz yui# pkg_admin lsall /usr/pkgsrc/packages/i386ELF/All/'{mit,unproven}-pthread*' /usr/pkgsrc/packages/i386ELF/All/mit-pthreads-1.60b6.tgz This adds a shell/user-interface to pkg-patterns, which are a superset of sh/csh patterns and can't be expanded by any shell. @ text @d3 5 a7 5 --- xlock/xlock.c.orig Wed Mar 22 17:55:32 2000 +++ xlock/xlock.c Tue May 9 13:35:51 2000 @@@@ -592,7 +592,9 @@@@ #ifdef USE_DPMS #define MIN_DPMS 30 /* 30 second minimum */ d14 1 a14 1 extern int dpmsstandby; @ 1.5 log @RCS tag added @ text @d2 13 a14 11 --- xlock/xlock.h Tue Mar 9 01:51:30 1999 +++ xlock/xlock.h.BAK Tue Mar 9 01:49:16 1999 @@@@ -131,7 +131,7 @@@@ #define XSCREENSAVER_PREF 1 /* Disagreements handled with this :) */ #else /* STANDALONE */ -#include +#include # include #include #include @ 1.4 log @update to xlockmore-4.13 @ text @d1 1 @ 1.3 log @Make xlock work on ELF systems too. @ text @d1 4 a4 12 $NetBSD$ --- configure.in-orig Tue Sep 29 05:15:55 1998 +++ configure.in Mon Jan 4 21:23:20 1999 @@@@ -2300,6 +2300,9 @@@@ BITMAPTYPE="bsd" PIXMAPTYPE="bsd" INSTPGMFLAGS="-s -o root -m 4111" + XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}" + XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}" + XALOCKLDFLAGS="-Wl,-R${XALOCK_LDFLAGS}" ;; d6 6 a11 1 *-*-dgux5* ) @ 1.2 log @no longer needed, as xlock has this applied now @ text @d1 12 a12 3 --- modes/Makefile.in.orig Thu Oct 2 17:58:33 1997 +++ modes/Makefile.in Mon Oct 13 10:07:43 1997 @@@@ -204,7 +204,7 @@@@ d14 1 a14 7 DEFINES = -DDEF_FILESEARCHPATH=\"$(xapploaddir)/%N%S\" DEFS = @@DEFS@@ $(DEFINES) -XLOCKINC = @@XLOCKINC@@ -I. -I.. -I$(UTILDIR) -I../.. +XLOCKINC = -I. -I.. -I$(UTILDIR) -I../.. @@XLOCKINC@@ CFLAGS = @@CFLAGS@@ #CFLAGS = -O #CFLAGS = -g @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @xlock + more @ text @@