Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nfs-ganesha for openSUSE:Factory checked in at 2021-07-30 23:22:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs-ganesha (Old) and /work/SRC/openSUSE:Factory/.nfs-ganesha.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-ganesha" Fri Jul 30 23:22:03 2021 rev:15 rq:909326 version:3.3+git0.39e0cf712 Changes: -------- --- /work/SRC/openSUSE:Factory/nfs-ganesha/nfs-ganesha.changes 2021-02-07 15:18:38.617730065 +0100 +++ /work/SRC/openSUSE:Factory/.nfs-ganesha.new.1899/nfs-ganesha.changes 2021-07-30 23:22:22.519623311 +0200 @@ -1,0 +2,9 @@ +Fri Jul 23 18:57:06 UTC 2021 - Patrick Seidensal <[email protected]> + +- Enable FSAL_RGW again, as it turned out to be compatible with Ceph 16.x, but + needs patching from upstream. Backport upstream patch to fix version + comparison. + + * Add fix-compilation--faulty-version-comparison.patch + +------------------------------------------------------------------- New: ---- fix-compilation--faulty-version-comparison.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-ganesha.spec ++++++ --- /var/tmp/diff_new_pack.dUA2EU/_old 2021-07-30 23:22:23.399622344 +0200 +++ /var/tmp/diff_new_pack.dUA2EU/_new 2021-07-30 23:22:23.399622344 +0200 @@ -1,7 +1,7 @@ # # spec file for package nfs-ganesha # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,7 +61,7 @@ %bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} -%bcond_with rgw +%bcond_without rgw %global use_fsal_rgw %{on_off_switch rgw} %bcond_with gluster @@ -113,11 +113,12 @@ Version: 3.3+git0.39e0cf712 Release: 0 Summary: An NFS server running in user space -License: LGPL-3.0-or-later AND GPL-3.0-or-later +License: GPL-3.0-or-later AND LGPL-3.0-or-later Group: Productivity/Networking/NFS URL: https://github.com/nfs-ganesha/nfs-ganesha/wiki Source: %{name}-%{version}.tar.bz2 +Patch0: fix-compilation--faulty-version-comparison.patch %if 0%{?suse_version} %if 0%{?is_opensuse} @@ -195,8 +196,8 @@ Requires(post): procps %else Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires(preun):systemd +Requires(postun):systemd BuildRequires: systemd %endif @@ -492,6 +493,7 @@ %prep %setup -q +%patch0 -p1 %build export LANGUAGE=en_US.UTF-8 ++++++ fix-compilation--faulty-version-comparison.patch ++++++ diff --color -rub nfs-ganesha-3.3+git0.39e0cf712/FSAL/FSAL_RGW/internal.h nfs-ganesha-3.3+git0.39e0cf712-patched/FSAL/FSAL_RGW/internal.h --- nfs-ganesha-3.3+git0.39e0cf712/FSAL/FSAL_RGW/internal.h 2021-07-14 16:34:13.514620142 +0200 +++ nfs-ganesha-3.3+git0.39e0cf712-patched/FSAL/FSAL_RGW/internal.h 2021-07-14 16:33:47.554856218 +0200 @@ -44,10 +44,9 @@ #include <include/rados/librgw.h> #include <include/rados/rgw_file.h> - -#if ((LIBRGW_FILE_VER_MAJOR != 1) || (LIBRGW_FILE_VER_MINOR < 1) || \ - (LIBRGW_FILE_VER_EXTRA < 7)) -#error rados/rgw_file.h version unsupported (require >= 1.1.1) +#if (!GSH_CHECK_VERSION(1, 1, 7, LIBRGW_FILE_VER_MAJOR, LIBRGW_FILE_VER_MINOR, \ + LIBRGW_FILE_VER_EXTRA)) +#error rados/rgw_file.h version unsupported (require >= 1.1.7) #endif /** diff --color -rub nfs-ganesha-3.3+git0.39e0cf712/include/config-h.in.cmake nfs-ganesha-3.3+git0.39e0cf712-patched/include/config-h.in.cmake --- nfs-ganesha-3.3+git0.39e0cf712/include/config-h.in.cmake 2021-07-14 16:34:13.682618615 +0200 +++ nfs-ganesha-3.3+git0.39e0cf712-patched/include/config-h.in.cmake 2021-07-14 16:33:47.554856218 +0200 @@ -3,6 +3,11 @@ #ifndef CONFIG_H #define CONFIG_H +#define GSH_CHECK_VERSION(major,minor,micro,libmajor,libminor,libmicro) \ + ((libmajor) > (major) || \ + ((libmajor) == (major) && (libminor) > (minor)) || \ + ((libmajor) == (major) && (libminor) == (minor) && (libmicro) >= (micro))) + #define GANESHA_VERSION_MAJOR @GANESHA_MAJOR_VERSION@ #define GANESHA_VERSION_MINOR @GANESHA_MINOR_VERSION@ #define GANESHA_EXTRA_VERSION @GANESHA_EXTRA_VERSION@
