diff --git a/.gitignore b/.gitignore index 4bd7ec0..1229603 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clog /nbdkit-*.tar.gz /nbdkit-*.tar.gz.sig +/*~ diff --git a/libguestfs.keyring b/libguestfs.keyring index bb3eb55..f0508c8 100644 Binary files a/libguestfs.keyring and b/libguestfs.keyring differ diff --git a/nbdkit.spec b/nbdkit.spec index fc019bf..c8b1abc 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -24,7 +24,7 @@ # On all other architectures, a simpler test suite must pass. This # omits any tests that run full qemu, since running qemu under TCG is # often broken on non-x86_64 arches. -%global complete_test_arches x86_64 +%global complete_test_arches NONE # If the test suite is broken on a particular architecture, document # it as a bug and add it to this list. @@ -50,8 +50,8 @@ ExclusiveArch: x86_64 %global source_directory 1.26-stable Name: nbdkit -Version: 1.26.0 -Release: 1%{?dist} +Version: 1.26.6 +Release: 2%{?dist} Summary: NBD server License: BSD @@ -108,9 +108,6 @@ BuildRequires: platform-python-devel BuildRequires: python3-devel %endif %if !0%{?rhel} -BuildRequires: python3-boto3 -%endif -%if !0%{?rhel} %if 0%{?have_ocaml} # Requires OCaml 4.02.2 which contains fix for # http://caml.inria.fr/mantis/view.php?id=6693 @@ -461,24 +458,6 @@ This package lets you write Ruby plugins for %{name}. %endif -%if !0%{?rhel} -# In theory this is noarch, but because plugins are placed in _libdir -# which varies across architectures, RPM does not allow this. -%package S3-plugin -Summary: Amazon S3 and Ceph plugin for %{name} -License: BSD - -Requires: %{name}-python-plugin >= 1.22 -# XXX Should not need to add this. -Requires: python3-boto3 - - -%description S3-plugin -This package lets you open disk images stored in Amazon S3 -or Ceph using %{name}. -%endif - - %package ssh-plugin Summary: SSH plugin for %{name} License: BSD @@ -810,9 +789,9 @@ for f in cc cdi torrent; do rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.* done +%endif rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-S3-plugin rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-S3-plugin.1* -%endif %check @@ -1051,15 +1030,6 @@ export LIBGUESTFS_TRACE=1 %endif -%if !0%{?rhel} -%files S3-plugin -%doc README -%license LICENSE -%{_libdir}/%{name}/plugins/nbdkit-S3-plugin -%{_mandir}/man1/nbdkit-S3-plugin.1* -%endif - - %files ssh-plugin %doc README %license LICENSE @@ -1241,6 +1211,25 @@ export LIBGUESTFS_TRACE=1 %changelog +* Fri Feb 18 2022 Richard W.M. Jones - 1.26.6-2 +- Drop S3 subpackage, dependencies fail on F34 + +* Wed Sep 22 2021 Richard W.M. Jones - 1.26.6-1 +- New upstream stable version 1.26.6. +- Remove upstream patch. + +* Fri Aug 20 2021 Eric Blake - 1.26.5-1 +- New upstream stable version 1.26.5; fixes CVE-2021-3716. + +* Thu Aug 05 2021 Richard W.M. Jones - 1.26.3-1 +- New upstream stable version 1.26.3. + +* Mon Jul 05 2021 Richard W.M. Jones - 1.26.2-1 +- New upstream stable version 1.26.2. + +* Fri Jun 11 2021 Richard W.M. Jones - 1.26.1-1 +- New upstream stable version 1.26.1. + * Mon Jun 07 2021 Richard W.M. Jones - 1.26.0-1 - New upstream version 1.26.0. diff --git a/sources b/sources index 63f11a1..90e60fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.26.0.tar.gz) = f5330a1ad47e45dfdfeed800af1fa5e5e02aa471da5cce45bf0d8f46f82655be8974bfc8fd2fd16a6cfc60349ada38675bc7e0b73b81f941d9022ac3cdda23ca -SHA512 (nbdkit-1.26.0.tar.gz.sig) = 838c10ecda260e801e5c760c9c61fa78a7713e6dd89fa7f3737259dcfeb64ebeba08ad2443190efe3190ef3c22617b1ca9cb4676a28512fd13708845e23a1d57 +SHA512 (nbdkit-1.26.6.tar.gz) = 750e3d6e667aa028794f16f2d7c83f1be9a8dd0392b26bda3e720a619eeddb48554f8bdfb350c97228bba257ba5decf0940c5e324487c302b5a2b99785ad9b88 +SHA512 (nbdkit-1.26.6.tar.gz.sig) = 6b1e180abb97e834affc66a211030688ea3e5a8dd66935d9cc2db64defe35ed36ce55200d5bb57e7508c08af03627677164a93478e5b8025e0e62cd447633e7f