Log Message:
Pullup ticket #3949 - requested by is
x11/xlockmore: security patch
x11/xlockmore-lite: security patch

Revisions pulled up:
- x11/xlockmore-lite/Makefile                             1.16-1.17
- x11/xlockmore/Makefile                                  1.100-1.101 via patch
- x11/xlockmore/distinfo                                  1.49-1.50
- x11/xlockmore/patches/patch-modes_dclock.c              1.1-1.2

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Mon Oct 15 15:29:11 UTC 2012

   Modified Files:
   	pkgsrc/x11/xlockmore: Makefile distinfo
   	pkgsrc/x11/xlockmore-lite: Makefile
   Added Files:
   	pkgsrc/x11/xlockmore/patches: patch-modes_dclock.c

   Log Message:
   xlock -mode dclock would segfault on OSes with sizeof(time_t)>sizeof(long);
   this includes NetBSD-6 on 32bit systems.

   As a result, xlock -mode random (the default) would eventually unlock
   the screen, without the user being aware of this (as she/he's can be
   presumed to have left the monitor).

   The reason was that some variables in dclock.c were declared long, but
   contain essentially time_t values. In on case, a pointer to such a
   variable was casted to (struct time_t *) and passed to localtime(),
   and the resulting pointer is not checked for error before being used.

   The variables have been changed to time_t and the typecast has been
   removed.

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Mon Oct 15 20:47:57 UTC 2012

   Modified Files:
   	pkgsrc/x11/xlockmore: Makefile distinfo
   	pkgsrc/x11/xlockmore-lite: Makefile
   	pkgsrc/x11/xlockmore/patches: patch-modes_dclock.c

   Log Message:
   A missed case of last problem.... dclock -veg and dclock -lab.