From 055adcff65ded69bc889170e7189d75cf8f75214 Mon Sep 17 00:00:00 2001
From: Ralf Senderek <fedora@senderek.ie>
Date: Sat, 5 Mar 2022 21:34:47 +0100
Subject: [PATCH] add subpackage cryptlib-tools

---
 cryptlib.spec | 31 ++++++++++++++++++++++++++++++-
 sources       |  1 +
 x86-64patch   |  6 +++---
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/cryptlib.spec b/cryptlib.spec
index d6e757c..cd8d74d 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -5,7 +5,7 @@
 
 Name:       cryptlib
 Version:    3.4.6  
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Security library and toolkit for encryption and authentication services    
 
 License:    Sleepycat and OpenSSL     
@@ -19,6 +19,7 @@ Source2:    gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc
 Source3:    https://senderek.ie/fedora/README-manual
 Source4:    https://senderek.ie/fedora/cryptlib-tests.tar.gz
 Source5:    https://senderek.ie/fedora/cryptlib-perlfiles.tar.gz
+Source6:    https://senderek.ie/fedora/cryptlib-tools.tar.gz
 
 # soname is now libcl.so.3.4
 Patch1:     flagspatch
@@ -127,6 +128,14 @@ Requires: man
 %description perl
 Cryptlib module for application development in Perl
 
+%package tools
+Summary:  Collection of stand-alone programs that use Cryptlib
+Requires: python3 >= 3.5
+Requires: man
+Requires: %{name}%-python3
+
+%description tools
+Collection of stand-alone programs that use Cryptlib
 
 
 %prep
@@ -256,6 +265,16 @@ rm -rf $(find %{buildroot}%{cryptlibdir}/test -name "*.c")
 cd %{buildroot}%{cryptlibdir}
 tar xpzf %{SOURCE4} 
 
+# install cryptlib tools 
+cd %{buildroot}%{cryptlibdir}
+tar xpzf %{SOURCE6} 
+mkdir -p %{buildroot}%{_mandir}/man1
+mkdir -p %{buildroot}%{_bindir}
+cp /%{buildroot}%{cryptlibdir}/tools/clsha1 %{buildroot}%{_bindir}
+cp /%{buildroot}%{cryptlibdir}/tools/clsha2 %{buildroot}%{_bindir}
+cp /%{buildroot}%{cryptlibdir}/tools/man/clsha1.1 %{buildroot}%{_mandir}/man1
+cp /%{buildroot}%{cryptlibdir}/tools/man/clsha2.1 %{buildroot}%{_mandir}/man1
+
 %check
 # checks are performed after install
 # in KOJI tests must be disabled as there is no networking
@@ -311,8 +330,18 @@ tar xpzf %{SOURCE4}
 %files test
 %{cryptlibdir}
 
+%files tools
+%{_bindir}/clsha1
+%{_bindir}/clsha2
+%{_mandir}/man1/clsha1.1.gz
+%{_mandir}/man1/clsha2.1.gz
+
+
 
 %changelog
+* Sat Mar 05 2022 Ralf Senderek <innovation@senderek.ie> - 3.4.6-7
+- Add subpackage cryptlib-tools
+
 * Fri Mar 04 2022 Ralf Senderek <innovation@senderek.ie> - 3.4.6-6
 - Define -march=x86-64
 
diff --git a/sources b/sources
index 8afab63..43c6493 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ SHA512 (cl346_fedora.zip) = a6149c91ce262f5aed253e0e1de297f690b5ecfa194c06fe4a68
 SHA512 (cl346_fedora.zip.sig) = 64e66b074823eeb42d2bdaa6d7136c2b3100aede2575a86ceb2257f3859511f2e1d57c3a9cfdc4e96ccc28ef0de66798bae31c51dc582dc9aa528e3d5a33b7f6
 SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6
 SHA512 (cryptlib-tests.tar.gz) = 3c32ed3af34617decec5edce97bb54d8a5a242b2214d2055aca6ed71f500fe4cfb8df2d3a1bfb13e003060eccdbb4428042b15b4bc8580cb2eaeedd8f61776d0
+SHA512 (cryptlib-tools.tar.gz) = 379063786bd13f5b2054a4713fbcffbb87fed536b5ec6143aad96dbfe8c4aa785a4e98bc94e4d4cb328bbb4da1df57c0764dcbe03327fb18cad7771be4a22808
diff --git a/x86-64patch b/x86-64patch
index 907c569..5613dee 100644
--- a/x86-64patch
+++ b/x86-64patch
@@ -1,11 +1,11 @@
---- cl-original/tools/ccopts.sh	2022-03-04 19:32:14.642320216 +0100
-+++ cl-patched/tools/ccopts.sh	2022-03-04 19:45:06.169944941 +0100
+--- cl-original/tools/ccopts.sh	2022-03-04 19:32:14.000000000 +0100
++++ cl-patched/tools/ccopts.sh	2022-03-05 21:02:44.503759431 +0100
 @@ -897,7 +897,7 @@
  		if [ $GENERICBUILD -gt 0 ] ; then
  			echo "  (Enabling lowest-common-denominator build options for cross-platform library)." >&2 ;
  		else
 -			CCARGS="$CCARGS -march=native -mtune=generic" ;
-+			CCARGS="$CCARGS -march=x86-64 -mtune=generic" ;
++			CCARGS="$CCARGS -march=x86-64-v3 -mtune=generic" ;
  		fi
  		if [ "$ARCH" = "x86_64" ] ; then
  			CCARGS="$CCARGS -fPIC" ;