From d818a61a05253694249305a6526740b3dd2cfd98 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Wed, 23 May 2012 17:53:33 +0000
Subject: Pullup ticket #3802 - requested by reed x11/slock: security update

Revisions pulled up:
- x11/slock/Makefile                                            1.4
- x11/slock/distinfo                                            1.2

---
   Module Name:    pkgsrc
   Committed By:   reed
   Date:           Wed May 23 17:10:50 UTC 2012

   Modified Files:
           pkgsrc/doc: CHANGES-2012
           pkgsrc/x11/slock: Makefile distinfo

   Log Message:
   Upgrade slock to 1.0

   Add license and change homepage.

   No changes file included in source distribution.
   Changes can be seen at http://hg.suckless.org/slock/ (see changelog
   for last few versions).

   One important fix is:
   added XRaiseWindow workaround when new clients are launched

   See http://secunia.com/advisories/48700/ for the security issue.
---
 x11/slock/Makefile | 11 ++++++-----
 x11/slock/distinfo |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/x11/slock/Makefile b/x11/slock/Makefile
index 66f88c7b400..e380cfcc031 100644
--- a/x11/slock/Makefile
+++ b/x11/slock/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2010/04/05 00:06:24 asau Exp $
+# $NetBSD: Makefile,v 1.3.18.1 2012/05/23 17:53:33 tron Exp $
 
-DISTNAME=		slock-0.7
+DISTNAME=		slock-1.0
 CATEGORIES=		x11
-MASTER_SITES=		http://suckless.org/download/
+MASTER_SITES=		http://dl.suckless.org/tools/
 
 MAINTAINER=		reed@reedmedia.net
-HOMEPAGE=		http://www.suckless.org/wiki/tools/xlib
+HOMEPAGE=		http://tools.suckless.org/slock
 COMMENT=		Simple X11 screen locker
+LICENSE=		mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -23,7 +24,7 @@ CFLAGS+=-DHAVE_SHADOW_H
 LIBS+=	-lcrypt
 
 do-build:
-	cd ${WRKSRC} && ${CC} -c -DVERSION=\"0.7\" ${CFLAGS} slock.c && \
+	cd ${WRKSRC} && ${CC} -c -DVERSION=\"1.0\" ${CFLAGS} slock.c && \
 		${CC} -o slock slock.o -lc ${LIBS} ${X11_LDFLAGS} -lX11
 
 SPECIAL_PERMS+=	bin/slock ${SETUID_ROOT_PERMS}
diff --git a/x11/slock/distinfo b/x11/slock/distinfo
index e524542ef60..1434e2c5648 100644
--- a/x11/slock/distinfo
+++ b/x11/slock/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/11 22:48:17 reed Exp $
+$NetBSD: distinfo,v 1.1.1.1.38.1 2012/05/23 17:53:33 tron Exp $
 
-SHA1 (slock-0.7.tar.gz) = 351355d6e09be739119e5fd6b1606c79b5b5e777
-RMD160 (slock-0.7.tar.gz) = 5765ffa0621abaf28718513e81190696df287bbe
-Size (slock-0.7.tar.gz) = 3487 bytes
+SHA1 (slock-1.0.tar.gz) = 38cef8503d512252e8f3f8275200e802990892c5
+RMD160 (slock-1.0.tar.gz) = 3fc1aa6c6aae9bfba59049a44f0330bef702f2df
+Size (slock-1.0.tar.gz) = 4313 bytes
-- 
cgit v1.2.3