Date: Fri, 11 Jun 2004 00:12:05 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 54599 for review Message-ID: <200406110012.i5B0C58i040098@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=54599 Change 54599 by peter@peter_daintree on 2004/06/11 00:11:37 IFC @54590 Affected files ... .. //depot/projects/hammer/contrib/cvs/BUGS#3 integrate .. //depot/projects/hammer/contrib/cvs/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/cvs/HACKING#3 integrate .. //depot/projects/hammer/contrib/cvs/INSTALL#5 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.am#5 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/NEWS#5 integrate .. //depot/projects/hammer/contrib/cvs/acinclude.m4#5 integrate .. //depot/projects/hammer/contrib/cvs/aclocal.m4#5 integrate .. //depot/projects/hammer/contrib/cvs/config.h.in#5 integrate .. //depot/projects/hammer/contrib/cvs/configure#5 integrate .. //depot/projects/hammer/contrib/cvs/configure.in#5 integrate .. //depot/projects/hammer/contrib/cvs/diff/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.1#1 branch .. //depot/projects/hammer/contrib/cvs/doc/cvs.man.footer#1 branch .. //depot/projects/hammer/contrib/cvs/doc/cvs.man.header#1 branch .. //depot/projects/hammer/contrib/cvs/doc/cvs.texinfo#5 integrate .. //depot/projects/hammer/contrib/cvs/doc/mkman.in#1 branch .. //depot/projects/hammer/contrib/cvs/doc/stamp-1#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/stamp-vti#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/version-client.texi#4 integrate .. //depot/projects/hammer/contrib/cvs/doc/version.texi#4 integrate .. //depot/projects/hammer/contrib/cvs/lib/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.am#4 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/lib/system.h#4 integrate .. //depot/projects/hammer/contrib/cvs/lib/xsize.h#1 branch .. //depot/projects/hammer/contrib/cvs/man/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/cvs/src/ChangeLog#5 integrate .. //depot/projects/hammer/contrib/cvs/src/add.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/client.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/commit.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/cvs.h#5 integrate .. //depot/projects/hammer/contrib/cvs/src/filesubr.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/history.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/ignore.c#4 integrate .. //depot/projects/hammer/contrib/cvs/src/log.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/sanity.sh#5 integrate .. //depot/projects/hammer/contrib/cvs/src/server.c#8 integrate .. //depot/projects/hammer/contrib/cvs/src/subr.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/update.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/vers_ts.c#5 integrate .. //depot/projects/hammer/contrib/cvs/src/wrapper.c#5 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd64.h#7 edit .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#6 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#15 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#1 branch .. //depot/projects/hammer/lib/msun/src/s_rintf.c#2 integrate .. //depot/projects/hammer/release/Makefile#48 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#26 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#23 integrate .. //depot/projects/hammer/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#89 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#28 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#19 integrate .. //depot/projects/hammer/sys/conf/NOTES#46 integrate .. //depot/projects/hammer/sys/conf/files#61 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#18 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/hammer/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/hammer/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/hammer/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/hammer/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/hammer/sys/dev/fb/vga.c#16 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#12 integrate .. //depot/projects/hammer/sys/dev/kbd/atkbd.c#9 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#10 integrate .. //depot/projects/hammer/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/hammer/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/hammer/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#5 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#15 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#12 integrate .. //depot/projects/hammer/sys/i386/bios/mca_machdep.c#3 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#7 integrate .. //depot/projects/hammer/sys/i386/bios/smbios.c#4 integrate .. //depot/projects/hammer/sys/i386/bios/vpd.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/bios.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#33 integrate .. //depot/projects/hammer/sys/i386/i386/symbols.raw#2 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#12 integrate .. //depot/projects/hammer/sys/i386/include/pc/bios.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#6 integrate .. //depot/projects/hammer/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/hammer/sys/isa/syscons_isa.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/esp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/vx/Makefile#2 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#27 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#22 integrate Differences ... ==== //depot/projects/hammer/contrib/cvs/BUGS#3 (text+ko) ==== @@ -47,12 +47,6 @@ are never a problem, whether or not LockDir is in use. -* "make remotecheck" sometimes fails on test 187a3 with - cvs server: in directory .: - cvs [server aborted]: *PANIC* administration files missing -This does not happen every time. (-kingdon, Nov 96, Red Hat linux 3.0.3). - - * The -m option to "cvs add" does not work with client/server CVS. CVS will accept the option, but it won't actually set the file's description. @@ -84,121 +78,6 @@ P.S. Is anyone working on fixing these bugs? -* From: Roland McGrath <roland@gnu.ai.mit.edu> - To: Cyclic CVS Hackers <info-cvs@prep.ai.mit.edu> - Subject: weird bug - Date: Sat, 25 Mar 1995 16:41:41 -0500 - X-Windows: Even your dog won't like it. - - I just noticed some droppings on my disk from what must be a pretty weird - bug in remote CVS. - - In my home directory on a repository machine I use, I find: - - drwxr-xr-x 4 roland staff 512 Mar 7 14:08 cvs-serv28962 - drwxr-xr-x 4 roland staff 512 Mar 7 14:11 cvs-serv28978 - drwxr-xr-x 4 roland staff 512 Mar 7 15:13 cvs-serv29141 - - OK, so these are leftover cruft from some cvs run that got aborted. - Well, it should clean up after itself, but so what. - - The last one is pretty dull; the real weirdness is the contents of the - first two directories. - - duality 77 # ls -RF cvs-serv28978/ - CVS/ cvs-serv28978/ - - cvs-serv28978/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978: - arpa/ - - cvs-serv28978/cvs-serv28978/arpa: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978: - assert/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978: - bare/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978: - conf/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978: - crypt/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978: - csu/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu: - CVS/ cvs-serv28978/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/CVS: - Entries Repository - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978: - ctype/ - - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype: - CVS/ cvs-serv28978/ - - [...] - - ls: cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978/socket: File name too long - cvs-serv28978/cvs-serv28978/arpa/cvs-serv28978/assert/cvs-serv28978/bare/cvs-serv28978/conf/cvs-serv28978/crypt/cvs-serv28978/csu/cvs-serv28978/ctype/cvs-serv28978/dirent/cvs-serv28978/elf/cvs-serv28978/gnu/cvs-serv28978/gnulib/cvs-serv28978/grp/cvs-serv28978/hurd/cvs-serv28978/hurd/hurd/cvs-serv28978/inet/cvs-serv28978/inet/arpa/cvs-serv28978/inet/netinet[...]/cvs-serv28978/posix/glob/cvs-serv28978/posix/gnu/cvs-serv28978/posix/sys/cvs-serv28978/protocols/cvs-serv28978/pwd/cvs-serv28978/resolv/cvs-serv28978/resolv/arpa/cvs-serv28978/resolv/sys/cvs-serv28978/resource/cvs-serv28978/resource/sys/cvs-serv28978/rpc/cvs-serv28978/setjmp/cvs-serv28978/signal/cvs-serv28978/signal/sys/cvs-serv28978/socket/cvs-serv28978: - -* From: Roland McGrath <roland@gnu.ai.mit.edu> - To: Cyclic CVS Hackers <info-cvs@prep.ai.mit.edu> - Subject: bizarre failure mode - Date: Tue, 7 Mar 95 14:17:28 -0500 - - This is pretty weird: - - CVS_SERVER='TMPDIR=. /usr/local/bin/cvs' ../cvs-build/src/cvs update -q - cvs [server aborted]: could not get working directory: Result too large - [Exit 1] - asylum 29 % grep 'Result too large' /usr/include/sys/errno.h - #define ERANGE 34 /* Result too large */ - - Now, getcwd fails with ERANGE when the buffer is too small. But I don't - know why that would be the case; I don't think there are exceptionally long - directory names involved. It would be robust to notice ERANGE and use a - bigger buffer. But I suspect something weirder is going on. - - The repository in question in duality.gnu.ai.mit.edu:/gd4/gnu/cvsroot/libc. - - Send me a PGP-signed message if you want the password to use the machine - where the problem showed up. - * CVS does not always seem to be waiting to the next filesystem timestamp quanta after commits. So far this has only shown up in testing under the BSDI OS. The symptoms are that ocassionally CVS will not notice that modified files @@ -208,18 +87,22 @@ an incorrect value, though this does not explain why symptoms have only been noticed under BSDI. + * Spaces in arguments to `cvs diff' are currently split on spaces and tabs before being passed to diff. This can often cause diff to abort since it can no longer interpret its options string and if it can, coincidentally, interpret its option string, then the problem may be output in unexpected formats. + * `release' of a project subdir does not remove the `subdir' entry from `./CVS/Entries'. -* The Windows Microsoft Visual C++ project files are out of date, but the - project can still be built under Windows using `nmake'. See the INSTALL - file for more. + +* Most of the remote commands are encountering assertion failures when listing + the toplevel of the repository (e.g. `cvs rlog .'). This appears to be + related to the symlinked CVS root fix. + * Status ==== //depot/projects/hammer/contrib/cvs/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,83 @@ +2004-06-09 Derek Price <derek@ximbiot.com> + + * 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> + + * NEWS: Note CAN-2004-0414 fix. + +2004-05-19 Derek Price <derek@ximbiot.com> + + * NEWS: Note CAN-2004-0396 fix. + +2004-05-17 Derek Price <derek@ximbiot.com> + + * BUGS: Note assertion failure of r* commands. + +2004-05-17 Derek Price <derek@ximbiot.com> + + * BUGS: Remove out of date comment about out of date Windows build + files and several bug reports that are so old, without similar recent + reports, that I'm assuming that the problems have been fixed. + +2004-05-15 Derek Price <derek@ximbiot.com> + + * cvsnt.dsp: Header file list updated. + * cvsnt.dep: Regenerated for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + (Patch from Conrad Pino <conrad@pino.com>.) + +2004-05-13 Derek Price <derek@ximbiot.com> + + * NEWS: Note MSVC++ project file regeneration. + +2004-05-13 Derek Price <derek@ximbiot.com> + + * cvsnt.dsw: Rename "zlib/zlib.*" to "zlib/libz.*". + Add project "lib/libcvs". + * cvsnt.dsp: Revised for "cvsnt.dsw" changes. Move "lib/*.c" to + project "lib/libcvs". Upgraded to Visual C++ 6.0 format. + * cvsnt.dep: Added for "cvsnt.dsp" change. + * cvsnt.mak: Regenerated for "cvsnt.dsp" change. + (Patch from Conrad Pino <conrad@pino.com>.) + + * configure.in: Generate windows-NT/fix-msvc-mak. + +2004-04-30 Derek Price <derek@ximbiot.com> + + * NEWS: Note that man page is generated from cvs.texinfo now. + * configure.in: Build doc/mkman. + * configure, Makefile.in: Regenerated. + +2004-04-26 Derek Price <derek@ximbiot.com> + + * NEWS: Note that :ext: no longer relies on an external transport with + a GNU argument processor. + +2004-04-20 Derek Price <derek@ximbiot.com> + + * NEWS: Note XP directory deletion fix. + +2004-04-16 Derek Price <derek@ximbiot.com> + + * NEWS: Correct CVS name for piped checkout issue now that we have one. + +2004-04-15 Derek Price <derek@ximbiot.com> + + * NEWS: Retroactively add CVE issue name for the piped etc issue. + +2004-04-15 Derek Price <derek@ximbiot.com> + + * NEWS: Retroactively add CVE issue name for the trojan server issue. + +2004-04-14 Derek Price <derek@ximbiot.com> + + * INSTALL (Building from source code under Unix): Move Autoconf & + Automake notes... + * HACKING (Regenerating Build Files): ...here. + 2004-04-13 Derek Price <derek@ximbiot.com> * NEWS: Note validation of paths passed to the client. ==== //depot/projects/hammer/contrib/cvs/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.10 2002/09/02 05:58:30 peter Exp $ +$FreeBSD: src/contrib/cvs/FREEBSD-upgrade,v 1.11 2004/06/09 20:51:26 des Exp $ MAINTAINER= peter@FreeBSD.org @@ -7,39 +7,19 @@ versions or official-patch versions must be imported. To prepare a new cvs dist for import, extract it into a fresh directory; +then delete the files and directories listed in FREEBSD-Xlist. -The following generated files were deleted: -doc/*.ps -doc/*.info* -doc/texinfo.tex -lib/getdate.c -cvsnt.* -cvs.spec* -build.com -*/*.com -*/*.dsp -*/.cvsignore -.cvsignore -README.VMS - -The following non-freebsd-specific directories were deleted: -os2 -emx -windows-NT -vms -zlib - -It is imported from it's top level directory something like this: +CVS is imported from its top level directory something like this: cvs -n import src/contrib/cvs CVSHOME v<version> -The -n option is "dont do anything" so you can see what is about to happen +The -n option is "don't do anything" so you can see what is about to happen first. Remove it when it looks ok. The initial import was done with: cvs import src/contrib/cvs CVSHOME v1_8_1 When new versions are imported, cvs will give instructions on how to merge -the local and vendor changes when/if conflicts arise.. +the local and vendor changes when/if conflicts arise. The developers can be reached at: <devel-cvs@cyclic.com>. Local changes that are suitable for public consumption should be submitted for inclusion ==== //depot/projects/hammer/contrib/cvs/HACKING#3 (text+ko) ==== @@ -104,6 +104,25 @@ (the latter causes Visual C++ 2.1 to create makefiles which Visual C++ 4.0 cannot use). +* Regenerating Build Files + +On UNIX, if you wish to change the Build files, you will need Autoconf and +Automake. + +Some combinations of Automake and Autoconf versions may break the +CVS build if file timestamps aren't set correctly and people don't +have the same versions the developers do, so the rules to run them +automatically aren't included in the generated Makefiles unless you run +configure with the --enable-maintainer-mode option. + +The CVS Makefiles and configure script were built using Automake 1.7.9 and +Autoconf 2.58, respectively. + +There is a known bug in Autoconf 2.57 that will prevent the configure +scripts it generates from working on some platforms. Other combinations of +autotool versions may or may not work. If you get other versions to work, +please send a report to <bug-cvs@gnu.org>. + * Writing patches (strategy) Only some kinds of changes are suitable for inclusion in the ==== //depot/projects/hammer/contrib/cvs/INSTALL#5 (text+ko) ==== @@ -257,21 +257,7 @@ Building from source code under Unix: -1) Some combinations of Automake and Autoconf versions may break the - CVS build if file timestamps aren't set correctly and people don't - have the same versions the developers do, so the rules to run them - automatically aren't included in the generated Makefiles unless you run - configure with --enable-maintainer-mode. - - The CVS Makefiles and configure script were built using Automake 1.7.9 and - Autoconf 2.58, respectively. - - There is a known bug in Autoconf 2.57 that will prevent the configure - scripts it generates from working on some platforms. Other combinations of - autotool versions may or may not work. If you get other versions to work, - please send a report to <bug-cvs@gnu.org>. - -2) Run "configure": +1) Run "configure": $ ./configure @@ -385,7 +371,7 @@ END OF NOTE FOR NDBM GUNK. -3) Try to build it: +2) Try to build it: $ make @@ -396,7 +382,7 @@ compiler information, make output, and anything else you think will be helpful. -3a) Run the regression tests (optional). +3) Run the regression tests (optional). You may also wish to validate the correctness of the new binary by running the regression tests. If they succeed, that is nice to ==== //depot/projects/hammer/contrib/cvs/Makefile.am#5 (text+ko) ==== @@ -35,6 +35,7 @@ TESTS \ build.com \ cvs-format.el \ + cvsnt.dep \ cvsnt.dsp \ cvsnt.dsw \ cvsnt.mak \ ==== //depot/projects/hammer/contrib/cvs/Makefile.in#5 (text+ko) ==== @@ -161,6 +161,7 @@ TESTS \ build.com \ cvs-format.el \ + cvsnt.dep \ cvsnt.dsp \ cvsnt.dsw \ cvsnt.mak \ @@ -372,7 +373,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/zlib + $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ ==== //depot/projects/hammer/contrib/cvs/NEWS#5 (text+ko) ==== @@ -1,18 +1,62 @@ -Changes since 1.11.14: +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. + This addresses the Common Vulnerabilities and Exposures Project's issue + #CAN-2004-0396. Please see <http://www.cve.mitre.org>; for more information. + +BUG FIXES + +* The Microsoft Visual C++ workspace and project files have been repaired and + regenerated with MSVC++ 6.0. + +* The cvs.1 man page is now generated automatically from a section of the CVS + Manual. + +* Thanks to a report from Mark Andrews at the Internet Systems Consortium, the + :ext: connection method no longer relies on a transparent transport that uses + an argument processor that can handle arbitrary ordering of options and other + arguments when using a username other than the caller's. + +* Thanks to Ken Raeburn at MIT, directory deletion, whether via `cvs release' + or empty directory pruning, now works on network shares under Windows XP. + +Changes from 1.11.14 to 1.11.15: +******************************** + SERVER SECURITY ISSUES * Piped checkouts of paths above $CVSROOT no longer work. Previously, clients could have requested the contents of RCS archive files anywhere on a CVS - server. + server. This addresses CVE issue CAN-2004-0405. Please see + <http://www.cve.mitre.org>; for more information. CLIENT SECURITY ISSUES * Clients now check paths from the server to verify that they are within one of the sandboxes the user requested be updated. Previously, a trojan server could have written or overwritten files anywhere the user had access, - presenting a serious security risk. + presenting a serious security risk. This addresses CVE issue CAN-2004-1080. + Please see <http://www.cve.mitre.org>; for more information. GENERAL USER ISSUES ==== //depot/projects/hammer/contrib/cvs/acinclude.m4#5 (text+ko) ==== @@ -267,3 +267,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) +]) ==== //depot/projects/hammer/contrib/cvs/aclocal.m4#5 (text+ko) ==== @@ -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 ==== //depot/projects/hammer/contrib/cvs/config.h.in#5 (text+ko) ==== @@ -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 ==== //depot/projects/hammer/contrib/cvs/configure#5 (text+ko) ==== @@ -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.15. +# Generated by GNU Autoconf 2.58 for Concurrent Versions System (CVS) 1.11.17. # # Report bugs to <bug-cvs@gnu.org>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='Concurrent Versions System (CVS)' PACKAGE_TARNAME='cvs' -PACKAGE_VERSION='1.11.15' -PACKAGE_STRING='Concurrent Versions System (CVS) 1.11.15' +PACKAGE_VERSION='1.11.17' +PACKAGE_STRING='Concurrent Versions System (CVS) 1.11.17' PACKAGE_BUGREPORT='bug-cvs@gnu.org' ac_unique_file="src/cvs.h" @@ -784,7 +784,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Concurrent Versions System (CVS) 1.11.15 to adapt to many kinds of systems. +\`configure' configures Concurrent Versions System (CVS) 1.11.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -846,7 +846,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Concurrent Versions System (CVS) 1.11.15:";; + short | recursive ) echo "Configuration of Concurrent Versions System (CVS) 1.11.17:";; esac cat <<\_ACEOF @@ -1031,7 +1031,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Concurrent Versions System (CVS) configure 1.11.15 +Concurrent Versions System (CVS) configure 1.11.17 generated by GNU Autoconf 2.58 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1045,7 +1045,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Concurrent Versions System (CVS) $as_me 1.11.15, which was +It was created by Concurrent Versions System (CVS) $as_me 1.11.17, which was generated by GNU Autoconf 2.58. Invocation command line was $ $0 $@ @@ -1657,7 +1657,7 @@ # Define the identity of the package. PACKAGE='cvs' - VERSION='1.11.15' + VERSION='1.11.17' # Some tools Automake needs. @@ -6102,84 +6102,774 @@ -cat >>confdefs.h <<\_ACEOF -#define getpass cvs_getpass +for ac_header in stdint.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> _ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------ ## +## Report this to bug-cvs@gnu.org ## +## ------------------------------ ## +_ASBOX + ) | >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406110012.i5B0C58i040098>