head 1.8; access; symbols pkgsrc-2021Q4:1.7.0.54 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.52 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.50 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.48 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.46 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.44 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.40 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.20 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.42 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.38 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.36 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.34 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.32 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.30 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.28 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.26 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.24 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.22 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.18 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.16 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.14 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.12 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.10 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.8 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.6 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.4 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.2 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.6.0.52 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.50 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.48 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.46 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.44 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.42 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.40 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.38 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.36 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.34 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.32 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.30 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.28 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.26 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.24 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.22 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.20 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.18 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.16 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.14 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.12 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.10 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.8 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.6 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.4 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.2 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.5.0.36 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.34 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.32 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.30 pkgsrc-2008Q1:1.5.0.28 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.26 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.24 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.22 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.20 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.18 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.16 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.14 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.12 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.10 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.8 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.6 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.4 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.2 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.4.0.10 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.8 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.6 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.4 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.2 netbsd-1-6-1-base:1.4 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1997-11-01:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.8 date 2022.01.24.18.05.58; author micha; state dead; branches; next 1.7; commitid QsUEN9ztebcRKUpD; 1.7 date 2015.04.15.07.31.15; author spz; state Exp; branches; next 1.6; commitid E64oVS4cwnttPEhy; 1.6 date 2008.10.06.22.40.12; author hubertf; state Exp; branches 1.6.52.1; next 1.5; 1.5 date 2004.11.27.00.15.22; author hubertf; state Exp; branches; next 1.4; 1.4 date 2002.12.05.00.45.53; author hubertf; state Exp; branches; next 1.3; 1.3 date 2000.05.16.13.32.07; author hubertf; state Exp; branches; next 1.2; 1.2 date 98.08.07.11.18.25; author agc; state Exp; branches; next 1.1; 1.1 date 97.11.03.00.50.26; author hubertf; state Exp; branches 1.1.1.1; next ; 1.6.52.1 date 2015.04.29.20.49.54; author tron; state Exp; branches; next ; commitid 8AOFTSI4OLnkOwjy; 1.1.1.1 date 97.11.03.00.50.26; author hubertf; state Exp; branches; next ; desc @@ 1.8 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-aa,v 1.7 2015/04/15 07:31:15 spz Exp $ --- xlock/XLock.ad.orig 2015-03-12 13:34:33.000000000 +0000 +++ xlock/XLock.ad @@@@ -46,10 +46,10 @@@@ XLock.icongeometry: 64x64 !XLock.icongeometry: 256x256 ! For sound -XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au -XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au -XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au -XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au +XLock.locksound: /usr/pkg/lib/X11/xlock/sounds/complete.au +XLock.infosound: /usr/pkg/lib/X11/xlock/sounds/identify-please.au +XLock.validsound: /usr/pkg/lib/X11/xlock/sounds/thank-you.au +XLock.invalidsound: /usr/pkg/lib/X11/xlock/sounds/not-programmed.au !XLock.locksound: complete.au !XLock.infosound: identify-please.au !XLock.validsound: thank-you.au @@@@ -63,12 +63,12 @@@@ XLock.left3d: Red XLock.both3d: Magenta ! For marquee & nose modes -XLock.program: fortune -s +!XLock.program: fortune -s !XLock.program: fortune -o !XLock.program: fortune -s !XLock.program: fortune !XLock.program: /usr/games/fortune -o -!XLock.program: /usr/games/fortune -s +XLock.program: /usr/games/fortune -s !XLock.program: /usr/games/fortune !XLock.program: finger !XLock.messagesfile: fortune.dat @@@@ -81,7 +81,7 @@@@ XLock.messagefont: *8x16* ! For modes with images !XLock.*.bitmap: bitmaps/m-xlock.xbm !XLock.*.bitmap: pixmaps/m-xlock.xpm -!XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps +!XLock.*.bitmap: /usr/pkg/lib/X11/xlock/bitmaps ! For mailbox check application !XLock.mailCmd: /usr/ucb/mail -e @@@@ -847,9 +847,9 @@@@ XLock.text3d.delay: 100000 !XLock.text3d.cycles: 1 !XLock.text3d.size: 1 XLock.text3d.saturation: 1.0 -!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/arial.ttf +!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/arial.ttf ! Directory of only *.ttf fonts. symbol.ttf and wingding.ttf should be excluded -!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/ +!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/ XLock.text3d.extrusion: 25.0 XLock.text3d.rot_amplitude: 1.0 XLock.text3d.rot_frequency: 0.001 @ 1.7 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-aa,v 1.6 2008/10/06 22:40:12 hubertf Exp $ @ 1.6 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 @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- xlock/XLock.ad.orig 2008-10-05 02:51:17.000000000 +0200 d5 16 a20 1 @@@@ -62,9 +62,9 @@@@ XLock.left3d: Red a23 1 -!XLock.program: fortune -o d25 4 a28 4 -!XLock.program: fortune +!XLock.program: /usr/games/fortune -o +XLock.program: /usr/games/fortune -s +!XLock.program: /usr/games/fortune d30 2 a31 1 !XLock.program: /usr/games/fortune -s d33 23 @ 1.6.52.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 --- xlock/XLock.ad.orig 2015-03-12 13:34:33.000000000 +0000 d5 1 a5 16 @@@@ -46,10 +46,10 @@@@ XLock.icongeometry: 64x64 !XLock.icongeometry: 256x256 ! For sound -XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au -XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au -XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au -XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au +XLock.locksound: /usr/pkg/lib/X11/xlock/sounds/complete.au +XLock.infosound: /usr/pkg/lib/X11/xlock/sounds/identify-please.au +XLock.validsound: /usr/pkg/lib/X11/xlock/sounds/thank-you.au +XLock.invalidsound: /usr/pkg/lib/X11/xlock/sounds/not-programmed.au !XLock.locksound: complete.au !XLock.infosound: identify-please.au !XLock.validsound: thank-you.au @@@@ -63,12 +63,12 @@@@ XLock.left3d: Red d9 1 d11 4 a14 4 +!XLock.program: fortune -s !XLock.program: fortune -o !XLock.program: fortune -s !XLock.program: fortune d16 1 a16 2 -!XLock.program: /usr/games/fortune -s +XLock.program: /usr/games/fortune -s a17 23 !XLock.program: finger !XLock.messagesfile: fortune.dat @@@@ -81,7 +81,7 @@@@ XLock.messagefont: *8x16* ! For modes with images !XLock.*.bitmap: bitmaps/m-xlock.xbm !XLock.*.bitmap: pixmaps/m-xlock.xpm -!XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps +!XLock.*.bitmap: /usr/pkg/lib/X11/xlock/bitmaps ! For mailbox check application !XLock.mailCmd: /usr/ucb/mail -e @@@@ -847,9 +847,9 @@@@ XLock.text3d.delay: 100000 !XLock.text3d.cycles: 1 !XLock.text3d.size: 1 XLock.text3d.saturation: 1.0 -!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/arial.ttf +!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/arial.ttf ! Directory of only *.ttf fonts. symbol.ttf and wingding.ttf should be excluded -!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/ +!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/ XLock.text3d.extrusion: 25.0 XLock.text3d.rot_amplitude: 1.0 XLock.text3d.rot_frequency: 0.001 @ 1.5 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 --- xlock/XLock.ad.orig 2004-11-02 02:23:44.000000000 +0100 d5 1 a5 1 @@@@ -60,9 +60,9 @@@@ XLock.left3d: Red @ 1.4 log @Update xlockmore to 5.06. Changes: Updated xlock/vms_x_fix.h from Jouk Jansen. Patched losira erase mode, would die on X_FreeColor with swirl,mandelbrot,lyapunov,tube on PseudoColor and DirectColor. Patched swirl for DirectColor. Makefile.in changes by Peter Breitenlohner so that xlock can be built outside the source tree. setuid(0) is moved 3 lines up so BAD_PAM option could work with an /etc/pam.d/xlock configuration file that users do not have access to. Thanks to Jan Provaznik . petri / 0 fix thanks to Jouk Jansen Cygwin fix for logout.c thanks to Joseph Davida . Linted (lots of minor fixes) and removed the voids on free. Lint pointed out some problems with erase modes and petri. Failed unlock attempts thanks to . Need Japanese, Dutch added by Jouk Jansen. New mode atunnels thanks to Eric Lassauge based on Roman demo. tunnel0.xpm color names for many grays ("darkgray", "gray2", etc) not found on SunOS4 which then caused memory leaks thanks to Tom Schmidt. -size option like fire (since it is real slow on slow machines) thanks to Tom Schmidt. Another VMS update and pipe protection from Jouk Jansen. TODO: Check multiscreen, allocation check Trackmouse would not be bad either. -wire does not seem to work. Some other colour schemes than the greyish default. pacman patch to get rid of negative unsigned check thanks to Jouk Jansen Patch for WindowMaker, this permits one to set several attributes to every window opened; each attribute is associated to the class of the window. Thanks to Paolo Subiaco Erase compilation warnings removed thanks to Jouk Jansen. @ text @d3 1 a3 1 --- xlock/XLock.ad.orig Mon Sep 30 22:39:14 2002 d5 1 a5 1 @@@@ -58,9 +58,9 @@@@ @ 1.3 log @Add back patch to find fortune even if not in $PATH. Noted by Dan McMahill. @ text @d3 3 a5 3 --- xlock/XLock.ad.orig Tue May 16 14:28:57 2000 +++ xlock/XLock.ad Tue May 16 14:29:12 2000 @@@@ -53,9 +53,9 @@@@ @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 3 a5 3 --- xlock/XLock.ad.orig Wed Oct 1 05:55:32 1997 +++ xlock/XLock.ad Mon Oct 13 09:08:42 1997 @@@@ -47,9 +47,9 @@@@ d12 6 a17 6 +!XLock.program: /usr/games/fortune -o +XLock.program: /usr/games/fortune -s +!XLock.program: /usr/games/fortune !XLock.program: finger !XLock.messagesfile: fortune.dat !XLock.messagefile: /etc/hosts @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @xlock + more @ text @@