From 0b38c6af07a0debfaf3fd347c3ec70abae9bc204 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 Aug 2006 19:36:22 +0000 Subject: [PATCH] * bootstrap.conf (gnulib_modules): Add gnupload. * Makefile.maint (emit_upload_commands): gnupload is now in build-aux. * gnupload: Remove from CVS, since it's now a gnulib module. --- ChangeLog | 5 ++ Makefile.maint | 2 +- bootstrap.conf | 2 +- gnupload | 176 --------------------------------------------------------- 4 files changed, 7 insertions(+), 178 deletions(-) delete mode 100755 gnupload diff --git a/ChangeLog b/ChangeLog index d939715..3a86e66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-08-22 Paul Eggert + * bootstrap.conf (gnulib_modules): Add gnupload. + * Makefile.maint (emit_upload_commands): gnupload is now + in build-aux. + * gnupload: Remove from CVS, since it's now a gnulib module. + * bootstrap (bootstrap_conf_cleanup): Remove. (excluded_files): New var. * bootstrap.conf: Likewise. diff --git a/Makefile.maint b/Makefile.maint index 0cc945d..4512d36 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -587,7 +587,7 @@ cvs-update: emit_upload_commands: @echo ===================================== @echo ===================================== - @echo "$(srcdir)/gnupload $(GNUPLOADFLAGS) \\" + @echo "$(srcdir)/build-aux/gnupload $(GNUPLOADFLAGS) \\" @echo " --to $(gnu_rel_host):coreutils \\" @echo " $(rel-files)" @echo '# send the /tmp/announcement e-mail' diff --git a/bootstrap.conf b/bootstrap.conf index bd83e98..2e30d47 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -44,7 +44,7 @@ gnulib_modules=" fileblocks filemode filenamecat fnmatch-gnu fopen-safer fprintftime fsusage ftruncate fts getdate getgroups gethrxtime getline getloadavg getndelim2 getopt getpagesize getpass-gnu - gettext gettime gettimeofday getugroups getusershell + gettext gettime gettimeofday getugroups getusershell gnupload group-member hard-locale hash hash-pjw host-os human idcache inttostr lchmod lchown lib-ignore linebuffer link-follow long-options lstat malloc mbswidth md5 memcasecmp mempcpy diff --git a/gnupload b/gnupload deleted file mode 100755 index 04363fa..0000000 --- a/gnupload +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/sh -# Sign files and upload them. - -scriptversion=2006-05-20.00 - -# Copyright (C) 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# Originally written by Alexandre Duret-Lutz . - -set -e - -GPG='/usr/bin/gpg --batch --no-tty' -to= - -usage="Usage: $0 [OPTIONS]... FILES... - -Sign all FILES, and upload them to selected destinations. - -Options: - --help print this help text and exit - --to DEST specify one destination for FILES - (multiple --to options are allowed) - --user NAME sign with key NAME - --version output version information and exit - -Recognized destinations are: - alpha.gnu.org:DIRECTORY - savannah.gnu.org:DIRECTORY - savannah.nongnu.org:DIRECTORY - ftp.gnu.org:DIRECTORY - build directive files and upload files by FTP - [user@]host:DIRECTORY upload files with scp - -Example: - gnupload --to sources.redhat.com:~ftp/pub/automake \\ - ""--to alpha.gnu.org:automake \\ - automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2 - -Report bugs to . -Send patches to ." - -while test -n "$1"; do - case $1 in - --help) - echo "$usage" - exit $? - ;; - --to) - if test -z "$2"; then - echo "$0: Missing argument for --to" 1>&2 - exit 1 - else - to="$to $2" - shift 2 - fi - ;; - --user) - if test -z "$2"; then - echo "$0: Missing argument for --user" 1>&2 - exit 1 - else - GPG="$GPG --local-user $2" - shift 2 - fi - ;; - --version) - echo "gnupload $scriptversion" - exit $? - ;; - -*) - echo "$0: Unknown option \`$1', try \`$0 --help'" 1>&2 - exit 1 - ;; - *) - break - ;; - esac -done - -if test $# = 0; then - echo "$0: No file to upload" 1>&2 - exit 1 -else - : -fi - -# Make sure all files exist. We don't want to ask -# for the passphrase if the script will fail. -for file; -do - if test ! -f $file; then - echo "$0: Cannot find \`$file'" 1>&2 - exit 1 - else - : - fi -done - -# Make sure passphrase is not exported in the environment. -unset passphrase - -# Reset PATH to be sure that echo is a built-in. We will later use -# `echo $passphrase' to output the passphrase, so it is important that -# it is a built-in (third-party programs tend to appear in `ps' -# listings with their arguments...). -# Remember this script runs with `set -e', so if echo is not built-in -# it will exit now. -PATH=/empty echo -n "Enter GPG passphrase: " -stty -echo -read -r passphrase -stty echo -echo - -for file; -do - echo "Signing $file..." - rm -f $file.sig - echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file -done - -for dest in $to; -do - for file; - do - echo "Uploading $file to $dest..." - files="$file $file.sig" - destdir=`echo $dest | sed 's/[^:]*://'` - case $dest in - alpha.gnu.org:*) - rm -f $file.directive $file.directive.asc - echo directory: $destdir >$file.directive - echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive - ncftpput ftp-upload.gnu.org /incoming/alpha $files $file.directive.asc - rm -f $file.directive $file.directive.asc - ;; - ftp.gnu.org:*) - rm -f $file.directive $file.directive.asc - echo directory: $destdir >$file.directive - echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $file.directive - ncftpput ftp-upload.gnu.org /incoming/ftp $files $file.directive.asc - rm -f $file.directive $file.directive.asc - ;; - savannah.gnu.org:*) - ncftpput savannah.gnu.org /incoming/savannah/$destdir $files - ;; - savannah.nongnu.org:*) - ncftpput savannah.nongnu.org /incoming/savannah/$destdir $files - ;; - *) - scp $files $dest - ;; - esac - done -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: -- 2.7.4