[packages/zbackup] - added protobuf patch (fix for protobuf 3.11+); release 14

qboosh qboosh at pld-linux.org
Sat Sep 21 12:29:54 CEST 2024


commit e501aa9d4d1fd295d980d3cae83a965cc819ac06
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 21 12:32:48 2024 +0200

    - added protobuf patch (fix for protobuf 3.11+); release 14

 zbackup-protobuf.patch | 11 +++++++++++
 zbackup.spec           |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/zbackup.spec b/zbackup.spec
index 2ca4bbd..10c26a2 100644
--- a/zbackup.spec
+++ b/zbackup.spec
@@ -2,15 +2,17 @@ Summary:	A versatile deduplicating backup tool
 Summary(pl.UTF-8):	Uniwersalne narzędzie do deduplikacji kopii zapasowych
 Name:		zbackup
 Version:	1.4.4
-Release:	13
+Release:	14
 License:	GPL v2+ with OpenSSL Exception
 Group:		Applications/Archiving
 #Source0Download: https://github.com/zbackup/zbackup/releases
 #TODO: Source0:	https://github.com/zbackup/zbackup/archive/%{version}/%{name}-%{version}.tar.gz
 Source0:	https://github.com/zbackup/zbackup/archive/%{version}.tar.gz
 # Source0-md5:	0753ca5d61533f951d6ebb6f087efa0b
+Patch0:		%{name}-protobuf.patch
 URL:		http://zbackup.org/
 BuildRequires:	cmake >= 2.8.2
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	lzo-devel
 BuildRequires:	openssl-devel
 BuildRequires:	protobuf-devel
@@ -39,6 +41,7 @@ dopóki pliki nie różnią się bardzo - nie wymaga to dużo miejsca.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
diff --git a/zbackup-protobuf.patch b/zbackup-protobuf.patch
new file mode 100644
index 0000000..0d114d3
--- /dev/null
+++ b/zbackup-protobuf.patch
@@ -0,0 +1,11 @@
+--- zbackup-1.4.4/backup_restorer.cc.orig	2015-09-16 09:28:04.000000000 +0200
++++ zbackup-1.4.4/backup_restorer.cc	2024-09-21 12:19:53.157978566 +0200
+@@ -27,7 +27,7 @@ void restore( ChunkStorage::Reader & chu
+   // TODO: this disables size checks for each separate message. Figure a better
+   // way to do this while keeping them enabled. It seems we need to create an
+   // instance of CodedInputStream for each message, but it might be expensive
+-  cis.SetTotalBytesLimit( backupData.size(), -1 );
++  cis.SetTotalBytesLimit( backupData.size() );
+ 
+   // Used when emitting chunks
+   string chunk;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zbackup.git/commitdiff/e501aa9d4d1fd295d980d3cae83a965cc819ac06



More information about the pld-cvs-commit mailing list