diff --git a/nbdkit-1.29.11.tar.gz b/nbdkit-1.29.11.tar.gz deleted file mode 100644 index a537ffa240977e4532b07409272550809a6d99cd..0000000000000000000000000000000000000000 Binary files a/nbdkit-1.29.11.tar.gz and /dev/null differ diff --git a/nbdkit-1.29.11.tar.gz.sig b/nbdkit-1.29.11.tar.gz.sig deleted file mode 100644 index f9e8bf4610b8c62f14b1599c58558c29b7af41df..0000000000000000000000000000000000000000 --- a/nbdkit-1.29.11.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmG+XX8RHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKAy6Q//ST3Ga9oH1iC4CUN7zAPKLURjZkyPvre2 -tRqIbOX48qgNyYcE0VhPPn+gHWgnuPr3osW1f6jwtkEyY4I/oBxRjpZGWSSaKjsL -i6gZsrj0RyW/1plnF0Yn+Lmz+TuCu0rZ2EwH+ODHlii3JFgajitFcOfhmi7EyvSP -KmNDgYXXA4loWjCYdhgmfMfSdLty8lzDdix1LEWDxz9Uc0YDXKipvYfbbIz8R1ld -bExoMx/5frUH6j4txT1kfXQbIFUIhOsHYOK7rsQDxigJw3rzySxAcMFeIlzdmQAE -cvqsQ6W6v/QO7aYgf4YrYQdyPv+etqk2/wuEImGKp0E3HX0lHmQ8qjJsvmttep3W -1fvwN2ujbAhOh5ZX0hxXB+wqi+qPYJC5yBS5QQUcozAGW3LOK6eel0+uUiQ4PlJf -1XciqVtHDBdW0zQ/2T1ifOtX0i1MqhZ9ynwBwsjDCsj7E6IGrJIVvGicK3gQMO6i -UlvMZxKCgN2qG7fQKgxZ0vL6jJTgDT9a82lL/HiUIDnlOkKkeBirWXmLb+qAAOzm -Jjp1WpXSKPCEIv2m7CRkxVC/dqQ3/ew1mbgxn+emz3EnqxFeTWL1Sgch6IvgQg2H -n8sif7vWp6zhxrxfgUI/Y3n0vXFoDUM0fpG0ZDG/HEnVHhqgyMiRhB3dZpHb8Rlr -0Zexrn1cG0I= -=wyW4 ------END PGP SIGNATURE----- diff --git a/nbdkit-1.32.6.tar.gz b/nbdkit-1.32.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0e5ef4f68d70611fd4c31eac5b131148b4c02237 Binary files /dev/null and b/nbdkit-1.32.6.tar.gz differ diff --git a/nbdkit-1.32.6.tar.gz.sig b/nbdkit-1.32.6.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..c86df62bdc4a16e64456afeeed60cd92e32cea1b --- /dev/null +++ b/nbdkit-1.32.6.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmQ+hCYRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKAjOA//YeTcb2gJfHXgzSZm55YjFgNk8aC5Tk5k +6z8DpMQDDmTHhdLXdUUcO8bdVgOExvlRjqR2x8fzfeOnCm36cOKEXhj4EjP8AXOU +sSwggRIMqBFMy4CYapve8kheMfTjOWDpUeRmlyat1j1IqFx+MYuy5JISuyv0ZYMH +i3EquEBurRP5cHsMT/q7gq+PAjFP1pCeiEIQZ0bQ4w13j1vWYvKqotL5MjUjLCGA +LKQd5sv+62Kl60A2E8wtyl8w1p/uVI1SKEvgX8oom/z9d6OdUTUSqZJnOMWRi2aF +of/5qmdOBjif4VEFm441tEiVUkFWpv79Kl31ujgWrdSUTXZOK8A3sb83uSqOjtgz +jqRUlVj6bIfnU7k8wKiv5pYB2HU1lZjQ9c2vYTrO/twcLTjkSckVvEztcYV4V+Fv +01bsD4zBn7s+jzPPouMmrjgrsVNFSlkF72uDB0HgouNwr9rZaFyJpBfR23elS0EB +owmn1M5OpkKWNZ2Vj38kcYmg2Ga/YHlW2ceirH83e6FFqo02tpwOYgx7sZl7vB2A +0TEYdB0SrbLIwW5GzGGLv8CGO7Xco9Mm0+J178G3muW55KoM9IoV8IYYEWogMcmW +cy5SIc3TH9wOO7SD0vT/FjSlQ7wW0kDIwlAMM1O9C3ZniC0TsmxZCSYbMRcwwqlV +15lFzxju65E= +=lWP8 +-----END PGP SIGNATURE----- diff --git a/nbdkit.spec b/nbdkit.spec index ed7a66ff44e785ceb5d6172259d81d84daf8f1c7..5fd7859b7260f1654bc1f1324223bfc8627c55eb 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -3,13 +3,13 @@ %global patches_touch_autotools %{nil} Name: nbdkit -Version: 1.29.11 +Version: 1.32.6 Release: 1 Summary: NBD server -License: BSD +License: BSD-3-Clause URL: https://github.com/libguestfs/nbdkit -Source0: https://download.libguestfs.org/nbdkit/1.29-development/nbdkit-%{version}.tar.gz -Source1: https://download.libguestfs.org/nbdkit/1.29-development/nbdkit-%{version}.tar.gz.sig +Source0: https://download.libguestfs.org/nbdkit/1.36-stable/nbdkit-%{version}.tar.gz +Source1: https://download.libguestfs.org/nbdkit/1.36-stable/nbdkit-%{version}.tar.gz.sig Source2: libguestfs.keyring %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool @@ -19,8 +19,10 @@ BuildRequires: autoconf, automake, libtool %endif BuildRequires: gnutls gnutls-devel libselinux-devel python3-devel gnupg2 lua-devel socat iproute BuildRequires: libguestfs-devel libvirt-devel xz-devel zlib-devel libcurl-devel e2fsprogs-devel -BuildRequires: bash-completion perl-devel perl(ExtUtils::Embed) ocaml >= 4.02.2 +BuildRequires: bash-completion perl-devel perl(ExtUtils::Embed) ocaml >= 4.03 ocaml-ocamldoc BuildRequires: ruby-devel tcl-devel perl-podlators qemu-img +#BuildRequires: gcc gcc-c++ perl-podlators zstd-devel libssh-devel +#BuildRequires: bc gnutls-utils coreutils expect util-linux iproute jq socat Requires: nbdkit-server nbdkit-basic-plugins nbdkit-basic-filters %description @@ -37,14 +39,14 @@ The key features are: %package server Summary: The nbdkit server -License: BSD +License: BSD-3-Clause %description server This package contains the nbdkit server with no plugins or filters. %package basic-plugins Summary: Basic plugins for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Obsoletes: nbdkit-plugin-file < 1.1.19-1 nbdkit-plugin-nbd < 1.1.19-1 nbdkit-plugin-streaming < 1.1.19-1 @@ -80,7 +82,7 @@ trivial dependencies. %package plugins Summary: Plugins set -License: BSD +License: BSD-3-Clause Provides: nbdkit-example-plugins nbdkit-curl-plugin nbdkit-plugin-curl = %{version}-%{release} Provides: nbdkit-ruby-plugin nbdkit-plugin-ruby = %{version}-%{release} Provides: nbdkit-tar-plugin nbdkit-plugin-tar = %{version}-%{release} @@ -117,7 +119,7 @@ This package contains a set of plugins for nbdkit. %package guestfs-plugin Summary: libguestfs plugin for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Provides: nbdkit-plugin-guestfs = %{version}-%{release} Obsoletes: nbdkit-plugin-guestfs <= %{version}-%{release} @@ -127,7 +129,7 @@ This package is a libguestfs plugin for nbdkit. %package libvirt-plugin Summary: Libvirt plugin for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Provides: nbdkit-plugin-libvirt = %{version}-%{release} Obsoletes: nbdkit-plugin-libvirt <= %{version}-%{release} @@ -139,7 +141,7 @@ virDomainBlockPeek API. %package ocaml-plugin Summary: OCaml plugin for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Provides: nbdkit-plugin-ocaml = %{version}-%{release} Obsoletes: nbdkit-plugin-ocaml <= %{version}-%{release} @@ -151,7 +153,7 @@ nbdkit-ocaml-plugin-devel. %package ocaml-plugin-devel Summary: OCaml development environment for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} nbdkit-ocaml-plugin = %{version}-%{release} Provides: nbdkit-plugin-ocaml-devel = %{version}-%{release} Obsoletes: nbdkit-plugin-ocaml-devel <= %{version}-%{release} @@ -161,7 +163,7 @@ This package lets you write OCaml plugins for nbdkit. %package perl-plugin Summary: Perl plugin for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Provides: nbdkit-plugin-perl = %{version}-%{release} Obsoletes: nbdkit-plugin-perl <= %{version}-%{release} @@ -171,7 +173,7 @@ This package lets you write Perl plugins for nbdkit. %package python3-plugin Summary: Python 3 plugin for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Provides: nbdkit-plugin-python3 = %{version}-%{release} Obsoletes: nbdkit-plugin-python3 <= %{version}-%{release} @@ -184,7 +186,7 @@ This package lets you write Python 3 plugins for nbdkit. %ifarch x86_64 %package vddk-plugin Summary: VMware VDDK plugin for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Provides: nbdkit-plugin-vddk = %{version}-%{release} Obsoletes: nbdkit-plugin-vddk <= %{version}-%{release} @@ -196,7 +198,7 @@ VMware VDDK for accessing VMware disks and servers. %package basic-filters Summary: Basic filters for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} Provides: %{name}-blocksize-filter = %{version}-%{release} Provides: %{name}-cache-filter = %{version}-%{release} @@ -264,7 +266,7 @@ trivial dependencies. %package devel Summary: Development files and documentation for nbdkit -License: BSD +License: BSD-3-Clause Requires: nbdkit-server = %{version}-%{release} pkgconfig %description devel @@ -373,43 +375,43 @@ make check -j1 -C tests TESTS=test-python || { } popd %endif - %post ocaml-plugin -p /sbin/ldconfig %postun ocaml-plugin -p /sbin/ldconfig %files %files server -%doc README LICENSE +%doc README.md LICENSE %{_sbindir}/nbdkit %dir %{_libdir}/nbdkit/{plugins,filters} %files basic-plugins -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/plugins/{nbdkit-data-plugin.so,nbdkit-file-plugin.so,nbdkit-memory-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-nbd-plugin.so,nbdkit-null-plugin.so,nbdkit-pattern-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-random-plugin.so,nbdkit-split-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-streaming-plugin.so,nbdkit-zero-plugin.so} %files plugins -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/plugins/{nbdkit-example*-plugin.so,nbdkit-example4-plugin,nbdkit-curl-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-ruby-plugin.so,nbdkit-tar-plugin,nbdkit-tcl-plugin.so,nbdkit-xz-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-S3-plugin,nbdkit-cc-plugin.so,nbdkit-cdi-plugin.so,nbdkit-eval-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-floppy-plugin.so,nbdkit-full-plugin.so,nbdkit-info-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-linuxdisk-plugin.so,nbdkit-ondemand-plugin.so,nbdkit-partitioning-plugin.so} %{_libdir}/nbdkit/plugins/{nbdkit-sh-plugin.so,nbdkit-sparse-random-plugin.so,nbdkit-tmpdisk-plugin.so} +#%%{_libdir}/nbdkit/plugins/{nbdkit-ones-plugin.so,nbdkit-ssh-plugin.so} %files guestfs-plugin -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/plugins/nbdkit-guestfs-plugin.so %files libvirt-plugin -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/plugins/nbdkit-libvirt-plugin.so %files ocaml-plugin -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/libnbdkitocaml.so.* %files ocaml-plugin-devel @@ -417,21 +419,21 @@ popd %{_libdir}/ocaml/NBDKit.* %files perl-plugin -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/plugins/nbdkit-perl-plugin.so %files python3-plugin -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/plugins/nbdkit-python3-plugin.so %ifarch x86_64 %files vddk-plugin -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/plugins/nbdkit-vddk-plugin.so %endif %files basic-filters -%doc README LICENSE +%doc README.md LICENSE %{_libdir}/nbdkit/filters/{nbdkit-blocksize-filter.so,nbdkit-cache-filter.so,nbdkit-cow-filter.so} %{_libdir}/nbdkit/filters/{nbdkit-delay-filter.so,nbdkit-error-filter.so,nbdkit-fua-filter.so} %{_libdir}/nbdkit/filters/{nbdkit-log-filter.so,nbdkit-nozero-filter.so,nbdkit-offset-filter.so} @@ -445,10 +447,11 @@ popd %{_libdir}/nbdkit/filters/{nbdkit-retry-request-filter.so,nbdkit-stats-filter.so,nbdkit-swab-filter.so} %{_libdir}/nbdkit/filters/{nbdkit-tar-filter.so,nbdkit-tls-fallback-filter.so,nbdkit-protect-filter.so} %{_libdir}/nbdkit/filters/{nbdkit-ext2-filter.so,nbdkit-gzip-filter.so,nbdkit-lua-filter.so} +%{_libdir}/nbdkit/filters/{nbdkit-blocksize-policy-filter.so,nbdkit-evil-filter.so,nbdkit-luks-filter.so,nbdkit-qcow2dec-filter.so,nbdkit-scan-filter.so} %files devel -%doc OTHER_PLUGINS README TODO LICENSE +%doc OTHER_PLUGINS README.md TODO LICENSE %doc plugins/example*/*.c %doc plugins/example4/nbdkit-example4-plugin %doc plugins/lua/example.lua @@ -474,6 +477,9 @@ popd %{_mandir}/man3/NBDKit.3.gz %changelog +* Tue Oct 17 2023 Ge Wang - 1.32.6-1 +- update to version 1.32.6 + * Thu Dec 30 2021 liyanan - 1.29.11-1 - update to 1.29.11