687 lines
32 KiB
Diff
687 lines
32 KiB
Diff
commit 33a198c1f6a4a1bc7f34d50a31032e03bec10fee
|
|
Author: Daniel P. Berrange <berrange@redhat.com>
|
|
Date: Fri Jul 17 20:20:08 2009 +0100
|
|
|
|
Initialize gcrypt threading
|
|
|
|
GNUTLS uses gcrypt for its crypto functions. gcrypt requires
|
|
that the app/library initializes threading before using it.
|
|
We don't want to force apps using libvirt to know about
|
|
gcrypt, so we make virInitialize init threading on their
|
|
behalf. This location also ensures libvirtd has initialized
|
|
it correctly. This initialization is required even if libvirt
|
|
itself were only using one thread, since another non-libvirt
|
|
library (eg GTK-VNC) could also be using gcrypt from another
|
|
thread
|
|
|
|
* src/libvirt.c: Register thread functions for gcrypt
|
|
* configure.in: Add -lgcrypt to linker flags
|
|
|
|
diff --git a/src/libvirt.c b/src/libvirt.c
|
|
index 103b331..cad33c2 100644
|
|
--- a/src/libvirt.c
|
|
+++ b/src/libvirt.c
|
|
@@ -22,6 +22,7 @@
|
|
#include <sys/wait.h>
|
|
#endif
|
|
#include <time.h>
|
|
+#include <gcrypt.h>
|
|
|
|
#include <libxml/parser.h>
|
|
#include <libxml/xpath.h>
|
|
@@ -251,6 +252,55 @@ winsock_init (void)
|
|
}
|
|
#endif
|
|
|
|
+static int virTLSMutexInit (void **priv)
|
|
+{ \
|
|
+ virMutexPtr lock = NULL;
|
|
+
|
|
+ if (VIR_ALLOC(lock) < 0)
|
|
+ return ENOMEM;
|
|
+
|
|
+ if (virMutexInit(lock) < 0) {
|
|
+ VIR_FREE(lock);
|
|
+ return errno;
|
|
+ }
|
|
+
|
|
+ *priv = lock;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int virTLSMutexDestroy(void **priv)
|
|
+{
|
|
+ virMutexPtr lock = *priv;
|
|
+ virMutexDestroy(lock);
|
|
+ VIR_FREE(lock);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int virTLSMutexLock(void **priv)
|
|
+{
|
|
+ virMutexPtr lock = *priv;
|
|
+ virMutexLock(lock);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int virTLSMutexUnlock(void **priv)
|
|
+{
|
|
+ virMutexPtr lock = *priv;
|
|
+ virMutexUnlock(lock);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static struct gcry_thread_cbs virTLSThreadImpl = {
|
|
+ (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
|
|
+ NULL,
|
|
+ virTLSMutexInit,
|
|
+ virTLSMutexDestroy,
|
|
+ virTLSMutexLock,
|
|
+ virTLSMutexUnlock,
|
|
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
|
|
+};
|
|
+
|
|
+
|
|
/**
|
|
* virInitialize:
|
|
*
|
|
@@ -273,6 +323,9 @@ virInitialize(void)
|
|
virRandomInitialize(time(NULL) ^ getpid()))
|
|
return -1;
|
|
|
|
+ gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl);
|
|
+ gcry_check_version(NULL);
|
|
+
|
|
virLogSetFromEnv();
|
|
|
|
DEBUG0("register drivers");
|
|
commit 1c5c63338c90f6e82731f6871901dc72732033ef
|
|
Author: Matthias Bolte <matthias.bolte@googlemail.com>
|
|
Date: Fri Dec 18 12:02:07 2009 +0100
|
|
|
|
Fix compilation with gcrypt < 1.4.2
|
|
|
|
Commit 33a198c1f6a4a1bc7f34d50a31032e03bec10fee increased the gcrypt
|
|
version requirement to 1.4.2 because the GCRY_THREAD_OPTION_VERSION
|
|
define was added in this version.
|
|
|
|
The configure script doesn't check for the gcrypt version. To support
|
|
gcrypt versions < 1.4.2 change the virTLSThreadImpl initialization
|
|
to use GCRY_THREAD_OPTION_VERSION only if it's defined.
|
|
|
|
diff --git a/src/libvirt.c b/src/libvirt.c
|
|
index 5167bc2..16c851f 100644
|
|
--- a/src/libvirt.c
|
|
+++ b/src/libvirt.c
|
|
@@ -291,7 +291,12 @@ static int virTLSMutexUnlock(void **priv)
|
|
}
|
|
|
|
static struct gcry_thread_cbs virTLSThreadImpl = {
|
|
+ /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */
|
|
+#ifdef GCRY_THREAD_OPTION_VERSION
|
|
(GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
|
|
+#else
|
|
+ GCRY_THREAD_OPTION_PTHREAD,
|
|
+#endif
|
|
NULL,
|
|
virTLSMutexInit,
|
|
virTLSMutexDestroy,
|
|
diff -rup libvirt-0.7.1/aclocal.m4 gcrypt-new/aclocal.m4
|
|
--- libvirt-0.7.1/aclocal.m4 2009-09-15 08:35:04.000000000 -0400
|
|
+++ gcrypt-new/aclocal.m4 2010-05-17 17:52:13.765215000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
|
|
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
|
|
|
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
|
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
@@ -190,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
|
|
[am__api_version='1.11'
|
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
|
dnl require some minimum version. Point them to the right macro.
|
|
-m4_if([$1], [1.11], [],
|
|
+m4_if([$1], [1.11.1], [],
|
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
|
])
|
|
|
|
@@ -206,7 +206,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
|
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
|
-[AM_AUTOMAKE_VERSION([1.11])dnl
|
|
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
|
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
diff -rup libvirt-0.7.1/configure gcrypt-new/configure
|
|
--- libvirt-0.7.1/configure 2009-09-15 08:35:09.000000000 -0400
|
|
+++ gcrypt-new/configure 2010-05-17 17:52:18.706838000 -0400
|
|
@@ -43324,7 +43324,7 @@ fi
|
|
$as_echo "$as_me: error: You must install the GnuTLS library in order to compile and run libvirt" >&2;}
|
|
{ (exit 1); exit 1; }; }
|
|
|
|
- GNUTLS_LIBS=$LIBS
|
|
+ GNUTLS_LIBS="$LIBS -lgcrypt"
|
|
LIBS="$old_libs"
|
|
fi
|
|
|
|
diff -rup libvirt-0.7.1/docs/devhelp/Makefile.in gcrypt-new/docs/devhelp/Makefile.in
|
|
--- libvirt-0.7.1/docs/devhelp/Makefile.in 2009-09-15 08:35:13.000000000 -0400
|
|
+++ gcrypt-new/docs/devhelp/Makefile.in 2010-05-17 17:52:23.305455000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/docs/examples/Makefile.in gcrypt-new/docs/examples/Makefile.in
|
|
--- libvirt-0.7.1/docs/examples/Makefile.in 2009-09-15 08:35:14.000000000 -0400
|
|
+++ gcrypt-new/docs/examples/Makefile.in 2010-05-17 17:52:23.492454000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -999,7 +999,7 @@ clean-libtool:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -1024,7 +1024,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
diff -rup libvirt-0.7.1/docs/examples/python/Makefile.in gcrypt-new/docs/examples/python/Makefile.in
|
|
--- libvirt-0.7.1/docs/examples/python/Makefile.in 2009-09-15 08:35:14.000000000 -0400
|
|
+++ gcrypt-new/docs/examples/python/Makefile.in 2010-05-17 17:52:23.650454000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/docs/Makefile.in gcrypt-new/docs/Makefile.in
|
|
--- libvirt-0.7.1/docs/Makefile.in 2009-09-15 08:35:13.000000000 -0400
|
|
+++ gcrypt-new/docs/Makefile.in 2010-05-17 17:52:23.143456000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -966,7 +966,7 @@ clean-libtool:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -991,7 +991,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
diff -rup libvirt-0.7.1/docs/schemas/Makefile.in gcrypt-new/docs/schemas/Makefile.in
|
|
--- libvirt-0.7.1/docs/schemas/Makefile.in 2009-09-15 08:35:14.000000000 -0400
|
|
+++ gcrypt-new/docs/schemas/Makefile.in 2010-05-17 17:52:23.807456000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/examples/domain-events/events-c/Makefile.in gcrypt-new/examples/domain-events/events-c/Makefile.in
|
|
--- libvirt-0.7.1/examples/domain-events/events-c/Makefile.in 2009-09-15 08:35:14.000000000 -0400
|
|
+++ gcrypt-new/examples/domain-events/events-c/Makefile.in 2010-05-17 17:52:23.983380000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/examples/hellolibvirt/Makefile.in gcrypt-new/examples/hellolibvirt/Makefile.in
|
|
--- libvirt-0.7.1/examples/hellolibvirt/Makefile.in 2009-09-15 08:35:14.000000000 -0400
|
|
+++ gcrypt-new/examples/hellolibvirt/Makefile.in 2010-05-17 17:52:24.166378000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/gnulib/lib/Makefile.in gcrypt-new/gnulib/lib/Makefile.in
|
|
--- libvirt-0.7.1/gnulib/lib/Makefile.in 2009-09-15 08:35:14.000000000 -0400
|
|
+++ gcrypt-new/gnulib/lib/Makefile.in 2010-05-17 17:52:24.409381000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -1128,7 +1128,7 @@ clean-libtool:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -1153,7 +1153,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
diff -rup libvirt-0.7.1/gnulib/tests/Makefile.in gcrypt-new/gnulib/tests/Makefile.in
|
|
--- libvirt-0.7.1/gnulib/tests/Makefile.in 2009-09-15 08:35:15.000000000 -0400
|
|
+++ gcrypt-new/gnulib/tests/Makefile.in 2010-05-17 17:52:24.719382000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -1501,7 +1501,7 @@ clean-libtool:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -1526,7 +1526,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
diff -rup libvirt-0.7.1/include/libvirt/Makefile.in gcrypt-new/include/libvirt/Makefile.in
|
|
--- libvirt-0.7.1/include/libvirt/Makefile.in 2009-09-15 08:35:15.000000000 -0400
|
|
+++ gcrypt-new/include/libvirt/Makefile.in 2010-05-17 17:52:25.069302000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/include/Makefile.in gcrypt-new/include/Makefile.in
|
|
--- libvirt-0.7.1/include/Makefile.in 2009-09-15 08:35:15.000000000 -0400
|
|
+++ gcrypt-new/include/Makefile.in 2010-05-17 17:52:24.902313000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -896,7 +896,7 @@ clean-libtool:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -921,7 +921,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
diff -rup libvirt-0.7.1/Makefile.in gcrypt-new/Makefile.in
|
|
--- libvirt-0.7.1/Makefile.in 2009-09-15 08:35:18.000000000 -0400
|
|
+++ gcrypt-new/Makefile.in 2010-05-17 17:52:28.423082000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -1060,7 +1060,7 @@ uninstall-pkgconfigDATA:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -1085,7 +1085,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -1265,7 +1265,8 @@ distdir: $(DISTFILES)
|
|
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
|
dist-hook
|
|
-test -n "$(am__skip_mode_fix)" \
|
|
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
|
+ || find "$(distdir)" -type d ! -perm -755 \
|
|
+ -exec chmod u+rwx,go+rx {} \; -o \
|
|
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
|
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
|
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
|
@@ -1309,17 +1310,17 @@ dist dist-all: distdir
|
|
distcheck: dist
|
|
case '$(DIST_ARCHIVES)' in \
|
|
*.tar.gz*) \
|
|
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
|
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
|
*.tar.bz2*) \
|
|
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
|
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
|
*.tar.lzma*) \
|
|
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
|
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
|
|
*.tar.xz*) \
|
|
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
|
*.tar.Z*) \
|
|
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
|
*.shar.gz*) \
|
|
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
|
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
|
*.zip*) \
|
|
unzip $(distdir).zip ;;\
|
|
esac
|
|
diff -rup libvirt-0.7.1/proxy/Makefile.in gcrypt-new/proxy/Makefile.in
|
|
--- libvirt-0.7.1/proxy/Makefile.in 2009-09-15 08:35:15.000000000 -0400
|
|
+++ gcrypt-new/proxy/Makefile.in 2010-05-17 17:52:25.334306000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/python/Makefile.in gcrypt-new/python/Makefile.in
|
|
--- libvirt-0.7.1/python/Makefile.in 2009-09-15 08:35:16.000000000 -0400
|
|
+++ gcrypt-new/python/Makefile.in 2010-05-17 17:52:25.538302000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -1090,7 +1090,7 @@ clean-libtool:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -1115,7 +1115,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
diff -rup libvirt-0.7.1/python/tests/Makefile.in gcrypt-new/python/tests/Makefile.in
|
|
--- libvirt-0.7.1/python/tests/Makefile.in 2009-09-15 08:35:16.000000000 -0400
|
|
+++ gcrypt-new/python/tests/Makefile.in 2010-05-17 17:52:25.702304000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/qemud/Makefile.in gcrypt-new/qemud/Makefile.in
|
|
--- libvirt-0.7.1/qemud/Makefile.in 2009-09-15 08:35:16.000000000 -0400
|
|
+++ gcrypt-new/qemud/Makefile.in 2010-05-17 17:52:25.997229000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -1522,7 +1522,7 @@ remote_protocol.c: remote_protocol.h
|
|
@WITH_LIBVIRTD_TRUE@ test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
|
|
@WITH_LIBVIRTD_TRUE@ ln -s ../default.xml \
|
|
@WITH_LIBVIRTD_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
|
-@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
|
|
+@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
|
|
@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
|
|
@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
|
|
|
|
@@ -1530,7 +1530,7 @@ remote_protocol.c: remote_protocol.h
|
|
@WITH_LIBVIRTD_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
|
|
@WITH_LIBVIRTD_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
|
|
@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
|
|
-@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
|
|
+@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
|
|
@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
|
|
@WITH_LIBVIRTD_TRUE@ rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
|
|
|
|
@@ -1577,6 +1577,8 @@ remote_protocol.c: remote_protocol.h
|
|
|
|
@WITH_LIBVIRTD_TRUE@install-logrotate: libvirtd.logrotate
|
|
@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
|
|
+@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
|
|
+@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
|
|
@WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
|
|
@WITH_LIBVIRTD_TRUE@ $(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
|
|
|
|
diff -rup libvirt-0.7.1/src/Makefile.in gcrypt-new/src/Makefile.in
|
|
--- libvirt-0.7.1/src/Makefile.in 2009-09-15 08:35:17.000000000 -0400
|
|
+++ gcrypt-new/src/Makefile.in 2010-05-17 17:52:26.929151000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -598,9 +598,9 @@ am__objects_45 = libvirt_util_la-bridge.
|
|
libvirt_util_la-pci.lo libvirt_util_la-hostusb.lo \
|
|
libvirt_util_la-qparams.lo \
|
|
libvirt_util_la-storage_encryption_conf.lo \
|
|
- libvirt_util_la-threads.lo libvirt_util_la-uuid.lo \
|
|
- libvirt_util_la-util.lo libvirt_util_la-virterror.lo \
|
|
- libvirt_util_la-xml.lo
|
|
+ libvirt_util_la-storage_file.lo libvirt_util_la-threads.lo \
|
|
+ libvirt_util_la-uuid.lo libvirt_util_la-util.lo \
|
|
+ libvirt_util_la-virterror.lo libvirt_util_la-xml.lo
|
|
am_libvirt_util_la_OBJECTS = $(am__objects_45)
|
|
libvirt_util_la_OBJECTS = $(am_libvirt_util_la_OBJECTS)
|
|
libvirt_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
|
@@ -617,11 +617,11 @@ am__libvirt_lxc_SOURCES_DIST = lxc_conf.
|
|
event.h hash.c hash.h iptables.c iptables.h logging.c \
|
|
logging.h memory.c memory.h pci.c pci.h hostusb.c hostusb.h \
|
|
qparams.c qparams.h storage_encryption_conf.h \
|
|
- storage_encryption_conf.c threads.c threads.h \
|
|
- threads-pthread.h threads-win32.h uuid.c uuid.h util.c util.h \
|
|
- virterror.c virterror_internal.h xml.c xml.h capabilities.c \
|
|
- capabilities.h domain_conf.c domain_conf.h nodeinfo.h \
|
|
- nodeinfo.c
|
|
+ storage_encryption_conf.c storage_file.c storage_file.h \
|
|
+ threads.c threads.h threads-pthread.h threads-win32.h uuid.c \
|
|
+ uuid.h util.c util.h virterror.c virterror_internal.h xml.c \
|
|
+ xml.h capabilities.c capabilities.h domain_conf.c \
|
|
+ domain_conf.h nodeinfo.h nodeinfo.c
|
|
am__objects_46 = libvirt_lxc-lxc_conf.$(OBJEXT) \
|
|
libvirt_lxc-lxc_container.$(OBJEXT) \
|
|
libvirt_lxc-lxc_controller.$(OBJEXT) \
|
|
@@ -633,6 +633,7 @@ am__objects_47 = libvirt_lxc-bridge.$(OB
|
|
libvirt_lxc-memory.$(OBJEXT) libvirt_lxc-pci.$(OBJEXT) \
|
|
libvirt_lxc-hostusb.$(OBJEXT) libvirt_lxc-qparams.$(OBJEXT) \
|
|
libvirt_lxc-storage_encryption_conf.$(OBJEXT) \
|
|
+ libvirt_lxc-storage_file.$(OBJEXT) \
|
|
libvirt_lxc-threads.$(OBJEXT) libvirt_lxc-uuid.$(OBJEXT) \
|
|
libvirt_lxc-util.$(OBJEXT) libvirt_lxc-virterror.$(OBJEXT) \
|
|
libvirt_lxc-xml.$(OBJEXT)
|
|
@@ -1485,6 +1486,7 @@ UTIL_SOURCES = \
|
|
hostusb.c hostusb.h \
|
|
qparams.c qparams.h \
|
|
storage_encryption_conf.h storage_encryption_conf.c \
|
|
+ storage_file.c storage_file.h \
|
|
threads.c threads.h \
|
|
threads-pthread.h \
|
|
threads-win32.h \
|
|
@@ -2151,6 +2153,7 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-pci.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-qparams.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-storage_encryption_conf.Po@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-storage_file.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-threads.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-util.Po@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-uuid.Po@am__quote@
|
|
@@ -2170,6 +2173,7 @@ distclean-compile:
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-pci.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-qparams.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-storage_encryption_conf.Plo@am__quote@
|
|
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-storage_file.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-threads.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-util.Plo@am__quote@
|
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-uuid.Plo@am__quote@
|
|
@@ -2753,6 +2757,14 @@ libvirt_util_la-storage_encryption_conf.
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -c -o libvirt_util_la-storage_encryption_conf.lo `test -f 'storage_encryption_conf.c' || echo '$(srcdir)/'`storage_encryption_conf.c
|
|
|
|
+libvirt_util_la-storage_file.lo: storage_file.c
|
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -MT libvirt_util_la-storage_file.lo -MD -MP -MF $(DEPDIR)/libvirt_util_la-storage_file.Tpo -c -o libvirt_util_la-storage_file.lo `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
|
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_util_la-storage_file.Tpo $(DEPDIR)/libvirt_util_la-storage_file.Plo
|
|
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='storage_file.c' object='libvirt_util_la-storage_file.lo' libtool=yes @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -c -o libvirt_util_la-storage_file.lo `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
|
|
+
|
|
libvirt_util_la-threads.lo: threads.c
|
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -MT libvirt_util_la-threads.lo -MD -MP -MF $(DEPDIR)/libvirt_util_la-threads.Tpo -c -o libvirt_util_la-threads.lo `test -f 'threads.c' || echo '$(srcdir)/'`threads.c
|
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_util_la-threads.Tpo $(DEPDIR)/libvirt_util_la-threads.Plo
|
|
@@ -3065,6 +3077,22 @@ libvirt_lxc-storage_encryption_conf.obj:
|
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -c -o libvirt_lxc-storage_encryption_conf.obj `if test -f 'storage_encryption_conf.c'; then $(CYGPATH_W) 'storage_encryption_conf.c'; else $(CYGPATH_W) '$(srcdir)/storage_encryption_conf.c'; fi`
|
|
|
|
+libvirt_lxc-storage_file.o: storage_file.c
|
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -MT libvirt_lxc-storage_file.o -MD -MP -MF $(DEPDIR)/libvirt_lxc-storage_file.Tpo -c -o libvirt_lxc-storage_file.o `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
|
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_lxc-storage_file.Tpo $(DEPDIR)/libvirt_lxc-storage_file.Po
|
|
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='storage_file.c' object='libvirt_lxc-storage_file.o' libtool=no @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -c -o libvirt_lxc-storage_file.o `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
|
|
+
|
|
+libvirt_lxc-storage_file.obj: storage_file.c
|
|
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -MT libvirt_lxc-storage_file.obj -MD -MP -MF $(DEPDIR)/libvirt_lxc-storage_file.Tpo -c -o libvirt_lxc-storage_file.obj `if test -f 'storage_file.c'; then $(CYGPATH_W) 'storage_file.c'; else $(CYGPATH_W) '$(srcdir)/storage_file.c'; fi`
|
|
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_lxc-storage_file.Tpo $(DEPDIR)/libvirt_lxc-storage_file.Po
|
|
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='storage_file.c' object='libvirt_lxc-storage_file.obj' libtool=no @AMDEPBACKSLASH@
|
|
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -c -o libvirt_lxc-storage_file.obj `if test -f 'storage_file.c'; then $(CYGPATH_W) 'storage_file.c'; else $(CYGPATH_W) '$(srcdir)/storage_file.c'; fi`
|
|
+
|
|
libvirt_lxc-threads.o: threads.c
|
|
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -MT libvirt_lxc-threads.o -MD -MP -MF $(DEPDIR)/libvirt_lxc-threads.Tpo -c -o libvirt_lxc-threads.o `test -f 'threads.c' || echo '$(srcdir)/'`threads.c
|
|
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_lxc-threads.Tpo $(DEPDIR)/libvirt_lxc-threads.Po
|
|
diff -rup libvirt-0.7.1/tests/confdata/Makefile.in gcrypt-new/tests/confdata/Makefile.in
|
|
--- libvirt-0.7.1/tests/confdata/Makefile.in 2009-09-15 08:35:17.000000000 -0400
|
|
+++ gcrypt-new/tests/confdata/Makefile.in 2010-05-17 17:52:27.383154000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/tests/Makefile.in gcrypt-new/tests/Makefile.in
|
|
--- libvirt-0.7.1/tests/Makefile.in 2009-09-15 08:35:17.000000000 -0400
|
|
+++ gcrypt-new/tests/Makefile.in 2010-05-17 17:52:27.223153000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
@@ -1401,7 +1401,7 @@ clean-libtool:
|
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
|
# (2) otherwise, pass the desired values on the `make' command line.
|
|
$(RECURSIVE_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
@@ -1426,7 +1426,7 @@ $(RECURSIVE_TARGETS):
|
|
fi; test -z "$$fail"
|
|
|
|
$(RECURSIVE_CLEAN_TARGETS):
|
|
- @failcom='exit 1'; \
|
|
+ @fail= failcom='exit 1'; \
|
|
for f in x $$MAKEFLAGS; do \
|
|
case $$f in \
|
|
*=* | --[!k]*);; \
|
|
diff -rup libvirt-0.7.1/tests/sexpr2xmldata/Makefile.in gcrypt-new/tests/sexpr2xmldata/Makefile.in
|
|
--- libvirt-0.7.1/tests/sexpr2xmldata/Makefile.in 2009-09-15 08:35:17.000000000 -0400
|
|
+++ gcrypt-new/tests/sexpr2xmldata/Makefile.in 2010-05-17 17:52:27.543159000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/tests/xencapsdata/Makefile.in gcrypt-new/tests/xencapsdata/Makefile.in
|
|
--- libvirt-0.7.1/tests/xencapsdata/Makefile.in 2009-09-15 08:35:18.000000000 -0400
|
|
+++ gcrypt-new/tests/xencapsdata/Makefile.in 2010-05-17 17:52:27.704150000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/tests/xmconfigdata/Makefile.in gcrypt-new/tests/xmconfigdata/Makefile.in
|
|
--- libvirt-0.7.1/tests/xmconfigdata/Makefile.in 2009-09-15 08:35:18.000000000 -0400
|
|
+++ gcrypt-new/tests/xmconfigdata/Makefile.in 2010-05-17 17:52:27.872118000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/tests/xml2sexprdata/Makefile.in gcrypt-new/tests/xml2sexprdata/Makefile.in
|
|
--- libvirt-0.7.1/tests/xml2sexprdata/Makefile.in 2009-09-15 08:35:18.000000000 -0400
|
|
+++ gcrypt-new/tests/xml2sexprdata/Makefile.in 2010-05-17 17:52:28.046074000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
diff -rup libvirt-0.7.1/tools/Makefile.in gcrypt-new/tools/Makefile.in
|
|
--- libvirt-0.7.1/tools/Makefile.in 2009-09-15 08:35:18.000000000 -0400
|
|
+++ gcrypt-new/tools/Makefile.in 2010-05-17 17:52:28.213075000 -0400
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile.in generated by automake 1.11 from Makefile.am.
|
|
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
|
# @configure_input@
|
|
|
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|