summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2000-08-21 20:31:50 +0000
committerhubertf <hubertf@pkgsrc.org>2000-08-21 20:31:50 +0000
commit7a8db65186e2df36a64ace60a07199b527a7b210 (patch)
tree3a0110d2f660e8b6ecfa0d202aecd23494f42712
parent26743e257d80a761e34471c7db19a644af4fdaf2 (diff)
downloadpkgsrc-7a8db65186e2df36a64ace60a07199b527a7b210.tar.gz
Update to 4.17.1. Changes:
!!! We already had the security-related changes in pkgsrc !!! * Security Focus found a security bug with display name passing "%d" as the * display name. Thanks to Jeremy Buhler <jbuhler@cs.washington.edu> for * the xlockmore patch. * Environment configuration (--disable-interactive) logic was corrected * (default was ok but you had to --enable-interactive to disable) thanks * to Tom Schmidt <tschmidt@micron.com>. * Man page changes.
-rw-r--r--x11/xlockmore/Makefile4
-rw-r--r--x11/xlockmore/files/md54
-rw-r--r--x11/xlockmore/files/patch-sum4
-rw-r--r--x11/xlockmore/patches/patch-ab24
4 files changed, 9 insertions, 27 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index d32ec8c2ebc..f444d5eb079 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2000/08/15 05:56:41 tron Exp $
+# $NetBSD: Makefile,v 1.32 2000/08/21 20:31:50 hubertf Exp $
# FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
#
-DISTNAME= xlockmore-4.17
+DISTNAME= xlockmore-4.17.1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
${MASTER_SITE_XCONTRIB:=applications/}
diff --git a/x11/xlockmore/files/md5 b/x11/xlockmore/files/md5
index b74c4541456..e35f01eb525 100644
--- a/x11/xlockmore/files/md5
+++ b/x11/xlockmore/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.16 2000/08/15 03:54:17 hubertf Exp $
+$NetBSD: md5,v 1.17 2000/08/21 20:31:51 hubertf Exp $
-MD5 (xlockmore-4.17.tar.gz) = 6e221dd493bb3fb49c1793c51e7d6e2a
+MD5 (xlockmore-4.17.1.tar.gz) = 18a2563e208b9a406c42ec0f96cfa173
diff --git a/x11/xlockmore/files/patch-sum b/x11/xlockmore/files/patch-sum
index 58a270745b5..41213125a38 100644
--- a/x11/xlockmore/files/patch-sum
+++ b/x11/xlockmore/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.6 2000/08/16 16:39:18 tron Exp $
+$NetBSD: patch-sum,v 1.7 2000/08/21 20:31:51 hubertf Exp $
MD5 (patch-aa) = ef89b7291b0d3c6351330887741cd7ae
-MD5 (patch-ab) = dc8c59b349e68bc33a78fde8152a672a
+MD5 (patch-ab) = 755a2fa6b00e109dd3149f4ad9848d9b
MD5 (patch-ac) = 982191521403c38e1804c7b078e4f45d
MD5 (patch-ad) = c8f16f930ebc3a759cc6dbb85da43ffd
MD5 (patch-ae) = 9dab989b9c932f21d88f08f080221a38
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index 10d755dc522..69b25d0fc39 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.8 2000/08/16 16:39:18 tron Exp $
+$NetBSD: patch-ab,v 1.9 2000/08/21 20:31:51 hubertf Exp $
---- xlock/xlock.c.orig Mon Jul 10 17:46:19 2000
-+++ xlock/xlock.c Wed Aug 16 18:38:01 2000
+--- xlock/xlock.c.orig Mon Aug 21 16:14:05 2000
++++ xlock/xlock.c Mon Aug 21 22:26:06 2000
@@ -597,7 +597,9 @@
#include <X11/extensions/dpms.h>
#else /* XFree86 < 4.x */
@@ -12,21 +12,3 @@ $NetBSD: patch-ab,v 1.8 2000/08/16 16:39:18 tron Exp $
extern int DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *);
extern int DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short);
#endif
-@@ -953,7 +955,7 @@
- #if defined( HAVE_SYSLOG_H ) && defined( USE_SYSLOG )
- extern Display *dsp;
-
-- syslog(SYSLOG_WARNING, buf);
-+ syslog(SYSLOG_WARNING, "%s", buf);
- if (!nolock) {
- if (strstr(buf, "unable to open display") == NULL)
- syslogStop(XDisplayString(dsp));
-@@ -962,7 +964,7 @@
- closelog();
- }
- #else
-- (void) fprintf(stderr, buf);
-+ (void) fprintf(stderr, "%s", buf);
- #endif
- exit(1);
- }