* bootstrap: Default to pserver, and switch to cvs.sv.gnu.org,

to accommodate recent changes to the GNU CVS server.

diff --git a/ChangeLog b/ChangeLog
index 6fc626f81be34611732c87d8238775bec3a1e2bf..ad2120b838481e65c60527de00044ce6c5060306 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2006-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * bootstrap: Default to pserver, and switch to cvs.sv.gnu.org,
+       to accommodate recent changes to the GNU CVS server.
+       * lib/.cvsignore: Add argp-pin.c, mkdirat.c, openat-priv.h.
+

 2005-12-14  Sergey Poznyakoff  <gray@gnu.org.ua>
 
        * src/names.c (name_scan): Take an additional argument requesting
 2005-12-14  Sergey Poznyakoff  <gray@gnu.org.ua>
 
        * src/names.c (name_scan): Take an additional argument requesting

-       exact matching. 
+       exact matching.

        * src/common.h (name_scan): Change prototype.
        * src/delete.c, src/incremen.c, src/update.c: Update invocations
        of name_scan.
        * src/common.h (name_scan): Change prototype.
        * src/delete.c, src/incremen.c, src/update.c: Update invocations
        of name_scan.


@@ -78,7 +84,7 @@
        option grouping.
        (license): Print full list of copyright years
        * NEWS: Update
        option grouping.
        (license): Print full list of copyright years
        * NEWS: Update

-       
+

 2005-12-06  Eric Blake  <ebb9@byu.net> (trivial changes)
 
        * configure.ac (DENSITY_LETTER): Fix m4 overquoting.
 2005-12-06  Eric Blake  <ebb9@byu.net> (trivial changes)
 
        * configure.ac (DENSITY_LETTER): Fix m4 overquoting.

diff --git a/bootstrap b/bootstrap
index 2afc661991aae58d9921a9f14c5810db73cf4716..ccad55ce9dcb3ed08fdd3bf0f58c3d937e2220d6 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap 'tar' from CVS.
 
 
 # Bootstrap 'tar' from CVS.
 

-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -59,7 +59,7 @@ and the result is prepended to the command line options.
 Running without arguments will suffice in most cases. It is equivalent
 to
 
 Running without arguments will suffice in most cases. It is equivalent
 to
 

-    ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
+    ./bootstrap --cvs-auth=pserver

 
 EOF
 }
 
 EOF
 }


@@ -150,10 +150,8 @@ checkout() {
     trap exit 1 2 13 15
     trap 'rm -fr $1; exit 1' 0
 
     trap exit 1 2 13 15
     trap 'rm -fr $1; exit 1' 0
 

-    case "${CVS_AUTH--}" in
-    -)       build_cvs_prefix ext anoncvs
-             ;;
-    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs}
+    case "${CVS_AUTH-pserver}" in
+    pserver) build_cvs_prefix pserver ${CVS_USER:-anonymous}

              ;;
     gserver|server)
             build_cvs_prefix $CVS_AUTH ${CVS_USER--}
              ;;
     gserver|server)
             build_cvs_prefix $CVS_AUTH ${CVS_USER--}


@@ -163,10 +161,7 @@ checkout() {
     *)       echo "$0: Unknown CVS access method" >&2
             exit 1;;
     esac
     *)       echo "$0: Unknown CVS access method" >&2
             exit 1;;
     esac

-    if [ "${CVS_AUTH--}" = "pserver" ]; then
-      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit
-    fi
-    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
+    cvs -q -d ${CVS_PREFIX}cvs.sv.gnu.org:/cvsroot/$1 co $1 || exit

 
     trap - 0
   fi
 
     trap - 0
   fi


@@ -203,11 +198,11 @@ copy_files() {
     esac
     dst=`echo $file | sed 's^.*/^^'`
     if [ $# -eq 3 ]; then
     esac
     dst=`echo $file | sed 's^.*/^^'`
     if [ $# -eq 3 ]; then

-      case $dst in  
+      case $dst in

       ${3}*) ;;
       *) dst=${3}$dst;;
       esac
       ${3}*) ;;
       *) dst=${3}$dst;;
       esac

-    fi  
+    fi

     echo "$0: Copying file $1/$file to $2/$dst"
     cp -p $1/$file $2/$dst
   done
     echo "$0: Copying file $1/$file to $2/$dst"
     cp -p $1/$file $2/$dst
   done