pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2008Q1]: pkgsrc/devel/m4 Pullup ticket 2331 - requested by wiz
details: https://anonhg.NetBSD.org/pkgsrc/rev/38791d212c1b
branches: pkgsrc-2008Q1
changeset: 540262:38791d212c1b
user: spz <spz%pkgsrc.org@localhost>
date: Sun Apr 13 11:45:17 2008 +0000
description:
Pullup ticket 2331 - requested by wiz
security update for m4
Revisions pulled up:
- pkgsrc/devel/m4/Makefile 1.53
- pkgsrc/devel/m4/PLIST 1.10
- pkgsrc/devel/m4/distinfo 1.21
- pkgsrc/devel/m4/patches/patch-aa removed
- pkgsrc/devel/m4/patches/patch-ab removed
- pkgsrc/devel/m4/patches/patch-ac removed
Module Name: pkgsrc
Committed By: wiz
Date: Fri Apr 11 06:08:43 UTC 2008
Modified Files:
pkgsrc/devel/m4: Makefile PLIST distinfo
Removed Files:
pkgsrc/devel/m4/patches: patch-aa patch-ab patch-ac
Log Message:
Update to 1.4.11:
* Noteworthy changes in Version 1.4.11 (2008-04-02) [stable]
Released by Eric Blake, based on git version 1.4.10a
** Security fixes for the -F option, for bugs present since -F was
introduced in 1.3: Avoid core dump with 'm4 -F file -t undefined', and
avoid arbitrary code execution with certain file names.
** Fix regression introduced in 1.4.9b in the `divert' builtin when more
than 512 kibibytes are saved in diversions on platforms like NetBSD
or darwin where fopen(name,"a+") seeks to the end of the file.
** The output of the `maketemp' and `mkstemp' builtins is now quoted if a
file was created. This is a minor security fix, because it was possible
(although rather unlikely) that an unquoted string could match an
existing macro name, such that use of the `mkstemp' output would trigger
inadvertent macro expansion and operate on the wrong file name.
** Enhance the `defn' builtin to support concatenation of multiple text
arguments, as required by POSIX. However, at this time, it is not
possible to concatenate a builtin macro with anything else; a warning is
now issued if this is attempted, although a future version of M4 may
lift this restriction to match other implementations.
** Enhance the `format' builtin to parse all C99 floating point numbers,
even on platforms where strtod(3) is buggy, although the replacement
function does have the known issue of rounding errors when parsing
some decimal floating point values. This fixes testsuite failures
introduced in 1.4.9b.
** Enhance the `index' builtin to guarantee linear behavior, in spite of
the surprisingly large number of systems with a brain-dead quadratic
strstr(3).
** A number of portability improvements inherited from gnulib.
diffstat:
devel/m4/Makefile | 5 ++---
devel/m4/PLIST | 8 +++++++-
devel/m4/distinfo | 11 ++++-------
devel/m4/patches/patch-aa | 18 ------------------
devel/m4/patches/patch-ab | 13 -------------
devel/m4/patches/patch-ac | 24 ------------------------
6 files changed, 13 insertions(+), 66 deletions(-)
diffs (135 lines):
diff -r fe1022bedec2 -r 38791d212c1b devel/m4/Makefile
--- a/devel/m4/Makefile Sat Apr 12 23:52:00 2008 +0000
+++ b/devel/m4/Makefile Sun Apr 13 11:45:17 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2007/09/25 01:23:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.52.6.1 2008/04/13 11:45:17 spz Exp $
-DISTNAME= m4-1.4.10
-PKGREVISION= 2
+DISTNAME= m4-1.4.11
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=m4/}
diff -r fe1022bedec2 -r 38791d212c1b devel/m4/PLIST
--- a/devel/m4/PLIST Sat Apr 12 23:52:00 2008 +0000
+++ b/devel/m4/PLIST Sun Apr 13 11:45:17 2008 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2006/12/04 12:46:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9.12.1 2008/04/13 11:45:17 spz Exp $
bin/${GNU_PROGRAM_PREFIX}m4
${GM4_LINK}bin/gm4
info/m4.info
man/man1/${GNU_PROGRAM_PREFIX}m4.1
share/examples/m4/capitalize.m4
+share/examples/m4/capitalize2.m4
share/examples/m4/comments.m4
share/examples/m4/ddivert.m4
share/examples/m4/debug.m4
@@ -14,6 +15,7 @@
share/examples/m4/foreach2.m4
share/examples/m4/foreachq.m4
share/examples/m4/foreachq2.m4
+share/examples/m4/foreachq3.m4
share/examples/m4/forloop.m4
share/examples/m4/forloop2.m4
share/examples/m4/fstab.m4
@@ -22,6 +24,8 @@
share/examples/m4/incl.m4
share/examples/m4/include.m4
share/examples/m4/indir.m4
+share/examples/m4/join.m4
+share/examples/m4/loop.m4
share/examples/m4/misc.m4
share/examples/m4/multiquotes.m4
share/examples/m4/patsubst.m4
@@ -36,4 +40,6 @@
share/examples/m4/undivert.m4
share/examples/m4/wrap.m4
share/examples/m4/wrapfifo.m4
+share/examples/m4/wraplifo.m4
+share/examples/m4/wraplifo2.m4
@dirrm share/examples/m4
diff -r fe1022bedec2 -r 38791d212c1b devel/m4/distinfo
--- a/devel/m4/distinfo Sat Apr 12 23:52:00 2008 +0000
+++ b/devel/m4/distinfo Sun Apr 13 11:45:17 2008 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.20 2007/07/29 14:36:46 joerg Exp $
+$NetBSD: distinfo,v 1.20.6.1 2008/04/13 11:45:17 spz Exp $
-SHA1 (m4-1.4.10.tar.gz) = 26d47c893722d683308f5d9fc172a11d5b2ad8a9
-RMD160 (m4-1.4.10.tar.gz) = 0a26a714ce9691006524da7c2c3e2859e7321a95
-Size (m4-1.4.10.tar.gz) = 928375 bytes
-SHA1 (patch-aa) = 426327aabb1f48647b3561439dba0261a49860f3
-SHA1 (patch-ab) = 01838a4b055888f48650f6e621f3848c47f7af2a
-SHA1 (patch-ac) = 86c14a4deae3171a0b7a66a2daf94eb58688b742
+SHA1 (m4-1.4.11.tar.gz) = 4d6b7f6344faee39f55af397c25f3e7ad13b6fcb
+RMD160 (m4-1.4.11.tar.gz) = 3689d9681cf9d2effbf87a3202cea68a75ebcec2
+Size (m4-1.4.11.tar.gz) = 1168840 bytes
diff -r fe1022bedec2 -r 38791d212c1b devel/m4/patches/patch-aa
--- a/devel/m4/patches/patch-aa Sat Apr 12 23:52:00 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2007/07/22 06:34:41 wiz Exp $
-
-From Eric Blake -- will be in m4-1.4.11.
-
---- src/output.c.orig 2007-07-05 03:56:06.000000000 +0000
-+++ src/output.c
-@@ -252,6 +252,11 @@ m4_tmpopen (int divnum)
- else if (set_cloexec_flag (fileno (file), true) != 0)
- M4ERROR ((warning_status, errno,
- "Warning: cannot protect diversion across forks"));
-+ /* POSIX states that it is undefined whether an append stream starts
-+ at offset 0 or at the end. We want the beginning. */
-+ else if (fseeko (file, 0, SEEK_SET) != 0)
-+ M4ERROR ((EXIT_FAILURE, errno,
-+ "cannot seek to beginning of diversion"));
- return file;
- }
-
diff -r fe1022bedec2 -r 38791d212c1b devel/m4/patches/patch-ab
--- a/devel/m4/patches/patch-ab Sat Apr 12 23:52:00 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/07/29 14:36:46 joerg Exp $
-
---- lib/freading.c.orig 2007-07-24 15:10:13.000000000 +0000
-+++ lib/freading.c
-@@ -34,6 +34,8 @@ freading (FILE *fp)
- return ((fp->_flags & _IO_NO_WRITES) != 0
- || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
- && fp->_IO_read_base != NULL));
-+#elif defined(__DragonFly__)
-+ return (((struct __FILE_public *)fp)->_flags & __SRD) != 0;
- #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */
- return (fp->_flags & __SRD) != 0;
- #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, mingw */
diff -r fe1022bedec2 -r 38791d212c1b devel/m4/patches/patch-ac
--- a/devel/m4/patches/patch-ac Sat Apr 12 23:52:00 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2007/07/29 14:36:47 joerg Exp $
-
---- configure.orig 2007-07-29 13:25:52.000000000 +0000
-+++ configure
-@@ -11711,10 +11711,17 @@ echo "${ECHO_T}$gl_cv_func_fflush_stdin"
- if test $gl_cv_func_fflush_stdin = no; then
-
- M4_LIBOBJS="$M4_LIBOBJS fflush.$ac_objext"
-- M4_LIBOBJS="$M4_LIBOBJS fseeko.$ac_objext"
-
- REPLACE_FFLUSH=1
-- REPLACE_FSEEKO=1
-+ case "$host_os" in
-+ dragonfly*)
-+ REPLACE_FSEEKO=0
-+ ;;
-+ *)
-+ M4_LIBOBJS="$M4_LIBOBJS fseeko.$ac_objext"
-+ REPLACE_FSEEKO=1
-+ ;;
-+ esac
-
- fi
-
Home |
Main Index |
Thread Index |
Old Index