head 1.10; access; symbols pkgsrc-2021Q4:1.9.0.54 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.52 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.50 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.48 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.46 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.44 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.40 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.20 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.42 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.38 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.36 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.34 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.32 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.30 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.28 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.26 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.24 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.22 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.18 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.16 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.14 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.12 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.10 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.8 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.6 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.4 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.2 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.8.0.64 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.62 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.60 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.58 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.56 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.54 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.52 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.50 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.48 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.46 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.44 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.42 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.40 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.38 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.36 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.34 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.32 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.30 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.28 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.26 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.24 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.22 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.20 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.18 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.16 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.14 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.12 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.10 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.8 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.6 pkgsrc-2008Q1:1.8.0.4 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.2 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.7.0.20 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.18 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.16 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.14 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.12 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.10 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.8 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.6 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.4 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.2 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.5.0.2 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2; locks; strict; comment @# @; 1.10 date 2022.01.24.18.05.58; author micha; state dead; branches; next 1.9; commitid QsUEN9ztebcRKUpD; 1.9 date 2015.04.15.07.31.15; author spz; state Exp; branches; next 1.8; commitid E64oVS4cwnttPEhy; 1.8 date 2007.10.28.16.15.21; author joerg; state Exp; branches 1.8.64.1; next 1.7; 1.7 date 2005.06.07.23.35.16; author hubertf; state dead; branches; next 1.6; 1.6 date 2005.05.30.23.34.49; author hubertf; state Exp; branches; next 1.5; 1.5 date 2005.01.28.10.24.47; author tron; state dead; branches; next 1.4; 1.4 date 2005.01.11.22.56.34; author hubertf; state Exp; branches; next 1.3; 1.3 date 2001.10.10.02.41.17; author hubertf; state dead; branches; next 1.2; 1.2 date 2000.08.15.03.54.17; author hubertf; state Exp; branches; next 1.1; 1.1 date 2000.05.11.16.37.53; author hubertf; state Exp; branches; next ; 1.8.64.1 date 2015.04.29.20.49.54; author tron; state Exp; branches; next ; commitid 8AOFTSI4OLnkOwjy; desc @@ 1.10 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-ad,v 1.9 2015/04/15 07:31:15 spz Exp $ --- xmlock/Makefile.in.orig 2010-04-19 13:33:29.000000000 +0000 +++ xmlock/Makefile.in @@@@ -119,14 +119,14 @@@@ install_xmlock : install-program install @@ $(ECHO) "" install-program : xmlock - $(top_srcdir)/mkinstalldirs $(bindir) - $(INSTALL_PROGRAM) xmlock$(E) $(bindir) + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) + $(INSTALL_PROGRAM) xmlock$(E) ${DESTDIR}$(bindir) install-man : install-ad : - $(top_srcdir)/mkinstalldirs $(xapploaddir) - $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(xapploaddir)/XmLock + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(xapploaddir) + $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad ${DESTDIR}$(xapploaddir)/XmLock uninstall : @@UNINSTALL_XMLOCK@@ @ 1.9 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-ad,v 1.8 2007/10/28 16:15:21 joerg Exp $ @ 1.8 log @Don't use the special permissions from configure, but annotate them directly. The OSF setgid is currently left out. Add DESTDIR support. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- xmlock/Makefile.in.orig 2007-09-16 20:16:51.000000000 +0200 d5 1 a5 1 @@@@ -118,14 +118,14 @@@@ install_xmlock : install-program install @ 1.8.64.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 --- xmlock/Makefile.in.orig 2010-04-19 13:33:29.000000000 +0000 d5 1 a5 1 @@@@ -119,14 +119,14 @@@@ install_xmlock : install-program install @ 1.7 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 @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2005/05/30 23:34:49 hubertf Exp $ d3 4 a6 4 --- xlock/passwd.c.orig 2005-05-30 23:28:55.000000000 +0200 +++ xlock/passwd.c @@@@ -88,7 +88,9 @@@@ static login_cap_t *rlc = NULL; #endif d8 15 a22 4 #include +#ifndef errno extern int errno; +#endif a23 2 #if ( HAVE_FCNTL_H && (defined( USE_MULTIPLE_ROOT ) || defined( USE_MULTIPLE_USER ))) #include @ 1.6 log @Add patch for DragonflyBSD, sent by Joerg Sonnenberger in private mail. Bump to 5.17nb1. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Remove obsolete patch file. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2005/01/11 22:56:34 hubertf Exp $ d3 4 a6 3 --- Makefile.in.orig 2002-09-22 00:58:54.000000000 +0200 +++ Makefile.in @@@@ -24,7 +24,7 @@@@ SHELL = /bin/sh d8 4 a11 4 srcdir = @@srcdir@@ top_srcdir = @@top_srcdir@@ -VPATH = @@srcdir@@/ +#HF#VPATH = @@srcdir@@/ d13 2 a14 2 TAR = tar RM = rm -f @ 1.4 log @remove bogus VPATH line from the pkg's Makefile. This bug is was not discovered so far due to a bug in GNU make. On NetBSD, it happens only under certain conditions (/install present), see PR pkg/28934 for more information. This commit is a stopgag, I'm still discussing with the xlockmore author what the right fix is. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 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 1 a1 1 $NetBSD: patch-ad,v 1.2 2000/08/15 03:54:17 hubertf Exp $ d3 3 a5 4 --- xlock/sound.c.orig Mon Jun 26 21:05:45 2000 +++ xlock/sound.c Tue Aug 15 05:41:29 2000 @@@@ -154,7 +154,7 @@@@ #ifdef USE_ESOUND d7 4 a10 4 #ifndef DEFAULT_SOUND_DIR -#define DEFAULT_SOUND_DIR "/usr/share/sounds/xlockmore/" +#define DEFAULT_SOUND_DIR "@@PREFIX@@/lib/X11/xlockmore/" #endif d12 2 a13 1 #ifdef HAVE_LIBESD @ 1.2 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 @d1 1 a1 1 $NetBSD$ @ 1.1 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 3 a5 3 --- xlock/sound.c.orig Fri Apr 14 13:21:37 2000 +++ xlock/sound.c Fri Apr 14 13:22:28 2000 @@@@ -127,7 +127,7 @@@@ d9 1 a9 1 -#define DEFAULT_SOUND_DIR "/usr/lib/sounds/xlockmore/" @