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 <glyn AT potatojunkie.co.uk>.
     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 <mancha1 AT hush.com>.

   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


(tron)

$NetBSD: patch-config.cygport,v 1.1.2.2 2015/04/29 20:49:54 tron Exp $

--- config.cygport.orig	2015-02-18 04:10:55.000000000 +0000
+++ config.cygport
@@ -4,12 +4,12 @@ PWD=`pwd`
 #NAME=${DIR}
 NAME=xlockmore
 GROUP=${NAME}
-if test "$1" == ""; then
+if test "$1" = ""; then
 	VERSION=`sed 's/^.*"\(.*\)"/\1/' ./version.h`
 	RELEASE=1
 else
 	VERSION=$1
-	if test "$2" == ""; then
+	if test "$2" = ""; then
 		RELEASE=1
 	else
 		RELEASE=$2