From f0731177065208802fe5a9f3e2882eceda97689b Mon Sep 17 00:00:00 2001
From: kim <kim@pkgsrc.org>
Date: Sat, 15 Apr 2017 22:31:49 +0000
Subject: Update to 4.5.1

Version 4.5.1 (25/02/2017):
  *Fixes:
  - logfile permissions problem (CVE-2017-5618)
  - SunOS build problem (bug #50089)
  - FreeBSD core dumps (bug #50143)
---
 misc/screen/Makefile                         |  6 +++---
 misc/screen/distinfo                         | 13 +++++++------
 misc/screen/patches/patch-doc_screen.texinfo | 15 +++++++++++++++
 misc/screen/patches/patch-screen.c           | 21 +--------------------
 4 files changed, 26 insertions(+), 29 deletions(-)
 create mode 100644 misc/screen/patches/patch-doc_screen.texinfo

(limited to 'misc')

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 13d0f289a4d..abb23c330a5 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2017/01/25 01:17:16 maya Exp $
+# $NetBSD: Makefile,v 1.101 2017/04/15 22:31:49 kim Exp $
 
-DISTNAME=	screen-4.5.0
-PKGREVISION=	2
+DISTNAME=	screen-4.5.1
+#PKGREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index a548a454203..58709248a02 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.45 2017/01/25 01:17:16 maya Exp $
+$NetBSD: distinfo,v 1.46 2017/04/15 22:31:49 kim Exp $
 
-SHA1 (screen-4.5.0.tar.gz) = b329f538e7265405a5c14e13520e95ced9d2cb17
-RMD160 (screen-4.5.0.tar.gz) = cb412991fa2e3ffb6e4ec34449176eccb39a24a9
-SHA512 (screen-4.5.0.tar.gz) = b2705ed9604355d4153d7902f820af6131a1f2387650f5c6efeda7acf543aad48e8603c26d7c6e74213c8eece994d5d9bb0d114bc19c8d8f3d8e99c00ea4a484
-Size (screen-4.5.0.tar.gz) = 963233 bytes
+SHA1 (screen-4.5.1.tar.gz) = d096ea40c7a349ec46f3bd4fcc02fd6a873318e6
+RMD160 (screen-4.5.1.tar.gz) = 2e8aa5ec158fc7d240df176dff0b9ddfcbfc9056
+SHA512 (screen-4.5.1.tar.gz) = ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804
+Size (screen-4.5.1.tar.gz) = 963153 bytes
 SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc
 SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3
 SHA1 (patch-ae) = 8792f7877c0a29701d7d0643e93360813ed7db0f
@@ -15,6 +15,7 @@ SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1
 SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552
 SHA1 (patch-ao) = 91eecb62351aff720447eb48ea85aae70b62f9b6
 SHA1 (patch-ap) = 4176e95502754206d6840ce228c61371df947650
-SHA1 (patch-screen.c) = 631d7681ef440cbab6d3795dfbb23c1e944deb7d
+SHA1 (patch-doc_screen.texinfo) = ddce313668c7f9d27973e62042dcdc11f23307b5
+SHA1 (patch-screen.c) = fa54bfdbefcf74944a677ab4b6636d0072e57267
 SHA1 (patch-socket.c) = 09683cee3685a5c6d625e86aa97f6a09f4280b56
 SHA1 (patch-tty.sh) = 93b1fe856cf16640295cb822d60118dbd3734602
diff --git a/misc/screen/patches/patch-doc_screen.texinfo b/misc/screen/patches/patch-doc_screen.texinfo
new file mode 100644
index 00000000000..65e1762e647
--- /dev/null
+++ b/misc/screen/patches/patch-doc_screen.texinfo
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_screen.texinfo,v 1.1 2017/04/15 22:31:49 kim Exp $
+
+--- doc/screen.texinfo.orig	2017-02-25 15:35:35.000000000 +0000
++++ doc/screen.texinfo	2017-04-15 22:26:36.000000000 +0000
+@@ -5796,8 +5796,8 @@
+ ============
+ 
+ @example
+-     Thomas Renninger <treen@suse.com>,
+-     Axel Beckert <abe@deuxchevaux.org>,
++     Thomas Renninger <treen@@suse.com>,
++     Axel Beckert <abe@@deuxchevaux.org>,
+      Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
+      Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
+      Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
diff --git a/misc/screen/patches/patch-screen.c b/misc/screen/patches/patch-screen.c
index ccb1459fc00..e3aa44a15f7 100644
--- a/misc/screen/patches/patch-screen.c
+++ b/misc/screen/patches/patch-screen.c
@@ -1,7 +1,6 @@
-$NetBSD: patch-screen.c,v 1.3 2017/01/25 01:17:16 maya Exp $
+$NetBSD: patch-screen.c,v 1.4 2017/04/15 22:31:49 kim Exp $
 
 Use standard headers.
-Don't open user-supplied paths as root.
 
 --- screen.c.orig	2017-01-17 19:28:29.000000000 +0000
 +++ screen.c
@@ -14,21 +13,3 @@ Don't open user-supplied paths as root.
  #include "screen.h"
  #ifdef HAVE_BRAILLE
  # include "braille.h"
-@@ -674,11 +676,17 @@ int main(int ac, char** av)
-               if (strlen(screenlogfile) > PATH_MAX)
-                 Panic(0, "-L: logfile name too long. (max. %d char)", PATH_MAX);
- 
-+	      int issetugid = geteuid() == 0;
-+
-+	      if (issetugid && seteuid(getuid()) < 0)
-+		Panic(0, "setuid 1");
-               FILE *w_check;
-               if ((w_check = fopen(screenlogfile, "w")) == NULL)
-                 Panic(0, "-L: logfile name access problem");
-               else
-                 fclose(w_check);
-+	      if (issetugid && seteuid(0) < 0)
-+		Panic(0, "setuid 2");
-             }
-             nwin_options.Lflag = 1;
-             break;
-- 
cgit v1.2.3