From a858da7a983d7207ed122b4c90281a1bd4533cb5 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Sat, 7 Dec 2002 12:14:40 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'unlabeled-1.5.2'. Sprout from master 2002-12-07 12:14:40 UTC Tomek Orzechowski '- /home/cvsroot -> /home/services/cvsroot' 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.spec --- cvs-DESTDIR.patch | 87 ------------ cvs-ac.patch | 27 ---- cvs-chmod.patch | 12 -- cvs-cvspass.patch | 23 ---- cvs-fixed_buffer.patch | 40 ------ cvs-hash-in-Makefile.am.patch | 26 ---- cvs-home_etc.patch | 37 ----- cvs-info.patch | 32 ----- cvs-libobj.patch | 29 ---- cvs-newnline.patch | 11 -- cvs-pserver-dos.patch | 13 -- cvs-timestamp.patch | 29 ---- cvs-tmprace.patch | 15 -- cvs-zlib.patch | 55 -------- cvs.spec | 250 ---------------------------------- 15 files changed, 686 deletions(-) delete mode 100644 cvs-DESTDIR.patch delete mode 100644 cvs-ac.patch delete mode 100644 cvs-chmod.patch delete mode 100644 cvs-cvspass.patch delete mode 100644 cvs-fixed_buffer.patch delete mode 100644 cvs-hash-in-Makefile.am.patch delete mode 100644 cvs-home_etc.patch delete mode 100644 cvs-info.patch delete mode 100644 cvs-libobj.patch delete mode 100644 cvs-newnline.patch delete mode 100644 cvs-pserver-dos.patch delete mode 100644 cvs-timestamp.patch delete mode 100644 cvs-tmprace.patch delete mode 100644 cvs-zlib.patch delete mode 100644 cvs.spec diff --git a/cvs-DESTDIR.patch b/cvs-DESTDIR.patch deleted file mode 100644 index a8c9ff6..0000000 --- a/cvs-DESTDIR.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 - diff --git a/cvs-ac.patch b/cvs-ac.patch deleted file mode 100644 index 847fded..0000000 --- a/cvs-ac.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 \ diff --git a/cvs-chmod.patch b/cvs-chmod.patch deleted file mode 100644 index df5cec2..0000000 --- a/cvs-chmod.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 \ diff --git a/cvs-cvspass.patch b/cvs-cvspass.patch deleted file mode 100644 index b022ff0..0000000 --- a/cvs-cvspass.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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); diff --git a/cvs-fixed_buffer.patch b/cvs-fixed_buffer.patch deleted file mode 100644 index 7ef63da..0000000 --- a/cvs-fixed_buffer.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 -+#include - #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; - } - } diff --git a/cvs-hash-in-Makefile.am.patch b/cvs-hash-in-Makefile.am.patch deleted file mode 100644 index 7aebe83..0000000 --- a/cvs-hash-in-Makefile.am.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 diff --git a/cvs-home_etc.patch b/cvs-home_etc.patch deleted file mode 100644 index 8071ff1..0000000 --- a/cvs-home_etc.patch +++ /dev/null @@ -1,37 +0,0 @@ -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)) diff --git a/cvs-info.patch b/cvs-info.patch deleted file mode 100644 index cbda45b..0000000 --- a/cvs-info.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 diff --git a/cvs-libobj.patch b/cvs-libobj.patch deleted file mode 100644 index d6b9481..0000000 --- a/cvs-libobj.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 diff --git a/cvs-newnline.patch b/cvs-newnline.patch deleted file mode 100644 index e861187..0000000 --- a/cvs-newnline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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", diff --git a/cvs-pserver-dos.patch b/cvs-pserver-dos.patch deleted file mode 100644 index 68947ed..0000000 --- a/cvs-pserver-dos.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 diff --git a/cvs-timestamp.patch b/cvs-timestamp.patch deleted file mode 100644 index 759125a..0000000 --- a/cvs-timestamp.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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; diff --git a/cvs-tmprace.patch b/cvs-tmprace.patch deleted file mode 100644 index 670d66d..0000000 --- a/cvs-tmprace.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 diff --git a/cvs-zlib.patch b/cvs-zlib.patch deleted file mode 100644 index 0b2badb..0000000 --- a/cvs-zlib.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 diff --git a/cvs.spec b/cvs.spec deleted file mode 100644 index 4c9a002..0000000 --- a/cvs.spec +++ /dev/null @@ -1,250 +0,0 @@ -Summary: Concurrent Versioning System -Summary(de): Concurrent-Versioning-System -Summary(es): Control de versiones en modo concurrente -Summary(fr): Un système pour maintenir à jour des fichiers -Summary(pl): Concurrent Versioning System -Summary(pt_BR): Controle de versões em modo concorrente -Summary(ru): óÉÓÔÅÍÁ ÕÐÒÁ×ÌÅÎÉÑ ×ÅÒÓÉÑÍÉ -Summary(tr): Sürüm denetim sistemi -Summary(uk): óÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ×ÅÒÓ¦ÑÍÉ -Summary(zh_CN): ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS -Name: cvs -Version: 1.11.2 -Release: 6 -License: GPL -Group: Development/Version Control -Source0: ftp://ftp.cvshome.org/pub/%{name}-1.11.1/%{name}-%{version}.tar.gz -Source1: %{name}.inetd -Patch0: %{name}-tmprace.patch -Patch1: %{name}-info.patch -Patch2: http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/%{name}-1.11.2-20020513-ipv6.patch.gz -Patch3: %{name}-zlib.patch -Patch4: %{name}-fixed_buffer.patch -Patch5: %{name}-cvspass.patch -Patch6: %{name}-libobj.patch -Patch7: %{name}-chmod.patch -Patch8: %{name}-home_etc.patch -Patch9: %{name}-pserver-dos.patch -Patch10: %{name}-ac.patch -Patch11: %{name}-newnline.patch -URL: http://www.cyclic.com/ -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: zlib-devel -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%define _cvs_root /home/services/cvsroot - -%description -CVS means Concurrent Version System; it is a version control system -which can record the history of your files (usually, but not always, -source code). CVS only stores the differences between versions, -instead of every version of every file you've ever created. CVS also -keeps a log of who, when and why changes occurred, among other -aspects. - -CVS is very helpful for managing releases and controlling the -concurrent editing of source files among multiple authors. Instead of -providing version control for a collection of files in a single -directory, CVS provides version control for a hierarchical collection -of directories consisting of revision controlled files. These -directories and files can then be combined together to form a software -release. - -%description -l de -CVS ist ein Frontend für das RCS(1)-Revisionskontrollsystem, das den -Begriff der Revisionskontrolle von einer Sammlung von Dateien in einem -einzelnen Verzeichnis auf eine ganze Hierarchie ausweitet, bestehend -aus revisionskontrollierten Dateien. Diese Verzeichnisse und Dateien -lassen sich zu einer Software-Release kombinieren. CVS bietet die -Funktionen, die zur Verwaltung von Software-Releases und zur -Überwachung der gleichzeitigen Bearbeitung von Quelldateien durch -mehrere Software- Entwickler notwendig sind. - -%description -l es -CVS es un front end para el rcs(1) - revisión control system - que -extiende la noción de control de revisión de una colectánea de archivo -en un único directorio para una colección jerárquica de directorios -que contiene archivos controlados por revisión. Estos directorios y -archivos pueden ser combinados juntos para crear una release de -software. CVS nos ofrece las funciones necesarias para administrar -esta release de software y para controlar la edición concurrente de -archivos fuente por múltiples programadores. - -%description -l fr -"CVS" signifie "Concurrent Version System". C'est un système de -comparaison de versions de fichiers, qui peut garder une trace des -changements apportés à des fichiers (le plus souvent, les fichiers des -sources d'un programme). CVS conserve seulement les différences, et -non l'intégralité d'un fichier récent et d'un fichier plus ancien. A -chaque modification d'un fichier, CVS garde (entre autres) le nom de -la personne ayant fait la modification, la raison justifiant cette -modification, et la date à laquelle celle-ci a eu lieu. - -CVS est très utile pour gérer la mise en commun des modifications -apportées par plusieurs personnes travaillant en parallèle sur les -mêmes fichiers. Au lieu de garder plusieurs versions des fichiers dans -un seul répertoire, CVS crée une série de répertoires, chacun -contenant une nouvelle version des fichiers. Ces répertoires et ces -fichiers peuvent ensuite être regroupés pour former la version la plus -à jour du logiciel. Installez ce package si vous avez besoin -d'utiliser un système de contrôle de version. - -%description -l pl -CVS jest nak³adk± na rcs (Revision Control System, czyli w wolnym -t³umaczeniu system kontroli wersji zasobów), który rozszerza -mo¿liwo¶ci rcs'a z narzêdzia do kontroli zbioru plików w pojedynczym -katalogu o mo¿liwo¶æ kontroli zbioru hierarchicznie u³o¿onych -katalogów z plikami. Z pomoc± CVS w ³atwy sposób mo¿na zarz±dzaæ kodem -¼ród³owym opracowywanym przez nawet bardzo du¿e zespo³y programistów -umo¿liwiaj±c ¶ledzenie i kontrolê wszystkich zmian w trakcie pracy nad -projektami i wypuszczaniem pe³nych wersji oprogramowania (release). - -%description -l pt_BR -CVS é um front end para o rcs(1) - revision control system - que -estende a noção de controle de revisão de uma coletânea de arquivo em -um único diretório para uma coleção hierárquica de diretórios que -contém arquivos controlados por revisão. Esses diretórios e arquivos -podem ser combinados juntos para criar uma release de software. CVS -oferece as funções necessárias para administrar essas release de -software e para controlar a edição concorrente de arquivos fonte por -múltiplos programadores. - -%description -l ru -CVS (Concurrent Version System) - ÜÔÏ ÓÉÓÔÅÍÁ ÕÐÒÁ×ÌÅÎÉÑ ×ÅÒÓÉÑÍÉ, -ËÏÔÏÒÁÑ ÕÍÅÅÔ ÚÁÐÉÓÁÔØ ÉÓÔÏÒÉÀ ×ÁÛÉÈ ÆÁÊÌÏ× (ÏÂÙÞÎÏ, ÎÏ ÎÅ ×ÓÅÇÄÁ, ÜÔÏ -ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ). CVS ÓÏÈÒÁÎÑÅÔ ÔÏÌØËÏ ÒÁÚÌÉÞÉÑ ÍÅÖÄÕ ×ÅÒÓÉÑÍÉ ×ÍÅÓÔÏ -ËÁÖÄÏÊ ×ÅÒÓÉÉ ËÁÖÄÏÇÏ ÆÁÊÌÁ, ËÏÔÏÒÁÑ ÂÙÌÁ ËÏÇÄÁ-ÌÉÂÏ ÓÏÚÄÁÎÁ. ôÁËÖÅ -CVS ÈÒÁÎÉÔ ÐÒÏÔÏËÏÌ ÔÏÇÏ, ËÔÏ, ËÏÇÄÁ É ÚÁÞÅÍ ÞÔÏ-ÌÉÂÏ ÉÚÍÅÎÉÌ. - -CVS ÏÞÅÎØ ÐÏÌÅÚÎÁ ÄÌÑ ÏÒÇÁÎÉÚÁÃÉÉ ÒÅÌÉÚÏ× É ÕÐÒÁ×ÌÅÎÉÑ ÐÁÒÁÌÌÅÌØÎÏÊ -ÐÒÁ×ËÏÊ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ× ÎÅÓËÏÌØËÉÍÉ Á×ÔÏÒÁÍÉ. ÷ÍÅÓÔÏ ÐÒÅÄÏÓÔÁ×ÌÅÎÉÑ -ÕÐÒÁ×ÌÅÎÉÑ ×ÅÒÓÉÑÍÉ ÎÁÂÏÒÁ ÆÁÊÌÏ× × ÏÄÎÏÍ ËÁÔÁÌÏÇÅ CVS ÐÒÅÄÏÓÔÁ×ÌÑÅÔ -ÕÐÒÁ×ÌÅÎÉÅ ×ÅÒÓÉÑÍÉ ÉÅÒÁÒÈÉÞÅÓËÏÇÏ ÎÁÂÏÒÁ ËÁÔÁÌÏÇÏ×, ÓÏÓÔÏÑÝÉÈ ÉÚ -ÆÁÊÌÏ×, ×ÅÒÓÉÑÍÉ ËÏÔÏÒÙÈ ÎÁÄÏ ÕÐÒÁ×ÌÌÑÔØ. üÔÉ ÆÁÊÌÙ É ËÁÔÁÌÏÇÉ ÍÏÇÕÔ -ÂÙÔØ ÓÏÂÒÁÎÙ ×ÍÅÓÔÅ ÄÌÑ ÆÏÒÍÉÒÏ×ÁÎÉÑ ÒÅÌÉÚÁ ðï. - -%description -l tr -CVS (Concurrent Versioning System), tek bir dizindeki dosya -topluluðunun sürüm denetimini, denetimi yapýlmýþ dizinlerin hiyerarþik -topluluðuna geniþleten rcs(1) sürüm denetim sisteminin ön yüzüdür. Bu -dizin ve dosyalar, bir yazýlým yayýný oluþturma amacýyla biraraya -getirilebilir. CVS, bu yazýlým yayýnlarýnýn yönetilmesini ve kaynak -dosyalarý bakýmýnýn birden çok yazýlým geliþtiricisi tarafýndan -eþzamanlý olarak yapýlmasýný kontrol etmek için gereken iþlevleri -saðlar. - -%description -l uk -CVS (Concurrent Version System) - ÃÅ ÓÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ×ÅÒÓ¦ÑÍÉ, ÑËÁ -×ͦ¤ ÚÁÐÉÓÁÔÉ ¦ÓÔÏÒ¦À ×ÁÛÉÈ ÆÁÊÌ¦× (ÚÁÚ×ÉÞÁÊ, ÁÌÅ ÎÅ ÚÁ×ÖÄÉ, ÃÅ -×ÉȦÄΦ ÔÅËÓÔÉ). CVS ÚÂÅÒ¦ÇÁ¤ Ô¦ÌØËÉ Ò¦ÚÎÉÃÀ Í¦Ö ×ÅÒÓ¦ÑÍÉ ÚÁͦÓÔØ -ËÏÖÎϧ ×ÅÒÓ¦§ ËÏÖÎÏÇÏ ÆÁÊÌÕ, ÑËÁ ÂÕÌÁ ËÏÌÉÓØ ÓÔ×ÏÒÅÎÁ. ôÁËÏÖ CVS -ÚÂÅÒ¦ÇÁ¤ ÐÒÏÔÏËÏÌ ÔÏÇÏ, ÈÔÏ, ËÏÌÉ ¦ ÎÁצÝÏ ÝÏÓØ ÚͦÎÉ×. - -CVS ÄÕÖÅ ËÏÒÉÓÎÁ ÄÌÑ ÏÒÇÁΦÚÁæÀ ÒÅÌ¦Ú¦× ÔÁ ËÅÒÕ×ÁÎÎÑ ÐÁÒÁÌÅÌØÎÏÀ -ÐÒÁ×ËÏÀ ×ÉÚ¦ÄÎÉÈ ÆÁÊÌ¦× Ë¦ÌØËÏÍÁ Á×ÔÏÒÁÍÉ. úÁͦÓÔØ ÎÁÄÁÎÎÑ ÍÏÖÌÉ×ÏÓÔ¦ -ËÅÒÕ×ÁÎÎÑ ×ÅÒÓ¦ÑÍÉ ÎÁÂÏÒÕ ÆÁÊÌ¦× × ÏÄÎÏÍÕ ËÁÔÁÌÏÚ¦, CVS ÎÁÄÁ¤ -ÍÏÖÌÉצÓÔØ ËÅÒÕ×ÁÎÎÑ ¦¤ÒÁÒȦÞÎÉÍ ÎÁÂÏÒÏÍ ËÁÔÁÌÏǦ×, ÝÏ ÓËÌÁÄÁÀÔØÓÑ Ú -ÆÁÊ̦×, ×ÅÒÓ¦ÑÍÉ ËÏÔÒÉÈ ÔÒÅÂÁ ËÅÒÕ×ÁÔÉ. 㦠ÆÁÊÌÉ ÔÁ ËÁÔÁÌÏÇÉ ÍÏÖÕÔØ -ÂÕÔÉ Ú¦ÂÒÁΦ ÒÁÚÏÍ ÄÌÑ ÆÏÒÍÕ×ÁÎÎÑ ÒÅ̦ÚÕ ðú. - -%package pserver -Summary: rc-inetd config files to run CVS pserver -Summary(pl): Pliki konfiguracyjne rc-ineta do postawienia pservera CVS -Group: Development/Version Control -Requires: rc-inetd -Prereq: cvs - -%description pserver -Config files for rc-inetd that are necessary to run CVS in pserver -mode. - -%description pserver -l pl -Pliki konfiguracyjne rc-inetd niezbêdne do uruchomienia CVSa w trybie -pserver. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p0 -%patch11 -p1 - -%build -rm -f missing -%{__aclocal} -%{__autoheader} -%{__autoconf} -%{__automake} -%configure \ - --enable-server \ - --enable-client -%{__make} - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/sysconfig/rc-inetd,%{_cvs_root}} - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cvs - -rm -f contrib/{.cvsignore,Makefile*,*.pl,*.sh,*.csh} -mv -f $RPM_BUILD_ROOT%{_datadir}/cvs/contrib/rcs2log $RPM_BUILD_ROOT%{_bindir} - -%post -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 - -%postun -[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 - -%pre pserver -if [ "$1" = 1 ]; then - # Add user and group - getgid cvs >/dev/null 2>&1 || %{_sbindir}/groupadd -f -g 52 cvs - id -u cvs >/dev/null 2>&1 || %{_sbindir}/useradd -g cvs -d %{_cvs_root} -u 52 -s /bin/false cvs 2>/dev/null -fi - -%post pserver -if [ "$1" = 1 ]; then - # Initialise repository - %{_bindir}/cvs -d :local:%{_cvs_root} init - chown -R cvs.cvs %{_cvs_root}/CVSROOT -fi -if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload -fi - -%postun pserver -if [ "$1" = "0" ]; then - # Remove user and group - %{_sbindir}/userdel cvs 2>/dev/null - %{_sbindir}/groupdel cvs 2>/dev/null - if [ -f /var/lock/subsys/rc-inetd ]; then - /etc/rc.d/init.d/rc-inetd reload - fi -fi - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(644,root,root,755) -%doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog doc/*.ps contrib -%attr(755,root,root) %{_bindir}/* -%{_mandir}/man[158]/* -%{_infodir}/cvs* - -%files pserver -%defattr(644,root,root,755) -%attr(770,root,cvs) %dir %{_cvs_root} -%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/cvs -- 2.44.0