This is actually two changes sets. The first part is an update from gnulib (including the fix for API change), the second adjusts .cvsignore files (sorting at same time) so that "git status" is clean after you run "make sync-vcs-ignore-files" to generate all .gitignore files. For reference, the complete (5000+-line) patch is here: http://meyering.net/code/tmp/libvirt-gnulib.patch If no one comments, I'll commit this in a couple hours. Jim From: Jim Meyering <meyering(a)redhat.com&gt; Date: Wed, 22 Oct 2008 16:56:58 +0200 Subject: [PATCH 1/2] adapt to API change in gnulib * qemud/qemud.c: Include <netdb.h>, not "getaddrinfo.h" * src/remote_internal.c: Likewise. updates from gnulib * gnulib/lib/.cvsignore: * gnulib/lib/Makefile.am: ... --- .gitignore | 32 --- gnulib/lib/.cvsignore | 6 + gnulib/lib/.gitignore | 23 -- gnulib/lib/Makefile.am | 194 +++++++++++++-- gnulib/lib/arpa_inet.in.h | 6 + gnulib/lib/c-ctype.h | 17 ++- gnulib/lib/float.in.h | 6 +- gnulib/lib/gai_strerror.c | 7 +- gnulib/lib/getaddrinfo.c | 18 ++- gnulib/lib/getaddrinfo.h | 163 ------------ gnulib/lib/getdelim.c | 15 +- gnulib/lib/netinet_in.in.h | 6 +- gnulib/lib/poll.c | 439 ++++++++++++++++++++++++++++---- gnulib/lib/stdint.in.h | 5 +- gnulib/lib/stdio.in.h | 90 +++++++ gnulib/lib/stdlib.in.h | 83 ++++++ gnulib/lib/string.in.h | 22 ++- gnulib/lib/sys_select.in.h | 37 +++- gnulib/lib/sys_socket.in.h | 311 ++++++++++++++++++++++- gnulib/lib/sys_stat.in.h | 50 ++++- gnulib/lib/sys_time.in.h | 6 +- gnulib/lib/unistd.in.h | 167 ++++++++++++- gnulib/lib/vasnprintf.c | 82 ++++++- gnulib/lib/wchar.in.h | 10 + gnulib/m4/arpa_inet_h.m4 | 9 +- gnulib/m4/eoverflow.m4 | 70 ----- gnulib/m4/getaddrinfo.m4 | 16 +- gnulib/m4/getdelim.m4 | 1 + gnulib/m4/gnulib-cache.m4 | 2 +- gnulib/m4/gnulib-common.m4 | 12 +- gnulib/m4/gnulib-comp.m4 | 99 +++++++- gnulib/m4/include_next.m4 | 32 ++- gnulib/m4/inet_ntop.m4 | 5 +- gnulib/m4/inet_pton.m4 | 5 +- gnulib/m4/lib-link.m4 | 27 ++- gnulib/m4/lib-prefix.m4 | 88 +++++-- gnulib/m4/lock.m4 | 330 ++----------------------- gnulib/m4/posix-shell.m4 | 6 +- gnulib/m4/stdio_h.m4 | 132 ++++++---- gnulib/m4/stdlib_h.m4 | 11 +- gnulib/m4/strdup.m4 | 22 ++- gnulib/m4/string_h.m4 | 11 +- gnulib/m4/sys_select_h.m4 | 20 ++- gnulib/m4/sys_socket_h.m4 | 64 ++++- gnulib/m4/sys_stat_h.m4 | 6 +- gnulib/m4/unistd_h.m4 | 44 +++- gnulib/m4/wchar.m4 | 25 ++- gnulib/tests/.cvsignore | 22 ++ gnulib/tests/.gitignore | 29 -- gnulib/tests/Makefile.am | 193 +++++++++++++- gnulib/tests/dummy.c | 42 --- gnulib/tests/test-EOVERFLOW.c | 32 --- gnulib/tests/test-getaddrinfo.c | 2 +- gnulib/tests/test-sys_select.c | 5 +- gnulib/tests/test-vc-list-files-cvs.sh | 3 +- gnulib/tests/test-vc-list-files-git.sh | 3 +- gnulib/tests/test-wchar.c | 6 +- qemud/qemud.c | 2 +- src/remote_internal.c | 2 +- 59 files changed, 2191 insertions(+), 982 deletions(-) delete mode 100644 .gitignore delete mode 100644 gnulib/lib/.gitignore delete mode 100644 gnulib/lib/getaddrinfo.h delete mode 100644 gnulib/m4/eoverflow.m4 delete mode 100644 gnulib/tests/.gitignore delete mode 100644 gnulib/tests/dummy.c delete mode 100644 gnulib/tests/test-EOVERFLOW.c ... diff --git a/qemud/qemud.c b/qemud/qemud.c index 9da27d2..db1a107 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -47,11 +47,11 @@ #include <fnmatch.h> #include <grp.h> #include <signal.h> +#include <netdb.h> #include "internal.h" #include "qemud.h" -#include "getaddrinfo.h" #include "util.h" #include "remote_internal.h" #include "conf.h" diff --git a/src/remote_internal.c b/src/remote_internal.c index 35b7b4b..47a86f0 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -58,7 +58,7 @@ #endif #include <libxml/uri.h> -#include "getaddrinfo.h" +#include <netdb.h> /* AI_ADDRCONFIG is missing on some systems. */ #ifndef AI_ADDRCONFIG -- 1.6.0.2.588.g3102 From: Jim Meyering <meyering(a)redhat.com&gt; Date: Wed, 22 Oct 2008 17:06:48 +0200 Subject: [PATCH 2/2] update .cvsignore files; regenerate .gitignore from them --- .cvsignore | 39 +++++++++++++++++++--------------- .gitignore | 37 +++++++++++++++++++++++++++++++++ gnulib/lib/.gitignore | 29 ++++++++++++++++++++++++++ gnulib/tests/.cvsignore | 49 ++++++++++++++++++++++--------------------- gnulib/tests/.gitignore | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 165 insertions(+), 41 deletions(-) create mode 100644 .gitignore create mode 100644 gnulib/lib/.gitignore create mode 100644 gnulib/tests/.gitignore diff --git a/.cvsignore b/.cvsignore index eded526..ecb8bf0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,32 +1,37 @@ +*.a +*.o +*.orig ...