[Pkg-cvs-commits] r32 - in /trunk: README.Debian cvs-pserver cvs-pserver.8 patches/68_DSA_external_passwd_file

[93sam at users.alioth.debian.org]

Author: 93sam
Date: Sun Aug 20 01:32:56 2006
New Revision: 32

URL: http://svn.debian.org/wsvn/?sc=1&rev=32
Log:
Add CVS_EXT_PASSWD_FILE support in cvs-pserver, cvs-pserver.conf and
its man page, and document how to use them and what the external
password file should look like in README.Debian

Add comments to the top of 68_DSA_external_passwd_file too.


Modified:
    trunk/README.Debian
    trunk/cvs-pserver
    trunk/cvs-pserver.8
    trunk/patches/68_DSA_external_passwd_file

Modified: trunk/README.Debian
URL: http://svn.debian.org/wsvn/trunk/README.Debian?rev=32&op=diff
==============================================================================
--- trunk/README.Debian (original)
+++ trunk/README.Debian Sun Aug 20 01:32:56 2006
@@ -84,4 +84,37 @@ patch to implement this, and users may k
 similar method in CVSROOT/config.  For more information see the CVS 
 documentation(infobrowser "(CVS)Configuring keyword expansion").
 
+The old CVSROOT/options patch is still present (and updated) to
+support users with old config for now, but will be removed
+soon. Update your config to use CVSROOT/config instead!
+
  -- James Rowe <Jay at jnrowe.ukfsn.org>  Sat,  03 Apr 2004 23:23:57 +0100
+
+External password file support
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The default location for the CVS-specific password file is still
+CVSROOT/passwd. However, support has also been added to override
+this. On the cvs pserver command line you can now add --password-file
+<filename>, or alternatively add
+
+CVS_EXT_PASSWD_FILE=<filename>
+
+in your /etc/cvs-pserver.conf for the Debian pserver wrapper scripts
+to do the right thing for you. If there is enough demand, I'll add
+support for this variable in the CVS debconf templates.
+
+The format of this external password file is *almost* the same as the
+CVSROOT/passwd file. To allow support for multiple repositories, the
+password file needs extra information. Each repository will need its
+own section, then entries for users in the same style as in a normal
+CVSROOT/passwd file:
+
+/full/path/to/repository1
+user1:passwd1:
+user2:passwd2:local_user2
+/full/path/to/repository2
+user1:passwd4:
+user3:passwd5:local_user6
+
+ -- Steve McIntyre <93sam at debian.org> Sun, 20 Aug 2006 01:54:08 +0100

Modified: trunk/cvs-pserver
URL: http://svn.debian.org/wsvn/trunk/cvs-pserver?rev=32&op=diff
==============================================================================
--- trunk/cvs-pserver (original)
+++ trunk/cvs-pserver Sun Aug 20 01:32:56 2006
@@ -33,6 +33,11 @@ done
 cvs_tmp_dir=""
 [ "$CVS_TMP_DIR" != "" ] && cvs_tmp_dir="-T $CVS_TMP_DIR"
 
-exec /usr/bin/cvs -b /usr/bin ${cvs_tmp_dir} ${allow_root_opts} pserver
+external_password_file=""
+[ "$CVS_EXT_PASSWD_FILE" != "" ] && \
+    external_password_file="--password-file $CVS_EXT_PASSWD_FILE"
+
+exec /usr/bin/cvs -b /usr/bin ${cvs_tmp_dir} ${allow_root_opts} \
+    ${external_password_file} pserver
 
 # End of file.

Modified: trunk/cvs-pserver.8
URL: http://svn.debian.org/wsvn/trunk/cvs-pserver.8?rev=32&op=diff
==============================================================================
--- trunk/cvs-pserver.8 (original)
+++ trunk/cvs-pserver.8 Sun Aug 20 01:32:56 2006
@@ -37,6 +37,10 @@ $TMPDIR then /tmp.
 .B CVS_PSERV_LIMIT_CPU
    These may be used to set process limits on cvs resource usage if desired.
 
+.B CVS_EXT_PASSWD_FILE
+   Is the location of an (optional) external password file, used to
+override the CVSROOT/passwd file for authentication if set.
+
 .SH "FILES"
 .B /etc/cvs-cron.conf
 

Modified: trunk/patches/68_DSA_external_passwd_file
URL: http://svn.debian.org/wsvn/trunk/patches/68_DSA_external_passwd_file?rev=32&op=diff
==============================================================================
--- trunk/patches/68_DSA_external_passwd_file (original)
+++ trunk/patches/68_DSA_external_passwd_file Sun Aug 20 01:32:56 2006
@@ -1,3 +1,7 @@
+# Add support for overriding lookups in CVSROOT/passwd
+# Specify --password-file <file> on the pserver command line to use it
+# Initial patch from the Debian DSA team, adapted by Steve McIntyre.
+# See README.Debian for more details.
 diff -ruN cvs-1.12.13-old/src/cvs.h cvs-1.12.13/src/cvs.h
 --- cvs-1.12.13-old/src/cvs.h	2005-10-02 16:17:20.000000000 +0100
 +++ cvs-1.12.13/src/cvs.h	2006-08-19 01:20:33.000000000 +0100