diff --git a/SPECS-EXTENDED/nbdkit/nbdkit.signatures.json b/SPECS-EXTENDED/nbdkit/nbdkit.signatures.json deleted file mode 100644 index 84e7282644..0000000000 --- a/SPECS-EXTENDED/nbdkit/nbdkit.signatures.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Signatures": { - "nbdkit-1.20.7.tar.gz": "999242d56787f69b79eddcd64e5cb2c3071d4bd8ed98dc7da711a09fca8095ec" - } -} \ No newline at end of file diff --git a/SPECS-EXTENDED/buildah/buildah.signatures.json b/SPECS/buildah/buildah.signatures.json similarity index 100% rename from SPECS-EXTENDED/buildah/buildah.signatures.json rename to SPECS/buildah/buildah.signatures.json diff --git a/SPECS-EXTENDED/buildah/buildah.spec b/SPECS/buildah/buildah.spec similarity index 97% rename from SPECS-EXTENDED/buildah/buildah.spec rename to SPECS/buildah/buildah.spec index 77812c78f0..3b1e964126 100644 --- a/SPECS-EXTENDED/buildah/buildah.spec +++ b/SPECS/buildah/buildah.spec @@ -1,20 +1,10 @@ -Vendor: Microsoft Corporation -Distribution: Mariner -%global with_bundled 1 - - %global with_debug 1 - - - - %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} %endif - %global provider github %global provider_tld com %global project containers @@ -22,53 +12,37 @@ Distribution: Mariner # https://github.com/containers/buildah %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} - # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %define built_tag v1.18.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%define download_url https://%{import_path}/archive/%{built_tag}.tar.gz - -Name: %{repo} -Version: 1.18.0 -Release: 6%{?dist} -Summary: A command line tool used for creating OCI Images -License: ASL 2.0 -URL: https://%{name}.io -Source: %{download_url}#/%{name}-%{version}.tar.gz -BuildRequires: device-mapper-devel -BuildRequires: golang -BuildRequires: git -BuildRequires: glib2-devel -BuildRequires: glibc-static >= 2.35-3%{?dist} -BuildRequires: go-md2man -BuildRequires: go-rpm-macros -BuildRequires: gpgme-devel -BuildRequires: libassuan-devel -BuildRequires: make -Requires: containers-common -# No ostree for centos 7 - -BuildRequires: ostree-devel - -# No btrfs for centos 8 - -BuildRequires: btrfs-progs-devel - - -Requires: crun >= 0.10-1 -BuildRequires: libseccomp-static -Recommends: container-selinux -Requires: libseccomp >= 2.4.1-0 -Recommends: slirp4netns >= 0.3-0 -Recommends: fuse-overlayfs - - - - - - - +Summary: A command line tool used for creating OCI Images +Name: %{repo} +Version: 1.18.0 +Release: 7%{?dist} +License: Apache-2.0 +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://%{name}.io +Source: https://%{import_path}/archive/%{built_tag}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: btrfs-progs-devel +BuildRequires: device-mapper-devel +BuildRequires: git +BuildRequires: glib2-devel +BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: go-md2man +BuildRequires: go-rpm-macros +BuildRequires: golang +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libseccomp-static +BuildRequires: make +BuildRequires: ostree-devel +Requires: libcontainers-common +Requires: libseccomp >= 2.4.1-0 +Recommends: container-selinux +Recommends: fuse-overlayfs +Recommends: slirp4netns >= 0.3-0 %description The %{name} package provides a command line tool which can be used to @@ -79,23 +53,6 @@ or * save container's root file system layer to create a new image * delete a working container or an image -%package tests -Summary: Tests for %{name} - -Requires: %{name} = %{version}-%{release} -Requires: bats -Requires: bzip2 -Requires: podman -Requires: golang -Requires: jq -Requires: httpd-tools -Requires: openssl - -%description tests -%{summary} - -This package contains system tests for %{name} - %prep %autosetup -Sgit -n %{name}-%{built_tag_strip} sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile @@ -112,25 +69,14 @@ mv vendor src export GOPATH=$(pwd)/_build:$(pwd) export BUILDTAGS='seccomp selinux' -%if 0%{?centos} >= 8 -export BUILDTAGS+=' exclude_graphdriver_btrfs' -%endif %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -%gobuild -o imgtype %{import_path}/tests/imgtype -GOMD2MAN=go-md2man %{__make} -C docs +GOMD2MAN=go-md2man make -C docs %install export GOPATH=$(pwd)/_build:$(pwd):%{gopath} make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install -install -d -p %{buildroot}/%{_datadir}/%{name}/test/system -cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system -cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - %files %license LICENSE %doc README.md @@ -140,12 +86,11 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/%{name} -%files tests -%license LICENSE -%{_bindir}/%{name}-imgtype -%{_datadir}/%{name}/test - %changelog +* Tue Nov 01 2022 Ameya Usgaonkar - 1.18.0-7 +- Move to core packages +- Remove tests package + * Tue Nov 01 2022 Olivia Crain - 1.18.0-6 - Bump release to rebuild with go 1.18.8 diff --git a/SPECS-EXTENDED/catatonit/catatonit.signatures.json b/SPECS/catatonit/catatonit.signatures.json similarity index 100% rename from SPECS-EXTENDED/catatonit/catatonit.signatures.json rename to SPECS/catatonit/catatonit.signatures.json diff --git a/SPECS-EXTENDED/catatonit/catatonit.spec b/SPECS/catatonit/catatonit.spec similarity index 78% rename from SPECS-EXTENDED/catatonit/catatonit.spec rename to SPECS/catatonit/catatonit.spec index 1975d7a153..17d5db7f56 100644 --- a/SPECS-EXTENDED/catatonit/catatonit.spec +++ b/SPECS/catatonit/catatonit.spec @@ -1,23 +1,21 @@ +Summary: A signal-forwarding process manager for containers +Name: catatonit +Version: 0.1.7 +Release: 7%{?dist} +License: GPLv3+ Vendor: Microsoft Corporation Distribution: Mariner - -Name: catatonit -Version: 0.1.7 -Release: 6%{?dist} -Summary: A signal-forwarding process manager for containers -License: GPLv3+ -URL: https://github.com/openSUSE/catatonit -Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: file -BuildRequires: gcc -BuildRequires: git -BuildRequires: glibc-static >= 2.35-3%{?dist} -BuildRequires: libtool -BuildRequires: make - -Provides: podman-%{name} = %{version}-%{release} +URL: https://github.com/openSUSE/catatonit +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: file +BuildRequires: gcc +BuildRequires: git +BuildRequires: glibc-static >= 2.35-3%{?dist} +BuildRequires: libtool +BuildRequires: make +Provides: podman-%{name} = %{version}-%{release} %description Catatonit is a /sbin/init program for use within containers. It @@ -36,7 +34,7 @@ sed -i '$d' configure.ac %build autoreconf -fi %configure -%{__make} %{?_smp_mflags} +%make_build # Make sure we *always* build a static binary. Otherwise we'll break containers # that don't have the necessary shared libs. @@ -61,6 +59,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name} %{_libexecdir}/podman/%{name} %changelog +* Tue Nov 01 2022 Ameya Usgaonkar - 0.1.7-7 +- Move to core packages + * Tue Sep 13 2022 Andy Caldwell - 0.1.7-6 - Rebuilt for glibc-static 2.35-3 diff --git a/SPECS-EXTENDED/containernetworking-plugins/containernetworking-plugins.signatures.json b/SPECS/containernetworking-plugins/containernetworking-plugins.signatures.json similarity index 100% rename from SPECS-EXTENDED/containernetworking-plugins/containernetworking-plugins.signatures.json rename to SPECS/containernetworking-plugins/containernetworking-plugins.signatures.json diff --git a/SPECS-EXTENDED/containernetworking-plugins/containernetworking-plugins.spec b/SPECS/containernetworking-plugins/containernetworking-plugins.spec similarity index 75% rename from SPECS-EXTENDED/containernetworking-plugins/containernetworking-plugins.spec rename to SPECS/containernetworking-plugins/containernetworking-plugins.spec index 83fba021d2..d21b1fd97c 100644 --- a/SPECS-EXTENDED/containernetworking-plugins/containernetworking-plugins.spec +++ b/SPECS/containernetworking-plugins/containernetworking-plugins.spec @@ -1,12 +1,10 @@ %global with_debug 1 - %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} %endif - %global provider github %global provider_tld com %global project containernetworking @@ -14,63 +12,59 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{import_path} - # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %define built_tag v1.1.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) %define download_url %{git0}/archive/%{built_tag}.tar.gz - -Name: %{project}-%{repo} -Version: 1.1.1 -Release: 3%{?dist} -Summary: Libraries for writing CNI plugin -License: ASL 2.0 and BSD and MIT -Vendor: Microsoft Corporation -Distribution: Mariner -URL: %{git0} -Source0: %{download_url}#/%{name}-%{version}.tar.gz +Summary: Libraries for writing CNI plugin +Name: %{project}-%{repo} +Version: 1.1.1 +Release: 4%{?dist} +License: Apache-2.0 AND BSD AND MIT +Vendor: Microsoft Corporation +Distribution: Mariner +URL: %{git0} +Source0: %{download_url}#/%{name}-%{version}.tar.gz +BuildRequires: git +BuildRequires: go-md2man +BuildRequires: go-rpm-macros # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: golang -BuildRequires: git -BuildRequires: go-md2man -BuildRequires: go-rpm-macros -BuildRequires: systemd-devel -Requires: systemd - - -Obsoletes: %{project}-cni < 0.7.1-2 -Provides: %{project}-cni = %{version}-%{release} -Provides: kubernetes-cni -Provides: container-network-stack = 1 +BuildRequires: golang +BuildRequires: systemd-devel +Requires: systemd +Obsoletes: %{project}-cni < 0.7.1-2 +Provides: %{project}-cni = %{version}-%{release} +Provides: kubernetes-cni +Provides: container-network-stack = 1 # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d' -Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.4.17 -Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.20 -Provides: bundled(golang(github.com/alexflint/go_filemutex)) = v1.1.0 -Provides: bundled(golang(github.com/buger/jsonparser)) = v1.1.1 -Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.1 -Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1 -Provides: bundled(golang(github.com/coreos/go_iptables)) = v0.6.0 -Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2 -Provides: bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c -Provides: bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0 -Provides: bundled(golang(github.com/d2g/dhcp4server)) = v0.0.0_20181031114812_7d4a0a7f59a5 -Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9 -Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.4 -Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2 -Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20200121045136_8c9f03a8e57e -Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12 -Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.2.0 -Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8 -Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.4 -Provides: bundled(golang(github.com/onsi/gomega)) = v1.15.0 -Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1 -Provides: bundled(golang(github.com/safchain/ethtool)) = v0.0.0_20210803160452_9aa261dae9b1 -Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1 -Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5 -Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f +Provides: bundled(golang(github.com/Microsoft/go_winio)) = v0.4.17 +Provides: bundled(golang(github.com/Microsoft/hcsshim)) = v0.8.20 +Provides: bundled(golang(github.com/alexflint/go_filemutex)) = v1.1.0 +Provides: bundled(golang(github.com/buger/jsonparser)) = v1.1.1 +Provides: bundled(golang(github.com/containerd/cgroups)) = v1.0.1 +Provides: bundled(golang(github.com/containernetworking/cni)) = v1.0.1 +Provides: bundled(golang(github.com/coreos/go_iptables)) = v0.6.0 +Provides: bundled(golang(github.com/coreos/go_systemd/v22)) = v22.3.2 +Provides: bundled(golang(github.com/d2g/dhcp4)) = v0.0.0_20170904100407_a1d1b6c41b1c +Provides: bundled(golang(github.com/d2g/dhcp4client)) = v1.0.0 +Provides: bundled(golang(github.com/d2g/dhcp4server)) = v0.0.0_20181031114812_7d4a0a7f59a5 +Provides: bundled(golang(github.com/fsnotify/fsnotify)) = v1.4.9 +Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.0.4 +Provides: bundled(golang(github.com/gogo/protobuf)) = v1.3.2 +Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0_20200121045136_8c9f03a8e57e +Provides: bundled(golang(github.com/mattn/go_shellwords)) = v1.0.12 +Provides: bundled(golang(github.com/networkplumbing/go_nft)) = v0.2.0 +Provides: bundled(golang(github.com/nxadm/tail)) = v1.4.8 +Provides: bundled(golang(github.com/onsi/ginkgo)) = v1.16.4 +Provides: bundled(golang(github.com/onsi/gomega)) = v1.15.0 +Provides: bundled(golang(github.com/pkg/errors)) = v0.9.1 +Provides: bundled(golang(github.com/safchain/ethtool)) = v0.0.0_20210803160452_9aa261dae9b1 +Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1 +Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.1.1_0.20210330154013_f5de75959ad5 +Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.0_20210104183010_2eb08e3e575f %description The CNI (Container Network Interface) project consists of a specification @@ -79,7 +73,6 @@ containers, along with a number of supported plugins. CNI concerns itself only with network connectivity of containers and removing allocated resources when the container is deleted. - %prep %autosetup -Sgit -n %{repo}-%{built_tag_strip} rm -rf plugins/main/windows @@ -117,9 +110,6 @@ install -dp %{buildroot}%{_unitdir} install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir} install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir} -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - %files %license LICENSE %doc *.md @@ -129,6 +119,9 @@ install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir} %{_unitdir}/cni-dhcp.socket %changelog +* Tue Nov 01 2022 Ameya Usgaonkar - 1.1.1-4 +- Move to core packages + * Tue Nov 01 2022 Olivia Crain - 1.1.1-3 - Bump release to rebuild with go 1.18.8 diff --git a/SPECS-EXTENDED/go-rpm-macros/fixing_ldflags_for_mariner.patch b/SPECS/go-rpm-macros/fixing_ldflags_for_mariner.patch similarity index 100% rename from SPECS-EXTENDED/go-rpm-macros/fixing_ldflags_for_mariner.patch rename to SPECS/go-rpm-macros/fixing_ldflags_for_mariner.patch diff --git a/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.signatures.json b/SPECS/go-rpm-macros/go-rpm-macros.signatures.json similarity index 100% rename from SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.signatures.json rename to SPECS/go-rpm-macros/go-rpm-macros.signatures.json diff --git a/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec b/SPECS/go-rpm-macros/go-rpm-macros.spec similarity index 87% rename from SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec rename to SPECS/go-rpm-macros/go-rpm-macros.spec index c9700292f1..42aa038309 100644 --- a/SPECS-EXTENDED/go-rpm-macros/go-rpm-macros.spec +++ b/SPECS/go-rpm-macros/go-rpm-macros.spec @@ -1,11 +1,7 @@ %global rcluadir %{_rpmconfigdir}/lua/mariner %global rpmmacrodir %{_rpmconfigdir}/macros.d -Vendor: Microsoft Corporation -Distribution: Mariner %global forgeurl https://pagure.io/go-rpm-macros -Version: 3.0.9 -%forgemeta #https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/51 %global _spectemplatedir %{_datadir}/rpmdevtools/mariner @@ -19,33 +15,34 @@ Version: 3.0.9 # make Go devel packages archful %global gopath %{_datadir}/gocode +Summary: Build-stage rpm automation for Go packages +Name: go-rpm-macros +Version: 3.0.9 +Release: 4%{?dist} +License: GPLv3+ +Vendor: Microsoft Corporation +Distribution: Mariner +%forgemeta +URL: %{forgeurl} +Source: %{forgesource} +Patch0: fixing_ldflags_for_mariner.patch + +Requires: go-srpm-macros = %{version}-%{release} +Requires: go-filesystem = %{version}-%{release} ExclusiveArch: %{golang_arches} %{gccgo_arches} -Name: go-rpm-macros -Release: 3%{?dist} -Summary: Build-stage rpm automation for Go packages - -License: GPLv3+ -URL: %{forgeurl} -# Source: https://pagure.io/go-rpm-macros/archive/3.0.9/go-rpm-macros-3.0.9.tar.gz -Source: %{forgesource} -Patch0: fixing_ldflags_for_mariner.patch - -Requires: go-srpm-macros = %{version}-%{release} -Requires: go-filesystem = %{version}-%{release} - %ifarch %{golang_arches} -Requires: golang -Provides: compiler(golang) -Provides: compiler(go-compiler) = 2 -Obsoletes: go-compilers-golang-compiler < %{version}-%{release} +Requires: golang +Provides: compiler(golang) +Provides: compiler(go-compiler) = 2 +Obsoletes: go-compilers-golang-compiler < %{version}-%{release} %endif %ifarch %{gccgo_arches} -Requires: gcc-go -Provides: compiler(gcc-go) -Provides: compiler(go-compiler) = 1 -Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release} +Requires: gcc-go +Provides: compiler(gcc-go) +Provides: compiler(go-compiler) = 1 +Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release} %endif %description @@ -58,7 +55,7 @@ pull it in for Go packages only. %package -n go-srpm-macros Summary: Source-stage rpm automation for Go packages BuildArch: noarch -Requires: redhat-rpm-config +Requires: mariner-rpm-macros %description -n go-srpm-macros This package provides SRPM-stage rpm automation to simplify the creation of Go @@ -170,6 +167,9 @@ install -m 0644 -vp rpm/macros.d/macros.go-compilers-gcc \ %{_spectemplatedir}/*.spec %changelog +* Tue Nov 01 2022 Ameya Usgaonkar - 3.0.9-4 +- Move to core package + * Tue Mar 01 2022 Pawel Winogrodzki - 3.0.9-3 - Fixing Go's linker flags. - License verified. diff --git a/SPECS/nbdkit/nbdkit-find-provides b/SPECS/nbdkit/nbdkit-find-provides new file mode 100755 index 0000000000..7013ccd891 --- /dev/null +++ b/SPECS/nbdkit/nbdkit-find-provides @@ -0,0 +1,23 @@ +#!/bin/bash - + +# Generate RPM provides automatically for nbdkit packages and filters. +# Copyright (C) 2009-2022 Red Hat Inc. + +# To test: +# find /usr/lib64/nbdkit/plugins | ./nbdkit-find-provides VER REL +# find /usr/lib64/nbdkit/filters | ./nbdkit-find-provides VER REL + +ver="$1" +rel="$2" + +function process_file +{ + if [[ $1 =~ /plugins/nbdkit-.*-plugin ]] || + [[ $1 =~ /filters/nbdkit-.*-filter ]]; then + echo "Provides:" "$(basename $1 .so)" "=" "$ver-$rel" + fi +} + +while read line; do + process_file "$line" +done diff --git a/SPECS/nbdkit/nbdkit.attr b/SPECS/nbdkit/nbdkit.attr new file mode 100644 index 0000000000..275767956a --- /dev/null +++ b/SPECS/nbdkit/nbdkit.attr @@ -0,0 +1,3 @@ +%__nbdkit_provides %{_rpmconfigdir}/nbdkit-find-provides %{version} %{release} +%__nbdkit_path %{_libdir}/nbdkit/(plugins|filters)/nbdkit-.*-(plugin|filter)(\.so)?$ +%__nbdkit_flags exeonly diff --git a/SPECS/nbdkit/nbdkit.signatures.json b/SPECS/nbdkit/nbdkit.signatures.json new file mode 100644 index 0000000000..8c365cc09d --- /dev/null +++ b/SPECS/nbdkit/nbdkit.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "nbdkit-1.30.10.tar.gz": "9c7047827e568c15a372a489869eecc374d272177fb6752859c4472dfcf68ef4" + } +} \ No newline at end of file diff --git a/SPECS-EXTENDED/nbdkit/nbdkit.spec b/SPECS/nbdkit/nbdkit.spec similarity index 65% rename from SPECS-EXTENDED/nbdkit/nbdkit.spec rename to SPECS/nbdkit/nbdkit.spec index d42ede9cc6..b7dd2ea2e2 100644 --- a/SPECS-EXTENDED/nbdkit/nbdkit.spec +++ b/SPECS/nbdkit/nbdkit.spec @@ -1,103 +1,93 @@ -%bcond_with ruby - -Vendor: Microsoft Corporation -Distribution: Mariner -%global _hardened_build 1 - -# Broken on {power64} because of -# https://bugzilla.redhat.com/show_bug.cgi?id=1778520 -%ifarch %{arm} x86_64 ppc -%global have_libguestfs 1 -%endif - -# We can only compiler the OCaml plugin on platforms which have native +# We can only compile the OCaml plugin on platforms which have native # OCaml support (not bytecode). %ifarch %{ocaml_native_compiler} %global have_ocaml 1 %endif - -# Architectures where the complete test suite must pass. +# Architectures where we run the complete test suite including +# the libguestfs tests. # # 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 - -%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 - +# If the test suite is broken on a particular architecture, document +# it as a bug and add it to this list. +%global broken_test_arches NONE # If there are patches which touch autotools files, set this to 1. %global patches_touch_autotools %{nil} - # The source directory. -%global source_directory 1.20-stable +%global source_directory 1.30-stable +# General exclude flag +%global exclude_pkg 1 -Name: nbdkit -Version: 1.20.7 -Release: 5%{?dist} Summary: NBD server - -License: BSD -URL: https://github.com/libguestfs/nbdkit - +Name: nbdkit +Version: 1.30.10 +Release: 3%{?dist} +License: BSD AND MIT +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://gitlab.com/nbdkit/nbdkit Source0: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz - -%if 0%{patches_touch_autotools} -BuildRequires: autoconf, automake, libtool -%endif - -%ifnarch %{complete_test_arches} -BuildRequires: autoconf, automake, libtool -%endif -BuildRequires: /usr/bin/pod2man +# Only for running the test suite: +BuildRequires: %{_bindir}/bc +BuildRequires: %{_bindir}/certtool +BuildRequires: %{_bindir}/cut +BuildRequires: %{_bindir}/hexdump +BuildRequires: %{_bindir}/nbdcopy +BuildRequires: %{_bindir}/nbdinfo +BuildRequires: %{_bindir}/nbdsh +BuildRequires: %{_bindir}/pod2man +BuildRequires: %{_bindir}/qemu-img +BuildRequires: %{_bindir}/qemu-io +BuildRequires: %{_bindir}/qemu-nbd +BuildRequires: %{_bindir}/socat +BuildRequires: %{_bindir}/stat +BuildRequires: bash-completion +BuildRequires: e2fsprogs +BuildRequires: e2fsprogs-devel +BuildRequires: expect +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: gnupg2 BuildRequires: gnutls-devel -BuildRequires: libselinux-devel -%if 0%{?have_libguestfs} +BuildRequires: jq +BuildRequires: libcurl-devel BuildRequires: libguestfs-devel -%endif +BuildRequires: libnbd-devel >= 1.3.11 +BuildRequires: libselinux-devel +BuildRequires: libssh2-devel BuildRequires: libvirt-devel +BuildRequires: libzstd-devel +BuildRequires: lua-devel +BuildRequires: make +BuildRequires: perl-devel +BuildRequires: python3-devel +BuildRequires: tcl-devel +BuildRequires: xorriso BuildRequires: xz-devel BuildRequires: zlib-devel -BuildRequires: libcurl-devel -BuildRequires: libnbd-devel >= 0.9.8 -BuildRequires: libssh-devel -BuildRequires: e2fsprogs, e2fsprogs-devel -BuildRequires: genisoimage -BuildRequires: bash-completion -BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) -BuildRequires: python3-devel -%if 0%{?have_ocaml} -# Requires OCaml 4.02.2 which contains fix for -# http://caml.inria.fr/mantis/view.php?id=6693 -BuildRequires: ocaml >= 4.02.2 -%endif -%if %{with ruby} -BuildRequires: ruby-devel -%endif -BuildRequires: tcl-devel -BuildRequires: lua-devel - -# Only for running the test suite: -BuildRequires: /usr/bin/certtool -BuildRequires: jq -BuildRequires: /usr/bin/nbdsh -BuildRequires: /usr/bin/qemu-img -BuildRequires: /usr/bin/socat -BuildRequires: /sbin/ss -BuildRequires: /usr/bin/ssh-keygen - +Requires: nbdkit-basic-filters%{?_isa} = %{version}-%{release} +Requires: nbdkit-basic-plugins%{?_isa} = %{version}-%{release} +# This package has RPM rules that create the automatic Provides: for +# nbdkit plugins and filters. This means nbdkit build depends on +# itself, but it's a simple noarch package so easy to install. +# +#BuildRequires: nbdkit-srpm-macros >= 1.30.0 # nbdkit is a metapackage pulling the server and a useful subset # of the plugins and filters. Requires: nbdkit-server%{?_isa} = %{version}-%{release} -Requires: nbdkit-basic-plugins%{?_isa} = %{version}-%{release} -Requires: nbdkit-basic-filters%{?_isa} = %{version}-%{release} - +%undefine _package_note_flags +%if 0%{patches_touch_autotools} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +%endif +%if 0%{?have_ocaml} +BuildRequires: ocaml >= 4.03 +BuildRequires: ocaml-ocamldoc +%endif %description NBD is a protocol for accessing block devices (hard disks and @@ -121,215 +111,164 @@ The key features are: * Filters can be stacked in front of plugins to transform the output. -In Fedora, '%{name}' is a meta-package which pulls in the core server -and a useful subset of plugins and filters. +'%{name}' is a meta-package which pulls in the core server and a +useful subset of plugins and filters with minimal dependencies. If you want just the server, install '%{name}-server'. To develop plugins, install the '%{name}-devel' package and start by reading the nbdkit(1) and nbdkit-plugin(3) manual pages. - %package server Summary: The %{name} server -License: BSD - %description server -This package contains the %{name} server with no plugins or filters. - +This package contains the %{name} server with only the null plugin +and no filters. To install a basic set of plugins and filters you +need to install "nbdkit-basic-plugins", "nbdkit-basic-filters" or +the metapackage "nbdkit". %package basic-plugins Summary: Basic plugins for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} -Provides: %{name}-data-plugin = %{version}-%{release} -Provides: %{name}-eval-plugin = %{version}-%{release} -Provides: %{name}-file-plugin = %{version}-%{release} -Provides: %{name}-floppy-plugin = %{version}-%{release} -Provides: %{name}-full-plugin = %{version}-%{release} -Provides: %{name}-info-plugin = %{version}-%{release} -Provides: %{name}-memory-plugin = %{version}-%{release} -Provides: %{name}-null-plugin = %{version}-%{release} -Provides: %{name}-pattern-plugin = %{version}-%{release} -Provides: %{name}-partitioning-plugin = %{version}-%{release} -Provides: %{name}-random-plugin = %{version}-%{release} -Provides: %{name}-sh-plugin = %{version}-%{release} -Provides: %{name}-split-plugin = %{version}-%{release} -Provides: %{name}-streaming-plugin = %{version}-%{release} -Provides: %{name}-zero-plugin = %{version}-%{release} - %description basic-plugins -This package contains some basic plugins for %{name} which have only -trivial dependencies. +This package contains plugins for %{name} which only depend on simple +C libraries: glibc, gnutls, libzstd. Other plugins for nbdkit with +more complex dependencies are packaged separately. -nbdkit-data-plugin Serve small amounts of data from the command line. +nbdkit-data-plugin Serve small amounts of data from the command line. -nbdkit-eval-plugin Write a shell script plugin on the command line. +nbdkit-eval-plugin Write a shell script plugin on the command line. -nbdkit-file-plugin The normal file plugin for serving files. +nbdkit-file-plugin The normal file plugin for serving files. -nbdkit-floppy-plugin Create a virtual floppy disk from a directory. +nbdkit-floppy-plugin Create a virtual floppy disk from a directory. -nbdkit-full-plugin A virtual disk that returns ENOSPC errors. +nbdkit-full-plugin A virtual disk that returns ENOSPC errors. -nbdkit-info-plugin Serve client and server information. +nbdkit-info-plugin Serve client and server information. -nbdkit-memory-plugin A virtual memory plugin. +nbdkit-memory-plugin A virtual memory plugin. -nbdkit-null-plugin A null (bitbucket) plugin. +nbdkit-ondemand-plugin Create filesystems on demand. -nbdkit-pattern-plugin Fixed test pattern. +nbdkit-pattern-plugin Fixed test pattern. -nbdkit-partitioning-plugin Create virtual disks from partitions. +nbdkit-partitioning-plugin Create virtual disks from partitions. -nbdkit-random-plugin Random content plugin for testing. +nbdkit-random-plugin Random content plugin for testing. -nbdkit-sh-plugin Write plugins as shell scripts or executables. +nbdkit-sh-plugin Write plugins as shell scripts or executables. -nbdkit-split-plugin Concatenate one or more files. +nbdkit-sparse-random-plugin Make sparse random disks. -nbdkit-streaming-plugin A streaming file serving plugin. - -nbdkit-zero-plugin Zero-length plugin for testing. +nbdkit-split-plugin Concatenate one or more files. +nbdkit-zero-plugin Zero-length plugin for testing. %package example-plugins Summary: Example plugins for %{name} -License: BSD - -Requires: %{name}-server%{?_isa} = %{version}-%{release} # example4 is written in Perl. Requires: %{name}-perl-plugin - +Requires: %{name}-server%{?_isa} = %{version}-%{release} %description example-plugins This package contains example plugins for %{name}. - # The plugins below have non-trivial dependencies are so are # packaged separately. +%package cc-plugin +Summary: Write small inline C plugins and scripts for %{name} +Requires: %{name}-server%{?_isa} = %{version}-%{release} +Requires: gcc + +%description cc-plugin +This package contains support for writing inline C plugins and scripts +for %{name}. NOTE this is NOT the right package for writing plugins +in C, install %{name}-devel for that. + +%package cdi-plugin +Summary: Containerized Data Import plugin for %{name} +Requires: %{name}-server%{?_isa} = %{version}-%{release} +Requires: jq +Requires: podman + +%description cdi-plugin +This package contains Containerized Data Import support for %{name}. + %package curl-plugin Summary: HTTP/FTP (cURL) plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description curl-plugin This package contains cURL (HTTP/FTP) support for %{name}. - -%if 0%{?have_libguestfs} %package guestfs-plugin Summary: libguestfs plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description guestfs-plugin This package is a libguestfs plugin for %{name}. -%endif - - -%package gzip-plugin -Summary: GZip file serving plugin for %{name} -License: BSD - -Requires: %{name}-server%{?_isa} = %{version}-%{release} - - -%description gzip-plugin -This package is a gzip file serving plugin for %{name}. %package iso-plugin Summary: Virtual ISO 9660 plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} -Requires: genisoimage - +Requires: xorriso %description iso-plugin This package is a virtual ISO 9660 (CD-ROM) plugin for %{name}. - %package libvirt-plugin Summary: Libvirt plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description libvirt-plugin This package is a libvirt plugin for %{name}. It lets you access libvirt guest disks readonly. It is implemented using the libvirt virDomainBlockPeek API. - %package linuxdisk-plugin Summary: Virtual Linux disk plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} # for mke2fs Requires: e2fsprogs - %description linuxdisk-plugin This package is a virtual Linux disk plugin for %{name}. - %package lua-plugin Summary: Lua plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description lua-plugin This package lets you write Lua plugins for %{name}. - %package nbd-plugin -Summary: NBD passthrough plugin for %{name} -License: BSD - +Summary: NBD proxy / forward plugin for %{name} Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description nbd-plugin This package lets you forward NBD connections from %{name} to another NBD server. - %if 0%{?have_ocaml} %package ocaml-plugin Summary: OCaml plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description ocaml-plugin This package lets you run OCaml plugins for %{name}. To compile OCaml plugins you will also need to install %{name}-ocaml-plugin-devel. - %package ocaml-plugin-devel Summary: OCaml development environment for %{name} -License: BSD - -Requires: %{name}-server%{?_isa} = %{version}-%{release} Requires: %{name}-ocaml-plugin%{?_isa} = %{version}-%{release} - +Requires: %{name}-server%{?_isa} = %{version}-%{release} %description ocaml-plugin-devel This package lets you write OCaml plugins for %{name}. @@ -338,103 +277,64 @@ This package lets you write OCaml plugins for %{name}. %package perl-plugin Summary: Perl plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description perl-plugin This package lets you write Perl plugins for %{name}. - %package python-plugin Summary: Python 3 plugin for %{name} -License: BSD - -# Remove in Fedora 33: -Provides: %{name}-python3-plugin = %{version}-%{release} -Obsoletes: %{name}-python3-plugin <= %{version}-%{release} -Provides: %{name}-python-plugin-common = %{version}-%{release} -Obsoletes: %{name}-python-plugin-common <= %{version}-%{release} - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description python-plugin This package lets you write Python 3 plugins for %{name}. -%if %{with ruby} +%if !0%{?exclude_pkg} %package ruby-plugin Summary: Ruby plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description ruby-plugin This package lets you write Ruby plugins for %{name}. %endif - +%if !0%{?exclude_pkg} %package ssh-plugin Summary: SSH plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description ssh-plugin This package contains SSH support for %{name}. - - -%package tar-plugin -Summary: Tar archive plugin for %{name} -License: BSD - -Requires: %{name}-server%{?_isa} = %{version}-%{release} -# XXX These should be autogenerated. -Requires: %{name}-perl-plugin -Requires: perl(Cwd) -Requires: perl(IO::File) - - -%description tar-plugin -This package is a tar archive plugin for %{name}. +%endif %package tcl-plugin Summary: Tcl plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - %description tcl-plugin This package lets you write Tcl plugins for %{name}. - %package tmpdisk-plugin Summary: Remote temporary filesystem disk plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} +Requires: e2fsprogs # For mkfs and mke2fs (defaults). -Requires: util-linux, e2fsprogs +Requires: util-linux +Suggests: dosfstools +Suggests: ntfsprogs # For other filesystems. -Suggests: xfsprogs, ntfsprogs, dosfstools - +Suggests: xfsprogs %description tmpdisk-plugin This package is a remote temporary filesystem disk plugin for %{name}. - %ifarch x86_64 %package vddk-plugin Summary: VMware VDDK plugin for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} - +# https://bugzilla.redhat.com/show_bug.cgi?id=1931818 +Requires: libxcrypt %description vddk-plugin This package is a plugin for %{name} which connects to @@ -444,53 +344,37 @@ VMware VDDK for accessing VMware disks and servers. %package basic-filters Summary: Basic filters for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} -Provides: %{name}-blocksize-filter = %{version}-%{release} -Provides: %{name}-cache-filter = %{version}-%{release} -Provides: %{name}-cacheextents-filter = %{version}-%{release} -Provides: %{name}-cow-filter = %{version}-%{release} -Provides: %{name}-delay-filter = %{version}-%{release} -Provides: %{name}-error-filter = %{version}-%{release} -Provides: %{name}-exitlast-filter = %{version}-%{release} -Provides: %{name}-extentlist-filter = %{version}-%{release} -Provides: %{name}-fua-filter = %{version}-%{release} -Provides: %{name}-ip-filter = %{version}-%{release} -Provides: %{name}-limit-filter = %{version}-%{release} -Provides: %{name}-log-filter = %{version}-%{release} -Provides: %{name}-nocache-filter = %{version}-%{release} -Provides: %{name}-noextents-filter = %{version}-%{release} -Provides: %{name}-nofilter-filter = %{version}-%{release} -Provides: %{name}-noparallel-filter = %{version}-%{release} -Provides: %{name}-nozero-filter = %{version}-%{release} -Provides: %{name}-offset-filter = %{version}-%{release} -Provides: %{name}-partition-filter = %{version}-%{release} -Provides: %{name}-rate-filter = %{version}-%{release} -Provides: %{name}-readahead-filter = %{version}-%{release} -Provides: %{name}-retry-filter = %{version}-%{release} -Provides: %{name}-stats-filter = %{version}-%{release} -Provides: %{name}-truncate-filter = %{version}-%{release} - %description basic-filters -This package contains some basic filters for %{name} which have only -trivial dependencies. +This package contains filters for %{name} which only depend on simple +C libraries: glibc, gnutls. Other filters for nbdkit with more +complex dependencies are packaged separately. nbdkit-blocksize-filter Adjust block size of requests sent to plugins. +nbdkit-blocksize-policy-filter Set block size constraints and policy. + nbdkit-cache-filter Server-side cache. nbdkit-cacheextents-filter Cache extents. +nbdkit-checkwrite-filter Check writes match contents of plugin. + nbdkit-cow-filter Copy-on-write overlay for read-only plugins. +nbdkit-ddrescue-filter Filter for serving from ddrescue dump. + nbdkit-delay-filter Inject read and write delays. nbdkit-error-filter Inject errors. nbdkit-exitlast-filter Exit on last client connection. +nbdkit-exitwhen-filter Exit gracefully when an event occurs. + +nbdkit-exportname-filter Adjust export names between client and plugin. + nbdkit-extentlist-filter Place extent list over a plugin. nbdkit-fua-filter Modify flush behaviour in plugins. @@ -501,6 +385,8 @@ nbdkit-limit-filter Limit nr clients that can connect concurrently. nbdkit-log-filter Log all transactions to a file. +nbdkit-multi-conn-filter Enable, emulate or disable multi-conn. + nbdkit-nocache-filter Disable cache requests in the underlying plugin. nbdkit-noextents-filter Disable extents in the underlying plugin. @@ -515,157 +401,189 @@ nbdkit-offset-filter Serve an offset and range. nbdkit-partition-filter Serve a single partition. +nbdkit-pause-filter Pause NBD requests. + +nbdkit-protect-filter Write-protect parts of a plugin. + nbdkit-rate-filter Limit bandwidth by connection or server. nbdkit-readahead-filter Prefetch data when reading sequentially. nbdkit-retry-filter Reopen connection on error. +nbdkit-retry-request-filter Retry single requests on error. + nbdkit-stats-filter Display statistics about operations. +nbdkit-swab-filter Filter for swapping byte order. + +nbdkit-tls-fallback-filter TLS protection filter. + nbdkit-truncate-filter Truncate, expand, round up or round down size. - %package ext2-filter Summary: ext2, ext3 and ext4 filesystem support for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} -# Remove in Fedora 34: -Provides: %{name}-ext2-plugin = %{version}-%{release} -Obsoletes: %{name}-ext2-plugin <= %{version}-%{release} - - %description ext2-filter This package contains ext2, ext3 and ext4 filesystem support for %{name}. +%package gzip-filter +Summary: GZip filter for %{name} +Requires: %{name}-server%{?_isa} = %{version}-%{release} + +%description gzip-filter +This package is a gzip filter for %{name}. + +%package tar-filter +Summary: Tar archive filter for %{name} +Requires: %{name}-server%{?_isa} = %{version}-%{release} +Requires: tar +Obsoletes: %{name}-tar-plugin < 1.23.9-3 + +%description tar-filter +This package is a tar archive filter for %{name}. %package xz-filter Summary: XZ filter for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} -# Remove in Fedora 33: -Provides: %{name}-xz-plugin = %{version}-%{release} -Obsoletes: %{name}-xz-plugin <= %{version}-%{release} - - %description xz-filter This package is the xz filter for %{name}. - %package devel Summary: Development files and documentation for %{name} -License: BSD - Requires: %{name}-server%{?_isa} = %{version}-%{release} -Requires: pkgconfig - +Requires: pkg-config %description devel This package contains development files and documentation for %{name}. Install this package if you want to develop plugins for %{name}. +%if !0%{?exclude_pkg} +%package srpm-macros +Summary: RPM Provides rules for %{name} plugins and filters +BuildArch: noarch + +%description srpm-macros +This package contains RPM rules that create the automatic Provides: +for %{name} plugins and filters found in the plugins directory. +%endif + %package bash-completion -Summary: Bash tab-completion for %{name} -BuildArch: noarch -Requires: bash-completion >= 2.0 -Requires: %{name}-server = %{version}-%{release} - +Summary: Bash tab-completion for %{name} +Requires: %{name}-server = %{version}-%{release} +Requires: bash-completion >= 2.0 +BuildArch: noarch %description bash-completion Install this package if you want intelligent bash tab-completion for %{name}. - %prep %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 '/^LIBGUESTFS_TESTS/d' tests/Makefile.am -sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am -autoreconf -i -%endif - %build -# Golang bindings are not enabled in the Fedora build since they don't +# Golang bindings are not enabled in the build since they don't # need to be. Most people would use them by copying the upstream # package into their vendor/ directory. +export PYTHON=python3 %configure \ - PYTHON=%{_bindir}/python3 \ + --with-extra='%{name}-%{version}-%{release}' \ --disable-static \ --disable-golang \ -%if !%{with ruby} + --disable-rust \ --disable-ruby \ -%endif + --disable-ssh \ + --with-libguestfs \ %if 0%{?have_ocaml} --enable-ocaml \ %else --disable-ocaml \ %endif -%if 0%{?have_libguestfs} - --with-libguestfs \ +%ifarch %{complete_test_arches} + --enable-libguestfs-tests \ %else - --without-libguestfs \ + --disable-libguestfs-tests \ %endif --with-tls-priority=@NBDKIT,SYSTEM +# --disable-lua \ +# --disable-perl \ +# --disable-tcl \ +# --without-ext2 \ +# --without-iso \ +# --without-libvirt + # Verify that it picked the correct version of Python # to avoid RHBZ#1404631 happening again silently. grep '^PYTHON_VERSION = 3' Makefile -make %{?_smp_mflags} +%make_build + +# Delete the S3 plugin as it is not built +rm -f %{buildroot}%{_mandir}/man1/nbdkit-S3-plugin* +rm -f %{buildroot}%{_libdir}/%{name}/plugins/nbdkit-S3-plugin* %install %make_install # Delete libtool crap. -find $RPM_BUILD_ROOT -name '*.la' -delete +find %{buildroot} -type f -name "*.la" -delete -print # If cargo happens to be installed on the machine then the # rust plugin is built. Delete it if this happens. -rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3* +rm -f %{buildroot}%{_mandir}/man3/nbdkit-rust-plugin.3* -# Remove the deprecated ext2 plugin (use ext2 filter instead). -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-ext2-plugin.so -rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-ext2-plugin.1* +# Delete the S3 plugin as it is not built +rm -f %{buildroot}%{_mandir}/man1/nbdkit-S3-plugin* +rm -f %{buildroot}%{_libdir}/%{name}/plugins/nbdkit-S3-plugin* %check +%ifnarch %{broken_test_arches} +function skip_test () +{ + for f in "$@"; do + rm -f "$f" + echo 'exit 77' > "$f" + chmod +x "$f" + done +} + # Workaround for broken libvirt (RHBZ#1138604). mkdir -p $HOME/.cache/libvirt # tests/test-captive.sh is racy especially on s390x. We need to # rethink this test upstream. -truncate -s 0 tests/test-captive.sh +skip_test tests/test-captive.sh %ifarch s390x # Temporarily kill tests/test-cache-max-size.sh since it fails # sometimes on s390x for unclear reasons. -truncate -s 0 tests/test-cache-max-size.sh +skip_test tests/test-cache-max-size.sh %endif # Temporarily kill test-nbd-tls.sh and test-nbd-tls-psk.sh # https://www.redhat.com/archives/libguestfs/2020-March/msg00191.html -truncate -s 0 tests/test-nbd-tls.sh tests/test-nbd-tls-psk.sh +skip_test tests/test-nbd-tls.sh tests/test-nbd-tls-psk.sh -# Make sure we can see the debug messages (RHBZ#1230160). +# Make sure we can see the debug messages export LIBGUESTFS_DEBUG=1 export LIBGUESTFS_TRACE=1 - -make %{?_smp_mflags} check - +%make_build check || { + cat tests/test-suite.log + exit 1 +} +%endif %if 0%{?have_ocaml} %ldconfig_scriptlets plugin-ocaml @@ -675,24 +593,25 @@ make %{?_smp_mflags} check %files # metapackage so empty - %files server %doc README %license LICENSE %{_sbindir}/nbdkit %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins +%{_libdir}/%{name}/plugins/nbdkit-null-plugin.so %dir %{_libdir}/%{name}/filters %{_mandir}/man1/nbdkit.1* %{_mandir}/man1/nbdkit-captive.1* +%{_mandir}/man1/nbdkit-client.1* %{_mandir}/man1/nbdkit-loop.1* +%{_mandir}/man1/nbdkit-null-plugin.1* %{_mandir}/man1/nbdkit-probing.1* %{_mandir}/man1/nbdkit-protocol.1* %{_mandir}/man1/nbdkit-service.1* %{_mandir}/man1/nbdkit-security.1* %{_mandir}/man1/nbdkit-tls.1* - %files basic-plugins %doc README %license LICENSE @@ -703,13 +622,13 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/plugins/nbdkit-full-plugin.so %{_libdir}/%{name}/plugins/nbdkit-info-plugin.so %{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so -%{_libdir}/%{name}/plugins/nbdkit-null-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-ondemand-plugin.so %{_libdir}/%{name}/plugins/nbdkit-partitioning-plugin.so %{_libdir}/%{name}/plugins/nbdkit-pattern-plugin.so %{_libdir}/%{name}/plugins/nbdkit-random-plugin.so %{_libdir}/%{name}/plugins/nbdkit-sh-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-sparse-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-data-plugin.1* %{_mandir}/man1/nbdkit-eval-plugin.1* @@ -718,16 +637,15 @@ make %{?_smp_mflags} check %{_mandir}/man1/nbdkit-full-plugin.1* %{_mandir}/man1/nbdkit-info-plugin.1* %{_mandir}/man1/nbdkit-memory-plugin.1* -%{_mandir}/man1/nbdkit-null-plugin.1* +%{_mandir}/man1/nbdkit-ondemand-plugin.1* %{_mandir}/man1/nbdkit-partitioning-plugin.1* %{_mandir}/man1/nbdkit-pattern-plugin.1* %{_mandir}/man1/nbdkit-random-plugin.1* %{_mandir}/man3/nbdkit-sh-plugin.3* +%{_mandir}/man1/nbdkit-sparse-random-plugin.1* %{_mandir}/man1/nbdkit-split-plugin.1* -%{_mandir}/man1/nbdkit-streaming-plugin.1* %{_mandir}/man1/nbdkit-zero-plugin.1* - %files example-plugins %doc README %license LICENSE @@ -735,6 +653,17 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/plugins/nbdkit-example4-plugin %{_mandir}/man1/nbdkit-example*-plugin.1* +%files cc-plugin +%doc README +%license LICENSE +%{_libdir}/%{name}/plugins/nbdkit-cc-plugin.so +%{_mandir}/man3/nbdkit-cc-plugin.3* + +%files cdi-plugin +%doc README +%license LICENSE +%{_libdir}/%{name}/plugins/nbdkit-cdi-plugin.so +%{_mandir}/man1/nbdkit-cdi-plugin.1* %files curl-plugin %doc README @@ -742,21 +671,11 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/plugins/nbdkit-curl-plugin.so %{_mandir}/man1/nbdkit-curl-plugin.1* - -%if 0%{?have_libguestfs} %files guestfs-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-guestfs-plugin.so %{_mandir}/man1/nbdkit-guestfs-plugin.1* -%endif - - -%files gzip-plugin -%doc README -%license LICENSE -%{_libdir}/%{name}/plugins/nbdkit-gzip-plugin.so -%{_mandir}/man1/nbdkit-gzip-plugin.1* %files iso-plugin @@ -765,35 +684,30 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/plugins/nbdkit-iso-plugin.so %{_mandir}/man1/nbdkit-iso-plugin.1* - %files libvirt-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-libvirt-plugin.so %{_mandir}/man1/nbdkit-libvirt-plugin.1* - %files linuxdisk-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-linuxdisk-plugin.so %{_mandir}/man1/nbdkit-linuxdisk-plugin.1* - %files lua-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-lua-plugin.so %{_mandir}/man3/nbdkit-lua-plugin.3* - %files nbd-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so %{_mandir}/man1/nbdkit-nbd-plugin.1* - %if 0%{?have_ocaml} %files ocaml-plugin %doc README @@ -804,6 +718,7 @@ make %{?_smp_mflags} check %{_libdir}/libnbdkitocaml.so %{_libdir}/ocaml/NBDKit.* %{_mandir}/man3/nbdkit-ocaml-plugin.3* +%{_mandir}/man3/NBDKit.3* %endif @@ -813,14 +728,13 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/plugins/nbdkit-perl-plugin.so %{_mandir}/man3/nbdkit-perl-plugin.3* - %files python-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-python-plugin.so %{_mandir}/man3/nbdkit-python-plugin.3* -%if %{with ruby} +%if !0%{?exclude_pkg} %files ruby-plugin %doc README %license LICENSE @@ -828,20 +742,13 @@ make %{?_smp_mflags} check %{_mandir}/man3/nbdkit-ruby-plugin.3* %endif - +%if !0%{?exclude_pkg} %files ssh-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-ssh-plugin.so %{_mandir}/man1/nbdkit-ssh-plugin.1* - - -%files tar-plugin -%doc README -%license LICENSE -%{_libdir}/%{name}/plugins/nbdkit-tar-plugin -%{_mandir}/man1/nbdkit-tar-plugin.1* - +%endif %files tcl-plugin %doc README @@ -849,17 +756,15 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/plugins/nbdkit-tcl-plugin.so %{_mandir}/man3/nbdkit-tcl-plugin.3* - %files tmpdisk-plugin %doc README %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-tmpdisk-plugin.so %{_mandir}/man1/nbdkit-tmpdisk-plugin.1* - %ifarch x86_64 %files vddk-plugin -%doc README +%doc README plugins/vddk/README.VDDK %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-vddk-plugin.so %{_mandir}/man1/nbdkit-vddk-plugin.1* @@ -870,17 +775,23 @@ make %{?_smp_mflags} check %doc README %license LICENSE %{_libdir}/%{name}/filters/nbdkit-blocksize-filter.so +%{_libdir}/%{name}/filters/nbdkit-blocksize-policy-filter.so %{_libdir}/%{name}/filters/nbdkit-cache-filter.so %{_libdir}/%{name}/filters/nbdkit-cacheextents-filter.so +%{_libdir}/%{name}/filters/nbdkit-checkwrite-filter.so %{_libdir}/%{name}/filters/nbdkit-cow-filter.so +%{_libdir}/%{name}/filters/nbdkit-ddrescue-filter.so %{_libdir}/%{name}/filters/nbdkit-delay-filter.so %{_libdir}/%{name}/filters/nbdkit-error-filter.so %{_libdir}/%{name}/filters/nbdkit-exitlast-filter.so +%{_libdir}/%{name}/filters/nbdkit-exitwhen-filter.so +%{_libdir}/%{name}/filters/nbdkit-exportname-filter.so %{_libdir}/%{name}/filters/nbdkit-extentlist-filter.so %{_libdir}/%{name}/filters/nbdkit-fua-filter.so %{_libdir}/%{name}/filters/nbdkit-ip-filter.so %{_libdir}/%{name}/filters/nbdkit-limit-filter.so %{_libdir}/%{name}/filters/nbdkit-log-filter.so +%{_libdir}/%{name}/filters/nbdkit-multi-conn-filter.so %{_libdir}/%{name}/filters/nbdkit-nocache-filter.so %{_libdir}/%{name}/filters/nbdkit-noextents-filter.so %{_libdir}/%{name}/filters/nbdkit-nofilter-filter.so @@ -888,23 +799,34 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/filters/nbdkit-nozero-filter.so %{_libdir}/%{name}/filters/nbdkit-offset-filter.so %{_libdir}/%{name}/filters/nbdkit-partition-filter.so +%{_libdir}/%{name}/filters/nbdkit-pause-filter.so +%{_libdir}/%{name}/filters/nbdkit-protect-filter.so %{_libdir}/%{name}/filters/nbdkit-rate-filter.so %{_libdir}/%{name}/filters/nbdkit-readahead-filter.so %{_libdir}/%{name}/filters/nbdkit-retry-filter.so +%{_libdir}/%{name}/filters/nbdkit-retry-request-filter.so %{_libdir}/%{name}/filters/nbdkit-stats-filter.so +%{_libdir}/%{name}/filters/nbdkit-swab-filter.so +%{_libdir}/%{name}/filters/nbdkit-tls-fallback-filter.so %{_libdir}/%{name}/filters/nbdkit-truncate-filter.so %{_mandir}/man1/nbdkit-blocksize-filter.1* +%{_mandir}/man1/nbdkit-blocksize-policy-filter.1* %{_mandir}/man1/nbdkit-cache-filter.1* %{_mandir}/man1/nbdkit-cacheextents-filter.1* +%{_mandir}/man1/nbdkit-checkwrite-filter.1* %{_mandir}/man1/nbdkit-cow-filter.1* +%{_mandir}/man1/nbdkit-ddrescue-filter.1* %{_mandir}/man1/nbdkit-delay-filter.1* %{_mandir}/man1/nbdkit-error-filter.1* %{_mandir}/man1/nbdkit-exitlast-filter.1* +%{_mandir}/man1/nbdkit-exitwhen-filter.1* +%{_mandir}/man1/nbdkit-exportname-filter.1* %{_mandir}/man1/nbdkit-extentlist-filter.1* %{_mandir}/man1/nbdkit-fua-filter.1* %{_mandir}/man1/nbdkit-ip-filter.1* %{_mandir}/man1/nbdkit-limit-filter.1* %{_mandir}/man1/nbdkit-log-filter.1* +%{_mandir}/man1/nbdkit-multi-conn-filter.1* %{_mandir}/man1/nbdkit-nocache-filter.1* %{_mandir}/man1/nbdkit-noextents-filter.1* %{_mandir}/man1/nbdkit-nofilter-filter.1* @@ -912,19 +834,34 @@ make %{?_smp_mflags} check %{_mandir}/man1/nbdkit-nozero-filter.1* %{_mandir}/man1/nbdkit-offset-filter.1* %{_mandir}/man1/nbdkit-partition-filter.1* +%{_mandir}/man1/nbdkit-pause-filter.1* +%{_mandir}/man1/nbdkit-protect-filter.1* %{_mandir}/man1/nbdkit-rate-filter.1* %{_mandir}/man1/nbdkit-readahead-filter.1* %{_mandir}/man1/nbdkit-retry-filter.1* +%{_mandir}/man1/nbdkit-retry-request-filter.1* %{_mandir}/man1/nbdkit-stats-filter.1* +%{_mandir}/man1/nbdkit-swab-filter.1* +%{_mandir}/man1/nbdkit-tls-fallback-filter.1* %{_mandir}/man1/nbdkit-truncate-filter.1* - %files ext2-filter %doc README %license LICENSE %{_libdir}/%{name}/filters/nbdkit-ext2-filter.so %{_mandir}/man1/nbdkit-ext2-filter.1* +%files gzip-filter +%doc README +%license LICENSE +%{_libdir}/%{name}/filters/nbdkit-gzip-filter.so +%{_mandir}/man1/nbdkit-gzip-filter.1* + +%files tar-filter +%doc README +%license LICENSE +%{_libdir}/%{name}/filters/nbdkit-tar-filter.so +%{_mandir}/man1/nbdkit-tar-filter.1* %files xz-filter %doc README @@ -932,7 +869,6 @@ make %{?_smp_mflags} check %{_libdir}/%{name}/filters/nbdkit-xz-filter.so %{_mandir}/man1/nbdkit-xz-filter.1* - %files devel %doc BENCHMARKING OTHER_PLUGINS README SECURITY TODO %license LICENSE @@ -944,8 +880,8 @@ make %{?_smp_mflags} check %doc plugins/ocaml/example.ml %endif %doc plugins/perl/example.pl -%doc plugins/python/example.py -%doc plugins/ruby/example.rb +%doc plugins/python/examples/*.py +#%doc plugins/ruby/example.rb %doc plugins/sh/example.sh %doc plugins/tcl/example.tcl %{_includedir}/nbdkit-common.h @@ -958,48 +894,440 @@ make %{?_smp_mflags} check %{_mandir}/man1/nbdkit-release-notes-1.*.1* %{_libdir}/pkgconfig/nbdkit.pc +%if !0%{?exclude_pkg} +%files srpm-macros +%license LICENSE +%{_rpmconfigdir}/fileattrs/nbdkit.attr +%{_rpmconfigdir}/nbdkit-find-provides +%endif %files bash-completion %license LICENSE %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/nbdkit - %changelog -* Thu Apr 21 2022 Muhammad Falak - 1.20.7-5 -- Avoid non-zero exit from `%check` section +* Mon Oct 31 2022 Ameya Usgaonkar - 1.30.10-3 +- Initial CBL-Mariner import from Fedora 36 (license: MIT). +- License verified -* Tue Mar 22 2022 Pawel Winogrodzki - 1.20.7-4 -- Disabling plug-in for Ruby due to building issues. +* Fri Oct 14 2022 Richard W.M. Jones - 1.30.10-2 +- New stable version 1.30.10 -* Fri Jan 21 2022 Pawel Winogrodzki - 1.20.7-3 -- Removing in-spec verification of source tarballs. -- License verified. +* Tue Jul 19 2022 Richard W.M. Jones - 1.30.9-2 +- New stable version 1.30.9 -* Fri Apr 30 2021 Pawel Winogrodzki - 1.20.7-2 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). -- Making binaries paths compatible with CBL-Mariner's paths. +* Tue Jul 19 2022 Richard W.M. Jones - 1.30.8-1 +- New stable version 1.30.8 -* Thu Sep 03 2020 Richard W.M. Jones - 1.20.7-1 -- New upstream version 1.20.7. +* Sun Jul 10 2022 Richard W.M. Jones - 1.30.7-1 +- New stable version 1.30.7 -* Mon Aug 10 2020 Richard W.M. Jones - 1.20.6-1 -- New upstream version 1.20.6. +* Mon Jun 13 2022 Richard W.M. Jones - 1.30.6-1 +- New stable version 1.30.6 -* Mon Jul 13 2020 Richard W.M. Jones - 1.20.5-1 -- New upstream version 1.20.5. +* Thu May 12 2022 Richard W.M. Jones - 1.30.5-1 +- New stable version 1.30.5 -* Fri Jun 19 2020 Richard W.M. Jones - 1.20.4-1 -- New upstream version 1.20.4. +* Tue Apr 26 2022 Richard W.M. Jones - 1.30.4-1 +- New stable version 1.30.4 -* Tue Jun 9 2020 Richard W.M. Jones - 1.20.3-1 -- New upstream version 1.20.3. +* Sat Apr 16 2022 Richard W.M. Jones - 1.30.3-1 +- New stable version 1.30.3 +- Remove dependency on ssh-keygen which was never really used. -* Wed May 20 2020 Richard W.M. Jones - 1.20.2-2 +* Sat Apr 02 2022 Richard W.M. Jones - 1.30.2-1 +- New stable version 1.30.2 + +* Tue Mar 15 2022 Richard W.M. Jones - 1.30.1-2 +- New stable version 1.30.1 + +* Mon Feb 28 2022 Richard W.M. Jones - 1.30.0-3 +- Add nbdkit-srpm-macros + +* Thu Feb 24 2022 Richard W.M. Jones - 1.30.0-1 +- New stable version 1.30.0 + +* Sat Feb 19 2022 Richard W.M. Jones - 1.29.16-1 +- New upstream development version 1.29.16 +- New nbdkit-blocksize-policy-filter. + +* Tue Feb 15 2022 Richard W.M. Jones - 1.29.15-1 +- New upstream development version 1.29.15 + +* Thu Jan 27 2022 Mamoru TASAKA - 1.29.14-2 +- F-36: rebuild against ruby31 + +* Thu Jan 20 2022 Richard W.M. Jones - 1.29.14-1 +- New upstream development version 1.29.14 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.29.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 15 2022 Richard W.M. Jones - 1.29.13-1 +- New upstream development version 1.29.13 + +* Tue Jan 04 2022 Richard W.M. Jones - 1.29.12-1 +- New upstream development version 1.29.12 + +* Sat Dec 18 2021 Richard W.M. Jones - 1.29.11-1 +- New upstream development version 1.29.11 +- Use new --disable-libguestfs-tests on non-guestfs arches. + +* Tue Dec 07 2021 Richard W.M. Jones - 1.29.9-1 +- New upstream development version 1.29.9 + +* Sat Dec 04 2021 Richard W.M. Jones - 1.29.8-1 +- New upstream development version 1.29.8 +- Add nbdkit-protect-filter. + +* Thu Nov 25 2021 Richard W.M. Jones - 1.29.7-2 +- Bump release and rebuild + +* Tue Nov 23 2021 Richard W.M. Jones - 1.29.7-1 +- New upstream development version 1.29.7 + +* Fri Nov 19 2021 Richard W.M. Jones - 1.29.6-1 +- New upstream development version 1.29.6 + +* Tue Nov 09 2021 Richard W.M. Jones - 1.29.5-1 +- New upstream development version 1.29.5 +- New minimum OCaml is 4.03 + +* Thu Nov 04 2021 Richard W.M. Jones - 1.29.4-1 +- New upstream development version 1.29.4 +- Remove references to nbdkit-streaming-plugin (now removed upstream) +- Move nbdkit-null-plugin to the nbdkit-server package + +* Tue Nov 02 2021 Richard W.M. Jones - 1.29.3-2 +- Switch to xorriso (instead of genisoimage) + +* Thu Oct 28 2021 Richard W.M. Jones - 1.29.3-1 +- New upstream development version 1.29.3 + +* Mon Oct 25 2021 Richard W.M. Jones - 1.29.2-1 +- New upstream development version 1.29.2 + +* Tue Oct 19 2021 Richard W.M. Jones - 1.29.1-1 +- New upstream development version 1.29.1 +- New filter: nbdkit-retry-request-filter + +* Mon Oct 04 2021 Richard W.M. Jones - 1.28.0-2 +- OCaml 4.13.1 build + +* Thu Sep 23 2021 Richard W.M. Jones - 1.28.0-1 +- New upstream stable branch version 1.28.0 + +* Tue Sep 21 2021 Richard W.M. Jones - 1.27.10-1 +- New upstream development version 1.27.10. + +* Tue Sep 14 2021 Sahana Prasad - 1.27.9-2 +- Rebuilt with OpenSSL 3.0.0 + +* Sat Sep 4 2021 Richard W.M. Jones - 1.27.9-1 +- New upstream development version 1.27.9. +- Remove patches which are upstream. + +* Wed Sep 1 2021 Richard W.M. Jones - 1.27.8-3 +- Re-enable tests on armv7. + +* Tue Aug 31 2021 Richard W.M. Jones - 1.27.8-2 +- Fix for qemu 6.1. + +* Mon Aug 23 2021 Richard W.M. Jones - 1.27.8-1 +- New upstream development version 1.27.8. +- Remove patch which is included upstream. + +* Thu Aug 19 2021 Eric Blake - 1.27.7-2 +- Include followup patch related to CVE-2021-3716. + +* Thu Aug 19 2021 Eric Blake - 1.27.7-1 +- New upstream development version 1.27.7; addresses CVE-2021-3716. + +* Fri Aug 13 2021 Eric Blake - 1.27.5-1 +- New upstream development version 1.27.5. + +* Thu Aug 05 2021 Richard W.M. Jones - 1.27.4-1 +- New upstream development version 1.27.4. + +* Fri Jul 23 2021 Richard W.M. Jones - 1.27.3-1 +- New upstream development version 1.27.3. + +* Thu Jul 22 2021 Fedora Release Engineering - 1.27.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 05 2021 Richard W.M. Jones - 1.27.2-1 +- New upstream development version 1.27.2. + +* Fri Jun 11 2021 Richard W.M. Jones - 1.27.1-1 +- New upstream development version 1.27.1. + +* Mon Jun 07 2021 Richard W.M. Jones - 1.26.0-1 +- New upstream version 1.26.0. + +* Fri Jun 04 2021 Python Maint - 1.25.9-2 +- Rebuilt for Python 3.10 + +* Thu Jun 03 2021 Richard W.M. Jones - 1.25.9-1 +- New upstream version 1.25.9. + +* Tue May 25 2021 Jitka Plesnikova - 1.25.8-2 +- Perl 5.34 re-rebuild of updated packages + +* Tue May 25 2021 Richard W.M. Jones - 1.25.8-1 +- New upstream version 1.25.8. + +* Tue May 25 2021 Jitka Plesnikova - 1.25.7-4 +- Perl 5.34 re-rebuild updated packages + +* Tue May 25 2021 Leigh Scott - 1.25.7-3 +- Rebuild for new libtorrent + +* Fri May 21 2021 Jitka Plesnikova - 1.25.7-2 +- Perl 5.34 rebuild + +* Wed May 05 2021 Richard W.M. Jones - 1.25.7-1 +- New upstream version 1.25.7. +- Disable libguestfs tests on riscv64. + +* Sat Apr 10 2021 Richard W.M. Jones - 1.25.6-1 +- New upstream version 1.25.6. + +* Sat Apr 03 2021 Richard W.M. Jones - 1.25.5-1 +- New upstream version 1.25.5. + +* Mon Mar 15 2021 Richard W.M. Jones - 1.25.4-2 +- Fix upstream URL. +- Enable non-guestfs tests on all arches. + +* Wed Mar 10 2021 Richard W.M. Jones - 1.25.4-1 +- New upstream development version 1.25.4. +- New filter: multi-conn + +* Tue Mar 9 2021 Richard W.M. Jones - 1.25.3-3 +- Make nbdkit-vddk-plugin depend on libxcrypt-compat (RHBZ#1931818). + +* Thu Mar 4 2021 Richard W.M. Jones - 1.25.3-2 +- Remove socat dependency in RHEL 9. + +* Tue Mar 2 2021 Richard W.M. Jones - 1.25.3-1 +- New upstream development version 1.25.3. + +* Tue Mar 2 2021 Richard W.M. Jones - 1.25.2-2 +- OCaml 4.12.0 build (RHBZ#1934138). + +* Wed Feb 03 2021 Richard W.M. Jones - 1.25.2-1 +- New upstream development version 1.25.2. +- Remove all remaining traces of nbdkit-gzip-plugin and nbdkit-tar-plugin. +- Remove nbdkit-streaming-plugin (deprecated upstream). +- Remove obsoletes of old nbdkit-ext2-plugin. + +* Tue Jan 26 2021 Fedora Release Engineering - 1.25.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Richard W.M. Jones - 1.25.1-1 +- New upstream development version 1.25.1. + +* Tue Jan 19 2021 Richard W.M. Jones - 1.24.0-3 +- Obsolete nbdkit-tar-plugin to provide smooth upgrades to F33+. + +* Fri Jan 08 2021 Mamoru TASAKA - 1.24.0-2 +- F-34: rebuild against ruby 3.0 + +* Thu Jan 07 2021 Richard W.M. Jones - 1.24.0-1 +- New upstream version 1.24.0. + +* Thu Jan 07 2021 Mamoru TASAKA - 1.23.13-2 +- F-34: rebuild against ruby 3.0 + +* Tue Dec 29 2020 Richard W.M. Jones - 1.23.13-1 +- New upstream development version 1.23.13. +- Add configure --with-extra. + +* Tue Dec 22 2020 Richard W.M. Jones - 1.23.11-1 +- New upstream development version 1.23.11. +- New nbdkit-checkwrite-filter. + +* Thu Dec 10 2020 Richard W.M. Jones - 1.23.10-2 +- Avoid boto3 dependency on RHEL. + +* Tue Dec 08 2020 Richard W.M. Jones - 1.23.10-1 +- New upstream development version 1.23.10. +- New nbdkit-sparse-random-plugin. + +* Thu Dec 03 2020 Richard W.M. Jones - 1.23.9-2 +- Move gzip and tar filters with other filters. +- Remove nbdkit-tar-plugin (replaced with nbdkit-tar-filter), except RHEL 8. +- Do not ship nbdkit-S3-plugin on RHEL. + +* Thu Nov 19 2020 Richard W.M. Jones - 1.23.9-1 +- New upstream development version 1.23.9. +- Add nbdkit-S3-plugin. + +* Mon Nov 02 2020 Richard W.M. Jones - 1.23.8-1 +- New upstream development version 1.23.8. +- Add nbdkit-exitwhen-filter. + +* Mon Oct 05 2020 Richard W.M. Jones - 1.23.7-1 +- New upstream development version 1.23.7. +- Add new NBDKit(3) man page for the OCaml plugin. + +* Tue Sep 22 2020 Richard W.M. Jones - 1.23.6-1 +- New upstream development version 1.23.6. +- New exportname filter. +- Add patch to fix tests. + +* Wed Sep 16 2020 Richard W.M. Jones - 1.23.5-1 +- New upstream development version 1.23.5. + +* Tue Sep 08 2020 Richard W.M. Jones - 1.23.4-1 +- New upstream development version 1.23.4. + +* Sat Sep 05 2020 Richard W.M. Jones - 1.23.3-1 +- New upstream development version 1.23.3. + +* Tue Sep 01 2020 Richard W.M. Jones - 1.23.2-2 +- OCaml 4.11.1 rebuild + +* Tue Sep 01 2020 Richard W.M. Jones - 1.23.2-1 +- New upstream development version 1.23.2. + +* Tue Sep 01 2020 Richard W.M. Jones - 1.22.0-2 +- Reenable sfdisk test because util-linux contains fix. + +* Thu Aug 27 2020 Richard W.M. Jones - 1.22.0-1 +- New stable version 1.22.0. + +* Mon Aug 24 2020 Richard W.M. Jones - 1.21.26-2 +- OCaml 4.11.0 rebuild + +* Thu Aug 20 2020 Richard W.M. Jones - 1.21.26-1 +- New upstream version 1.21.26. + +* Sun Aug 16 2020 Richard W.M. Jones - 1.21.25-1 +- New upstream version 1.21.25. +- New nbdkit-ondemand-plugin. +- New nbdkit-client(1) man page. + +* Tue Aug 11 2020 Richard W.M. Jones - 1.21.24-1 +- New upstream version 1.21.24. +- Add nbdkit-tls-fallback-filter. + +* Mon Aug 10 2020 Merlin Mathesius - 1.21.23-1 +- Enable libguestfs tests only on %%{kernel_arches} + +* Sat Aug 8 2020 Richard W.M. Jones - 1.21.23-1 +- New upstream version 1.21.23. + +* Thu Aug 6 2020 Richard W.M. Jones - 1.21.22-1 +- New upstream version 1.21.22. +- Note this requires updated libnbd 1.3.11 because of bugs in 1.3.10. + +* Tue Aug 4 2020 Richard W.M. Jones - 1.21.21-1 +- New upstream version 1.21.21. +- Remove patches, all upstream. + +* Sat Aug 1 2020 Richard W.M. Jones - 1.21.20-6 +- Add upstream patches to try to track down test failure in Koji. + +* Tue Jul 28 2020 Fedora Release Engineering - 1.21.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 24 2020 Richard W.M. Jones - 1.21.20-1 +- New upstream development version 1.21.20. +- Disable test-partition1.sh because of sfdisk bug. + +* Tue Jul 21 2020 Tom Stellard - 1.21.19-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Sat Jul 18 2020 Richard W.M. Jones - 1.21.19-1 +- New upstream development version 1.21.19. +- New nbdkit-cdi-plugin. + +* Mon Jul 13 2020 Richard W.M. Jones - 1.21.18-1 +- New upstream development version 1.21.18. +- Fixes nbdkit-gzip-filter. + +* Sat Jul 11 2020 Richard W.M. Jones - 1.21.17-1 +- New upstream development version 1.21.17. +- New nbdkit-gzip-filter. +- Remove deprecated nbdkit-gzip-plugin. + +* Thu Jul 9 2020 Richard W.M. Jones - 1.21.16-1 +- New upstream development version 1.21.16. +- New nbdkit-tar-filter. +- nbdkit-ext2-plugin has been removed, no need to delete it. + +* Mon Jul 6 2020 Richard W.M. Jones - 1.21.15-1 +- New upstream development version 1.21.15. +- New nbdkit-swab-filter. + +* Fri Jul 3 2020 Richard W.M. Jones - 1.21.14-1 +- New upstream development version 1.21.14. +- New nbdkit-pause-filter. + +* Mon Jun 29 2020 Richard W.M. Jones - 1.21.13-1 +- New upstream development version 1.21.13. +- Tar plugin rewritten again in C. +- New nbdkit-torrent-plugin. +- Remove various upgrade paths which are no longer needed in F33. + +* Sat Jun 27 2020 Jitka Plesnikova - 1.21.12-3 +- Perl 5.32 re-rebuild updated packages + +* Thu Jun 25 2020 Richard W.M. Jones - 1.21.12-2 +- Fix dependencies of nbdkit-tar-plugin since rewritten in Python. + +* Tue Jun 23 2020 Richard W.M. Jones - 1.21.12-1 +- New upstream development version 1.21.12. +- Use new --disable-rust configure option. + +* Mon Jun 22 2020 Jitka Plesnikova - 1.21.11-2 +- Perl 5.32 rebuild + +* Fri Jun 19 2020 Richard W.M. Jones - 1.21.11-1 +- New upstream development version 1.21.11. + +* Mon Jun 15 2020 Richard W.M. Jones - 1.21.10-1 +- New upstream development version 1.21.10. +- This makes nbdkit-basic-plugins depend on zstd. + +* Sun Jun 14 2020 Richard W.M. Jones - 1.21.9-1 +- New upstream development version 1.21.9. + +* Tue Jun 9 2020 Richard W.M. Jones - 1.21.8-1 +- New upstream development version 1.21.8. +- Remove upstream patches. + +* Thu Jun 4 2020 Richard W.M. Jones - 1.21.7-1 +- New upstream development version 1.21.7. +- New nbdkit-cc-plugin subpackage. + +* Tue Jun 2 2020 Richard W.M. Jones - 1.21.6-1 +- New upstream development version 1.21.6. + +* Sat May 30 2020 Richard W.M. Jones - 1.21.5-1 +- New upstream development version 1.21.5. +- New ddrescue filter. + +* Tue May 26 2020 Miro Hrončok - 1.21.4-3 +- Rebuilt for Python 3.9 + +* Wed May 20 2020 Richard W.M. Jones - 1.21.4-2 - Add upstream patch to make tests/test-truncate4.sh more stable on s390x. -* Tue May 19 2020 Richard W.M. Jones - 1.20.2-1 -- New upstream version 1.20.2. +* Tue May 19 2020 Richard W.M. Jones - 1.21.4-1 +- New upstream development version 1.21.4. + +* Sun May 10 2020 Richard W.M. Jones - 1.21.3-1 +- New upstream development version 1.21.3. + +* Thu May 07 2020 Richard W.M. Jones - 1.21.2-1 +- New upstream development version 1.21.2. + +* Tue May 05 2020 Richard W.M. Jones - 1.20.1-2 +- Bump and rebuild for OCaml 4.11.0+dev2-2020-04-22 rebuild. * Mon May 4 2020 Richard W.M. Jones - 1.20.1-2 - New upstream version 1.20.1. diff --git a/SPECS-EXTENDED/podman/podman.signatures.json b/SPECS/podman/podman.signatures.json similarity index 100% rename from SPECS-EXTENDED/podman/podman.signatures.json rename to SPECS/podman/podman.signatures.json diff --git a/SPECS-EXTENDED/podman/podman.spec b/SPECS/podman/podman.spec similarity index 98% rename from SPECS-EXTENDED/podman/podman.spec rename to SPECS/podman/podman.spec index 417b9c9983..59d24e1cf1 100644 --- a/SPECS-EXTENDED/podman/podman.spec +++ b/SPECS/podman/podman.spec @@ -1,13 +1,5 @@ -%global with_check 0 -%global with_debug 1 - -%if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - %global provider github %global provider_tld com %global project containers @@ -15,7 +7,6 @@ # https://github.com/containers/%%{name} %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global git0 https://%{import_path} - # dnsname %global repo_plugins dnsname # https://github.com/containers/dnsname @@ -23,7 +14,6 @@ %global git_plugins https://%{import_path_plugins} %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) - # gvproxy %global repo_gvproxy gvisor-tap-vsock # https://github.com/containers/gvisor-tap-vsock @@ -31,52 +21,49 @@ %global git_gvproxy https://%{import_path_gvproxy} %global commit_gvproxy 4ee84d66bd86668f011733d8873989b5862bcd07 %global shortcommit_gvproxy %(c=%{commit_gvproxy}; echo ${c:0:7}) - %global built_tag v4.1.1 - +Summary: Manage Pods, Containers and Container Images Name: podman Version: 4.1.1 -Release: 4%{?dist} -License: ASL 2.0 and BSD and ISC and MIT and MPLv2.0 -Summary: Manage Pods, Containers and Container Images +Release: 5%{?dist} +License: Apache-2.0 AND BSD AND ISC AND MIT AND MPLv2.0 Vendor: Microsoft Corporation Distribution: Mariner URL: https://%{name}.io/ Source0: %{git0}/archive/%{built_tag}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz#/%{repo_plugins}-%{shortcommit_plugins}.tar.gz Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz#/%{repo_gvproxy}-%{shortcommit_gvproxy}.tar.gz -Provides: %{name}-manpages = %{version}-%{release} -BuildRequires: go-md2man -BuildRequires: golang BuildRequires: gcc +BuildRequires: git BuildRequires: glib2-devel BuildRequires: glibc-static >= 2.35-3%{?dist} -BuildRequires: git +BuildRequires: go-md2man BuildRequires: go-rpm-macros +BuildRequires: golang BuildRequires: gpgme-devel BuildRequires: libassuan-devel +BuildRequires: libcontainers-common BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: shadow-utils -BuildRequires: pkgconfig BuildRequires: make BuildRequires: ostree-devel +BuildRequires: pkg-config +BuildRequires: shadow-utils BuildRequires: systemd BuildRequires: systemd-devel -BuildRequires: libcontainers-common Requires: catatonit -Requires: iptables -Requires: nftables Requires: conmon >= 2.0.30 -Requires: libcontainers-common -Requires: netavark >= 1.0.3 -Requires: shadow-utils-subid -Requires: moby-runc -Requires: slirp4netns Requires: containernetworking-plugins >= 0.9.1 +Requires: iptables +Requires: libcontainers-common +Requires: moby-runc +Requires: netavark >= 1.0.3 +Requires: nftables +Requires: shadow-utils-subid +Requires: slirp4netns Suggests: qemu-user-static - +Provides: %{name}-manpages = %{version}-%{release} # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d' Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.1.0 @@ -156,41 +143,22 @@ manipulate images (but not containers) created by the other. %{repo} Simple management tool for pods, containers and images %package docker -Summary: Emulate Docker CLI using %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Conflicts: docker -Conflicts: docker-latest -Conflicts: docker-ce -Conflicts: docker-ee -Conflicts: moby-engine +Summary: Emulate Docker CLI using %{name} +Requires: %{name} = %{version}-%{release} +Conflicts: docker +Conflicts: docker-ce +Conflicts: docker-ee +Conflicts: docker-latest +Conflicts: moby-engine +BuildArch: noarch %description docker This package installs a script named docker that emulates the Docker CLI by executes %{name} commands, it also creates links between all Docker CLI man pages and %{name}. -%package tests -Summary: Tests for %{name} - -Requires: %{name} = %{version}-%{release} -Requires: bats -Requires: jq -Requires: skopeo -Requires: nmap-ncat -Requires: httpd-tools -Requires: openssl -Requires: socat -Requires: buildah -Requires: gnupg - -%description tests -%{summary} - -This package contains system tests for %{name} - %package remote -Summary: (Experimental) Remote client for managing %{name} containers +Summary: (Experimental) Remote client for managing %{name} containers %description remote Remote client for managing %{name} containers. @@ -203,9 +171,9 @@ manage pods, containers and container images. %{name}-remote supports ssh connections as well. %package plugins -Summary: Plugins for %{name} -Requires: dnsmasq -Recommends: %{name}-gvproxy = %{version}-%{release} +Summary: Plugins for %{name} +Requires: dnsmasq +Recommends: %{name}-gvproxy = %{version}-%{release} %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -216,7 +184,7 @@ is removed from the network, it will remove the entry from the hosts file. Each CNI network will have its own dnsmasq instance. %package gvproxy -Summary: Go replacement for libslirp and VPNKit +Summary: Go replacement for libslirp and VPNKit %description gvproxy A replacement for libslirp and VPNKit, written in pure Go. @@ -235,7 +203,6 @@ tar zxf %{SOURCE1} tar zxf %{SOURCE2} %build -%if "%{_vendor}" != "debbuild" %set_build_flags export CGO_CFLAGS=$CFLAGS # These extra flags present in $CFLAGS have been skipped for now as they break the build @@ -246,7 +213,6 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an %ifarch x86_64 export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" %endif -%endif export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) @@ -295,7 +261,7 @@ export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/gvproxy %{import_path_gvproxy}/cmd/gvproxy cd .. -%{__make} docs docker-docs +make docs docker-docs %install install -dp %{buildroot}%{_unitdir} @@ -329,11 +295,6 @@ done rm -f %{buildroot}%{_mandir}/man5/docker*.5 -install -d -p %{buildroot}/%{_datadir}/%{name}/test/system -cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} %files -f %{name}.file-list %license LICENSE @@ -367,10 +328,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name}-remote -%files tests -%license LICENSE -%{_datadir}/%{name}/test - %files plugins %license %{repo_plugins}-%{commit_plugins}/LICENSE %doc %{repo_plugins}-%{commit_plugins}/{README.md,README_PODMAN.md} @@ -383,9 +340,12 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy - # rhcontainerbot account currently managed by lsm5 %changelog +* Tue Nov 01 2022 Ameya Usgaonkar - 4.1.1-5 +- Move to core package +- Removed tests package + * Tue Nov 01 2022 Olivia Crain - 4.1.1-4 - Bump release to rebuild with go 1.18.8 @@ -2482,6 +2442,7 @@ succeed - autobuilt 623fcfa * Tue Feb 26 2019 Dan Walsh - 2:1.0.1-39.dev.gitcf52144 + * Tue Feb 26 2019 Lokesh Mandvekar (Bot) - 2:1.0.1-38.dev.gitcf52144 - autobuilt cf52144 @@ -2736,7 +2697,6 @@ succeed * Sat Nov 10 2018 Dan Walsh - 1:0.11.20.11.2-2.dev.git78e6d8e1 - Remove dirty flag from podman version - * Sat Nov 10 2018 Lokesh Mandvekar (Bot) - 1:0.11.20.11.2-1.dev.git7965716.dev.git78e6d8e1 - bump to 0.11.2 - autobuilt 78e6d8e diff --git a/SPECS-EXTENDED/slirp4netns/slirp4netns.signatures.json b/SPECS/slirp4netns/slirp4netns.signatures.json similarity index 100% rename from SPECS-EXTENDED/slirp4netns/slirp4netns.signatures.json rename to SPECS/slirp4netns/slirp4netns.signatures.json diff --git a/SPECS-EXTENDED/slirp4netns/slirp4netns.spec b/SPECS/slirp4netns/slirp4netns.spec similarity index 91% rename from SPECS-EXTENDED/slirp4netns/slirp4netns.spec rename to SPECS/slirp4netns/slirp4netns.spec index 606feb106f..704874202d 100644 --- a/SPECS-EXTENDED/slirp4netns/slirp4netns.spec +++ b/SPECS/slirp4netns/slirp4netns.spec @@ -1,41 +1,39 @@ -Vendor: Microsoft Corporation -Distribution: Mariner %global git0 https://github.com/rootless-containers/%{name} %global commit0 4367de7c3361c344155220a4e999ffd7432dad81 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %define built_tag v1.1.8 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz - -Name: slirp4netns -Version: 1.1.8 -Release: 2%{?dist} +Summary: slirp for network namespaces +Name: slirp4netns +Version: 1.1.8 +Release: 3%{?dist} +License: GPLv2 AND MIT +Vendor: Microsoft Corporation +Distribution: Mariner +URL: %{git0} +Source0: %{download_url}#/%{name}-%{version}.tar.gz +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: git +BuildRequires: glib2-devel +BuildRequires: go-md2man +BuildRequires: libcap-devel +BuildRequires: libseccomp-devel +BuildRequires: libslirp-devel +BuildRequires: make # no go-md2man in ppc64 -ExcludeArch: ppc64 -Summary: slirp for network namespaces -License: GPLv2 -URL: %{git0} -Source0: %{download_url}#/%{name}-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc -BuildRequires: glib2-devel -BuildRequires: git -BuildRequires: go-md2man -BuildRequires: libcap-devel -BuildRequires: libseccomp-devel -BuildRequires: libslirp-devel -BuildRequires: make +ExcludeArch: ppc64 %description slirp for network namespaces, without copying buffers across the namespaces. %package devel -Summary: %{summary} -BuildArch: noarch +Summary: %{summary} +BuildArch: noarch %description devel %{summary} @@ -50,16 +48,13 @@ building other packages which use import path with %build ./autogen.sh ./configure --prefix=%{_usr} --libdir=%{_libdir} -%{__make} generate-man +make generate-man %install make DESTDIR=%{buildroot} install install-man %check -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - %files %license COPYING %doc README.md @@ -67,6 +62,10 @@ make DESTDIR=%{buildroot} install install-man %{_mandir}/man1/%{name}.1.gz %changelog +* Tue Nov 01 2022 Ameya Usgaonkar - 1.1.8-3 +- Move from extended to core +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 1.1.8-2 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index c18c946d05..2e7b1dd819 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -12673,8 +12673,8 @@ "type": "other", "other": { "name": "nbdkit", - "version": "1.20.7", - "downloadUrl": "http://libguestfs.org/download/nbdkit/1.20-stable/nbdkit-1.20.7.tar.gz" + "version": "1.30.10", + "downloadUrl": "http://libguestfs.org/download/nbdkit/1.30-stable/nbdkit-1.30.10.tar.gz" } } },