From: Eric Blake Date: Sat, 5 Apr 2008 22:55:03 +0000 (-0600) Subject: Prepare for release. X-Git-Tag: v2.62~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d165d14c0a8facf5bd598c250a6c056fc747be35;p=thirdparty%2Fautoconf.git Prepare for release. * maint.mk (announcement): Avoid deleted option. * cfg.mk (release_archive_dir): Use default. * build-aux/gnupload: New file, from automake/gnulib. * Makefile.am (EXTRA_DIST): Distribute it. * .x-sc_two_space_separator_in_usage: New file, to exempt gnupload from syntax check. Signed-off-by: Eric Blake --- diff --git a/.x-sc_two_space_separator_in_usage b/.x-sc_two_space_separator_in_usage new file mode 100644 index 00000000..1b03a248 --- /dev/null +++ b/.x-sc_two_space_separator_in_usage @@ -0,0 +1 @@ +gnupload diff --git a/ChangeLog b/ChangeLog index ffeab3c3..54272e29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-04-05 Eric Blake + + Prepare for release. + * maint.mk (announcement): Avoid deleted option. + * cfg.mk (release_archive_dir): Use default. + * build-aux/gnupload: New file, from automake/gnulib. + * Makefile.am (EXTRA_DIST): Distribute it. + * .x-sc_two_space_separator_in_usage: New file, to exempt gnupload + from syntax check. + 2008-04-05 Jim Meyering and Ralf Wildenhues diff --git a/Makefile.am b/Makefile.am index 9e3cd4ec..2e1e72f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,8 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \ BUGS \ GNUmakefile maint.mk cfg.mk \ build-aux/git-version-gen \ - build-aux/announce-gen .prev-version .version + build-aux/announce-gen build-aux/gnupload \ + .prev-version .version MAINTAINERCLEANFILES = $(srcdir)/INSTALL diff --git a/build-aux/gnupload b/build-aux/gnupload new file mode 100755 index 00000000..6621ebd8 --- /dev/null +++ b/build-aux/gnupload @@ -0,0 +1,183 @@ +#!/bin/sh +# Sign files and upload them. + +scriptversion=2008-04-02.19 + +# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation +# +# 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 3, 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, see . + +# Originally written by Alexandre Duret-Lutz . + +set -e + +GPG='gpg --batch --no-tty' +to= + +usage="Usage: $0 [OPTIONS]... FILES... + +Sign all FILES, and upload them to selected destinations, according to +. + +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 + cat >$file.directive<$file.directive<