[pkgsrc/trunk]: pkgsrc/x11/slock Update x11/slock to slock-1.4

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20c5187d05c2
branches:  trunk
changeset: 355143:20c5187d05c2
user:      leot <leot%pkgsrc.org@localhost>
date:      Wed Nov 23 08:20:21 2016 +0000

description:
Update x11/slock to slock-1.4

Changes:
1.4
---
- fix CVE-2016-6866
- add proper priviledge dropping
- use explicit_bzero from OpenBSD to clear password from memory
- major code audit and rewrite of some parts (thanks, Laslo!)

Approved by <reed>

diffstat:

 x11/slock/Makefile |  16 ++++++++++------
 x11/slock/distinfo |  10 +++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diffs (66 lines):

diff -r 61aadd40200c -r 20c5187d05c2 x11/slock/Makefile
--- a/x11/slock/Makefile        Wed Nov 23 07:40:16 2016 +0000
+++ b/x11/slock/Makefile        Wed Nov 23 08:20:21 2016 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2016/02/28 19:49:06 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2016/11/23 08:20:21 leot Exp $
 
-DISTNAME=              slock-1.3
+DISTNAME=              slock-1.4
 CATEGORIES=            x11
 MASTER_SITES=          http://dl.suckless.org/tools/
 
@@ -11,6 +11,8 @@
 
 MAKE_JOBS_SAFE=        no
 
+.include "../../mk/bsd.prefs.mk"
+
 SUBST_CLASSES+=                makefile
 SUBST_STAGE.makefile=  pre-configure
 SUBST_MESSAGE.makefile=        Adjust config.mk
@@ -22,6 +24,9 @@
 SUBST_SED.makefile+=   -e 's,^CFLAGS *= ,CFLAGS += ,'
 SUBST_SED.makefile+=   -e 's,^CPPFLAGS *= ,CPPFLAGS += ,'
 SUBST_SED.makefile+=   -e 's,^LDFLAGS *= ,LDFLAGS += ,'
+.if ${OPSYS} == "OpenBSD"
+SUBST_SED.makefile+=   -e 's,^COMPATSRC *=.*$$,COMPATSRC = ,'
+.endif
 SUBST_SED.makefile+=   -e 's/cc/${CC:Q}/'
 
 # Bump _XOPEN_SOURCE version to 600 in order to avoid "Compiler or options
@@ -34,16 +39,15 @@
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-
 .if !(${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly")
-CFLAGS+=               -DHAVE_SHADOW_H
+CPPFLAGS+=             -DHAVE_SHADOW_H
 .endif
 
 .if !(${OPSYS} == "OpenBSD" || ${OPSYS} == "Darwin")
 LIBS+= -lcrypt
+.endif
 
-.endif
+CPPFLAGS.NetBSD+=      -D_NETBSD_SOURCE        # needed for setgroups(2)
 
 SPECIAL_PERMS+=        bin/slock ${SETUID_ROOT_PERMS}
 
diff -r 61aadd40200c -r 20c5187d05c2 x11/slock/distinfo
--- a/x11/slock/distinfo        Wed Nov 23 07:40:16 2016 +0000
+++ b/x11/slock/distinfo        Wed Nov 23 08:20:21 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2016/02/16 17:47:19 leot Exp $
+$NetBSD: distinfo,v 1.6 2016/11/23 08:20:21 leot Exp $
 
-SHA1 (slock-1.3.tar.gz) = 5e370b09b1644cd0f2490ed55209dd8f9e83e25b
-RMD160 (slock-1.3.tar.gz) = 9b352dff97ecebe4ccd971e54e8bdf4348964b12
-SHA512 (slock-1.3.tar.gz) = 5024588f6d25f9d72a9d2b8ef9d8a2a94e5d5e53f30f4a15df83b693a3706b1ad6550422f36af29f54429a9c516d14a349e46aeb9896c6e32009ff0da5c02a8f
-Size (slock-1.3.tar.gz) = 5943 bytes
+SHA1 (slock-1.4.tar.gz) = 65b821a0953daa919b5ac69b470d772033808ad7
+RMD160 (slock-1.4.tar.gz) = ac38666104a129f3b582ab9d1a2b0c9918b876bf
+SHA512 (slock-1.4.tar.gz) = ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
+Size (slock-1.4.tar.gz) = 6889 bytes