[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] maint: update to latest gnulib



Among others, this fixes a cosmetic bug where bootstrap stated:

./bootstrap: Bootstrapping from checked-out http://libvirt.org sources...

instead of the intended:

./bootstrap: Bootstrapping from checked-out libvirt sources...

* .gnulib: Update to latest, for bootstrap improvement.
* bootstrap: Resync from gnulib.
---

Pushing under the "trivial" rule (or rather, under the general
agreement that gnulib updates are fair game outside of libvirt freeze).

* .gnulib 92f3a4c...0f8ddbf (17):
  > bootstrap: AC_INIT may have more than four parameters
  > ChangeLog: whitespace cleanup
  > qacl: port to MS-Windows port of GNU Emacs
  > acl: include quote.h
  > fchownat, renameat, unlinkat: update statat dependencies
  > Assume gnulib is checked out from Git, not CVS
  > utimensat-tests, etc.: try to fix some races
  > utimens, utimensat: work around Solaris UTIME_OMIT bug
  > gettext: now it's your responsibility to add -I$(top_builddir)/intl
  > acl: include errno.h to get errno
  > tests: don't assume getdtablesize () <= 10000000
  > extern-inline: work around bug in Sun c99
  > autoupdate
  > qacl: new module, broken out from the acl module
  > alignof, intprops, malloca: port better to IBM's C compiler
  > wctype-h: fix gettext link error on mingw
  > autoupdate

 .gnulib   |  2 +-
 bootstrap | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gnulib b/.gnulib
index 92f3a4c..0f8ddbf 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 92f3a4c8e52e64c233e260431d095dbf88554c14
+Subproject commit 0f8ddbf1a13a93a4584afdd82f0f87e498a0db6f
diff --git a/bootstrap b/bootstrap
index 96f1e76..0cbea66 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2013-03-08.16; # UTC
+scriptversion=2013-05-08.20; # UTC

 # Bootstrap this package from checked-out sources.

@@ -140,20 +140,21 @@ po_download_command_format2=\
 "wget --mirror -nd -q -np -A.po -P '%s' \
  http://translationproject.org/latest/%s/";

+# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
+# fall back to the package name (1st argument with munging)
 extract_package_name='
-  /^AC_INIT(/{
-     /.*,.*,.*, */{
-       s///
-       s/[][]//g
-       s/)$//
+  /^AC_INIT(\[*/{
+     s///
+     /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
+       s//\1/
+       s/[],)].*//
        p
        q
      }
-     s/AC_INIT(\[*//
-     s/]*,.*//
+     s/[],)].*//
      s/^GNU //
      y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-     s/[^A-Za-z0-9_]/-/g
+     s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
      p
   }
 '
-- 
1.8.1.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]