3:52 a.m.
Hi,
few miscellaneous fixes for nbdkit.
Thanks,
Pino Toscano (3):
build: use AC_MSG_RESULT for $PERL_LDOPTS
crypto: add missing '{'
tests: fix generation of PKI test data
configure.ac | 1 +
src/crypto.c | 2 +-
tests/Makefile.am | 10 +++++-----
3 files changed, 7 insertions(+), 6 deletions(-)
--
2.13.6
3:52 a.m.
New subject: [PATCH nbdkit 1/3] build: use AC_MSG_RESULT for $PERL_LDOPTS
Make sure to show a result for the configure message
AC_MSG_CHECKING([for Perl embed LDOPTS])
otherwise the configure output is:
checking for Perl embed LDOPTS... checking for python... python
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index d2fdf6c..f0688cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,6 +207,7 @@ AS_IF([test "x$PERL" != "xno" && test
"x$enable_perl" != "xno"],[
dnl Check for Perl LDOPTS.
AC_MSG_CHECKING([for Perl embed LDOPTS])
PERL_LDOPTS="$($PERL -MExtUtils::Embed -e 'ldopts')"
+ AC_MSG_RESULT([$PERL_LDOPTS])
dnl XXX Could check these actually work.
])
--
2.13.6
3:52 a.m.
New subject: [PATCH nbdkit 2/3] crypto: add missing '{'
Add missing opening curly bracket, fixing the build when GnuTLS is not
enabled.
---
src/crypto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/crypto.c b/src/crypto.c
index 3f283b3..869627f 100644
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -417,7 +417,7 @@ crypto_negotiate_tls (struct connection *conn, int sockin, int
sockout)
void
crypto_init (int tls_set_on_cli)
{
- if (tls > 0)
+ if (tls > 0) {
fprintf (stderr, "%s: TLS cannot be enabled because this binary was compiled
without GnuTLS.\n",
program_name);
exit (EXIT_FAILURE);
--
2.13.6
3:52 a.m.
New subject: [PATCH nbdkit 3/3] tests: fix generation of PKI test data
Move the generation of PKI test data outside of the HAVE_LIBGUESTFS,
otherwise they will not be generated when the tests using libguestfs
are not enabled.
Also, use $(srcdir) to properly refr to make-pki.sh in the source
directory, fixing the build with builddir!=srcdir.
---
tests/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9a42964..f2775bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -133,6 +133,11 @@ TESTS += test-exit-with-parent
test_exit_with_parent_SOURCES = test-exit-with-parent.c test.h
test_exit_with_parent_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+# PKI files for the TLS tests.
+check_DATA += pki/.stamp
+pki/.stamp: $(srcdir)/make-pki.sh
+ $(srcdir)/make-pki.sh
+
# In-depth tests need libguestfs, since that is a convenient way to
# drive qemu.
@@ -177,11 +182,6 @@ test_oldstyle_SOURCES = test-oldstyle.c test.h
test_oldstyle_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS)
-# PKI files for the TLS tests.
-check_DATA += pki/.stamp
-pki/.stamp: make-pki.sh
- ./make-pki.sh
-
# file plugin test.
check_PROGRAMS += test-file
TESTS += test-file
--
2.13.6
5:11 a.m.
New subject: [PATCH nbdkit 3/3] tests: fix generation of PKI test data
On Fri, Oct 06, 2017 at 10:52:24AM +0200, Pino Toscano wrote:
Move the generation of PKI test data outside of the HAVE_LIBGUESTFS,
otherwise they will not be generated when the tests using libguestfs
are not enabled.
Also, use $(srcdir) to properly refr to make-pki.sh in the source
directory, fixing the build with builddir!=srcdir.
---
tests/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9a42964..f2775bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -133,6 +133,11 @@ TESTS += test-exit-with-parent
test_exit_with_parent_SOURCES = test-exit-with-parent.c test.h
test_exit_with_parent_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+# PKI files for the TLS tests.
+check_DATA += pki/.stamp
+pki/.stamp: $(srcdir)/make-pki.sh
+ $(srcdir)/make-pki.sh
+
# In-depth tests need libguestfs, since that is a convenient way to
# drive qemu.
@@ -177,11 +182,6 @@ test_oldstyle_SOURCES = test-oldstyle.c test.h
test_oldstyle_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS)
-# PKI files for the TLS tests.
-check_DATA += pki/.stamp
-pki/.stamp: make-pki.sh
- ./make-pki.sh
-
# file plugin test.
check_PROGRAMS += test-file
TESTS += test-file
--
2.13.6
ACK series.
Thanks,
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top
2639
days inactive
2639
days old
4 comments
2 participants
participants (2)
-
Pino Toscano -
Richard W.M. Jones