From 7063caea892602fcfe080b5ff43b7c45697891fc Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Mon, 17 Nov 2008 12:18:49 +0100 Subject: Update gnulib files. --- Makefile.am | 2 +- build-aux/gnupload | 84 ++++++++++++++++++++++++++++-------------- gl/m4/getaddrinfo.m4 | 3 +- gl/m4/netdb_h.m4 | 12 ++++-- gl/netdb.in.h | 10 +---- gl/tests/sockets.h | 4 +- lib/gl/Makefile.am | 2 +- lib/gl/m4/gnulib-cache.m4 | 8 ++-- lib/gl/m4/gnulib-comp.m4 | 8 ++-- lib/gl/m4/netdb_h.m4 | 12 ++++-- lib/gl/netdb.in.h | 10 +---- lib/gl/sockets.h | 4 +- lib/gl/tests/Makefile.am | 6 +-- libextra/gl/Makefile.am | 2 +- libextra/gl/m4/gnulib-cache.m4 | 8 ++-- libextra/gl/m4/gnulib-comp.m4 | 8 ++-- 16 files changed, 105 insertions(+), 78 deletions(-) diff --git a/Makefile.am b/Makefile.am index e2256c315d..e6f47b8820 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,6 @@ if HAVE_GUILE SUBDIRS += guile endif -ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/m4 -I libextra/gl/m4 -I libextra/m4 +ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/gl/m4 -I libextra/gl/m4 -I lib/m4 -I libextra/m4 EXTRA_DIST = cfg.mk maint.mk .clcopying diff --git a/build-aux/gnupload b/build-aux/gnupload index b90e3ae231..12c9394943 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,7 +1,7 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2008-04-02.19 +scriptversion=2008-11-12.21 # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation # @@ -24,10 +24,12 @@ set -e GPG='gpg --batch --no-tty' to= +delete=false usage="Usage: $0 [OPTIONS]... FILES... -Sign all FILES, and upload them to selected destinations, according to +Sign all FILES, and upload them to (or delete them from) selected +destinations, according to . Options: @@ -35,6 +37,7 @@ Options: --to DEST specify one destination for FILES (multiple --to options are allowed) --user NAME sign with key NAME + --delete delete FILES from destination instead of uploading --version output version information and exit Recognized destinations are: @@ -45,9 +48,14 @@ Recognized destinations are: build directive files and upload files by FTP [user@]host:DIRECTORY upload files with scp +Deletion only works for ftp.gnu.org and alpha.gnu.org (using the +archive: directive). Otherwise it is a no-op. Deleting a file foo also +deletes foo.sig; do not specify the .sig explicitly. + Simple single-target single-file examples: gnupload --to alpha.gnu.org:automake automake-1.8.2b.tar.gz gnupload --to ftp.gnu.org:automake automake-1.8.3.tar.gz + gnupload --to alpha.gnu.org:automake --delete automake-oops.tar.gz Multiple-target multiple-file example: gnupload --to sources.redhat.com:~ftp/pub/automake \\ @@ -59,6 +67,10 @@ Send patches to ." while test -n "$1"; do case $1 in + --delete) + delete=true + shift + ;; --help) echo "$usage" exit $? @@ -96,23 +108,25 @@ while test -n "$1"; do done if test $# = 0; then - echo "$0: No file to upload" 1>&2 + echo "$0: No file to upload or delete" 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 +if $delete; then :; else + # 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 +fi # Make sure passphrase is not exported in the environment. unset passphrase @@ -129,27 +143,39 @@ 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 +# Nothing to sign if deleting. +if $delete; then :; else + for file + do + echo "Signing $file..." + rm -f $file.sig + echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file + done +fi for dest in $to do for file do - echo "Uploading $file to $dest..." - files="$file $file.sig" + # Prepare arguments. + if $delete; then + echo "Removing $file from $dest..." + files= # nothing to upload if deleting + directive="archive: $file" + else + echo "Uploading $file to $dest..." + files="$file $file.sig" + directive="filename: "`basename -- "$file"` + fi destdir=`echo $dest | sed 's/[^:]*://'` + case $dest in alpha.gnu.org:*) rm -f $file.directive $file.directive.asc cat >$file.directive<$file.directive< ], [getaddrinfo(NULL, NULL, NULL, NULL);], gl_cv_w32_getaddrinfo=yes) - LIBS="$am_save_LIBS"]) + LIBS="$am_save_LIBS" + ]) if test "$gl_cv_w32_getaddrinfo" = "yes"; then LIBS="$LIBS -lws2_32" else diff --git a/gl/m4/netdb_h.m4 b/gl/m4/netdb_h.m4 index 6ae1248177..5a12251f9a 100644 --- a/gl/m4/netdb_h.m4 +++ b/gl/m4/netdb_h.m4 @@ -1,4 +1,4 @@ -# netdb_h.m4 serial 4 +# netdb_h.m4 serial 5 dnl Copyright (C) 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,8 +9,14 @@ AC_DEFUN([gl_HEADER_NETDB], AC_REQUIRE([gl_NETDB_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([netdb.h]) if test $ac_cv_header_netdb_h = yes; then - AC_CHECK_TYPES([struct addrinfo], [NETDB_H=''], [NETDB_H='netdb.h'], - [[#include ]]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #include + struct addrinfo a; + int b = EAI_OVERFLOW; + int c = AI_NUMERICSERV; + ]])], + [NETDB_H=''], [NETDB_H='netdb.h']) HAVE_NETDB_H=1 else NETDB_H='netdb.h' diff --git a/gl/netdb.in.h b/gl/netdb.in.h index 523136224a..363206d3b3 100644 --- a/gl/netdb.in.h +++ b/gl/netdb.in.h @@ -36,12 +36,6 @@ #ifndef _GL_NETDB_H #define _GL_NETDB_H -#if @HAVE_NETDB_H@ && @HAVE_STRUCT_ADDRINFO@ - -/* Declarations for a platform that has . */ - -#else - /* Get netdb.h definitions such as struct hostent for MinGW. */ #include @@ -112,7 +106,7 @@ struct addrinfo # endif # ifndef EAI_OVERFLOW -/* Not defined on mingw32. */ +/* Not defined on mingw32 and Haiku. */ # define EAI_OVERFLOW -12 /* Argument buffer overflow. */ # endif # ifndef EAI_ADDRFAMILY @@ -184,7 +178,5 @@ extern int getnameinfo(const struct sockaddr *restrict sa, socklen_t salen, #endif /* @GNULIB_GETADDRINFO@ */ -#endif /* HAVE_NETDB_H */ - #endif /* _GL_NETDB_H */ #endif /* _GL_NETDB_H */ diff --git a/gl/tests/sockets.h b/gl/tests/sockets.h index 3ab16a0d50..33348db72d 100644 --- a/gl/tests/sockets.h +++ b/gl/tests/sockets.h @@ -20,9 +20,9 @@ #ifndef SOCKETS_H # define SOCKETS_H 1 -#define SOCKETS_1_0 0x100 +#define SOCKETS_1_0 0x100 /* don't use - does not work on Windows XP */ #define SOCKETS_1_1 0x101 -#define SOCKETS_2_0 0x200 +#define SOCKETS_2_0 0x200 /* don't use - does not work on Windows XP */ #define SOCKETS_2_1 0x201 #define SOCKETS_2_2 0x202 diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am index 1e1d9123f7..d0c7232489 100644 --- a/lib/gl/Makefile.am +++ b/lib/gl/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=lib/gl --m4-base=lib/gl/m4 --doc-base=doc --tests-base=lib/gl/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf AUTOMAKE_OPTIONS = 1.5 gnits diff --git a/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4 index 326f6559e9..1e311606cd 100644 --- a/lib/gl/m4/gnulib-cache.m4 +++ b/lib/gl/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf +# gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=lib/gl --m4-base=lib/gl/m4 --doc-base=doc --tests-base=lib/gl/tests --aux-dir=build-aux --with-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gl/override]) @@ -43,11 +43,11 @@ gl_MODULES([ vasprintf ]) gl_AVOID([]) -gl_SOURCE_BASE([gl]) -gl_M4_BASE([gl/m4]) +gl_SOURCE_BASE([lib/gl]) +gl_M4_BASE([lib/gl/m4]) gl_PO_BASE([]) gl_DOC_BASE([doc]) -gl_TESTS_BASE([gl/tests]) +gl_TESTS_BASE([lib/gl/tests]) gl_WITH_TESTS gl_LIB([liblgnu]) gl_LGPL([2]) diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4 index ab92dc2fdb..6ace8bcc90 100644 --- a/lib/gl/m4/gnulib-comp.m4 +++ b/lib/gl/m4/gnulib-comp.m4 @@ -42,7 +42,7 @@ AC_DEFUN([lgl_INIT], m4_pushdef([lgl_LIBSOURCES_LIST], []) m4_pushdef([lgl_LIBSOURCES_DIR], []) gl_COMMON - gl_source_base='gl' + gl_source_base='lib/gl' gl_FUNC_ALLOCA gl_BYTESWAP gl_HEADER_ERRNO_H @@ -132,7 +132,7 @@ AC_DEFUN([lgl_INIT], m4_pushdef([lgltests_LIBSOURCES_LIST], []) m4_pushdef([lgltests_LIBSOURCES_DIR], []) gl_COMMON - gl_source_base='gl/tests' + gl_source_base='lib/gl/tests' gt_TYPE_WCHAR_T gt_TYPE_WINT_T AC_CHECK_FUNCS([shutdown]) @@ -191,7 +191,7 @@ AC_DEFUN([lgl_REPLACE_FUNCS], [ AC_DEFUN([lgl_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([lgl_LIBSOURCES_DIR], [gl]) + m4_define([lgl_LIBSOURCES_DIR], [lib/gl]) m4_append([lgl_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) @@ -218,7 +218,7 @@ AC_DEFUN([lgltests_REPLACE_FUNCS], [ AC_DEFUN([lgltests_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([lgltests_LIBSOURCES_DIR], [gl/tests]) + m4_define([lgltests_LIBSOURCES_DIR], [lib/gl/tests]) m4_append([lgltests_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) diff --git a/lib/gl/m4/netdb_h.m4 b/lib/gl/m4/netdb_h.m4 index 6ae1248177..5a12251f9a 100644 --- a/lib/gl/m4/netdb_h.m4 +++ b/lib/gl/m4/netdb_h.m4 @@ -1,4 +1,4 @@ -# netdb_h.m4 serial 4 +# netdb_h.m4 serial 5 dnl Copyright (C) 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,8 +9,14 @@ AC_DEFUN([gl_HEADER_NETDB], AC_REQUIRE([gl_NETDB_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([netdb.h]) if test $ac_cv_header_netdb_h = yes; then - AC_CHECK_TYPES([struct addrinfo], [NETDB_H=''], [NETDB_H='netdb.h'], - [[#include ]]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #include + struct addrinfo a; + int b = EAI_OVERFLOW; + int c = AI_NUMERICSERV; + ]])], + [NETDB_H=''], [NETDB_H='netdb.h']) HAVE_NETDB_H=1 else NETDB_H='netdb.h' diff --git a/lib/gl/netdb.in.h b/lib/gl/netdb.in.h index a95dbd4e63..a81e2b4378 100644 --- a/lib/gl/netdb.in.h +++ b/lib/gl/netdb.in.h @@ -36,12 +36,6 @@ #ifndef _GL_NETDB_H #define _GL_NETDB_H -#if @HAVE_NETDB_H@ && @HAVE_STRUCT_ADDRINFO@ - -/* Declarations for a platform that has . */ - -#else - /* Get netdb.h definitions such as struct hostent for MinGW. */ #include @@ -112,7 +106,7 @@ struct addrinfo # endif # ifndef EAI_OVERFLOW -/* Not defined on mingw32. */ +/* Not defined on mingw32 and Haiku. */ # define EAI_OVERFLOW -12 /* Argument buffer overflow. */ # endif # ifndef EAI_ADDRFAMILY @@ -184,7 +178,5 @@ extern int getnameinfo(const struct sockaddr *restrict sa, socklen_t salen, #endif /* @GNULIB_GETADDRINFO@ */ -#endif /* HAVE_NETDB_H */ - #endif /* _GL_NETDB_H */ #endif /* _GL_NETDB_H */ diff --git a/lib/gl/sockets.h b/lib/gl/sockets.h index d8f25c238d..f226640a17 100644 --- a/lib/gl/sockets.h +++ b/lib/gl/sockets.h @@ -20,9 +20,9 @@ #ifndef SOCKETS_H # define SOCKETS_H 1 -#define SOCKETS_1_0 0x100 +#define SOCKETS_1_0 0x100 /* don't use - does not work on Windows XP */ #define SOCKETS_1_1 0x101 -#define SOCKETS_2_0 0x200 +#define SOCKETS_2_0 0x200 /* don't use - does not work on Windows XP */ #define SOCKETS_2_1 0x201 #define SOCKETS_2_2 0x202 diff --git a/lib/gl/tests/Makefile.am b/lib/gl/tests/Makefile.am index 363bb76a4d..1e29c51fba 100644 --- a/lib/gl/tests/Makefile.am +++ b/lib/gl/tests/Makefile.am @@ -31,10 +31,10 @@ MAINTAINERCLEANFILES = AM_CPPFLAGS = \ -I. -I$(srcdir) \ - -I../.. -I$(srcdir)/../.. \ - -I../../gl -I$(srcdir)/../../gl + -I../../.. -I$(srcdir)/../../.. \ + -I../../../lib/gl -I$(srcdir)/../../../lib/gl -LDADD = libtests.a ../../gl/liblgnu.la libtests.a $(LIBTESTS_LIBDEPS) +LDADD = libtests.a ../../../lib/gl/liblgnu.la libtests.a $(LIBTESTS_LIBDEPS) libtests_a_SOURCES = libtests_a_LIBADD = $(lgltests_LIBOBJS) diff --git a/libextra/gl/Makefile.am b/libextra/gl/Makefile.am index 81622b721d..4f63b51481 100644 --- a/libextra/gl/Makefile.am +++ b/libextra/gl/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib +# Reproduce by: gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --tests-base=libextra/gl/tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib AUTOMAKE_OPTIONS = 1.5 gnits diff --git a/libextra/gl/m4/gnulib-cache.m4 b/libextra/gl/m4/gnulib-cache.m4 index f41efb2425..273e603df4 100644 --- a/libextra/gl/m4/gnulib-cache.m4 +++ b/libextra/gl/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib +# gnulib-tool --import --dir=. --lib=libxgnu --source-base=libextra/gl --m4-base=libextra/gl/m4 --doc-base=doc --tests-base=libextra/gl/tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -26,11 +26,11 @@ gl_MODULES([ havelib ]) gl_AVOID([dummy stdint]) -gl_SOURCE_BASE([gl]) -gl_M4_BASE([gl/m4]) +gl_SOURCE_BASE([libextra/gl]) +gl_M4_BASE([libextra/gl/m4]) gl_PO_BASE([]) gl_DOC_BASE([doc]) -gl_TESTS_BASE([tests]) +gl_TESTS_BASE([libextra/gl/tests]) gl_LIB([libxgnu]) gl_MAKEFILE_NAME([]) gl_LIBTOOL diff --git a/libextra/gl/m4/gnulib-comp.m4 b/libextra/gl/m4/gnulib-comp.m4 index 5921be18cf..ce0255bfb5 100644 --- a/libextra/gl/m4/gnulib-comp.m4 +++ b/libextra/gl/m4/gnulib-comp.m4 @@ -40,7 +40,7 @@ AC_DEFUN([xgl_INIT], m4_pushdef([xgl_LIBSOURCES_LIST], []) m4_pushdef([xgl_LIBSOURCES_DIR], []) gl_COMMON - gl_source_base='gl' + gl_source_base='libextra/gl' gl_HMAC_MD5 gl_MD5 gl_MEMXOR @@ -82,7 +82,7 @@ AC_DEFUN([xgl_INIT], m4_pushdef([xgltests_LIBSOURCES_LIST], []) m4_pushdef([xgltests_LIBSOURCES_DIR], []) gl_COMMON - gl_source_base='tests' + gl_source_base='libextra/gl/tests' m4_ifval(xgltests_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([xgltests_LIBSOURCES_DIR])[ || for gl_file in ]xgltests_LIBSOURCES_LIST[ ; do @@ -136,7 +136,7 @@ AC_DEFUN([xgl_REPLACE_FUNCS], [ AC_DEFUN([xgl_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([xgl_LIBSOURCES_DIR], [gl]) + m4_define([xgl_LIBSOURCES_DIR], [libextra/gl]) m4_append([xgl_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) @@ -163,7 +163,7 @@ AC_DEFUN([xgltests_REPLACE_FUNCS], [ AC_DEFUN([xgltests_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_define([xgltests_LIBSOURCES_DIR], [tests]) + m4_define([xgltests_LIBSOURCES_DIR], [libextra/gl/tests]) m4_append([xgltests_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) -- cgit v1.2.1