Browse Source

* bootstrap: Default to pserver, and switch to cvs.sv.gnu.org,
to accommodate recent changes to the GNU CVS server.

Paul Eggert 19 years ago
parent
commit
c17a9f91d0
2 changed files with 15 additions and 14 deletions
  1. 8 2
      ChangeLog
  2. 7 12
      bootstrap

+ 8 - 2
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>
 2005-12-14  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 
 	* src/names.c (name_scan): Take an additional argument requesting
 	* src/names.c (name_scan): Take an additional argument requesting
-	exact matching. 
+	exact matching.
 	* src/common.h (name_scan): Change prototype.
 	* src/common.h (name_scan): Change prototype.
 	* src/delete.c, src/incremen.c, src/update.c: Update invocations
 	* src/delete.c, src/incremen.c, src/update.c: Update invocations
 	of name_scan.
 	of name_scan.
@@ -78,7 +84,7 @@
 	option grouping.
 	option grouping.
 	(license): Print full list of copyright years
 	(license): Print full list of copyright years
 	* NEWS: Update
 	* NEWS: Update
-	
+
 2005-12-06  Eric Blake  <ebb9@byu.net> (trivial changes)
 2005-12-06  Eric Blake  <ebb9@byu.net> (trivial changes)
 
 
 	* configure.ac (DENSITY_LETTER): Fix m4 overquoting.
 	* configure.ac (DENSITY_LETTER): Fix m4 overquoting.

+ 7 - 12
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
 # 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
 # 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
 Running without arguments will suffice in most cases. It is equivalent
 to
 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 exit 1 2 13 15
     trap 'rm -fr $1; exit 1' 0
     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)
     gserver|server)
 	     build_cvs_prefix $CVS_AUTH ${CVS_USER--}
 	     build_cvs_prefix $CVS_AUTH ${CVS_USER--}
@@ -163,10 +161,7 @@ checkout() {
     *)       echo "$0: Unknown CVS access method" >&2
     *)       echo "$0: Unknown CVS access method" >&2
 	     exit 1;;
 	     exit 1;;
     esac
     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
     trap - 0
   fi
   fi
@@ -203,11 +198,11 @@ copy_files() {
     esac
     esac
     dst=`echo $file | sed 's^.*/^^'`
     dst=`echo $file | sed 's^.*/^^'`
     if [ $# -eq 3 ]; then
     if [ $# -eq 3 ]; then
-      case $dst in  
+      case $dst in
       ${3}*) ;;
       ${3}*) ;;
       *) dst=${3}$dst;;
       *) dst=${3}$dst;;
       esac
       esac
-    fi	 
+    fi
     echo "$0: Copying file $1/$file to $2/$dst"
     echo "$0: Copying file $1/$file to $2/$dst"
     cp -p $1/$file $2/$dst
     cp -p $1/$file $2/$dst
   done
   done