From 3e90a43bc7c51ce174535f0a103dd5b2e87f3179 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Mon, 13 Apr 2015 12:33:49 +0000
Subject: Update to less-475. Changes since 470: * Fix possible memory
 corruption * Disable history feature when compiled with LESSHISTFILE set to
 "-". * Fix bug where prompt was sometimes not displayed with +G.

Also contains a fix for CVE-2014-9488 (oob read on malformed UTF-8 data)
---
 misc/less/Makefile         |  4 ++--
 misc/less/distinfo         |  9 ++++-----
 misc/less/patches/patch-ac | 16 ----------------
 3 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 misc/less/patches/patch-ac

(limited to 'misc')

diff --git a/misc/less/Makefile b/misc/less/Makefile
index b4be98f1848..b1f0c5ff741 100644
--- a/misc/less/Makefile
+++ b/misc/less/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2014/12/08 00:55:58 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2015/04/13 12:33:49 tnn Exp $
 
-DISTNAME=	less-470
+DISTNAME=	less-475
 CATEGORIES=	misc
 MASTER_SITES=	http://www.greenwoodsoftware.com/less/
 
diff --git a/misc/less/distinfo b/misc/less/distinfo
index 6ffe23f327a..ca79e3cd4fb 100644
--- a/misc/less/distinfo
+++ b/misc/less/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2014/12/08 00:55:58 rodent Exp $
+$NetBSD: distinfo,v 1.15 2015/04/13 12:33:49 tnn Exp $
 
-SHA1 (less-470.tar.gz) = 167c0b65bb086895b2a9583a52b6a74e10d5e933
-RMD160 (less-470.tar.gz) = c24bd0994b597b953b55d8e928136ccb76f3c88c
-Size (less-470.tar.gz) = 316014 bytes
-SHA1 (patch-ac) = d50886aff976d81f23684cd96b5c9e7f94554b93
+SHA1 (less-475.tar.gz) = 8232220364ce95fe2397fd717cad4ecffa6bcbce
+RMD160 (less-475.tar.gz) = a1404028b0d17492a1f8f28a2e4638de0975e6dd
+Size (less-475.tar.gz) = 316345 bytes
diff --git a/misc/less/patches/patch-ac b/misc/less/patches/patch-ac
deleted file mode 100644
index a8041f67c9f..00000000000
--- a/misc/less/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/07/08 10:42:53 tron Exp $
-
-Fix resource leak found by Coverity scan of the NetBSD sources.
-
---- edit.c.orig	2005-12-03 21:20:32.000000000 +0100
-+++ edit.c
-@@ -711,7 +711,8 @@ use_logfile(filename)
- 	 */
- 	filename = shell_unquote(filename);
- 	exists = open(filename, OPEN_READ);
--	close(exists);
-+	if (exists >= 0)
-+		close(exists);
- 	exists = (exists >= 0);
- 
- 	/*
-- 
cgit v1.2.3