+++ /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 \
---- cvs-1.11.1p1.org/src/login.c Thu Sep 6 18:18:29 2001
-+++ cvs-1.11.1p1/src/login.c Wed Dec 11 15:19:42 2002
-@@ -7,6 +7,7 @@
- * Allow user to log in for an authenticating server.
- */
+--- cvs-1.11.4/src/filesubr.c.orig Tue Sep 24 22:47:09 2002
++++ cvs-1.11.4/src/filesubr.c Fri Jan 17 20:59:20 2003
+@@ -18,6 +18,7 @@
+ file system semantics. */
+ #include <assert.h>
+#include <sys/stat.h>
#include "cvs.h"
- #include "getline.h"
-@@ -30,7 +31,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. */
-@@ -44,6 +45,8 @@
+ static int deep_remove_dir PROTO((const char *path));
+@@ -969,8 +970,24 @@
+ const char *dir;
+ const char *file;
{
- char *homedir;
- char *passfile;
-+ char *path;
+- char *path = xmalloc (strlen (dir) + 1 + strlen(file) + 1);
+- sprintf (path, "%s/%s", dir, file);
++ char *path,*cfgdir;
+ struct stat st;
-
- /* Environment should override file. */
- if ((passfile = getenv ("CVS_PASSFILE")) != NULL)
-@@ -65,8 +68,17 @@
- return (char *) NULL;
- }
-
-+ if ( (path=getenv("CONFIG_DIR")) && path[0] ) {
-+ path=(char*) malloc(strlen(homedir)+strlen(getenv("CONFIG_DIR"))+2);
-+ sprintf(path, "%s/%s", homedir, getenv("CONFIG_DIR"));
-+ } else path=(char *) NULL;
-+ if ( path && stat(path,&st)!=-1 && S_ISDIR(st.st_mode) ) {
-+ passfile = (char *) xmalloc (strlen (path) + strlen (CVS_PASSWORD_FILE) + 3);
-+ sprintf (passfile, "%s/%s", path, CVS_PASSWORD_FILE);
++ int isdot = (*file == '.');
++
++ if ( (path = getenv("CONFIG_DIR")) && path[0] ) {
++ cfgdir = xmalloc(strlen(dir) + 1 + strlen(path) + 1);
++ sprintf(cfgdir, "%s/%s", dir, path);
++ } else
++ cfgdir = NULL;
++ if ( cfgdir && (stat(path, &st) != -1) && S_ISDIR(st.st_mode) ) {
++ path = xmalloc(strlen(cfgdir) + 1 + strlen(file)-isdot + 1);
++ sprintf (path, "%s/%s", cfgdir, file+isdot);
++ } else {
++ path = xmalloc (strlen (dir) + 1 + strlen(file) + 1);
++ sprintf (path, "%s/%s", dir, 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 +87,11 @@
- kind of thing.... */
- strcat (passfile, "/");
- #endif
-+ strcat (passfile, ".");
- strcat (passfile, CVS_PASSWORD_FILE);
-+ } /* else */
-+ if (path)
-+ free(path);
-
- /* Safety first and last, Scouts. */
- if (isfile (passfile))
---- cvs-1.11.1p1.org/src/cvsrc.c Sun Dec 22 14:18:41 2002
-+++ cvs-1.11.1p1/src/cvsrc.c Sun Dec 22 14:30:43 2002
-@@ -9,13 +9,14 @@
- */
-
-
-+#include <sys/stat.h>
- #include "cvs.h"
- #include "getline.h"
-
- /* this file is to be found in the user's home directory */
-
- #ifndef CVSRC_FILENAME
--#define CVSRC_FILENAME ".cvsrc"
-+#define CVSRC_FILENAME "cvsrc"
- #endif
- char cvsrc[] = CVSRC_FILENAME;
-
-@@ -36,6 +37,9 @@
- char *homeinit;
- FILE *cvsrcfile;
-
-+ char *path;
-+ struct stat st;
-+
- char *line;
- int line_length;
- size_t line_chars_allocated;
-@@ -73,10 +77,22 @@
- if (!homedir)
- return;
-
-+ if ( (path=getenv("CONFIG_DIR")) && path[0] ) {
-+ path=(char*) malloc(strlen(homedir)+strlen(getenv("CONFIG_DIR"))+2);
-+ sprintf(path, "%s/%s", homedir, getenv("CONFIG_DIR"));
-+ } else path=(char *) NULL;
-+ if ( path && stat(path,&st)!=-1 && S_ISDIR(st.st_mode) ) {
-+ homeinit = (char *) xmalloc (strlen (path) + strlen (cvsrc) + 3);
-+ sprintf (homeinit, "%s/%s", path, cvsrc);
-+ }
-+ else {
- homeinit = (char *) xmalloc (strlen (homedir) + strlen (cvsrc) + 10);
- strcpy (homeinit, homedir);
- strcat (homeinit, "/");
- strcat (homeinit, cvsrc);
-+ } /* else */
-+ if (path)
-+ free(path);
-
- /* if it can't be read, there's no point to continuing */
++ if (cfgdir)
++ free(cfgdir);
+ return path;
+ }
+++ /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.4/configure.in.orig Fri Jan 17 19:46:05 2003
++++ cvs-1.11.4/configure.in Fri Jan 17 19:55:47 2003
+@@ -272,13 +272,12 @@
+ AC_FUNC_MMAP
+
+ # Try to find connect and gethostbyname.
+-AC_CHECK_LIB(nsl, main)
+ AC_SEARCH_LIBS(connect, xnet socket inet,
+ AC_DEFINE(HAVE_CONNECT, 1,
+ [Define if you have the connect function.]))
+ dnl no need to search nsl for gethostbyname here since we should have
+ dnl just added libnsl above if we found it.
+-AC_SEARCH_LIBS(gethostbyname, netinet)
++AC_SEARCH_LIBS(gethostbyname, netinet nsl)
+
+
+ dnl
+++ /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
-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])
+--- cvs-1.11.4/configure.in.orig Sat Dec 28 19:02:11 2002
++++ cvs-1.11.4/configure.in Fri Jan 17 19:30:29 2003
+@@ -848,6 +848,7 @@
+ dnl end --enable-*
+ dnl
+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 @@
+
+ dnl For the moment we will assume that all systems which have
+ dnl the unixyness to run configure are unixy enough to do the
+@@ -916,8 +917,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 \
+- zlib/Makefile])
++ windows-NT/SCC/Makefile])
+
+ dnl and we're done
+ AC_OUTPUT
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
Summary(uk): óÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ×ÅÒÓ¦ÑÍÉ
Summary(zh_CN): ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS
Name: cvs
-Version: 1.11.2
-Release: 7
+Version: 1.11.4
+Release: 0.9
License: GPL
Group: Development/Version Control
-Source0: ftp://ftp.cvshome.org/pub/%{name}-%{version}/%{name}-%{version}.tar.gz
+# active ftp only(?)
+Source0: ftp://ftp.cvshome.org/pub/%{name}-%{version}/%{name}-%{version}.tar.bz2
Source1: %{name}.inetd
Patch0: %{name}-tmprace.patch
Patch1: %{name}-info.patch
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
+Patch6: %{name}-home_etc.patch
+Patch7: %{name}-newnline.patch
+Patch8: %{name}-no_libnsl.patch
URL: http://www.cyclic.com/
BuildRequires: autoconf
BuildRequires: automake
Summary: rc-inetd config files to run CVS pserver
Summary(pl): Pliki konfiguracyjne rc-ineta do postawienia pservera CVS
Group: Development/Version Control
+PreReq: %{name} = %{version}
Requires: rc-inetd
-Prereq: cvs
%description pserver
Config files for rc-inetd that are necessary to run CVS in pserver
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p0
-%patch11 -p1
%build
rm -f missing
rm -f contrib/{.cvsignore,Makefile*,*.pl,*.sh,*.csh}
mv -f $RPM_BUILD_ROOT%{_datadir}/cvs/contrib/rcs2log $RPM_BUILD_ROOT%{_bindir}
+%clean
+rm -rf $RPM_BUILD_ROOT
+
%post
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
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
projects / packages / cvs.git / commitdiff