Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Apply patch (requested by christos in ticket #889):
details: https://anonhg.NetBSD.org/src/rev/a005e578cb2a
branches: netbsd-6
changeset: 776349:a005e578cb2a
user: riz <riz%NetBSD.org@localhost>
date: Mon Jun 03 02:45:23 2013 +0000
description:
Apply patch (requested by christos in ticket #889):
Teach rcs about the new cvs "commitid" keyword, so that we don't bitch each
time we play with an RCS file maintained by CVS.
Update cvs for:
- setuid fixes
- acl support
- path name resolution fixes
- "compat format string" fixes so it can use the config files
of older cvs versions.
diffstat:
external/gpl2/xcvs/Makefile.inc | 5 +-
external/gpl2/xcvs/bin/xcvs/Makefile | 7 +-
external/gpl2/xcvs/dist/INSTALL | 198 +-
external/gpl2/xcvs/dist/Makefile.am | 6 +-
external/gpl2/xcvs/dist/Makefile.in | 424 +-
external/gpl2/xcvs/dist/acl/COPYING | 248 +
external/gpl2/xcvs/dist/acl/COPYING.LIB | 481 +
external/gpl2/xcvs/dist/acl/INSTALL | 23 +
external/gpl2/xcvs/dist/acl/README | 279 +
external/gpl2/xcvs/dist/acl/aclconfig.default | 33 +
external/gpl2/xcvs/dist/aclocal.m4 | 348 +-
external/gpl2/xcvs/dist/build-aux/compile | 21 +-
external/gpl2/xcvs/dist/build-aux/config.guess | 96 +-
external/gpl2/xcvs/dist/build-aux/config.sub | 32 +-
external/gpl2/xcvs/dist/build-aux/depcomp | 87 +-
external/gpl2/xcvs/dist/build-aux/install-sh | 691 +-
external/gpl2/xcvs/dist/build-aux/mdate-sh | 12 +-
external/gpl2/xcvs/dist/build-aux/missing | 49 +-
external/gpl2/xcvs/dist/build-aux/mkinstalldirs | 162 +
external/gpl2/xcvs/dist/build-aux/texinfo.tex | 919 +-
external/gpl2/xcvs/dist/build-aux/ylwrap | 11 +-
external/gpl2/xcvs/dist/config.h.in | 31 +-
external/gpl2/xcvs/dist/configure | 35902 +++---------------
external/gpl2/xcvs/dist/configure.in | 31 +-
external/gpl2/xcvs/dist/contrib/Makefile.in | 298 +-
external/gpl2/xcvs/dist/contrib/pam/Makefile.in | 115 +-
external/gpl2/xcvs/dist/diff/Makefile.in | 145 +-
external/gpl2/xcvs/dist/diff/diff3.c | 2 +-
external/gpl2/xcvs/dist/diff/util.c | 2 +-
external/gpl2/xcvs/dist/doc/Makefile.in | 426 +-
external/gpl2/xcvs/dist/doc/i18n/Makefile.in | 209 +-
external/gpl2/xcvs/dist/doc/i18n/pt_BR/Makefile.in | 115 +-
external/gpl2/xcvs/dist/lib/Makefile.in | 213 +-
external/gpl2/xcvs/dist/lib/vasnprintf.c | 54 +-
external/gpl2/xcvs/dist/m4/chdir-long.m4 | 8 +-
external/gpl2/xcvs/dist/m4/extensions.m4 | 1 +
external/gpl2/xcvs/dist/m4/glibc2.m4 | 30 +
external/gpl2/xcvs/dist/m4/glibc21.m4 | 30 +
external/gpl2/xcvs/dist/m4/intdiv0.m4 | 70 +
external/gpl2/xcvs/dist/m4/intmax.m4 | 30 +
external/gpl2/xcvs/dist/m4/inttypes-pri.m4 | 30 +
external/gpl2/xcvs/dist/m4/isc-posix.m4 | 24 +
external/gpl2/xcvs/dist/m4/lcmessage.m4 | 30 +
external/gpl2/xcvs/dist/m4/printf-posix.m4 | 44 +
external/gpl2/xcvs/dist/m4/strftime.m4 | 2 +-
external/gpl2/xcvs/dist/maint-aux/Makefile.in | 115 +-
external/gpl2/xcvs/dist/man/Makefile.in | 295 +-
external/gpl2/xcvs/dist/src/Makefile.am | 1 +
external/gpl2/xcvs/dist/src/Makefile.in | 271 +-
external/gpl2/xcvs/dist/src/acl.c | 2211 +
external/gpl2/xcvs/dist/src/add.c | 38 +
external/gpl2/xcvs/dist/src/admin.c | 19 +
external/gpl2/xcvs/dist/src/annotate.c | 19 +
external/gpl2/xcvs/dist/src/commit.c | 28 +
external/gpl2/xcvs/dist/src/cvs.h | 26 +-
external/gpl2/xcvs/dist/src/diff.c | 74 +
external/gpl2/xcvs/dist/src/error.c | 12 +-
external/gpl2/xcvs/dist/src/filesubr.c | 3 +-
external/gpl2/xcvs/dist/src/import.c | 16 +-
external/gpl2/xcvs/dist/src/lock.c | 4 +-
external/gpl2/xcvs/dist/src/log.c | 19 +
external/gpl2/xcvs/dist/src/logmsg.c | 4 +-
external/gpl2/xcvs/dist/src/ls.c | 3 +-
external/gpl2/xcvs/dist/src/main.c | 10 +-
external/gpl2/xcvs/dist/src/mkmodules.c | 94 +-
external/gpl2/xcvs/dist/src/parseinfo.c | 194 +-
external/gpl2/xcvs/dist/src/parseinfo.h | 1 +
external/gpl2/xcvs/dist/src/patch.c | 55 +-
external/gpl2/xcvs/dist/src/rcs.c | 2 +-
external/gpl2/xcvs/dist/src/recurse.c | 2 +-
external/gpl2/xcvs/dist/src/remove.c | 19 +
external/gpl2/xcvs/dist/src/sanity.sh | 170 +-
external/gpl2/xcvs/dist/src/server.c | 49 +-
external/gpl2/xcvs/dist/src/status.c | 20 +
external/gpl2/xcvs/dist/src/subr.c | 11 +-
external/gpl2/xcvs/dist/src/tag.c | 85 +-
external/gpl2/xcvs/dist/src/update.c | 22 +-
external/gpl2/xcvs/dist/src/version.c | 6 +-
external/gpl2/xcvs/lib/libcvs/Makefile | 4 +-
external/gpl2/xcvs/lib/libdiff/Makefile | 4 +-
gnu/usr.bin/rcs/lib/Makefile | 4 +-
gnu/usr.bin/rcs/lib/rcsbase.h | 20 +-
gnu/usr.bin/rcs/lib/rcssyn.c | 31 +-
gnu/usr.bin/rcs/rlog/Makefile | 4 +-
gnu/usr.bin/rcs/rlog/rlog.1 | 4 +-
gnu/usr.bin/rcs/rlog/rlog.c | 27 +-
86 files changed, 13861 insertions(+), 32109 deletions(-)
diffs (truncated from 59883 to 300 lines):
diff -r a9d42df652f5 -r a005e578cb2a external/gpl2/xcvs/Makefile.inc
--- a/external/gpl2/xcvs/Makefile.inc Sun May 19 22:20:17 2013 +0000
+++ b/external/gpl2/xcvs/Makefile.inc Mon Jun 03 02:45:23 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/05/26 12:56:27 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.2.6.1 2013/06/03 02:45:23 riz Exp $
.include <bsd.own.mk>
@@ -7,7 +7,8 @@
WARNS?= 0
CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-parentheses \
- -Wno-format-security -Wno-format
+ -Wno-format-security -Wno-format \
+ -Wno-tautological-constant-out-of-range-compare
BINDIR?= /usr/bin
IDIST= ${NETBSDSRCDIR}/external/gpl2/xcvs/dist
diff -r a9d42df652f5 -r a005e578cb2a external/gpl2/xcvs/bin/xcvs/Makefile
--- a/external/gpl2/xcvs/bin/xcvs/Makefile Sun May 19 22:20:17 2013 +0000
+++ b/external/gpl2/xcvs/bin/xcvs/Makefile Mon Jun 03 02:45:23 2013 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2011/06/04 02:08:50 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2013/06/03 02:45:23 riz Exp $
.include "${.CURDIR}/../../Makefile.inc"
-
PROG= xcvs
# So that cleandir works on case-insensitive file systems.
@@ -11,8 +10,8 @@
.PATH: ${DIST} ${IDIST}/doc ${IDIST}/man
MAN= cvs.1 cvs.5
-SRCS= add.c admin.c annotate.c buffer.c checkin.c checkout.c classify.c \
- client.c commit.c create_adm.c cvsrc.c diff.c edit.c \
+SRCS= acl.c add.c admin.c annotate.c buffer.c checkin.c checkout.c \
+ classify.c client.c commit.c create_adm.c cvsrc.c diff.c edit.c \
entries.c error.c exithandle.c expand_path.c fileattr.c filesubr.c \
find_names.c hardlink.c hash.c history.c ignore.c import.c \
lock.c log.c log-buffer.c login.c logmsg.c ls.c main.c mkmodules.c \
diff -r a9d42df652f5 -r a005e578cb2a external/gpl2/xcvs/dist/INSTALL
--- a/external/gpl2/xcvs/dist/INSTALL Sun May 19 22:20:17 2013 +0000
+++ b/external/gpl2/xcvs/dist/INSTALL Mon Jun 03 02:45:23 2013 +0000
@@ -2,18 +2,24 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
- 5. You can remove the program binaries and object files from the
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,15 +83,22 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -88,25 +111,41 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -117,16 +156,47 @@
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +208,53 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -153,7 +262,8 @@
where SYSTEM can have one of these forms:
Home |
Main Index |
Thread Index |
Old Index