Compare commits
26 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
559f31a603 | ||
|
43bacc08c3 | ||
|
2037933f88 | ||
|
d1bd233f4a | ||
|
31886771ce | ||
|
7c4f31f5c3 | ||
|
442c62b8e5 | ||
|
6856676bd4 | ||
|
cb86460bd2 | ||
|
9f07358d79 | ||
|
a09f2340e1 | ||
|
95070b5f76 | ||
|
3130f5ec4b | ||
|
fffade3981 | ||
|
2f7d85fd85 | ||
|
451663e6ac | ||
|
cd71d8d33a | ||
|
ee3fd0e5ef | ||
|
78e81666e0 | ||
|
2b58f2e7f5 | ||
|
75e47a783b | ||
|
c739c90a4a | ||
|
7622c61a59 | ||
|
055d5bb77c | ||
|
cda8370501 | ||
|
06eb82a75f |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
/clog
|
||||
/nbdkit-*.tar.gz
|
||||
/nbdkit-*.tar.gz.sig
|
||||
|
BIN
libguestfs.keyring
Normal file
BIN
libguestfs.keyring
Normal file
Binary file not shown.
181
nbdkit.spec
181
nbdkit.spec
@ -9,22 +9,40 @@
|
||||
# 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 aarch64 x86_64
|
||||
%global complete_test_arches x86_64
|
||||
|
||||
# Currently everything has Python 2. RHEL 7 doesn't have Python 3.
|
||||
%if 0%{?rhel} != 7
|
||||
%global have_python3 1
|
||||
%endif
|
||||
|
||||
# If we should verify tarball signature with GPGv2.
|
||||
%global verify_tarball_signature 1
|
||||
|
||||
# If there are patches which touch autotools files, set this to 1.
|
||||
%global patches_touch_autotools %{nil}
|
||||
|
||||
# The source directory.
|
||||
%global source_directory 1.4-stable
|
||||
|
||||
Name: nbdkit
|
||||
Version: 1.1.28
|
||||
Release: 5%{?dist}
|
||||
Version: 1.4.2
|
||||
Release: 1%{?dist}
|
||||
Summary: NBD server
|
||||
|
||||
License: BSD
|
||||
URL: https://github.com/libguestfs/nbdkit
|
||||
|
||||
Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz
|
||||
Source0: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz
|
||||
%if 0%{verify_tarball_signature}
|
||||
Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz.sig
|
||||
# Keyring used to verify tarball signature.
|
||||
Source2: libguestfs.keyring
|
||||
%endif
|
||||
|
||||
%if 0%{patches_touch_autotools}
|
||||
BuildRequires: autoconf, automake, libtool
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 7
|
||||
# On RHEL 7, nothing in the virt stack is shipped on aarch64 and
|
||||
@ -47,6 +65,8 @@ BuildRequires: libvirt-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: perl(ExtUtils::Embed)
|
||||
BuildRequires: python2-devel
|
||||
@ -59,6 +79,10 @@ BuildRequires: python3-devel
|
||||
BuildRequires: ocaml >= 4.02.2
|
||||
%endif
|
||||
BuildRequires: ruby-devel
|
||||
BuildRequires: tcl-devel
|
||||
%if 0%{verify_tarball_signature}
|
||||
BuildRequires: gnupg2
|
||||
%endif
|
||||
|
||||
# Only for running the test suite:
|
||||
BuildRequires: /usr/bin/certtool
|
||||
@ -127,6 +151,10 @@ trivial dependencies.
|
||||
|
||||
A null (bitbucket) plugin.
|
||||
|
||||
* nbdkit-random-plugin
|
||||
|
||||
Random content plugin for testing.
|
||||
|
||||
* nbdkit-split-plugin
|
||||
|
||||
Concatenate one or more files into a single virtual disk.
|
||||
@ -135,6 +163,10 @@ trivial dependencies.
|
||||
|
||||
A streaming file serving plugin.
|
||||
|
||||
* nbdkit-zero-plugin
|
||||
|
||||
Zero-length plugin for testing.
|
||||
|
||||
|
||||
%package example-plugins
|
||||
Summary: Example plugins for %{name}
|
||||
@ -164,6 +196,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
This package contains cURL (HTTP/FTP/SSH) support for %{name}.
|
||||
|
||||
|
||||
%package plugin-ext2
|
||||
Summary: ext2, ext3 and ext4 filesystem support for %{name}
|
||||
License: BSD
|
||||
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
%description plugin-ext2
|
||||
This package contains ext2, ext3 and ext4 filesystem support for
|
||||
%{name}.
|
||||
|
||||
|
||||
%if 0%{?have_libguestfs}
|
||||
%package plugin-guestfs
|
||||
Summary: libguestfs plugin for %{name}
|
||||
@ -300,12 +344,25 @@ Summary: Tar archive plugin for %{name}
|
||||
License: BSD
|
||||
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# XXX This dependency should be autogenerated.
|
||||
Requires: %{name}-plugin-perl
|
||||
|
||||
|
||||
%description plugin-tar
|
||||
This package is a tar archive plugin for %{name}.
|
||||
|
||||
|
||||
%package plugin-tcl
|
||||
Summary: Tcl plugin for %{name}
|
||||
License: BSD
|
||||
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
%description plugin-tcl
|
||||
This package lets you write Tcl plugins for %{name}.
|
||||
|
||||
|
||||
%package plugin-xz
|
||||
Summary: XZ file serving plugin for %{name}
|
||||
License: BSD
|
||||
@ -328,6 +385,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
This package contains some basic filters for %{name} which have only
|
||||
trivial dependencies.
|
||||
|
||||
* nbdkit-blocksize-filter
|
||||
|
||||
Adjust block size of requests sent to plugins.
|
||||
|
||||
* nbdkit-cache-filter
|
||||
|
||||
Server-side cache.
|
||||
@ -340,6 +401,18 @@ trivial dependencies.
|
||||
|
||||
Inject read and write delays.
|
||||
|
||||
* nbdkit-fua-filter
|
||||
|
||||
Modify flush behaviour in plugins.
|
||||
|
||||
* nbdkit-log-filter
|
||||
|
||||
Log all transactions to a file.
|
||||
|
||||
* nbdkit-nozero-filter
|
||||
|
||||
Adjust handling of zero requests by plugins.
|
||||
|
||||
* nbdkit-offset-filter
|
||||
|
||||
Serve an offset and range.
|
||||
@ -363,13 +436,32 @@ for %{name}. Install this package if you want to develop
|
||||
plugins for %{name}.
|
||||
|
||||
|
||||
%package bash-completion
|
||||
Summary: Bash tab-completion for %{name}
|
||||
BuildArch: noarch
|
||||
Requires: bash-completion >= 2.0
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
|
||||
%description bash-completion
|
||||
Install this package if you want intelligent bash tab-completion
|
||||
for %{name}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autopatch -p1
|
||||
%if 0%{verify_tarball_signature}
|
||||
tmphome="$(mktemp -d)"
|
||||
gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
||||
%endif
|
||||
%autosetup -p1
|
||||
%if 0%{patches_touch_autotools}
|
||||
autoreconf -i
|
||||
%endif
|
||||
|
||||
%ifnarch %{complete_test_arches}
|
||||
# Simplify the test suite so it doesn't require qemu.
|
||||
sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am
|
||||
sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
|
||||
autoreconf -i
|
||||
%endif
|
||||
|
||||
@ -391,7 +483,7 @@ make %{?_smp_mflags}
|
||||
%if 0%{?have_python3}
|
||||
pushd python3
|
||||
export PYTHON=%{_bindir}/python3
|
||||
%configure --disable-static --disable-perl --disable-ocaml --disable-ruby
|
||||
%configure --disable-static --disable-perl --disable-ocaml --disable-ruby --disable-tcl
|
||||
# Verify that it picked the correct version of Python
|
||||
# to avoid RHBZ#1404631 happening again silently.
|
||||
grep '^PYTHON_VERSION = 3' Makefile
|
||||
@ -446,7 +538,7 @@ make check -j1 || {
|
||||
%if 0%{?have_libguestfs}
|
||||
%if 0%{?have_python3}
|
||||
pushd python3
|
||||
make check -j1 TESTS=test-python || {
|
||||
make check -j1 -C tests TESTS=test-python || {
|
||||
cat tests/test-suite.log
|
||||
exit 1
|
||||
}
|
||||
@ -478,14 +570,18 @@ popd
|
||||
%{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so
|
||||
%{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so
|
||||
%{_libdir}/%{name}/plugins/nbdkit-null-plugin.so
|
||||
%{_libdir}/%{name}/plugins/nbdkit-random-plugin.so
|
||||
%{_libdir}/%{name}/plugins/nbdkit-split-plugin.so
|
||||
%{_libdir}/%{name}/plugins/nbdkit-streaming-plugin.so
|
||||
%{_libdir}/%{name}/plugins/nbdkit-zero-plugin.so
|
||||
%{_mandir}/man1/nbdkit-file-plugin.1*
|
||||
%{_mandir}/man1/nbdkit-memory-plugin.1*
|
||||
%{_mandir}/man1/nbdkit-nbd-plugin.1*
|
||||
%{_mandir}/man1/nbdkit-null-plugin.1*
|
||||
%{_mandir}/man1/nbdkit-random-plugin.1*
|
||||
%{_mandir}/man1/nbdkit-split-plugin.1*
|
||||
%{_mandir}/man1/nbdkit-streaming-plugin.1*
|
||||
%{_mandir}/man1/nbdkit-zero-plugin.1*
|
||||
|
||||
|
||||
%files example-plugins
|
||||
@ -503,6 +599,13 @@ popd
|
||||
%{_mandir}/man1/nbdkit-curl-plugin.1*
|
||||
|
||||
|
||||
%files plugin-ext2
|
||||
%doc README
|
||||
%license LICENSE
|
||||
%{_libdir}/%{name}/plugins/nbdkit-ext2-plugin.so
|
||||
%{_mandir}/man1/nbdkit-ext2-plugin.1*
|
||||
|
||||
|
||||
%if 0%{?have_libguestfs}
|
||||
%files plugin-guestfs
|
||||
%doc README
|
||||
@ -577,6 +680,13 @@ popd
|
||||
%{_mandir}/man1/nbdkit-tar-plugin.1*
|
||||
|
||||
|
||||
%files plugin-tcl
|
||||
%doc README
|
||||
%license LICENSE
|
||||
%{_libdir}/%{name}/plugins/nbdkit-tcl-plugin.so
|
||||
%{_mandir}/man3/nbdkit-tcl-plugin.3*
|
||||
|
||||
|
||||
%files plugin-xz
|
||||
%doc README
|
||||
%license LICENSE
|
||||
@ -587,14 +697,22 @@ popd
|
||||
%files basic-filters
|
||||
%doc README
|
||||
%license LICENSE
|
||||
%{_libdir}/%{name}/filters/nbdkit-blocksize-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-cache-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-cow-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-delay-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-fua-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-log-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-nozero-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-offset-filter.so
|
||||
%{_libdir}/%{name}/filters/nbdkit-partition-filter.so
|
||||
%{_mandir}/man1/nbdkit-blocksize-filter.1*
|
||||
%{_mandir}/man1/nbdkit-cache-filter.1*
|
||||
%{_mandir}/man1/nbdkit-cow-filter.1*
|
||||
%{_mandir}/man1/nbdkit-delay-filter.1*
|
||||
%{_mandir}/man1/nbdkit-fua-filter.1*
|
||||
%{_mandir}/man1/nbdkit-log-filter.1*
|
||||
%{_mandir}/man1/nbdkit-nozero-filter.1*
|
||||
%{_mandir}/man1/nbdkit-offset-filter.1*
|
||||
%{_mandir}/man1/nbdkit-partition-filter.1*
|
||||
|
||||
@ -608,6 +726,7 @@ popd
|
||||
%doc plugins/perl/example.pl
|
||||
%doc plugins/python/example.py
|
||||
%doc plugins/ruby/example.rb
|
||||
%doc plugins/tcl/example.tcl
|
||||
%{_includedir}/nbdkit-common.h
|
||||
%{_includedir}/nbdkit-filter.h
|
||||
%{_includedir}/nbdkit-plugin.h
|
||||
@ -616,7 +735,53 @@ popd
|
||||
%{_libdir}/pkgconfig/nbdkit.pc
|
||||
|
||||
|
||||
%files bash-completion
|
||||
%license LICENSE
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/nbdkit
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.4.2-1
|
||||
- New upstream version 1.4.2.
|
||||
|
||||
* Fri Jul 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1
|
||||
- New upstream version 1.4.1.
|
||||
- Small refactorings in the spec file.
|
||||
|
||||
* Fri Jul 6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
|
||||
- New upstream version 1.4.0.
|
||||
- Add support for Tcl plugins.
|
||||
- New plugins: ext2, random, tcl, zero.
|
||||
- New filters: blocksize, fua, log, nozero.
|
||||
- New bash tab completion subpackage.
|
||||
|
||||
* Sun Jul 1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-3
|
||||
- Add all upstream patches since 1.2.4 was released.
|
||||
|
||||
* Tue Jun 12 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-2
|
||||
- Add all upstream patches since 1.2.4 was released.
|
||||
|
||||
* Sat Jun 9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-1
|
||||
- New stable version 1.2.4.
|
||||
- Remove upstream patches.
|
||||
- Enable tarball signatures.
|
||||
- Add upstream patch to fix tests when guestfish not available.
|
||||
|
||||
* Wed Jun 6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-1
|
||||
- New stable version 1.2.3.
|
||||
- Add patch to work around libvirt problem with relative socket paths.
|
||||
- Add patch to fix the xz plugin test with recent guestfish.
|
||||
|
||||
* Sat Apr 21 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-1
|
||||
- New stable version 1.2.2.
|
||||
|
||||
* Mon Apr 9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-1
|
||||
- New stable version 1.2.1.
|
||||
|
||||
* Fri Apr 6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
|
||||
- Move to stable branch version 1.2.0.
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.28-5
|
||||
- Escape macros in %%changelog
|
||||
|
||||
|
3
sources
3
sources
@ -1 +1,2 @@
|
||||
SHA512 (nbdkit-1.1.28.tar.gz) = cbf40dffc773575a69d20edc42570bf63bd5f189ec0a3c4beeca7fca518ec969b94a15fdc834762f322c99145a95a015f5aad60edb078ba98c7b805583218fef
|
||||
SHA512 (nbdkit-1.4.2.tar.gz) = aea6dc3921403b957f9a06695af0bf7d4aee80bc1fe8e95f9eacbda6d15f3dae3f50d1daa945d4adbd3505639d985507b1e3f0368e2ff4b3cfb4c38c2665f16b
|
||||
SHA512 (nbdkit-1.4.2.tar.gz.sig) = db451997801c10f58566fa7a34656a8fdc7898891e6ac990b6889e39624826828892b812f9bbe257b96b0f41ce99816da2365687de11a7d3acce9bea614e6886
|
||||
|
Loading…
Reference in New Issue
Block a user