head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.12 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.10 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.8 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.6 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.2 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.4.0.8 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.6 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.4 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.2 pkgsrc-2008Q1:1.3.0.18 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.16 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.14 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.12 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.12 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.10 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.8 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.6 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.5 date 2008.11.04.14.27.37; author reed; state dead; branches; next 1.4; 1.4 date 2008.04.09.00.38.51; author reed; state Exp; branches 1.4.8.1; next 1.3; 1.3 date 2006.03.20.18.15.38; author jlam; state Exp; branches; next 1.2; 1.2 date 2005.10.16.05.07.58; author reed; state Exp; branches; next 1.1; 1.1 date 2004.05.08.01.28.36; author reed; state Exp; branches; next ; 1.4.8.1 date 2008.11.05.10.19.17; author rtr; state dead; branches; next ; desc @@ 1.5 log @Update to 1.1 This includes a security fix. From ChangeLog: 2008-10-14 Antonio Diaz * Version 1.1 released. * configure: Quote arguments stored in config.status. 2008-08-21 Antonio Diaz * Version 1.0 released. * configure: Added option `--program-prefix'. * signal.c (strip_escapes): Buffer overflow fixed. * signal.c (resize_buffer): Pointer aliasing warning fixed. @ text @$NetBSD: patch-ab,v 1.4 2008/04/09 00:38:51 reed Exp $ --- Makefile.in.orig 2007-08-05 13:45:46.000000000 -0500 +++ Makefile.in 2008-04-08 12:57:13.000000000 -0500 @@@@ -46,35 +46,35 @@@@ install : all install-info if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi - $(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname) - -rm -f $(DESTDIR)$(bindir)/r$(progname) - cd $(DESTDIR)$(bindir) ; ln $(progname) r$(progname) + $(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(program_prefix)$(progname) + -rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname) + cd $(DESTDIR)$(bindir) ; ln $(program_prefix)$(progname) $(program_prefix)r$(progname) install-info : if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d $(DESTDIR)$(infodir) ; fi - $(INSTALL_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(progname).info - -install-info $(DESTDIR)$(infodir)/$(progname).info $(DESTDIR)$(infodir)/dir + $(INSTALL_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info + -install-info $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info $(DESTDIR)$(infodir)/dir install-man : if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi - $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1 - -rm -f $(DESTDIR)$(mandir)/man1/r$(progname).1 - cd $(DESTDIR)$(mandir)/man1 ; ln $(progname).1 r$(progname).1 + $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1 + -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1 + cd $(DESTDIR)$(mandir)/man1 ; ln $(program_prefix)$(progname).1 $(program_prefix)r$(progname).1 install-strip : all $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install uninstall : uninstall-info - -rm -f $(DESTDIR)$(bindir)/$(progname) - -rm -f $(DESTDIR)$(bindir)/r$(progname) + -rm -f $(DESTDIR)$(bindir)/$(program_prefix)$(progname) + -rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname) uninstall-info : - -install-info --remove $(DESTDIR)$(infodir)/$(progname).info $(DESTDIR)$(infodir)/dir - -rm -f $(DESTDIR)$(infodir)/$(progname).info + -install-info --remove $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info $(DESTDIR)$(infodir)/dir + -rm -f $(DESTDIR)$(infodir)/$(program_prefix)$(progname).info uninstall-man : - -rm -f $(DESTDIR)$(mandir)/man1/$(progname).1 - -rm -f $(DESTDIR)$(mandir)/man1/r$(progname).1 + -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1 + -rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1 dist : ln -sf . $(DISTNAME) @ 1.4 log @Update to ed-0.9. Both patches changed. I made new patches to support being able to install to program_prefix. (I supplied these upstream too.) From change log: 2008-02-24 Antonio Diaz * Version 0.9 released. * signal.c (sighup_handler): Return 0 if no error. * Arg_parser updated to 1.1. 2007-08-18 Antonio Diaz * Version 0.8 released. * check.sh: Testsuite exits unsuccesfully in case of error. * ed.1: Fixed some minor problems in the manual page. * ed.texinfo: Added 21kB of legalese (fdl.texinfo). 2007-07-18 Antonio Diaz * Version 0.7 released. * buf.c (dec_addr): Now returns correct address when wrapping. 2007-06-29 Antonio Diaz * Version 0.6 released. * License updated to GPL version 3 or later. * signal.c (sigwinch_handler, set_signal): Fixed two minor compatibility problems. * main_loop.c (main_loop): Fixed an infinite loop when reading an empty script. 2007-03-09 Antonio Diaz * Version 0.5 released. * main_loop.c (next_addr): '%' reimplemented as it was in ed 0.2. 2007-01-15 Antonio Diaz * Version 0.4 released. * Fixed some minor problems in the testsuite. 2006-11-11 Antonio Diaz * Version 0.3 released. * buf.c (open_sbuf): Fixed symlink vulnerability using standard function `tmpfile'. * signal.c: Fixed signal handling for SIGINT. * main_loop.c (exec_command): Fixed `c' and `i' commands with address 0. * The pause mode has been removed. * main.c: Added new options `--loose-exit-status' and `--verbose'. * carg_parser.c: New argument parser that replaces `getopt_long'. * `configure' and `Makefile.in' have been replaced. * Removed recursive make for testsuite. * Created directory `doc'. * Removed all pre ISO C89 code. * Removed all global variables. * ed.texinfo: Added to the manual the changes from Andrew and some mine. @ text @d1 1 a1 1 $NetBSD$ @ 1.4.8.1 log @pullup ticket #2575 - requested by reed ed: update package for security fix revisions pulled up: pkgsrc/editors/ed/Makefile 1.11 pkgsrc/editors/ed/distinfo 1.7 pkgsrc/editors/ed/patches/patch-aa r0 pkgsrc/editors/ed/patches/patch-ab r0 Module Name: pkgsrc Committed By: reed Date: Tue Nov 4 14:27:37 UTC 2008 Modified Files: pkgsrc/editors/ed: Makefile distinfo Removed Files: pkgsrc/editors/ed/patches: patch-aa patch-ab Log Message: Update to 1.1 This includes a security fix. From ChangeLog: 2008-10-14 Antonio Diaz * Version 1.1 released. * configure: Quote arguments stored in config.status. 2008-08-21 Antonio Diaz * Version 1.0 released. * configure: Added option `--program-prefix'. * signal.c (strip_escapes): Buffer overflow fixed. * signal.c (resize_buffer): Pointer aliasing warning fixed. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2008/04/09 00:38:51 reed Exp $ @ 1.3 log @* Nuke all references to and definitions of INFO_DIR in package Makefiles and replace with appropriate references to PKGINFODIR instead. * Properly account for split info files during installation. * Move info file listings directly into the package PLISTs. This fixes info-file-related PLIST problems. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2005/10/16 05:07:58 reed Exp $ d3 3 a5 11 --- Makefile.in.orig 1994-11-19 04:45:32.000000000 -0800 +++ Makefile.in 2005-10-15 16:09:14.000000000 -0700 @@@@ -41,8 +41,8 @@@@ prefix = @@prefix@@ exec_prefix = @@exec_prefix@@ bindir = $(exec_prefix)/bin -infodir = $(prefix)/info -mandir = $(prefix)/man/man1 +infodir = $(prefix)/$(PKGINFODIR) +mandir = $(prefix)/$(PKGMANDIR)/man1 manext = .1 d7 48 a54 1 CPPFLAGS = -I. -I$(srcdir) $(DEFS) @@CPPFLAGS@@ @ 1.2 log @Just like this configure doesn't support --infodir, it doesn't support --mandir. Also add to the patch to allow this PKGMANDIR customization. @ text @d1 1 a1 1 $NetBSD$ d11 1 a11 1 +infodir = $(prefix)/$(INFO_DIR) @ 1.1 log @Make sure this installs the info document to INFO_DIR directory. @ text @d3 3 a5 3 --- Makefile.in.orig Fri May 7 17:59:02 2004 +++ Makefile.in Fri May 7 17:59:29 2004 @@@@ -41,7 +41,7 @@@@ d10 1 d12 1 a12 1 mandir = $(prefix)/man/man1 d15 1 @