[src/netbsd-1-6]: src/gnu Apply patch (requested by taca in ticket #1716):

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-1-6]: src/gnu Apply patch (requested by taca in ticket #1716):
From: tron <tron%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 11:27:29 +0000
details:   https://anonhg.NetBSD.org/src/rev/abec84bee9a1
branches:  netbsd-1-6
changeset: 531409:abec84bee9a1
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 21 09:45:19 2004 +0000

description:
Apply patch (requested by taca in ticket #1716):
Update cvs to version 1.1.17.

diffstat:

 gnu/dist/cvs/ChangeLog               |    34 +-
 gnu/dist/cvs/NEWS                    |    17 +-
 gnu/dist/cvs/acinclude.m4            |    82 +
 gnu/dist/cvs/aclocal.m4              |    82 +
 gnu/dist/cvs/config.h.in             |    10 +
 gnu/dist/cvs/configure               |  1475 +++++++++++++++++++++++++++++++++-
 gnu/dist/cvs/configure.in            |     3 +-
 gnu/dist/cvs/doc/ChangeLog           |     5 +
 gnu/dist/cvs/doc/cvs.1               |     6 -
 gnu/dist/cvs/doc/cvs.texinfo         |     4 -
 gnu/dist/cvs/doc/stamp-1             |     4 +-
 gnu/dist/cvs/doc/stamp-vti           |     6 +-
 gnu/dist/cvs/doc/version-client.texi |     4 +-
 gnu/dist/cvs/doc/version.texi        |     6 +-
 gnu/dist/cvs/lib/ChangeLog           |     5 +
 gnu/dist/cvs/lib/Makefile.am         |     3 +
 gnu/dist/cvs/lib/Makefile.in         |     6 +-
 gnu/dist/cvs/src/ChangeLog           |    25 +
 gnu/dist/cvs/src/commit.c            |     7 +-
 gnu/dist/cvs/src/cvs.h               |     4 +
 gnu/dist/cvs/src/filesubr.c          |     8 +-
 gnu/dist/cvs/src/history.c           |    33 +-
 gnu/dist/cvs/src/sanity.sh           |    68 +-
 gnu/dist/cvs/src/server.c            |    76 +-
 gnu/dist/cvs/src/subr.c              |    31 +-
 gnu/dist/cvs/src/wrapper.c           |    34 +-
 gnu/usr.bin/cvs/include/config.h     |     4 +-
 27 files changed, 1945 insertions(+), 97 deletions(-)

diffs (truncated from 2509 to 300 lines):

diff -r d750f9664c8b -r abec84bee9a1 gnu/dist/cvs/ChangeLog
--- a/gnu/dist/cvs/ChangeLog    Fri Jun 18 19:56:05 2004 +0000
+++ b/gnu/dist/cvs/ChangeLog    Mon Jun 21 09:45:19 2004 +0000
@@ -1,28 +1,12 @@
-2004-05-15  Derek Price  <derek%ximbiot.com@localhost>
-
-       * libz.dsp: Header file list updated.
-       * libz.mak: Regenerated for "libz.dsp" changes.
-       (Patch from Conrad Pino <conrad%pino.com@localhost>.)
-
-2004-05-13  Derek Price  <derek%ximbiot.com@localhost>
-
-       * .cvsignore: Changed for "libz.dsp", "zlib.dsp" changes.
-       * libz.dsp: Added for "../cvsnt.dsw" changes.
-       * libz.dep: Added for "libz.dsp" addition.
-       * libz.mak: Added for "libz.dsp" addition.
-       * zlib.dsp: Removed for "../cvsnt.dsw" changes.
-       (Patch from Conrad Pino <conrad%pino.com@localhost>.)
-
-2004-05-13  Derek Price  <derek%ximbiot.com@localhost>
-
-       * fix-msvc-make-head.pl, fix-msvc-mak.pl: New files.
-       * .cvsignore: Add fix-msvc-mak.
-
-2004-04-20  Derek Price  <derek%ximbiot.com@localhost>
-
-       * filesubr.c (unlink_file_dir, deep_remove_dir): Handle errno of
-       ENOTEMPTY from dirs under Windows XP.
-       (Report and suggested fix from Ken Raeburn <raeburn%mit.edu@localhost>.)
+2004-06-09  Derek Price  <derek%ximbiot.com@localhost>
+
+       * NEWS: Note Stefan & Sebastian's security fixes.
+       * acinclude.m4 (gl_SIZE_MAX, gl_XSIZE): Import from GNULIB.
+       * configure.in: Call gl_XSIZE.
+
+2004-06-09  Derek Price  <derek%ximbiot.com@localhost>
+
+       * NEWS: Note CAN-2004-0414 fix.
 
 2004-05-19  Derek Price  <derek%ximbiot.com@localhost>
 
diff -r d750f9664c8b -r abec84bee9a1 gnu/dist/cvs/NEWS
--- a/gnu/dist/cvs/NEWS Fri Jun 18 19:56:05 2004 +0000
+++ b/gnu/dist/cvs/NEWS Mon Jun 21 09:45:19 2004 +0000
@@ -1,8 +1,23 @@
-Changes since 1.11.15:
+Changes since 1.11.16:
 **********************
 
 SERVER SECURITY FIXES
 
+* Thanks to Stefan Esser & Sebastian Krahmer, several potential security
+  problems have been fixed.  The ones which were considered dangerous enough
+  to catalogue were assigned issue numbers CAN-2004-0416, CAN-2004-0417, &
+  CAN-2004-0418 by the Common Vulnerabilities and Exposures Project.  Please
+  see <http://www.cve.mitre.org> for more information.
+
+* A potential buffer overflow vulnerability in the server has been fixed.
+  This addresses the Common Vulnerabilities and Exposures Project's issue
+  #CAN-2004-0414.  Please see <http://www.cve.mitre.org> for more information.
+
+Changes from 1.11.15 to 1.11.16:
+********************************
+
+SERVER SECURITY FIXES
+
 * A potential buffer overflow vulnerability in the server has been fixed.
   Prior to this patch, a malicious client could potentially use carefully
   crafted server requests to run arbitrary programs on the CVS server machine.
diff -r d750f9664c8b -r abec84bee9a1 gnu/dist/cvs/acinclude.m4
--- a/gnu/dist/cvs/acinclude.m4 Fri Jun 18 19:56:05 2004 +0000
+++ b/gnu/dist/cvs/acinclude.m4 Mon Jun 21 09:45:19 2004 +0000
@@ -237,3 +237,85 @@
   AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi])
 fi
 ])dnl
+
+
+
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  result=
+  AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
+      else
+        result="$res_hi$res_lo"UL
+      fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
+    fi
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])
+
+
+
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_HEADERS(stdint.h)
+])
diff -r d750f9664c8b -r abec84bee9a1 gnu/dist/cvs/aclocal.m4
--- a/gnu/dist/cvs/aclocal.m4   Fri Jun 18 19:56:05 2004 +0000
+++ b/gnu/dist/cvs/aclocal.m4   Mon Jun 21 09:45:19 2004 +0000
@@ -281,6 +281,88 @@
 fi
 ])dnl
 
+
+
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  result=
+  AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
+      else
+        result="$res_hi$res_lo"UL
+      fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
+    fi
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])
+
+
+
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_HEADERS(stdint.h)
+])
+
 # Do all the work for Automake.                            -*- Autoconf -*-
 
 # This macro actually does too much some checks are only needed if
diff -r d750f9664c8b -r abec84bee9a1 gnu/dist/cvs/config.h.in
--- a/gnu/dist/cvs/config.h.in  Fri Jun 18 19:56:05 2004 +0000
+++ b/gnu/dist/cvs/config.h.in  Mon Jun 21 09:45:19 2004 +0000
@@ -425,6 +425,10 @@
    */
 #undef SERVER_SUPPORT
 
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+#undef SIZE_MAX
+
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
@@ -486,6 +490,12 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
 /* Define to `int' if <sys/types.h> does not define. */
 #undef mode_t
 
diff -r d750f9664c8b -r abec84bee9a1 gnu/dist/cvs/configure
--- a/gnu/dist/cvs/configure    Fri Jun 18 19:56:05 2004 +0000
+++ b/gnu/dist/cvs/configure    Mon Jun 21 09:45:19 2004 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.58 for Concurrent Versions System (CVS) 1.11.16.
+# Generated by GNU Autoconf 2.58 for Concurrent Versions System (CVS) 1.11.17.
 #
 # Report bugs to <bug-cvs%gnu.org@localhost>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='Concurrent Versions System (CVS)'
 PACKAGE_TARNAME='cvs'
-PACKAGE_VERSION='1.11.16'
-PACKAGE_STRING='Concurrent Versions System (CVS) 1.11.16'
+PACKAGE_VERSION='1.11.17'
+PACKAGE_STRING='Concurrent Versions System (CVS) 1.11.17'
 PACKAGE_BUGREPORT='bug-cvs%gnu.org@localhost'
 
 ac_unique_file="src/cvs.h"
@@ -784,7 +784,7 @@
Prev by Date: [src/netbsd-1-6]: src Pull in some fixes from trunk so this compiles on non-N...
Next by Date: [src/netbsd-1-6]: src/gnu/dist/cvs/lib Apply patch (requested by taca in tick...
Previous by Thread: [src/netbsd-1-6]: src Pull in some fixes from trunk so this compiles on non-N...
Next by Thread: [src/netbsd-1-6]: src/gnu/dist/cvs/lib Apply patch (requested by taca in tick...
Indexes:
Home | Main Index | Thread Index | Old Index