Pullup ticket #5217 - requested by sevan

editors/ed: security fix

Revisions pulled up:
- editors/ed/Makefile                                           1.19
- editors/ed/distinfo                                           1.11

---
   Module Name:    pkgsrc
   Committed By:   wiz
   Date:           Thu Jan 12 11:20:02 UTC 2017

   Modified Files:
           pkgsrc/editors/ed: Makefile distinfo

   Log Message:
   Updated ed to 1.14.1.

   Changes in version 1.14:

   Version 1.14 is the largest bug hunt ever attempted in GNU ed. Other
   goals of version 1.14 are to complete the documentation and to remove
   any gratuitous incompatibilities with the POSIX standard. Thanks to Ori
   Avtalion for initiating all this with a couple bug reports. ;-)

   Byte counts, informative messages, command error messages, and the '?'
   and '!' prompts are now written to stdout instead of to stderr. The
   standard error (stderr) is now used only for diagnostic messages.

   The current address is now correctly set to the addressed line after an
   empty insert command.

   Fixed inconsistent behavior of the substitute command. It incorrectly
   reported 'Invalid pattern delimiter' when the two last delimiters were
   omitted after a null regular expression. Now it consistently reports
   'Missing pattern delimiter' if the two last delimiters are omitted after
   any regular expression (null or not).

   's/a/%' has been fixed. It incorrectly replaced 'a' with '%' instead of
   using the replacement from the last substitution.

   An infinite loop, happening when EOF was found in the middle of a
   replacement string, has been fixed.

   Ed no longer accepts newlines in the replacement of a 's' command if it
   is part of the command list of a global command, because in this case
   the meaning of the newline becomes ambiguous. For the same reason, the
   last delimiter can't be omitted if the 's' command is not the last
   command in the command list.

   The substitute command now correctly sets the current address to the
   address of the last line on which a substitution occurred, and leaves it
   unchanged if no substitution is performed.

   A bug in the calculation of address offsets has been fixed. '3 ---- 2'
   was calculated as address -2 instead of the correct address 1.

   Address ranges with the first address omitted are now accepted.

   The current address is now correctly set to the addressed line (or to
   the new last line if at EOF) after an empty replacement text in the
   change command.

   Repeated print suffixes are now rejected. It has been documented that ed
   allows any combination of non-repeated print suffixes and combines their
   effects.

   The substitute command now accepts suffixes in any order.

   The 'repeat substitution' command now rejects multiple count suffixes.

   The 'p' suffix of the 'repeat substitution' command now toggles all the
   print suffixes of the last substitution.

   End of file on standard input now behaves as a 'q' command.

   The modified status is no longer cleared after writing the buffer to the
   standard input of a shell command. (Reported by Jerome Frgacic).

   The descriptions of the 'a', 'c', 'e', 'g', 'i', 'j', 'k', 'm', 'q',
   'r', 's', 'u' and 'w' commands in the manual have been fixed.

   Most tests in the testsuite have been improved. Bug reporting has been
   simplified; only the failed logs and results are kept in the test
   directory, which can then be (tarred, compressed, and) attached to the
   bug report.

2 files changed, 10 insertions, 12 deletions

diff --git a/editors/ed/Makefile b/editors/ed/Makefile
index afd3c0cfb2c..4491663346b 100644
--- a/editors/ed/Makefile
+++ b/editors/ed/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2016/03/05 14:43:14 bsiegert Exp $
+# $NetBSD: Makefile,v 1.18.8.1 2017/02/24 19:22:06 bsiegert Exp $
 
-DISTNAME=		ed-1.13
+DISTNAME=		ed-1.14.1
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_GNU:=ed/}
 EXTRACT_SUFX=		.tar.lz
@@ -10,17 +10,15 @@ HOMEPAGE=		http://www.gnu.org/software/ed/ed.html
 COMMENT=		GNU version of line-oriented text editor
 LICENSE=		gnu-gpl-v3
 
-GNU_CONFIGURE=		YES
-
+GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 
 CONFIGURE_ARGS+=	--program-prefix=g
 
 INSTALL_TARGET=		install install-man
+TEST_TARGET=		check
 
-AUTO_MKDIRS=		yes
-
-.include "../../mk/bsd.prefs.mk"
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 gnu/bin gnu/${PKGMANDIR}/man1
 
 post-install:
 .for f in ed red
diff --git a/editors/ed/distinfo b/editors/ed/distinfo
index 9ea04a02eaa..2a3c8f734cd 100644
--- a/editors/ed/distinfo
+++ b/editors/ed/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2016/03/05 14:43:14 bsiegert Exp $
+$NetBSD: distinfo,v 1.10.8.1 2017/02/24 19:22:06 bsiegert Exp $
 
-SHA1 (ed-1.13.tar.lz) = 31fc89eeaa99d6505bc7367651166e925d8fa430
-RMD160 (ed-1.13.tar.lz) = ea6a0365b8da87fba7ea526e6998f8f21f14eb57
-SHA512 (ed-1.13.tar.lz) = f5da185843bce0165326438fa493b5ba3a7b20415276e2269902cccb4f623b09ac5d6c15fb24a8cf89ab27781af05f6235f2b13000eae825074ebabe2f73ffb6
-Size (ed-1.13.tar.lz) = 63832 bytes
+SHA1 (ed-1.14.1.tar.lz) = a91f785f7e16dc68e1c9c86d532ebd9698171ba0
+RMD160 (ed-1.14.1.tar.lz) = b4c74158c8a8806f68e3b8763302ce656d741040
+SHA512 (ed-1.14.1.tar.lz) = dfcd764e2c5b3f1be4656b7f3998bc7d6a2b8296c37e6db7375ba65fe2dc6e62b4d92468e5b9d2ca05e6486c3b480a172bf4b99598412d1b9451505e426fe093
+Size (ed-1.14.1.tar.lz) = 67365 bytes