- disabled DoS feature in pserver (passing no commit message from client

  caused locking module and spawning editor on server - forever...);
  credits: orzech for noticing vi on cvs's process list ;)
- new %%doc
- release 5

Changed files:
    cvs-pserver-dos.patch -> 1.1
    cvs.spec -> 1.87

diff --git a/cvs-pserver-dos.patch b/cvs-pserver-dos.patch
new file mode 100644 (file)
index 0000000..b3b2692
--- /dev/null
+++ b/cvs-pserver-dos.patch
@@ -0,0 +1,13 @@
+--- 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 comit 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.spec b/cvs.spec
index 5dfcb94fa5d11731c0f896b23dd5622d26dc9d95..4682f515357eaba41135f571223017d6e8e174d4 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -10,7 +10,7 @@ Summary(uk):  
 Summary(zh_CN):        ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS 
 Name:          cvs
 Version:       1.11.2
-Release:       4
+Release:       5
 License:       GPL
 Group:         Development/Version Control
 Source0:       ftp://ftp.cvshome.org/pub/%{name}-1.11.1/%{name}-%{version}.tar.gz
@@ -24,6 +24,7 @@ Patch5:               %{name}-cvspass.patch
 Patch6:                %{name}-libobj.patch
 Patch7:                %{name}-chmod.patch
 Patch8:                %{name}-home_etc.patch
+Patch9:                %{name}-pserver-dos.patch
 URL:           http://www.cyclic.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -171,6 +172,7 @@ pserver.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 rm -f missing
@@ -196,9 +198,6 @@ 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}
 
-gzip -9nf doc/*.ps BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog \
-       contrib/{*.man,README,ChangeLog,intro.doc}
-
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
@@ -237,7 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz doc/*.ps.gz contrib
+%doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog doc/*.ps contrib
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man[158]/*
 %{_infodir}/cvs*