search for: gnutls_libs

.... + +Use: + + ./configure --enable-gcc-warnings --enable-valgrind + +When testing use: + + make check make check-valgrind Packager information diff --git a/configure.ac b/configure.ac index 25851b1..16e3250 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,23 @@ AS_IF([test "$GNUTLS_LIBS" != ""],[ dnl Check for valgrind. AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind],[no]) +dnl If valgrind headers are available (optional). +dnl Since this is only useful for developers, you have to enable +dnl it explicitly using --enable-valgrind. +AC_ARG_ENABLE([valgrind], +...

...Makefile.am index 79bbad9c..f8aeecfe 100644 --- a/filters/ddrescue/Makefile.am +++ b/filters/ddrescue/Makefile.am @@ -57,6 +57,7 @@ nbdkit_ddrescue_filter_la_LDFLAGS = \ $(NULL) nbdkit_ddrescue_filter_la_LIBADD = \ $(top_builddir)/common/utils/libutils.la \ + $(LINK_LIBNBDKIT_ON_WINDOWS) \ $(GNUTLS_LIBS) \ $(NULL) diff --git a/filters/delay/Makefile.am b/filters/delay/Makefile.am index 470c6062..e7b097eb 100644 --- a/filters/delay/Makefile.am +++ b/filters/delay/Makefile.am @@ -44,6 +44,9 @@ nbdkit_delay_filter_la_CPPFLAGS = \ -I$(top_srcdir)/include \ $(NULL) nbdkit_delay_filter_la_CFLAG...

...s always built if a suitable mke2fs command is present. --- configure.ac | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f24c3734..c93e822b 100644 --- a/configure.ac +++ b/configure.ac @@ -483,18 +483,25 @@ AS_IF([test "$GNUTLS_LIBS" != ""],[ LIBS="$old_LIBS" ]) +AC_ARG_WITH([linuxdisk], + [AS_HELP_STRING([--without-linuxdisk], + [disable linuxdisk plugin @<:@default=check@:>@])], + [], + [with_linuxdisk=check]) dnl Check for mke2fs -d (used by linuxdisk plugi...

...disable. Updates: commit 2a3efc5836df3d55d304cc4b3ea2800b5e93831a --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e6ca09de..376b1538 100644 --- a/configure.ac +++ b/configure.ac @@ -483,17 +483,17 @@ AS_IF([test "$GNUTLS_LIBS" != ""],[ LIBS="$old_LIBS" ]) -AC_ARG_WITH([linuxdisk], - [AS_HELP_STRING([--without-linuxdisk], +AC_ARG_ENABLE([linuxdisk], + [AS_HELP_STRING([--disable-linuxdisk], [disable linuxdisk plugin @<:@default=check@:>@])], [], - [...

This time it should hopefully work. I tested all 3 combinations: autoconf ./configure [--disable-linuxdisk | --enable-linuxdisk | <nothing> ] make clean && make && make check and they all appear to do the right thing. Rich.

From: Alan Somers <asomers@gmail.com> There was a missing #include. It only worked on Linux due to header pollution. --- plugins/ssh/ssh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/ssh/ssh.c b/plugins/ssh/ssh.c index ea199a93..a4007c40 100644 --- a/plugins/ssh/ssh.c +++ b/plugins/ssh/ssh.c @@ -30,6 +30,8 @@ * SUCH DAMAGE. */ +#include <sys/stat.h> +

...S = \ -I$(top_srcdir)/common/protocol \ -I$(top_srcdir)/common/utils \ $(NULL) -nbdkit_CFLAGS = \ +libnbdkit_la_CFLAGS = \ $(PTHREAD_CFLAGS) \ $(WARNINGS_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(LIBSELINUX_CFLAGS) \ $(VALGRIND_CFLAGS) \ $(NULL) -nbdkit_LDADD = \ +libnbdkit_la_LIBADD = \ $(GNUTLS_LIBS) \ $(LIBSELINUX_LIBS) \ $(DL_LIBS) \ $(top_builddir)/common/protocol/libprotocol.la \ $(top_builddir)/common/utils/libutils.la \ $(NULL) -nbdkit_LDFLAGS = \ +libnbdkit_la_LDFLAGS = \ + -shared $(NO_UNDEFINED_ON_WINDOWS) \ $(PTHREAD_LIBS) \ $(DL_LDFLAGS) \ $(NULL) @@ -109,7 +114,7 @@...

...gin_la_CFLAGS = \ $(WARNINGS_CFLAGS) \ $(GNUTLS_CFLAGS) @@ -53,6 +54,7 @@ nbdkit_data_plugin_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/plugins/plugins.syms nbdkit_data_plugin_la_LIBADD = \ $(top_builddir)/common/sparse/libsparse.la \ + $(top_builddir)/common/utils/libutils.la \ $(GNUTLS_LIBS) if HAVE_POD diff --git a/plugins/file/Makefile.am b/plugins/file/Makefile.am index f3b3f97..1d28d26 100644 --- a/plugins/file/Makefile.am +++ b/plugins/file/Makefile.am @@ -41,12 +41,15 @@ nbdkit_file_plugin_la_SOURCES = \ nbdkit_file_plugin_la_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(to...

...AGS = \ + -module -no-undefined -shared -avoid-version \ + $(DL_LDFLAGS) \ + $(NULL) + nbdkit_CPPFLAGS = \ -Dbindir=\"$(bindir)\" \ -Dlibdir=\"$(libdir)\" \ @@ -92,6 +104,7 @@ nbdkit_CFLAGS = \ $(VALGRIND_CFLAGS) \ $(NULL) nbdkit_LDADD = \ + nbdkit-shim-dlopen.la \ $(GNUTLS_LIBS) \ $(LIBSELINUX_LIBS) \ $(DL_LIBS) \ diff --git a/server/nbdkit.syms b/server/nbdkit.syms index 96c22c07..d20e0784 100644 --- a/server/nbdkit.syms +++ b/server/nbdkit.syms @@ -63,6 +63,7 @@ nbdkit_peer_name; nbdkit_read_password; nbdkit_realpath; + nbdkit_set_dlopen_prefix;...

...bindir)\" \ -Dsysconfdir=\"$(sysconfdir)\" \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/include \ -I$(top_srcdir)/common/include \ -I$(top_srcdir)/common/protocol \ @@ -93,6 +94,7 @@ nbdkit_CFLAGS = \ $(VALGRIND_CFLAGS) \ $(NULL) nbdkit_LDADD = \ + ../lib/libnbdkit.la \ $(GNUTLS_LIBS) \ $(LIBSELINUX_LIBS) \ $(DL_LIBS) \ @@ -142,6 +144,7 @@ test_public_SOURCES = \ extents.c \ $(NULL) test_public_CPPFLAGS = \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/include \ -I$(top_srcdir)/common/include \ -I$(top_srcdir)/common/protocol \ diff --git a/server/internal.h b/server/i...

...AGS = \ -I$(top_srcdir)/include \ - -Dsysconfdir=\"$(sysconfdir)\" + -Dsysconfdir=\"$(sysconfdir)\" \ + $(NULL) libnbd_la_CFLAGS = \ $(WARNINGS_CFLAGS) \ $(PTHREAD_CFLAGS) \ $(GNUTLS_CFLAGS) \ - $(LIBXML2_CFLAGS) + $(LIBXML2_CFLAGS) \ + $(NULL) libnbd_la_LIBADD = \ $(GNUTLS_LIBS) \ - $(LIBXML2_LIBS) + $(LIBXML2_LIBS) \ + $(NULL) libnbd_la_LDFLAGS = \ $(PTHREAD_LIBS) \ -Wl,--version-script=$(srcdir)/libnbd.syms \ - -version-info 0:0:0 + -version-info 0:0:0 \ + $(NULL) # pkg-config / pkgconf diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 0d876bb..bae9e58 10...

...S_CFLAGS) \ + $(NULL) +nbdkit_ddrescue_filter_la_LDFLAGS = \ + -module -avoid-version -shared \ + -Wl,--version-script=$(top_srcdir)/filters/filters.syms \ + $(NULL) +nbdkit_ddrescue_filter_la_LIBADD = \ + $(top_builddir)/common/sparse/libsparse.la \ + $(top_builddir)/common/utils/libutils.la \ + $(GNUTLS_LIBS) \ + $(NULL) + +if HAVE_POD + +man_MANS = nbdkit-ddrescue-filter.1 +CLEANFILES += $(man_MANS) + +nbdkit-ddrescue-filter.1: nbdkit-ddrescue-filter.pod + $(PODWRAPPER) --section=1 --man $@ \ + --html $(top_builddir)/html/$@.html \ + $< + +endif HAVE_POD diff --git a/filters/ddrescue/ddresc...

...LL) +nbdkit_ddrescue_filter_la_LDFLAGS = \ + -module -avoid-version -shared $(SHARED_LDFLAGS) \ + -Wl,--version-script=$(top_srcdir)/filters/filters.syms \ + $(NULL) +nbdkit_ddrescue_filter_la_LIBADD = \ + $(top_builddir)/common/sparse/libsparse.la \ + $(top_builddir)/common/utils/libutils.la \ + $(GNUTLS_LIBS) \ + $(NULL) + +if HAVE_POD + +man_MANS = nbdkit-ddrescue-filter.1 +CLEANFILES += $(man_MANS) + +nbdkit-ddrescue-filter.1: nbdkit-ddrescue-filter.pod + $(PODWRAPPER) --section=1 --man $@ \ + --html $(top_builddir)/html/$@.html \ + $< + +endif HAVE_POD diff --git a/filters/ddrescue/ddresc...

...S_CFLAGS) \ + $(NULL) +nbdkit_ddrescue_filter_la_LDFLAGS = \ + -module -avoid-version -shared \ + -Wl,--version-script=$(top_srcdir)/filters/filters.syms \ + $(NULL) +nbdkit_ddrescue_filter_la_LIBADD = \ + $(top_builddir)/common/sparse/libsparse.la \ + $(top_builddir)/common/utils/libutils.la \ + $(GNUTLS_LIBS) \ + $(NULL) + +if HAVE_POD + +man_MANS = nbdkit-ddrescue-filter.1 +CLEANFILES += $(man_MANS) + +nbdkit-ddrescue-filter.1: nbdkit-ddrescue-filter.pod + $(PODWRAPPER) --section=1 --man $@ \ + --html $(top_builddir)/html/$@.html \ + $< + +endif HAVE_POD diff --git a/filters/ddrescue/ddresc...

Also available here: https://github.com/rwmjones/nbdkit/tree/2020-windows-mingw This is the port to Windows using native Windows APIs (not MSYS or Cygwin). This patch series is at the point where it basically now works. I can run the server with the memory plugin, and access it remotely using guestfish, creating filesystems and so on without any apparent problems. Nevertheless there are many

This is an incomplete port to Windows. Currently the server compiles and starts up successfully, but goes into an infinite loop when you connect to it. Nevertheless I think the approach is ready for feedback. This being Windows the changes go quite deep. Rich.

Also available here: https://github.com/rwmjones/nbdkit/tree/2020-windows-mingw-nolib After a lot of work I have made the port to Windows work without using a separate library. Instead, on Windows only, we build an "import library" (library of stubs) which resolves references to nbdkit_* functions in the main program and fixes up the plugin, basically the first technique outlined in

There's more that can be done (in particular, use of CLEANUP_FREE), but this is enough to at least see if I'm on the right track. I couldn't figure out an obvious difference between common/include and common/utils, but it looks like the former is for things that are inlineable via .h only, while the latter is when you need to link in a convenience library, so this landed in the

I'm a lot happier with this version: no mucking with dlmopen(). It does add a bit more coupling between nbdkit proper and the vddk plugin (namely, nbdkit now exports a new function that the vddk plugin relies on), but patch 2 adds testsuite coverage of the new function so we shouldn't regress. Patch 1 and 2 are new, patch 3 is unchanged from when Rich posted it in v2, and patch 4 is

The patches following do indeed allow you to compile nbdkit.exe, but it does not actually work yet. I'm posting this experimental series more as a work in progress and to get feedback. Note this does not require Windows itself to build or test. You can cross-compile it using mingw64-* packages on Fedora or Debian, and test it [spoiler alert: it fails] using Wine. Rich.