Enable gcc versions > 9

.gitignore

@@ -17,3 +17,4 @@
 /cl345_fedora.zip
 /cl345_fedora.zip.sig
 /perlpatch
+/gccversionpatch

cryptlib.spec

@@ -5,7 +5,7 @@
 
 Name:       cryptlib
 Version:    3.4.5  
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Security library and toolkit for encryption and authentication services    
 
 License:    Sleepycat and OpenSSL     
@@ -24,6 +24,7 @@ Source5:    https://crypto-bone.com/fedora/cryptlib-perlfiles.tar.gz
 Patch1:     ccflagspatch
 Patch2:     javapatch
 Patch3:     perlpatch
+Patch4:     gccversionpatch
 
 ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
 
@@ -142,6 +143,7 @@ cd %{name}-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # remove pre-build jar file
 rm %{_builddir}/%{name}-%{version}/bindings/cryptlib.jar
@@ -308,6 +310,9 @@ tar xpzf %{SOURCE4}
 
 
 %changelog
+* Sat Nov 23 2019 Ralf Senderek <innovation@senderek.ie> - 3.4.5-4
+- Enable gcc versions > 9
+
 * Fri May 24 2019 Ralf Senderek <innovation@senderek.ie> - 3.4.5-3
 - Update Perl installation paths
 

gccversionpatch

@@ -0,0 +1,24 @@
+--- cl-original/tools/ccopts.sh	2019-11-23 17:03:39.315504598 +0100
++++ cl-patched/tools/ccopts.sh	2019-11-23 17:05:59.813581907 +0100
+@@ -508,10 +508,17 @@
+ # apparent version less than 10 we add a trailing zero to the string to make
+ # the checks that follow work.
+ 
+-GCC_VER="$($CC -dumpversion | tr -d  '.' | cut -c 1-2)"
+-if [ "$GCC_VER" -lt 10 ] ; then
+-	GCC_VER="${GCC_VER}0" ;
+-fi
++GCC_VER="$($CC -dumpversion)"
++case $GCC_VER in
++        [0-9])
++                GCC_VER="${GCC_VER}0" ;;
++
++        [0-9][0-9]*)
++                GCC_VER="$(echo $GCC_VER | tr -d  '.' | cut -c 1-3)" ;;
++
++        *)
++                GCC_VER="$(echo $GCC_VER | tr -d  '.' | cut -c 1-2)" ;;
++esac
+ 
+ # Try and determine the CPU type.  This is made more complex by a pile of
+ # *BSE's which, along with antideluvian tools like an as that doesn't

sources

@@ -1,7 +1,2 @@
-SHA512 (cl345_fedora.zip) = 8eaa68752496ce5915b56e7d97434a6e8efcf458a83fdc7ef6b5dd23039fd5445b7b468c0b23e2d6482d5df625f78e12580ca7d09b9edf1839b53e8468f055bb
-SHA512 (cl345_fedora.zip.sig) = 7f5be2253500f2984edd00d31156cc98878b5b96a4217386ce60b02232f7a4fd00be788c5dbe05d6490e5bc17eba349ca738be4fc7cb286f9eb909f3a957e92e
-SHA512 (cryptlib-tests.tar.gz) = c798f775c846861f23ed22cdff8b4a38060087f795c01d829bddaa26470a287f38638b5c72cc76074e0218c5e78ccc7553094fd2bd9a0d1f0eefa499c850b80b
-SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6
-SHA512 (ccflagspatch) = 3e781515c8b798702ba277e15f0cde10e93b0c30c4ab16bd536d53425718c1382edec64c60a44ba6e33d4159cd1fa8651784ad65014b2ff92800fb865639a820
-SHA512 (javapatch) = 0006253572159ddf55af1b0d66182905c37f483b8bef565242afd9dc3824f5a76d0983ebe9cd9951e89bd1ab92816bd372854d4ac6d8eabec4c4129080bfa7f1
-SHA512 (perlpatch) = 757c278648c885f31f460eaee59d52fcd1326e99e82cab4b373ddcc24d3ecec638a2c429ea76e56d2dbf67b63220aaea901da1f3e9c50ff32f9cef44346b18a8
+SHA512 (cryptlib.spec) = a40c080ce01c2005d9b381aea212792c7435102a33a50242d8c5c2f6aa8a0e7376a0f9afccf557f717ba8f5a3a4fa257d3a208fa14241656d8c8feea59635ffc
+SHA512 (gccversionpatch) = a4787db28308a9216d05a0eee3e421a6effa107bc803222b7d9fa973a289751fd541c95076f974135d40e048b12df732d4106ebeda907da811973c46143bd0e8