[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake
'make syntax-check' wants a newer gnulib for 2014 copyright.
Also, a couple of fixes for bootstrap issues reported on IRC:
- on some older glibc systems, ./configure could deadlock due to
a glibc malloc bug
- on FreeBSD systems, a broken autom4te coupled with gettext
0.18.3 prevents bootstrap; we can't work around it, but can at
least inform the user why they have a problem
And as always, portability fixes in other modules, some of which
are used by libvirt.
* .gnulib: Update to latest, in part for bootstrap improvements,
and for the new year.
* bootstrap: Resync to gnulib.
* gnulib/local/m4/ssize_t.m4.diff: Regenerate.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
Pushing under the build-breaker rule now that 'make syntax-check'
is impacted.
* .gnulib 831b84c...c7802e2 (33):
> doc: update main copyright year
> maint: update copyright
> version-etc: new year
> autoupdate
> passfd: give nicer error for recvfd at eof
> autoupdate
> gettimeofday: port recent C++ fix to Emacs
> gettimeofday: fix C++ crosscompilation
> qacl: port to Windows better
> md5, sha1, sha256, sha512: fix compile error in c++ mode
> open-tests: fix build failure with -Werror=old-style-declaration
> md5, sha1, sha256, sha512: fix link error with partial libcrypto
> md5, sha1, sha256, sha512: add gl_SET_CRYPTO_CHECK_DEFAULT
> md5, sha1, sha256, sha512: add 'auto', and a way to specify default
> autoupdate
> bootstrap: warn about BSD toolchain snafu
> open-tests: port to glibc with _FORTIFY_SOURCE and -O1
> include_next: minimize code duplication
> getcwd: fix compile error in configure check
> regex: suppress core dumps from detection code
> md5, sha1, sha256, sha512: support mandating use of openssl
> test-xvasprintf: disable some -Wformat-security diagnostics
> regex: avoid glibc deadlock during configure
> md5, sha1, sha256, sha512: use openssl routines if available
> base64: fix recent compilation regression on some compilers
> autoupdate
> autoupdate
> ignore-value: revert previous code change
> selinux-h: improve stub types and add more stub functions
> ignore-value: prefer GCC version back through 2.0
> pty: Activate the signature wrapper of forkpty.
> maint: fix gendocs.sh permissions
> autoupdate
.gnulib | 2 +-
bootstrap | 12 ++++++++++--
gnulib/local/m4/ssize_t.m4.diff | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gnulib b/.gnulib
index 831b84c..1276a2c 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 831b84c59ef413c57a36b67344467d66a8a2ba70
+Subproject commit 1276a2c5f24c0c932426aca9c899fa524d2443f2
diff --git a/bootstrap b/bootstrap
index e31d17d..ce90bc4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
#! /bin/sh
# Print a version string.
-scriptversion=2013-08-15.22; # UTC
+scriptversion=2013-12-05.23; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 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
@@ -551,6 +551,14 @@ if ! printf "$buildreq" | check_versions; then
fi
fi
+# Warn the user if autom4te appears to be broken; this causes known
+# issues with at least gettext 0.18.3.
+probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
+if test "x$probe" != xhi; then
+ warn_ "WARNING: your autom4te wrapper eats stdin;"
+ warn_ "if bootstrap fails, consider upgrading your autotools"
+fi
+
echo "$0: Bootstrapping from checked-out $package sources..."
# See if we can use gnulib's git-merge-changelog merge driver.
diff --git a/gnulib/local/m4/ssize_t.m4.diff b/gnulib/local/m4/ssize_t.m4.diff
index 93f8ad7..08c2b9c 100644
--- a/gnulib/local/m4/ssize_t.m4.diff
+++ b/gnulib/local/m4/ssize_t.m4.diff
@@ -5,7 +5,7 @@ index 209d64c..5ea72a1 100644
@@ -1,4 +1,4 @@
-# ssize_t.m4 serial 5 (gettext-0.18.2)
+# ssize_t.m4 serial 6 (gettext-0.18.2)
- dnl Copyright (C) 2001-2003, 2006, 2010-2013 Free Software Foundation, Inc.
+ dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,21 @@ AC_DEFUN([gt_TYPE_SSIZE_T],
--
1.8.4.2
11 years, 3 months
- 1
- 0
[libvirt] [PATCH] docs: return paragraph must be last
by Eric Blake
Commit eb70ceb tried to create a code block for
libvirt-libvirt.html#virConnectGetType, but failed to note
that our doc generator treats everything after "Returns" as
part of the return description rather than looking for
paragraph and code layout. Fix some other API that also had
generic details crammed into the return type paragraph.
* src/libvirt.c (virConnectOpen, virConnectOpenReadOnly)
(virConnectOpenAuth, virConnectListAllDomains): Fit doc pattern.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
Pushing under the trivial rule.
src/libvirt.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/libvirt.c b/src/libvirt.c
index f43718d..0752c3f 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1379,8 +1379,6 @@ failed:
* This function should be called first to get a connection to the
* Hypervisor and xen store
*
- * Returns a pointer to the hypervisor connection or NULL in case of error
- *
* If @name is NULL, if the LIBVIRT_DEFAULT_URI environment variable is set,
* then it will be used. Otherwise if the client configuration file
* has the "uri_default" parameter set, then it will be used. Finally
@@ -1393,6 +1391,8 @@ failed:
* environment variable LIBVIRT_AUTOSTART=0
*
* URIs are documented at http://libvirt.org/uri.html
+ *
+ * Returns a pointer to the hypervisor connection or NULL in case of error
*/
virConnectPtr
virConnectOpen(const char *name)
@@ -1425,9 +1425,9 @@ error:
* See virConnectOpen for notes about environment variables which can
* have an effect on opening drivers
*
- * Returns a pointer to the hypervisor connection or NULL in case of error
- *
* URIs are documented at http://libvirt.org/uri.html
+ *
+ * Returns a pointer to the hypervisor connection or NULL in case of error
*/
virConnectPtr
virConnectOpenReadOnly(const char *name)
@@ -1462,9 +1462,9 @@ error:
* See virConnectOpen for notes about environment variables which can
* have an effect on opening drivers
*
- * Returns a pointer to the hypervisor connection or NULL in case of error
- *
* URIs are documented at http://libvirt.org/uri.html
+ *
+ * Returns a pointer to the hypervisor connection or NULL in case of error
*/
virConnectPtr
virConnectOpenAuth(const char *name,
@@ -9374,12 +9374,6 @@ error:
* VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT, for filtering based on whether
* a domain has snapshots.
*
- * Returns the number of domains found or -1 and sets domains to NULL in case of
- * error. On success, the array stored into @domains is guaranteed to have an
- * extra allocated element set to NULL but not included in the return count, to
- * make iteration easier. The caller is responsible for calling virDomainFree()
- * on each array element, then calling free() on @domains.
- *
* Example of usage:
*
* virDomainPtr *domains;
@@ -9396,6 +9390,12 @@ error:
* virDomainFree(domains[i]);
* }
* free(domains);
+ *
+ * Returns the number of domains found or -1 and sets domains to NULL in case of
+ * error. On success, the array stored into @domains is guaranteed to have an
+ * extra allocated element set to NULL but not included in the return count, to
+ * make iteration easier. The caller is responsible for calling virDomainFree()
+ * on each array element, then calling free() on @domains.
*/
int
virConnectListAllDomains(virConnectPtr conn,
--
1.8.4.2
11 years, 3 months
- 1
- 0