Apply all patches from upstream since 1.1.18.

0001-plugins-nbd-Fix-small-typo-in-the-documentation.patch

@@ -0,0 +1,26 @@
+From 937be0da588a9374ae38363ed11e168c98370be5 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 21 Nov 2017 21:54:57 +0000
+Subject: [PATCH 1/4] plugins: nbd: Fix small typo in the documentation.
+
+Fixes commit 0e8e8eb11d6b70d262a99b5b630af354768bfc61.
+---
+ plugins/nbd/nbdkit-nbd-plugin.pod | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/nbd/nbdkit-nbd-plugin.pod b/plugins/nbd/nbdkit-nbd-plugin.pod
+index e02e6cc..2b3a054 100644
+--- a/plugins/nbd/nbdkit-nbd-plugin.pod
++++ b/plugins/nbd/nbdkit-nbd-plugin.pod
+@@ -16,7 +16,7 @@ It provides an NBD server that forwards all traffic as a client to
+ another existing NBD server.  A primary usage of this setup is to
+ alter the set of features available to the ultimate end client,
+ without having to change the original server (for example, to convert
+-between oldstyle and newtyle, or to add TLS support where the original
++between oldstyle and newstyle, or to add TLS support where the original
+ server lacks it).
+ 
+ For now, this is limited to connecting to another NBD server over a
+-- 
+2.13.2
+

0002-plugins-perl-Minor-typographical-fixes-to-the-man-pa.patch

@@ -0,0 +1,34 @@
+From 55be677eb156146bcdcdf332854b02dc1064ef7b Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 21 Nov 2017 22:18:36 +0000
+Subject: [PATCH 2/4] plugins: perl: Minor typographical fixes to the man page.
+
+---
+ plugins/perl/nbdkit-perl-plugin.pod | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/perl/nbdkit-perl-plugin.pod b/plugins/perl/nbdkit-perl-plugin.pod
+index 2ecdcf1..7d5a68d 100644
+--- a/plugins/perl/nbdkit-perl-plugin.pod
++++ b/plugins/perl/nbdkit-perl-plugin.pod
+@@ -63,14 +63,14 @@ script won't work.
+ =head2 METHODS
+ 
+ Your script has access to the following methods in the C<Nbdkit>
+-package (in fact, attempting to C<use Nbdkit;> will fail, the methods
++package (in fact, attempting to C<use Nbdkit> will fail, the methods
+ are already available):
+ 
+- Nbdkit::set_error(I<$err>)
++ Nbdkit::set_error($err);
+ 
+ Record C<$err> as the reason you are about to throw an exception. C<$err>
+ should correspond to usual errno values, where it may help to
+-C<use POSIX();>.
++C<use POSIX()>.
+ 
+ =head2 EXCEPTIONS
+ 
+-- 
+2.13.2
+

0003-docs-Small-fix-to-documentation-of-threads-option.patch

@@ -0,0 +1,26 @@
+From 2264f3bbbc3cb52cee4bea86da7c34d7f9a38e65 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 21 Nov 2017 22:35:28 +0000
+Subject: [PATCH 3/4] docs: Small fix to documentation of --threads option.
+
+Fixes commit e9516a147ace4e302d7eec0a2a81ddad1c5bfb00.
+---
+ docs/nbdkit.pod | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod
+index 4593391..fb923c1 100644
+--- a/docs/nbdkit.pod
++++ b/docs/nbdkit.pod
+@@ -232,7 +232,7 @@ Unix domain sockets:
+ 
+ =item B<-t> THREADS
+ 
+-= item B<--threads> THREADS
++=item B<--threads> THREADS
+ 
+ Set the number of threads to be used per connection, which in turn
+ controls the number of outstanding requests that can be processed at
+-- 
+2.13.2
+

0004-docs-Describe-dump-plugin-earlier-in-the-manual.patch

@@ -0,0 +1,27 @@
+From 1b4f7c713e2acddad110434c9d1587eb94fc39c5 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 21 Nov 2017 22:38:03 +0000
+Subject: [PATCH 4/4] docs: Describe --dump-plugin earlier in the manual.
+
+---
+ docs/nbdkit.pod | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod
+index fb923c1..5dac12d 100644
+--- a/docs/nbdkit.pod
++++ b/docs/nbdkit.pod
+@@ -324,6 +324,10 @@ To list all the options supported by a plugin, do:
+ 
+  nbdkit --help file
+ 
++To dump information about a plugin, do:
++
++ nbdkit file --dump-plugin
++
+ =head1 SOCKET ACTIVATION
+ 
+ nbdkit supports socket activation (sometimes called systemd socket
+-- 
+2.13.2
+

nbdkit.spec

@@ -6,7 +6,7 @@
 
 Name:           nbdkit
 Version:        1.1.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -14,6 +14,11 @@ URL:            https://github.com/libguestfs/nbdkit
 
 Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz
 
+Patch0001:      0001-plugins-nbd-Fix-small-typo-in-the-documentation.patch
+Patch0002:      0002-plugins-perl-Minor-typographical-fixes-to-the-man-pa.patch
+Patch0003:      0003-docs-Small-fix-to-documentation-of-threads-option.patch
+Patch0004:      0004-docs-Describe-dump-plugin-earlier-in-the-manual.patch
+
 %if 0%{?rhel} == 7
 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and
 # libguestfs was not shipped on POWER (fixed in 7.5).  We could in
@@ -500,10 +505,11 @@ popd
 
 
 %changelog
-* Tue Nov 21 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1.18-2
+* Tue Nov 21 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1.18-3
 - New upstream version 1.1.18.
 - Add NBD forwarding plugin.
 - Add libselinux-devel so that SELinux support is enabled in the daemon.
+- Apply all patches from upstream since 1.1.18.
 
 * Fri Oct 20 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1.16-2
 - New upstream version 1.1.16.