From 1f2ef84a63061d22c30e847dbfa8ab111f99cad0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 23 Oct 2021 22:35:34 +0200
Subject: [PATCH] - fix building with gcc 10+, rebuild with openssl 3.0.0, rel
 14

---
 cvsnt.spec  |  4 +++-
 gcc10.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 gcc10.patch

diff --git a/cvsnt.spec b/cvsnt.spec
index 63a32d7..26f2896 100644
--- a/cvsnt.spec
+++ b/cvsnt.spec
@@ -23,7 +23,7 @@ Summary(pl.UTF-8):	Concurrent Versioning System
 Name:		cvsnt
 # http://www.cvsnt.org/archive/2.5_stable tell which version is stable
 Version:	2.5.05.3744
-Release:	13
+Release:	14
 License:	GPL v2+/LGPL v2+
 Group:		Development/Version Control
 Source0:	http://www.cvsnt.org/archive/%{name}-%{version}.tar.gz
@@ -40,6 +40,7 @@ Patch5:		%{name}-gcc4.patch
 Patch6:		format-security.patch
 Patch7:		cxx.patch
 Patch8:		openssl.patch
+Patch9:		gcc10.patch
 URL:		http://www.cvsnt.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.7.9
@@ -215,6 +216,7 @@ CVSNT version of RCS tools.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 rm -r protocols/ntlm
 
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..5332cee
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,13 @@
+--- cvsnt-2.5.05.3744/diff/diff3.c~	2021-10-23 22:29:35.000000000 +0200
++++ cvsnt-2.5.05.3744/diff/diff3.c	2021-10-23 22:32:54.900316124 +0200
+@@ -205,8 +205,8 @@
+ static int merge;
+ 
+ /* I/O mode: nonzero only if using binary input/output.  */
+-int binary_input;
+-int binary_output;
++extern int binary_input;
++extern int binary_output;
+ 
+ diff_encoding_type encoding3 = {0};
+ int no_unlink;
-- 
2.44.0