Sprout from master 2002-08-06 10:10:51 UTC kloczek <kloczek@pld-linux.org> '- typo.'
Delete:
cvs-DESTDIR.patch
cvs-ac.patch
cvs-chmod.patch
cvs-cvspass.patch
cvs-fixed_buffer.patch
cvs-hash-in-Makefile.am.patch
cvs-home_etc.patch
cvs-info.patch
cvs-libobj.patch
cvs-newnline.patch
cvs-pserver-dos.patch
cvs-timestamp.patch
cvs-tmprace.patch
cvs-zlib.patch
cvs.inetd
+++ /dev/null
-diff -Nru cvs-1.11/contrib/Makefile.in cvs-1.11.new/contrib/Makefile.in
---- cvs-1.11/contrib/Makefile.in Fri Sep 8 20:28:02 2000
-+++ cvs-1.11.new/contrib/Makefile.in Thu Sep 21 23:21:55 2000
-@@ -80,18 +80,18 @@
-
- install: all installdirs
- for f in $(CONTRIB_FILES) ; do\
-- $(INSTALL_DATA) $(srcdir)/$$f $(libdir)/cvs/contrib/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(libdir)/cvs/contrib/$$f; \
- done
- for f in $(CONTRIB_PROGS) ; do\
-- $(INSTALL_PROGRAM) $$f $(libdir)/cvs/contrib/$$f; \
-+ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(libdir)/cvs/contrib/$$f; \
- done
- for f in $(PROGS) ; do\
-- $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
-+ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; \
- done
- .PHONY: install
-
- installdirs:
-- $(top_srcdir)/mkinstalldirs $(libdir)/cvs/contrib
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/cvs/contrib
- .PHONY: installdirs
-
- tags:
-diff -Nru cvs-1.11/doc/Makefile.in cvs-1.11.new/doc/Makefile.in
---- cvs-1.11/doc/Makefile.in Fri Sep 8 20:28:02 2000
-+++ cvs-1.11.new/doc/Makefile.in Thu Sep 21 23:22:42 2000
-@@ -99,11 +99,11 @@
- install-info: info installdirs
- if test -f cvs.info ; then docdir=.; else docdir=$(srcdir);fi; \
- for i in $$docdir/*.info* ; do \
-- $(INSTALL_DATA) $$i $(infodir)/`basename $$i` ; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`basename $$i` ; \
- done
-
- installdirs:
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
- .PHONY: installdirs
-
- dvi: cvs.dvi cvsclient.dvi
-diff -Nru cvs-1.11/man/Makefile.in cvs-1.11.new/man/Makefile.in
---- cvs-1.11/man/Makefile.in Fri Sep 8 20:28:02 2000
-+++ cvs-1.11.new/man/Makefile.in Thu Sep 21 23:23:45 2000
-@@ -39,17 +39,17 @@
- # install will not fail if $(prefix)/man/man5 does not yet exist.
- install: all installdirs
- for f in $(MAN1FILES); do \
-- $(INSTALL_DATA) $(srcdir)/$$f $(man1dir)/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(man1dir)/$$f; \
- done
- for f in $(MAN5FILES); do \
-- $(INSTALL_DATA) $(srcdir)/$$f $(man5dir)/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(man5dir)/$$f; \
- done
- for f in $(MAN8FILES); do \
-- $(INSTALL_DATA) $(srcdir)/$$f $(man8dir)/$$f; \
-+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(man8dir)/$$f; \
- done
-
- installdirs:
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(man1dir) $(man5dir) $(man8dir)
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
-
- .PHONY: install installdirs
-
-diff -Nru cvs-1.11/src/Makefile.in cvs-1.11.new/src/Makefile.in
---- cvs-1.11/src/Makefile.in Thu Sep 21 23:24:42 2000
-+++ cvs-1.11.new/src/Makefile.in Thu Sep 21 23:24:04 2000
-@@ -87,12 +87,12 @@
-
- install: installdirs
- @for prog in $(PROGS); do \
-- echo Installing $$prog in $(bindir); \
-- $(INSTALL) $$prog $(bindir)/$$prog ; \
-+ echo Installing $$prog in $(DESTDIR)$(bindir); \
-+ $(INSTALL) $$prog $(DESTDIR)$(bindir)/$$prog ; \
- done
-
- installdirs:
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-
- .PHONY: install installdirs
-
+++ /dev/null
---- configure.in.org Sun Aug 4 20:35:47 2002
-+++ configure.in Sun Aug 4 20:50:48 2002
-@@ -390,16 +390,6 @@
- AC_OUTPUT([Makefile \
- cvs.spec \
- contrib/Makefile \
-- contrib/clmerge \
-- contrib/cln_hist \
-- contrib/commit_prep \
-- contrib/cvs_acls \
-- contrib/log \
-- contrib/log_accum \
-- contrib/mfpipe \
-- contrib/pvcs2rcs \
-- contrib/rcslock \
-- contrib/sccs2rcs \
- diff/Makefile \
- doc/Makefile \
- emx/Makefile \
-@@ -407,7 +397,6 @@
- man/Makefile \
- os2/Makefile \
- src/Makefile \
-- src/cvsbug \
- src/version.h \
- tools/Makefile \
- vms/Makefile \
+++ /dev/null
---- cvs-1.11.2/configure.in~ Wed May 15 21:37:12 2002
-+++ cvs-1.11.2/configure.in Wed May 15 21:40:05 2002
-@@ -412,8 +412,7 @@
- tools/Makefile \
- vms/Makefile \
- windows-NT/Makefile \
-- windows-NT/SCC/Makefile]
-- [chmod +x \
-+ windows-NT/SCC/Makefile
- contrib/clmerge \
- contrib/cln_hist \
- contrib/commit_prep \
+++ /dev/null
---- cvs-1.11.1p1/src/login.c.bero Tue Jul 31 18:12:58 2001
-+++ cvs-1.11.1p1/src/login.c Tue Jul 31 18:17:32 2001
-@@ -322,8 +322,18 @@
- fp = CVS_FOPEN (passfile, "r");
- if (fp == NULL)
- {
-- error (0, errno, "warning: failed to open %s for reading", passfile);
-- goto process;
-+ /* The password file doesn't exist yet - probably because it's
-+ * the first time someone uses cvs login. Create it.
-+ */
-+ fp = CVS_FOPEN (passfile, "w");
-+ fclose (fp);
-+ fp = CVS_FOPEN (passfile, "r");
-+ if (fp == NULL)
-+ {
-+ /* Creating the password file didn't work. Bail out. */
-+ error (0, errno, "warning: failed to open %s for reading", passfile);
-+ goto process;
-+ }
- }
-
- cvsroot_canonical = normalize_cvsroot (root);
+++ /dev/null
-diff -ur cvs-1.11.1p1.orig/src/buffer.c cvs-1.11.1p1/src/buffer.c
---- cvs-1.11.1p1.orig/src/buffer.c Thu Apr 19 21:29:05 2001
-+++ cvs-1.11.1p1/src/buffer.c Thu Feb 14 13:22:23 2002
-@@ -1,6 +1,7 @@
- /* Code for the buffer data structure. */
-
- #include <assert.h>
-+#include <unistd.h>
- #include "cvs.h"
- #include "buffer.h"
-
-@@ -292,15 +293,28 @@
-
- if (nbytes != data->size)
- {
-+ struct buffer_data *p;
-+ int cnt;
-+
- /* Not all the data was written out. This is only
- permitted in nonblocking mode. Adjust the buffer,
- and return. */
-
- assert (buf->nonblocking);
-
-+ cnt = 0;
-+ for (p = data; p->next; p = p->next)
-+ cnt++;
-+
- data->size -= nbytes;
- data->bufp += nbytes;
-
-+ /* Don't allow buffers to grow over 100 pages. */
-+ if (cnt > 100) {
-+ usleep(100000);
-+ continue;
-+ }
-+
- return 0;
- }
- }
+++ /dev/null
---- cvs-1.11.1p1/contrib/Makefile.am.comment Thu Aug 30 17:44:49 2001
-+++ cvs-1.11.1p1/contrib/Makefile.am Thu Aug 30 17:45:39 2001
-@@ -71,9 +71,9 @@
- CLEANFILES = $(bin_SCRIPTS) $(contrib_SCRIPTS)
-
- # we'd rather have a link here rather than two copies of a script
-+# FIXME - this path should be determined dynamically from bindir
-+# & contribdir
- install-data-local:
-- # FIXME - this path should be determined dynamically from bindir
-- # & contribdir
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_LINKS)'; for p in $$list; do \
---- cvs-1.11.1p1/doc/Makefile.am.comment Thu Aug 30 17:43:38 2001
-+++ cvs-1.11.1p1/doc/Makefile.am Thu Aug 30 17:44:19 2001
-@@ -143,8 +143,8 @@
- # don't look through VPATH for targets, but only for sources.
- # - They should be disabled on systems without the bug and in environments
- # where $(srcdir) = $(builddir)
-+# use cat so the time stamp gets set properly
- CVSvn.texi: $(srcdir)/CVSvn.texi
-- # use cat so the time stamp gets set properly
- cat $(srcdir)/CVSvn.texi >$@
- $(srcdir)/CVSvn.texi: $(srcdir)/CVSvn.texi.in $(top_srcdir)/configure.in
- sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/CVSvn.texi.in >$(srcdir)/CVSvn.ttexi
+++ /dev/null
-diff -ruN cvs-1.11.2.org/src/login.c cvs-1.11.2/src/login.c
---- cvs-1.11.2.org/src/login.c Sat Jun 1 23:47:43 2002
-+++ cvs-1.11.2/src/login.c Sat Jun 1 23:49:12 2002
-@@ -30,7 +30,7 @@
- #endif
-
- #ifndef CVS_PASSWORD_FILE
--#define CVS_PASSWORD_FILE ".cvspass"
-+#define CVS_PASSWORD_FILE "cvspass"
- #endif
-
- /* If non-NULL, get_cvs_password() will just return this. */
-@@ -65,8 +65,13 @@
- return (char *) NULL;
- }
-
-+ if (getenv("CONFIG_DIR")) {
-+ passfile = (char *) xmalloc (strlen (homedir) + strlen (getenv("CONFIG_DIR")) + strlen (CVS_PASSWORD_FILE) + 4);
-+ sprintf (passfile, "%s/%s/%s", homedir, getenv("CONFIG_DIR"), CVS_PASSWORD_FILE);
-+ }
-+ else {
- passfile =
-- (char *) xmalloc (strlen (homedir) + strlen (CVS_PASSWORD_FILE) + 3);
-+ (char *) xmalloc (strlen (homedir) + strlen (CVS_PASSWORD_FILE) + 4);
- strcpy (passfile, homedir);
- #ifndef NO_SLASH_AFTER_HOME
- /* NO_SLASH_AFTER_HOME is defined for VMS, where foo:[bar]/.cvspass is not
-@@ -75,7 +80,9 @@
- kind of thing.... */
- strcat (passfile, "/");
- #endif
-+ strcat (passfile, ".");
- strcat (passfile, CVS_PASSWORD_FILE);
-+ }
-
- /* Safety first and last, Scouts. */
- if (isfile (passfile))
+++ /dev/null
-diff -Nur cvs-1.11.1p1.orig/doc/cvs.texinfo cvs-1.11.1p1/doc/cvs.texinfo
---- cvs-1.11.1p1.orig/doc/cvs.texinfo Tue Apr 24 20:14:52 2001
-+++ cvs-1.11.1p1/doc/cvs.texinfo Sat Aug 4 18:40:13 2001
-@@ -49,9 +49,10 @@
-
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* CVS: (cvs). Concurrent Versions System
--END-INFO-DIR-ENTRY
-+@dircategory Version Control:
-+@direntry
-+* cvs: (cvs). Concurrent Versions System
-+@end direntry
- @end format
- @end ifinfo
-
-diff -Nur cvs-1.11.1p1.orig/doc/cvsclient.texi cvs-1.11.1p1/doc/cvsclient.texi
---- cvs-1.11.1p1.orig/doc/cvsclient.texi Tue Apr 24 20:14:52 2001
-+++ cvs-1.11.1p1/doc/cvsclient.texi Sat Aug 4 18:46:45 2001
-@@ -3,9 +3,9 @@
- @setfilename cvsclient.info
- @include CVSvn.texi
-
--@dircategory Programming
-+@dircategory Version Control:
- @direntry
--* cvsclient: (cvsclient). The CVS client/server protocol.
-+* cvsclient: (cvsclient). The CVS client/server protocol
- @end direntry
-
- @node Top
+++ /dev/null
---- cvs-1.11.2/configure.in~ Wed May 15 21:33:03 2002
-+++ cvs-1.11.2/configure.in Wed May 15 21:35:54 2002
-@@ -204,7 +204,7 @@
-
- AC_FUNC_FNMATCH
- if test "$ac_cv_func_fnmatch_works" = no; then
-- LIBOBJS="$LIBOBJS fnmatch.o"
-+ AC_LIBOBJ(fnmatch)
- fi
-
- dnl for the buffer routine replacements
-@@ -312,7 +312,7 @@
- AC_DEFINE(ENCRYPTION)
- fi
-
--AC_CHECK_FUNC(gethostname, :, LIBOBJS="$LIBOBJS hostname.o")
-+AC_CHECK_FUNC(gethostname, :, AC_LIBOBJ(hostname))
-
- # Check for options requesting client and server feature. If none are
- # given and we have connect(), we want the full client & server arrangement.
-@@ -366,7 +366,7 @@
- [AC_TRY_COMPILE([], [return __CYGWIN32__;],
- ccvs_cv_sys_cygwin32=yes, ccvs_cv_sys_cygwin32=no)])
- if test $ccvs_cv_sys_cygwin32 = yes; then
-- LIBOBJS="$LIBOBJS fncase.o"
-+ AC_LIBOBJ(fncase)
- LIBS="$LIBS -ladvapi32"
-
- dnl On Windows you can only change file times if you can write to
+++ /dev/null
---- cvs-1.11.5/src/logmsg.c
-+++ cvs-1.11.5/src/logmsg.c
-@@ -262,7 +262,7 @@
- }
-
- (void) fprintf (fp,
-- "%s----------------------------------------------------------------------\n",
-+ "\n%s----------------------------------------------------------------------\n",
- CVSEDITPREFIX);
- (void) fprintf (fp,
- "%sEnter Log. Lines beginning with `%.*s' are removed automatically\n%s\n",
+++ /dev/null
---- cvs-1.11.2/src/server.c.orig Tue Jul 2 19:22:18 2002
-+++ cvs-1.11.2/src/server.c Tue Jul 2 19:25:43 2002
-@@ -2791,6 +2791,10 @@
- sleep (secs);
- }
-
-+ /* Don't fork editor on server! It could occur if no commit message
-+ * was passed. */
-+ use_editor = 0;
-+
- exitstatus = (*command) (argument_count, argument_vector);
-
- /* Output any partial lines. If the client doesn't support
+++ /dev/null
---- src/vers_ts.c~ Sun Oct 4 02:01:40 1998
-+++ src/vers_ts.c Mon Jan 8 12:00:57 2001
-@@ -340,13 +340,22 @@
- {
- struct stat sb;
- char *cp;
-- char *ts;
-+ char *ts = NULL;
-+ time_t mtime = 0L;
-
-- if (CVS_LSTAT (file, &sb) < 0)
-+ if (!CVS_LSTAT (file, &sb))
- {
-- ts = NULL;
-+ mtime = sb.st_mtime;
- }
-- else
-+ /* If it's a symlink, return whichever is the newest mtime of
-+ the link and its target, for safety.
-+ */
-+ if (!CVS_STAT (file, &sb))
-+ {
-+ if (mtime < sb.st_mtime)
-+ mtime = sb.st_mtime;
-+ }
-+ if (mtime)
- {
- struct tm *tm_p;
- struct tm local_tm;
+++ /dev/null
---- cvs-1.10/src/cvsbug.in.jbj Mon Aug 31 13:43:39 1998
-+++ cvs-1.10/src/cvsbug.in Mon Aug 31 14:02:41 1998
-@@ -85,9 +85,9 @@
-
- [ -z "$TMPDIR" ] && TMPDIR=/tmp
-
--TEMP=$TMPDIR/p$$
--BAD=$TMPDIR/pbad$$
--REF=$TMPDIR/pf$$
-+TEMP="/bin/mktemp $TMPDIR/p.XXXXXX"
-+BAD="/bin/mktemp $TMPDIR/pbad.XXXXXX"
-+REF="/bin/mktemp $TMPDIR/pf.XXXXXX"
-
- if [ -z "$LOGNAME" -a -n "$USER" ]; then
- LOGNAME=$USER
+++ /dev/null
-diff -ur cvs-1.11.1/configure.in cvs-1.11.1.zlib/configure.in
---- cvs-1.11.1/configure.in Wed Apr 25 23:51:25 2001
-+++ cvs-1.11.1.zlib/configure.in Wed May 30 21:48:59 2001
-@@ -300,6 +300,8 @@
- enable_server=yes
- fi])
-
-+AC_CHECK_LIB(z, zlibVersion)
-+
- dnl The auth server needs to be able to check passwords against passwd
- dnl file entries, so we only #define AUTH_SERVER_SUPPORT if we can
- dnl find the crypt function.
-@@ -410,8 +410,7 @@
- tools/Makefile \
- vms/Makefile \
- windows-NT/Makefile \
-- windows-NT/SCC/Makefile \
-- zlib/Makefile],
-+ windows-NT/SCC/Makefile]
- [chmod +x \
- contrib/clmerge \
- contrib/cln_hist \
-diff -ur cvs-1.11.1/src/Makefile.am cvs-1.11.1.zlib/src/Makefile.am
---- cvs-1.11.1/src/Makefile.am Tue Apr 24 20:14:53 2001
-+++ cvs-1.11.1.zlib/src/Makefile.am Wed May 30 21:47:19 2001
-@@ -20,7 +20,7 @@
- # try and remove naming ocnflicts and fix Automake to allow particular includes
- # to be attached only to particular object files. Short term fix is either or.
- ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
--INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
-+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
-
- bin_PROGRAMS = cvs
- bin_SCRIPTS = cvsbug
-@@ -100,8 +100,7 @@
-
- cvs_LDADD = \
- ../diff/libdiff.a \
-- ../lib/libcvs.a \
-- ../zlib/libz.a
-+ ../lib/libcvs.a
-
- # extra clean targets
- # wish this could be distclean-hdr-local but it's not part of automake
---- cvs-1.11.2/Makefile.am~ Thu Sep 13 21:08:15 2001
-+++ cvs-1.11.2/Makefile.am Sat May 11 01:30:51 2002
-@@ -17,7 +17,7 @@
- ## Subdirectories to run make in for the primary targets.
- # Unix source subdirs, where we'll want to run lint and etags:
- # This is a legacy variable from b4 Automake
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
- windows-NT os2 emx vms
+++ /dev/null
-SERVICE_NAME=cvspserver
-SOCK_TYPE=stream
-PROTOCOL=tcp
-PORT=2401
-FLAGS=nowait
-USER=cvs
-GROUP=cvs
-SERVER=tcpd
-DAEMON=/usr/bin/cvs
-DAEMONARGS="-f --allow-root=/home/cvsroot pserver"
projects / packages / cvs.git / commitdiff