[arch-commits] Commit in cryfs/trunk (5 files)

Felix Yan felixonmars at gemini.archlinux.org
Fri Aug 19 10:56:36 UTC 2022


    Date: Friday, August 19, 2022 @ 10:56:36
  Author: felixonmars
Revision: 1270003

upgpkg: cryfs 0.11.2-4: rebuild with fmt 9.0

Added:
  cryfs/trunk/cryfs-fmt-9.0.patch
  cryfs/trunk/keys/
  cryfs/trunk/keys/pgp/
  cryfs/trunk/keys/pgp/5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1.asc
Modified:
  cryfs/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |    9 +-
 cryfs-fmt-9.0.patch                                   |   54 ++++++++++++++++
 keys/pgp/5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1.asc |    1 
 3 files changed, 61 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-19 10:54:38 UTC (rev 1270002)
+++ PKGBUILD	2022-08-19 10:56:36 UTC (rev 1270003)
@@ -5,7 +5,7 @@
 
 pkgname=cryfs
 pkgver=0.11.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Cryptographic filesystem for the cloud'
 arch=(x86_64)
 depends=(fuse2 curl spdlog fmt boost-libs)
@@ -12,12 +12,15 @@
 makedepends=(cmake python boost range-v3)
 url='https://www.cryfs.org'
 license=(LGPL3)
-source=(https://github.com/cryfs/cryfs/releases/download/$pkgver/cryfs-$pkgver.tar.xz{,.asc})
+source=(https://github.com/cryfs/cryfs/releases/download/$pkgver/cryfs-$pkgver.tar.xz{,.asc}
+        $pkgname-fmt-9.0.patch)
 sha256sums=('951ef565d37521df5586b00ed898f1cb76188739c27b9db866cc91ca14fdf1bd'
-            'SKIP')
+            'SKIP'
+            'ab49804bf583de28f50e9aeac74f1e8308994866ad57e2b25e75df183dd70903')
 validpgpkeys=(5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1) # CryFS Team <messmer at cryfs.org>
 
 prepare() {
+  patch -p1 -i $pkgname-fmt-9.0.patch
   sed -e '/Release/d' -i doc/CMakeLists.txt # Install man page also with dafault build type
 }
 

Added: cryfs-fmt-9.0.patch
===================================================================
--- cryfs-fmt-9.0.patch	                        (rev 0)
+++ cryfs-fmt-9.0.patch	2022-08-19 10:56:36 UTC (rev 1270003)
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero at lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer at users.noreply.github.com>
+---
+ ChangeLog.txt          | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+   UNUSED(mode);
+   UNUSED(path);
+   ThreadNameForDebugging _threadName("mknod");
+-  LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++  LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+   return ENOSYS;
+ }
+ 
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+   ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+-  LOG(DEBUG, "mkdir({}, {})", path, mode);
++  LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+   try {
+     ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ 	// DokanY seems to call mkdir("/"). Ignore that
+ 	if ("/" == path) {
+ #ifdef FSPP_LOG
+-        LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++        LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ 		return 0;
+ 	}
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+   ThreadNameForDebugging _threadName("link");
+-  LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++  LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+   //auto real_from = _impl->RootDir() / from;
+   //auto real_to = _impl->RootDir() / to;
+   //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());

Added: keys/pgp/5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1.asc
===================================================================
(Binary files differ)

Index: cryfs/trunk/keys/pgp/5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1.asc
===================================================================
--- keys/pgp/5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1.asc	2022-08-19 10:54:38 UTC (rev 1270002)
+++ keys/pgp/5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1.asc	2022-08-19 10:56:36 UTC (rev 1270003)

Property changes on: cryfs/trunk/keys/pgp/5D5EC7BC6F1443EC2AF7177A9E6C996C991D25E1.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property


More information about the arch-commits mailing list