[netcf-devel] [PATCH] update gnulib
Eric Blake
eblake at redhat.com
Thu Aug 9 20:25:48 UTC 2012
On 08/09/2012 02:17 PM, Eric Blake wrote:
> On 08/09/2012 12:19 PM, Laine Stump wrote:
>> update the gnulib submodule to the latest version in git. This is
>> required in order to build on systems with recent glibc, which has
>> eliminated gets() due to security concerns. (gnulib commit 66712c23
>> makes this change).
>> ---
>> .gnulib | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/.gnulib b/.gnulib
>> index 4aa8192..a451aa0 160000
>> --- a/.gnulib
>> +++ b/.gnulib
>> @@ -1 +1 @@
>> -Subproject commit 4aa819277730ab4b12c43267928cb9b9b9a4c8fd
>> +Subproject commit a451aa0d0cbbec1efae7d07eb002fd4220511a27
>
> Incomplete; ACK if you also squash this in (resync to the latest
> bootstrap, and tweak bootstrap.conf to deal with a file no longer
> maintained in gnulib):
>
> diff --git i/bootstrap w/bootstrap
> index b286beb..e3e270b 100755
> --- i/bootstrap
> +++ w/bootstrap
...
> diff --git i/bootstrap.conf w/bootstrap.conf
> index 2d77573..95a84aa 100644
> --- i/bootstrap.conf
> +++ w/bootstrap.conf
> @@ -1,6 +1,6 @@
> # Bootstrap configuration.
>
> -# Copyright (C) 2010-2011 Red Hat, Inc.
> +# Copyright (C) 2010-2012 Red Hat, Inc.
>
> # This library is free software; you can redistribute it and/or
> # modify it under the terms of the GNU Lesser General Public
> @@ -99,6 +99,7 @@ tests_base=gnulib/tests
> gnulib_tool_option_extras="\
> --lgpl=2\
> --with-tests\
> + --makefile-name=gnulib.mk\
> "
>
> # Convince bootstrap to use multiple m4 directories.
> @@ -126,7 +127,6 @@ touch ChangeLog || exit 1
> # Override bootstrap's list - we don't use mdate-sh or texinfo.tex.
> gnulib_extra_files="
> $build_aux/install-sh
> - $build_aux/missing
> $build_aux/depcomp
> $build_aux/config.guess
> $build_aux/config.sub
Not quite enough. You also need:
diff --git i/.gitignore w/.gitignore
index 91b3a7c..a979db3 100644
--- i/.gitignore
+++ w/.gitignore
@@ -13,8 +13,11 @@
.libs/
/build-aux
/ChangeLog
+/GNUmakefile
+/INSTALL
Makefile
Makefile.in
+/maint.mk
/TAGS
/aclocal.m4
/autom4te.cache/
@@ -41,5 +44,6 @@ src/netcf-transaction.init
src/netcf.syms
stamp-h1
tests/test-debian
+tests/test-initscripts
tests/test-redhat
ylwrap
diff --git i/gnulib/lib/Makefile.am w/gnulib/lib/Makefile.am
index 3445c6d..f05f145 100644
--- i/gnulib/lib/Makefile.am
+++ w/gnulib/lib/Makefile.am
@@ -1,8 +1,15 @@
## Makefile for gnulib/lib -*-Makefile-*-
-## Copyright (C) 2011 Red Hat, Inc.
+## Copyright (C) 2011- 2012 Red Hat, Inc.
## See COPYING.LIB for the License of this software
+# Keep automake happy by priming variables that gnulib only appends to
+BUILT_SOURCES=
+EXTRA_DIST=
+MOSTLYCLEANDIRS=
+MOSTLYCLEANFILES=
+noinst_LTLIBRARIES=
+
include gnulib.mk
INCLUDES = $(GETTEXT_CPPFLAGS)
Do you want me to post a v2, or just push my corrections?
--
Eric Blake eblake at redhat.com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <https://lists.fedorahosted.org/pipermail/netcf-devel/attachments/20120809/bb14dd20/attachment.sig>
More information about the netcf-devel
mailing list