Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cryfs for openSUSE:Leap:16.0 checked in at 2025-05-03 18:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:16.0/cryfs (Old) and /work/SRC/openSUSE:Leap:16.0/.cryfs.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cryfs" Sat May 3 18:44:58 2025 rev:3 rq:1273967 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Leap:16.0/cryfs/cryfs.changes 2025-04-23 11:06:51.366550292 +0200 +++ /work/SRC/openSUSE:Leap:16.0/.cryfs.new.30101/cryfs.changes 2025-05-03 18:45:08.125979728 +0200 @@ -1,0 +2,25 @@ +Thu May 1 06:32:49 UTC 2025 - mun...@googlemail.com + +- Migration to fuse 3 and deprecation of fuse (1) + * Add fix-feature-fuse3.patch -- based on upstream branch + https://github.com/cryfs/cryfs/tree/feature/fuse3 + (bsc#1242083) (bsc#1242079) +- Increase physicalmemory for ppc64 and ppc64le builds + +------------------------------------------------------------------- +Fri Apr 25 05:24:25 UTC 2025 - mun...@googlemail.com + +- Add _constraints (required for ppc64, ppc64le) + +------------------------------------------------------------------- +Fri Apr 25 04:16:51 UTC 2025 - mun...@googlemail.com + +- Add fix-build-with-boost-1_88.patch +- Remove _constraints file (not needed for now) +- Cleanup spec file (from the previous 0.x versions): + * Use __builder ninja + * Use %cmake macro + * Add %check/tests (arch specific) + * Add -DCRYPTOPP_DISABLE_ASM=ON (arch specific) + +------------------------------------------------------------------- New: ---- fix-build-with-boost-1_88.patch fix-feature-fuse3.patch BETA DEBUG BEGIN: New: - Add fix-build-with-boost-1_88.patch - Remove _constraints file (not needed for now) New:- Migration to fuse 3 and deprecation of fuse (1) * Add fix-feature-fuse3.patch -- based on upstream branch https://github.com/cryfs/cryfs/tree/feature/fuse3 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryfs.spec ++++++ --- /var/tmp/diff_new_pack.xm2HUU/_old 2025-05-03 18:45:08.658001942 +0200 +++ /var/tmp/diff_new_pack.xm2HUU/_new 2025-05-03 18:45:08.658001942 +0200 @@ -16,35 +16,49 @@ # -# disable lto for ppc64 -%ifarch ppc64 -%define _lto_cflags %{nil} -%endif +# https://www.cryptopp.com/wiki/Link_Time_Optimization +# see also -DCRYPTOPP_DISABLE_ASM=ON below +#%%define _lto_cflags %%{nil} + +%bcond_without tests + Name: cryfs Version: 1.0.1 Release: 0 Summary: Cryptographic filesystem for the cloud License: LGPL-3.0-only URL: https://www.cryfs.org/ -Source: https://github.com/cryfs/cryfs/releases/download/%{version}/%{name}-%{version}.tar.xz +Source0: https://github.com/cryfs/cryfs/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/cryfs/cryfs/releases/download/%{version}/%{name}-%{version}.tar.xz.asc # 0x5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1 Source2: %{name}.keyring +# PATCH-FIX-UPSTREAM fix-build-with-boost-1_88.patch -- based on PR 494 +Patch0: fix-build-with-boost-1_88.patch +# PATCH-FIX-UPSTREAM fix-feature-fuse3.patch -- based on branch feature/fuse3 +Patch1: fix-feature-fuse3.patch BuildRequires: cmake >= 3.25 BuildRequires: gcc-c++ -BuildRequires: libboost_atomic-devel >= 1.84.0 -BuildRequires: libboost_chrono-devel >= 1.84.0 -BuildRequires: libboost_filesystem-devel >= 1.84.0 -BuildRequires: libboost_program_options-devel >= 1.84.0 -BuildRequires: libboost_system-devel >= 1.84.0 -BuildRequires: libboost_thread-devel >= 1.84.0 +BuildRequires: libboost_atomic-devel-impl >= 1.84.0 +BuildRequires: libboost_chrono-devel-impl >= 1.84.0 +BuildRequires: libboost_filesystem-devel-impl >= 1.84.0 +BuildRequires: libboost_program_options-devel-impl >= 1.84.0 +BuildRequires: libboost_system-devel-impl >= 1.84.0 +BuildRequires: libboost_thread-devel-impl >= 1.84.0 +BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: cmake(range-v3) BuildRequires: cmake(spdlog) -BuildRequires: pkgconfig(fuse) >= 2.9.0 +BuildRequires: pkgconfig(fuse3) >= 3.9.0 BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libssl) +%if %{with tests} +BuildRequires: pkgconfig(gmock) +BuildRequires: pkgconfig(gtest) +%endif +# system cryptopp lib cannot currently be used. +# see also https://github.com/cryfs/cryfs/issues/369 +Provides: bundled(libcryptopp) = 8.9.0 %description CryFS provides a FUSE-based mount that encrypts file contents, file @@ -57,31 +71,51 @@ %prep %autosetup -c -p1 +# install man pages also with default build type +sed -e '/Release/d' -i doc/CMakeLists.txt + %build -mkdir build -cd build -# FIXME: you should use the %%cmake macros -cmake .. \ - -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_CXX_FLAGS="%{optflags} -fPIC" \ - -DCMAKE_C_FLAGS="%{optflags} -fPIC" \ - -DBoost_USE_STATIC_LIBS=OFF \ - -DBUILD_TESTING=OFF \ - -DCRYFS_UPDATE_CHECKS=OFF \ -%ifarch %{ix86} x86_64 - -DCMAKE_CXX_FLAGS="-msse4.1" \ +%define __builder ninja +%cmake \ +%ifarch %{arm32} %{ix86} ppc64 ppc64le s390x + -DCRYPTOPP_DISABLE_ASM=ON \ %endif - -DCMAKE_BUILD_TYPE=Release - +%if %{with tests} + -DBUILD_TESTING=ON \ +%endif + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCRYFS_UPDATE_CHECKS=OFF %cmake_build %install %cmake_install +%check +export PATH=%{buildroot}%{_bindir}:$PATH +cryfs --version +%if %{with tests} +pushd build/test +./blobstore/blobstore-test +./blockstore/blockstore-test +#./cpp-utils/cpp-utils-test +%ifnarch %{ix86} ppc64 ppc64le +./cryfs/cryfs-test --gtest_filter='-CryConfigCompatibilityTest.*' +%endif +%ifnarch riscv64 +./cryfs-cli/cryfs-cli-test --gtest_filter='-CliTest.*:CliTest_Unmount.*' +%endif +#./fspp/fspp-test +./gitversion/gitversion-test +./parallelaccessstore/parallelaccessstore-test +popd +%endif + %files %license LICENSE.txt %doc README.md ChangeLog.txt -%{_bindir}/cryfs* -%{_mandir}/man?/cryfs* +%{_bindir}/%{name} +%{_bindir}/%{name}-unmount +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_mandir}/man1/%{name}-unmount.1%{?ext_man} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.xm2HUU/_old 2025-05-03 18:45:08.698003612 +0200 +++ /var/tmp/diff_new_pack.xm2HUU/_new 2025-05-03 18:45:08.702003779 +0200 @@ -8,8 +8,10 @@ <disk> <size unit="G">4</size> </disk> + <physicalmemory> + <size unit="G">6</size> + </physicalmemory> </hardware> </overwrite> </constraints> - ++++++ fix-build-with-boost-1_88.patch ++++++ >From 926822a4e3778dac7362637b80aca584d217c753 Mon Sep 17 00:00:00 2001 From: Michael Cho <mich...@michaelcho.dev> Date: Sun, 13 Apr 2025 10:37:29 -0400 Subject: [PATCH] Fix building with Boost 1.88 --- src/cpp-utils/process/subprocess.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/cpp-utils/process/subprocess.cpp b/src/cpp-utils/process/subprocess.cpp index 479bfe876..396ae09ec 100644 --- a/src/cpp-utils/process/subprocess.cpp +++ b/src/cpp-utils/process/subprocess.cpp @@ -1,7 +1,18 @@ #include "subprocess.h" #include <array> #include <boost/asio.hpp> +#include <boost/version.hpp> +#if BOOST_VERSION < 108800 #include <boost/process.hpp> +#else +#define BOOST_PROCESS_VERSION 1 +#include <boost/process/v1/args.hpp> +#include <boost/process/v1/async_pipe.hpp> +#include <boost/process/v1/child.hpp> +#include <boost/process/v1/exe.hpp> +#include <boost/process/v1/io.hpp> +#include <boost/process/v1/search_path.hpp> +#endif #include <cerrno> #include <cstddef> #include <cstdio> ++++++ fix-feature-fuse3.patch ++++++ ++++ 1745 lines (skipped)
