[med-svn] [Git][med-team/harvest-tools][master] 3 commits: Build with protobuf 3.20.1+

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / harvest-tools


Commits:
fc6ab282 by Andreas Tille at 2022-07-25T11:27:07+02:00
Build with protobuf 3.20.1+

- - - - -
6b4e9605 by Andreas Tille at 2022-07-25T11:27:45+02:00
routine-update: Standards-Version: 4.6.1

- - - - -
fc61b61f by Andreas Tille at 2022-07-25T11:28:43+02:00
routine-update: Ready to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/protobuf-3.20.1.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+harvest-tools (1.3-8) unstable; urgency=medium
+
+  [ László Böszörményi ]
+  * Build with protobuf 3.20.1+
+    Closes: #1012573
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.6.1 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 25 Jul 2022 11:27:58 +0200
+
 harvest-tools (1.3-7) unstable; urgency=medium
 
   * Fix watchfile to detect new versions on github (routine-update)


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
                libprotobuf-dev,
                libcapnp-dev,
                zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/med-team/harvest-tools
 Vcs-Git: https://salsa.debian.org/med-team/harvest-tools.git
 Homepage: https://harvest.readthedocs.org/en/latest/content/harvest-tools.html


=====================================
debian/patches/protobuf-3.20.1.patch
=====================================
@@ -0,0 +1,18 @@
+Description: fix Protobuf FTBFS
+ SetTotalBytesLimit no longer has second argument.
+Author: Laszlo Boszormenyi (GCS) <gcs at debian.org>
+Forwarded: no
+Last-Update: 2022-06-06
+Bug-Debian: https://bugs.debian.org/1012573
+
+--- harvest-tools-1.3.orig/src/harvest/HarvestIO.cpp
++++ harvest-tools-1.3/src/harvest/HarvestIO.cpp
+@@ -208,7 +208,7 @@ bool HarvestIO::loadHarvestProtocolBuffe
+ 	GzipInputStream gz(&raw_input);
+ 	CodedInputStream coded_input(&gz);
+ 	
+-	coded_input.SetTotalBytesLimit(INT_MAX, INT_MAX);
++	coded_input.SetTotalBytesLimit(INT_MAX);
+ 	
+ 	if ( ! harvest.ParseFromCodedStream(&coded_input) )
+ 	{


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ remove_memwrap.patch
 parallel.patch
 use-c++-14.patch
 python-2to3.patch
+protobuf-3.20.1.patch



View it on GitLab: https://salsa.debian.org/med-team/harvest-tools/-/compare/374328aca9752fedbcf8f2709598dedbedb62f6a...fc61b61f82533997f37323f1ea8907cec4632355

-- 
View it on GitLab: https://salsa.debian.org/med-team/harvest-tools/-/compare/374328aca9752fedbcf8f2709598dedbedb62f6a...fc61b61f82533997f37323f1ea8907cec4632355
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220725/a2b7c64e/attachment-0001.htm>