The package rpms/nbdkit.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/nbdkit.git/commit/?id=f38f61c339f925....

Change: +ExclusiveArch: x86_64

Thanks.

Full change: ============

commit 05a3e073d018e7ac218e2890aad51c303f04cc0a Author: Richard W.M. Jones rjones@redhat.com Date: Wed Nov 29 18:08:30 2017 +0000

Fix Python 3 builds / RHEL macros (RHBZ#1404631).

diff --git a/nbdkit.spec b/nbdkit.spec index 3a197ce..1a77fa5 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -4,9 +4,14 @@ %global have_libguestfs 1 %endif

+# Currently everything has Python 2. RHEL 7 doesn't have Python 3. +%if 0%{?rhel} != 7 +%global have_python3 1 +%endif + Name: nbdkit Version: 1.1.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NBD server

License: BSD @@ -40,7 +45,7 @@ BuildRequires: libcurl-devel BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) BuildRequires: python2-devel -%if 0%{?rhel} >= 8 +%if 0%{?have_python3} BuildRequires: python3-devel %endif %ifarch %{ocaml_native_compiler} @@ -230,7 +235,7 @@ Obsoletes: %{name}-plugin-python <= %{version}-%{release} This package lets you write Python 2 plugins for %{name}.

-%if 0%{?rhel} >= 8 +%if 0%{?have_python3} %package plugin-python3 Summary: Python 3 plugin for %{name} License: BSD @@ -309,7 +314,7 @@ mv "$copy" python3 %configure --disable-static --with-tls-priority=@NBDKIT,SYSTEM make %{?_smp_mflags}

-%if 0%{?rhel} >= 8 +%if 0%{?have_python3} pushd python3 export PYTHON=%{_bindir}/python3 %configure --disable-static --disable-perl --disable-ocaml --disable-ruby @@ -326,7 +331,7 @@ popd # Install for Python 2 and Python 3 separately. # We do the Python 3 install first since that build is # incomplete. -%if 0%{?rhel} >= 8 +%if 0%{?have_python3} pushd python3 %make_install popd @@ -370,7 +375,7 @@ make check || { exit 1 }

-%if 0%{?rhel} >= 8 +%if 0%{?have_python3} pushd python3 make check || { cat tests/test-suite.log @@ -469,7 +474,7 @@ popd %{_libdir}/%{name}/plugins/nbdkit-python2-plugin.so

-%if 0%{?rhel} >= 8 +%if 0%{?have_python3} %files plugin-python3 %{_libdir}/%{name}/plugins/nbdkit-python3-plugin.so %endif @@ -505,6 +510,9 @@ popd

%changelog +* Wed Nov 29 2017 Richard W.M. Jones rjones@redhat.com - 1.1.18-4 +- Fix Python 3 builds / RHEL macros (RHBZ#1404631). + * 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.

commit 0b892779f5360fb3625c21555fd1d8155a88f44d Author: Richard W.M. Jones rjones@redhat.com Date: Tue Nov 21 22:52:57 2017 +0000

Apply all patches from upstream since 1.1.18.

diff --git a/0001-plugins-nbd-Fix-small-typo-in-the-documentation.patch b/0001-plugins-nbd-Fix-small-typo-in-the-documentation.patch new file mode 100644 index 0000000..a132ef4 --- /dev/null +++ b/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 + diff --git a/0002-plugins-perl-Minor-typographical-fixes-to-the-man-pa.patch b/0002-plugins-perl-Minor-typographical-fixes-to-the-man-pa.patch new file mode 100644 index 0000000..cc2d8a3 --- /dev/null +++ b/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 + diff --git a/0003-docs-Small-fix-to-documentation-of-threads-option.patch b/0003-docs-Small-fix-to-documentation-of-threads-option.patch new file mode 100644 index 0000000..862dd7d --- /dev/null +++ b/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 + diff --git a/0004-docs-Describe-dump-plugin-earlier-in-the-manual.patch b/0004-docs-Describe-dump-plugin-earlier-in-the-manual.patch new file mode 100644 index 0000000..ad912cc --- /dev/null +++ b/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 + diff --git a/nbdkit.spec b/nbdkit.spec index 7c5d624..3a197ce 100644 --- a/nbdkit.spec +++ b/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/%%7Bname%7D-%%7Bversion%7D.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.

commit 6766db434d5b5d663930afe09569e4b2d00d0fe7 Author: Richard W.M. Jones rjones@redhat.com Date: Tue Nov 21 22:24:22 2017 +0000

Add libselinux-devel so that SELinux support is enabled in the daemon.

diff --git a/nbdkit.spec b/nbdkit.spec index b38988b..7c5d624 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -6,7 +6,7 @@

Name: nbdkit Version: 1.1.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server

License: BSD @@ -24,6 +24,7 @@ ExclusiveArch: x86_64

BuildRequires: /usr/bin/pod2man BuildRequires: gnutls-devel +BuildRequires: libselinux-devel %if 0%{?have_libguestfs} BuildRequires: libguestfs-devel %endif @@ -499,9 +500,10 @@ popd

%changelog -* Tue Nov 21 2017 Richard W.M. Jones rjones@redhat.com - 1.1.18-1 +* Tue Nov 21 2017 Richard W.M. Jones rjones@redhat.com - 1.1.18-2 - New upstream version 1.1.18. - Add NBD forwarding plugin. +- Add libselinux-devel so that SELinux support is enabled in the daemon.

* Fri Oct 20 2017 Richard W.M. Jones rjones@redhat.com - 1.1.16-2 - New upstream version 1.1.16.

commit 0a2938eb960cf06ea126ee293a16f5db1053fee1 Author: Richard W.M. Jones rjones@redhat.com Date: Tue Nov 21 21:27:08 2017 +0000

New upstream version 1.1.18.

diff --git a/nbdkit.spec b/nbdkit.spec index 0640efc..b38988b 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -5,8 +5,8 @@ %endif

Name: nbdkit -Version: 1.1.16 -Release: 2%{?dist} +Version: 1.1.18 +Release: 1%{?dist} Summary: NBD server

License: BSD @@ -137,6 +137,24 @@ libvirt guest disks readonly. It is implemented using the libvirt virDomainBlockPeek API.

+%package plugin-nbd +Summary: NBD forwarding plugin for %{name} +License: BSD + +Requires: %{name}%{?_isa} = %{version}-%{release} + + +%description plugin-nbd +This package is an NBD forwarding plugin for %{name}. + +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 server +lacks it). + + %ifarch %{ocaml_native_compiler} %package plugin-ocaml Summary: OCaml plugin for %{name} @@ -411,6 +429,12 @@ popd %{_mandir}/man1/nbdkit-libvirt-plugin.1*

+%files plugin-nbd +%doc LICENSE README +%{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so +%{_mandir}/man1/nbdkit-nbd-plugin.1* + + %ifarch %{ocaml_native_compiler} %files plugin-ocaml %doc LICENSE README @@ -475,6 +499,10 @@ popd

%changelog +* Tue Nov 21 2017 Richard W.M. Jones rjones@redhat.com - 1.1.18-1 +- New upstream version 1.1.18. +- Add NBD forwarding plugin. + * Fri Oct 20 2017 Richard W.M. Jones rjones@redhat.com - 1.1.16-2 - New upstream version 1.1.16. - Disable python3 plugin on RHEL/EPEL <= 7. diff --git a/sources b/sources index 291721a..f396f5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.1.16.tar.gz) = 05c739b8c5c5a7376c5077d192fec2742655f8db6c10c9aea28da174c229a5b3b45f57108f2e82fb7adcd0126d7355b4aab48a92e93cc7e7b2c5549b9f425579 +SHA512 (nbdkit-1.1.18.tar.gz) = 62ebe50eb7c3e2faac66f763cc8d8b206c76692cd6f865acb4753fdb16ca3ee466b90f52daff1c9a54e6554103cfeb7752c4007f3dca6765d3c85f32e89c0c33

commit f38f61c339f925928e8cd6e520581968105ada96 Author: Richard W.M. Jones rjones@redhat.com Date: Fri Oct 20 11:46:28 2017 +0100

Disable python3 plugin on RHEL/EPEL <= 7. Only ship on x86_64 in RHEL/EPEL <= 7.

diff --git a/nbdkit.spec b/nbdkit.spec index 3ff686b..0640efc 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -6,7 +6,7 @@

Name: nbdkit Version: 1.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server

License: BSD @@ -14,6 +14,14 @@ URL: https://github.com/libguestfs/nbdkit

Source0: http://libguestfs.org/download/nbdkit/%%7Bname%7D-%%7Bversion%7D.tar.gz

+%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 +# theory make all of this work by having lots more conditionals, but +# for now limit this package to x86_64 on RHEL. +ExclusiveArch: x86_64 +%endif + BuildRequires: /usr/bin/pod2man BuildRequires: gnutls-devel %if 0%{?have_libguestfs} @@ -26,7 +34,9 @@ BuildRequires: libcurl-devel BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) BuildRequires: python2-devel +%if 0%{?rhel} >= 8 BuildRequires: python3-devel +%endif %ifarch %{ocaml_native_compiler} # Requires OCaml 4.02.2 which contains fix for # http://caml.inria.fr/mantis/view.php?id=6693 @@ -196,6 +206,7 @@ Obsoletes: %{name}-plugin-python <= %{version}-%{release} This package lets you write Python 2 plugins for %{name}.

+%if 0%{?rhel} >= 8 %package plugin-python3 Summary: Python 3 plugin for %{name} License: BSD @@ -206,6 +217,7 @@ Requires: %{name}-plugin-python-common = %{version}-%{release}

%description plugin-python3 This package lets you write Python 3 plugins for %{name}. +%endif

%package plugin-ruby @@ -273,6 +285,7 @@ mv "$copy" python3 %configure --disable-static --with-tls-priority=@NBDKIT,SYSTEM make %{?_smp_mflags}

+%if 0%{?rhel} >= 8 pushd python3 export PYTHON=%{_bindir}/python3 %configure --disable-static --disable-perl --disable-ocaml --disable-ruby @@ -282,12 +295,14 @@ grep '^PYTHON_VERSION = 3' Makefile make %{?_smp_mflags} unset PYTHON popd +%endif

%install # Install for Python 2 and Python 3 separately. # We do the Python 3 install first since that build is # incomplete. +%if 0%{?rhel} >= 8 pushd python3 %make_install popd @@ -295,6 +310,7 @@ popd pushd $RPM_BUILD_ROOT%{_libdir}/nbdkit/plugins/ mv nbdkit-python-plugin.so nbdkit-python3-plugin.so popd +%endif

%make_install

@@ -330,12 +346,14 @@ make check || { exit 1 }

+%if 0%{?rhel} >= 8 pushd python3 make check || { cat tests/test-suite.log exit 1 } popd +%endif

%endif %endif @@ -421,8 +439,10 @@ popd %{_libdir}/%{name}/plugins/nbdkit-python2-plugin.so

+%if 0%{?rhel} >= 8 %files plugin-python3 %{_libdir}/%{name}/plugins/nbdkit-python3-plugin.so +%endif

%files plugin-ruby @@ -455,8 +475,10 @@ popd

%changelog -* Fri Oct 20 2017 Richard W.M. Jones rjones@redhat.com - 1.1.16-1 +* Fri Oct 20 2017 Richard W.M. Jones rjones@redhat.com - 1.1.16-2 - New upstream version 1.1.16. +- Disable python3 plugin on RHEL/EPEL <= 7. +- Only ship on x86_64 in RHEL/EPEL <= 7.

* Wed Sep 27 2017 Richard W.M. Jones rjones@redhat.com - 1.1.15-1 - New upstream version 1.1.15.

commit 3e2f88dacd6d52bbc0c7c5c639f2fe8bcc476af0 Author: Richard W.M. Jones rjones@redhat.com Date: Fri Oct 20 10:53:40 2017 +0100

New upstream version 1.1.16.

diff --git a/nbdkit.spec b/nbdkit.spec index b7b2561..3ff686b 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -5,7 +5,7 @@ %endif

Name: nbdkit -Version: 1.1.15 +Version: 1.1.16 Release: 1%{?dist} Summary: NBD server

@@ -455,6 +455,9 @@ popd

%changelog +* Fri Oct 20 2017 Richard W.M. Jones rjones@redhat.com - 1.1.16-1 +- New upstream version 1.1.16. + * Wed Sep 27 2017 Richard W.M. Jones rjones@redhat.com - 1.1.15-1 - New upstream version 1.1.15. - Enable TLS support. diff --git a/sources b/sources index a15bd8f..291721a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.1.15.tar.gz) = 731881e5fd13f9d684500c76b9f7d3ab1787468240a80714df0b7350e7922d96a2747de44e82427ed1da6d6559f473b32f906b2b9b57ad75095732d1897b83c5 +SHA512 (nbdkit-1.1.16.tar.gz) = 05c739b8c5c5a7376c5077d192fec2742655f8db6c10c9aea28da174c229a5b3b45f57108f2e82fb7adcd0126d7355b4aab48a92e93cc7e7b2c5549b9f425579

commit 18285e9581533fd7c35063fd0f7ea100de8d01cd Author: Richard W.M. Jones rjones@redhat.com Date: Wed Sep 27 21:14:08 2017 +0100

New upstream version 1.1.15. Enable TLS support.

diff --git a/nbdkit.spec b/nbdkit.spec index 2a8b97a..b7b2561 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -5,7 +5,7 @@ %endif

Name: nbdkit -Version: 1.1.14 +Version: 1.1.15 Release: 1%{?dist} Summary: NBD server

@@ -15,6 +15,7 @@ URL: https://github.com/libguestfs/nbdkit Source0: http://libguestfs.org/download/nbdkit/%%7Bname%7D-%%7Bversion%7D.tar.gz

BuildRequires: /usr/bin/pod2man +BuildRequires: gnutls-devel %if 0%{?have_libguestfs} BuildRequires: libguestfs-devel %endif @@ -269,7 +270,7 @@ copy="$(mktemp -d)" cp -a . "$copy" mv "$copy" python3

-%configure --disable-static +%configure --disable-static --with-tls-priority=@NBDKIT,SYSTEM make %{?_smp_mflags}

pushd python3 @@ -454,6 +455,10 @@ popd

%changelog +* Wed Sep 27 2017 Richard W.M. Jones rjones@redhat.com - 1.1.15-1 +- New upstream version 1.1.15. +- Enable TLS support. + * Fri Sep 01 2017 Richard W.M. Jones rjones@redhat.com - 1.1.14-1 - New upstream version 1.1.14.

diff --git a/sources b/sources index 67e77d2..a15bd8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.1.14.tar.gz) = 94412f35a9f397fe68a98211b92697f22f414a4629ed476dedb0b925f42ea2b1d94ba3905e26f4ec702e4224704c6f2187e490e11b3a53af122ba3e08deea034 +SHA512 (nbdkit-1.1.15.tar.gz) = 731881e5fd13f9d684500c76b9f7d3ab1787468240a80714df0b7350e7922d96a2747de44e82427ed1da6d6559f473b32f906b2b9b57ad75095732d1897b83c5