diff --git a/.gitignore b/.gitignore index 52055a7..c3085a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/libguestfs.keyring -SOURCES/libnbd-1.14.2.tar.gz +SOURCES/libnbd-1.16.0.tar.gz diff --git a/.libnbd.metadata b/.libnbd.metadata index ffd5b90..1a92f1c 100644 --- a/.libnbd.metadata +++ b/.libnbd.metadata @@ -1,2 +1,2 @@ cc1b37b9cfafa515aab3eefd345ecc59aac2ce7b SOURCES/libguestfs.keyring -6bc66366a216117c3c451dc7764c790435749b80 SOURCES/libnbd-1.14.2.tar.gz +c2414379523599f06d4fb1f16fb9ed988e7fbb35 SOURCES/libnbd-1.16.0.tar.gz diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh index 8edca8d..987ffe3 100755 --- a/SOURCES/copy-patches.sh +++ b/SOURCES/copy-patches.sh @@ -6,7 +6,7 @@ set -e # directory. Use it like this: # ./copy-patches.sh -rhel_version=9.2 +rhel_version=9.3 # Check we're in the right directory. if [ ! -f libnbd.spec ]; then diff --git a/SOURCES/libnbd-1.14.2.tar.gz.sig b/SOURCES/libnbd-1.14.2.tar.gz.sig deleted file mode 100644 index 7be2f79..0000000 --- a/SOURCES/libnbd-1.14.2.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmO0NR0RHHJpY2hAYW5u -ZXhpYS5vcmcACgkQkXOPc+G3aKBAzw//ZRKoT32ixiD1aL21Trbv8NTobPFy9We1 -hjdt6CYETBC71aTiaDONhBbXzyX0gv31WmCHWLYrxaE9edS9oaUD4l763ZCuYr9O -6JR3CW8NG9/soh5INESzl7cm0i4WHofhKjMkmoZt+vPlCnBfUuZ+GOQHlzYNc41N -3h2rjuIZZNRD0op6FmgnrY0Y2IYYtzR1kiUh47JQanHwwDHhdaaz4x348LQk/FlI -s0qQv8wYe2kRfLvCgNVaPgywp8dx3cb+JmxcRcmolHLWM171XBkrYl2cJjBnYBAr -5/pYU6wpzun3R53fTxHRBddLkLOOy2mbGDvyc0lsnc2Jh0RWKEThvC9A216KcSyL -vIVwXnH5zq4mbEApK6G+hO34SWOmT5f8sIWm2vfsaQ7QncBO3fmBkge1o9roGmHy -97nOPbx2+070gGz5tvCdCcZ4cq+K4Xh4OjikrBj/O0vmeA6c7+REJulKTxF9Dp4H -e+zswAGo4kN7uGMSET3U8nbuWxs+RZfYGqCX1ivkfRBj8271CEh3rFNrlAxq3M8v -dEUB8d3LIwlKMrc/ZpjL3x9zuM7dR7ZTQkYKJGRIL5GPUO9jwRDLBPCnx5Krjiyk -JyN7Uxd52k09GDcLNKHDa3qLiU7Ye+DFTZqF23DOgXwlEWP/Gbg0Xe6DRVIM2gwM -ateF79dey/4= -=Le0m ------END PGP SIGNATURE----- diff --git a/SOURCES/libnbd-1.16.0.tar.gz.sig b/SOURCES/libnbd-1.16.0.tar.gz.sig new file mode 100644 index 0000000..27f9891 --- /dev/null +++ b/SOURCES/libnbd-1.16.0.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmQ+sXgRHHJpY2hAYW5u +ZXhpYS5vcmcACgkQkXOPc+G3aKCBfw//VlPUPQXmQv4wz4aXPvlncbfktcZbLk4I +eeRBt3dNBQNRIUzPMKfxOSWOX7H2zRp0mOMX9gFu+urvFfjn25QEAdkLpDJvoYVf +Csy9CzYu/CeuUzl43h07FW8n8oXbp0YZkWnq1+QoO3tqrjn9JXJRttMYhn7K6Hgi +zhuTsS/GfYrdzVRFBgF0DPJmso6M0fe9uk8cXAxuKPdrBwzqIUgFj1VOnwK1Pmla +vwSZTDB0SPK54lu1Pfw7nGiQQeyG59V//T7NYqQPrhQ+4j8Wx5/+3IPO2Q6FNp/x +OAsYKsPLQhu91oJPj6M7Xubt/rVSKJ8crHLtgwI7ZdVwzMfwAGzuf5qTta1HXlJj +uXOQLja0/x9pddVWEw+gUutRjOg6ayRAroMDYgucp8gdIny2MpjsRQX9wlAjFCoE +kGayXqRtVTDqtEVdeRPpMh1IyZcYkSuFUXevVuEqHSiUPXIWC7zVCS7WSkl53DLV +mcdSp7dQsIERrd99gi/bve2ndCHMkcRV5c26b3wTaTH7IpMMCrje+TS14bNn4e3M +MNwdwTkEBoagEDcYobZN0P2alL3MSeleEjycEQbJMD90PZC1Jya/tqbnlKIRvHS1 +nWxBTEZMIj4/HOCRNx+2nWLIxn4kAMRZ/zuYRlaXaA0GV0AdJxyobDuevrkglZtg +qD401mkvLis= +=3xTJ +-----END PGP SIGNATURE----- diff --git a/SPECS/libnbd.spec b/SPECS/libnbd.spec index fcf726e..35333b8 100644 --- a/SPECS/libnbd.spec +++ b/SPECS/libnbd.spec @@ -8,10 +8,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.14-stable +%global source_directory 1.16-stable Name: libnbd -Version: 1.14.2 +Version: 1.16.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -29,7 +29,7 @@ Source2: libguestfs.keyring Source3: copy-patches.sh # Patches are stored in the upstream repository: -# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-9.2/ +# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-9.3/ # (no patches) @@ -51,6 +51,12 @@ BuildRequires: libxml2-devel # For nbdfuse. BuildRequires: fuse3, fuse3-devel +%if !0%{?rhel} +# For nbdublk +BuildRequires: liburing-devel >= 2.2 +BuildRequires: ubdsrv-devel >= 1.0-3.rc6 +%endif + # For the Python 3 bindings. BuildRequires: python3-devel @@ -169,6 +175,21 @@ Recommends: fuse3 This package contains FUSE support for %{name}. +%if !0%{?rhel} +%package -n nbdublk +Summary: Userspace NBD block device +License: LGPLv2+ +Requires: %{name}%{?_isa} = %{version}-%{release} +Recommends: kernel >= 6.0.0 +Recommends: %{_sbindir}/ublk + + +%description -n nbdublk +This package contains a userspace NBD block device +based on %{name}. +%endif + + %package bash-completion Summary: Bash tab-completion for %{name} BuildArch: noarch @@ -215,6 +236,11 @@ find $RPM_BUILD_ROOT -name '*.la' -delete # Delete the golang man page since we're not distributing the bindings. rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* +%if 0%{?rhel} +# Delete nbdublk on RHEL. +rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nbdublk +%endif + %check function skip_test () @@ -318,6 +344,13 @@ make %{?_smp_mflags} check || { %{_mandir}/man1/nbdfuse.1* +%if !0%{?rhel} +%files -n nbdublk +%{_bindir}/nbdublk +%{_mandir}/man1/nbdublk.1* +%endif + + %files bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/nbdcopy @@ -325,10 +358,17 @@ make %{?_smp_mflags} check || { %{_datadir}/bash-completion/completions/nbdfuse %{_datadir}/bash-completion/completions/nbdinfo %{_datadir}/bash-completion/completions/nbdsh +%if !0%{?rhel} +%{_datadir}/bash-completion/completions/nbdublk +%endif %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 1.12.6-1 +* Tue Apr 18 2023 Richard W.M. Jones - 1.16.0-1 +- Rebase to 1.16.0 + resolves: rhbz#2168628 + +* Wed Mar 15 2023 MSVSphere Packaging Team - 1.14.2-1 - Rebuilt for MSVSphere 9.1. * Tue Jan 03 2023 Richard W.M. Jones - 1.14.2-1