rpms/cryptlib
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to version 3.4.7

Browse Source
This commit is contained in:
Ralf Senderek 2023-11-01 15:27:42 +01:00
parent 0787febbe4
commit a6ebcb4b6b
6 changed files with 2536 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,3 +3,5 @@
/cryptlib-perlfiles.tar.gz
/cryptlib-tests.tar.gz
/cryptlib-tools.tar.gz
/cl347_fedora.zip
/cl347_fedora.zip.sig

49
cryptlib.spec
View File

@ -4,14 +4,14 @@
%global withpython2 0
Name: cryptlib
Version: 3.4.6
Release: 19%{?dist}
Version: 3.4.7
Release: 1%{?dist}
Summary: Security library and toolkit for encryption and authentication services
License: Sleepycat and OpenSSL
URL: https://www.cs.auckland.ac.nz/~pgut001/cryptlib
Source0: https://senderek.ie/fedora/cl346_fedora.zip
Source1: https://senderek.ie/fedora/cl346_fedora.zip.sig
Source0: https://senderek.ie/fedora/cl347_fedora.zip
Source1: https://senderek.ie/fedora/cl347_fedora.zip.sig
# for security reasons a public signing key should always be stored in distgit
# and never be used with a URL to make impersonation attacks harder
# (verified: https://senderek.ie/keys/codesigningkey)
@ -22,14 +22,11 @@ Source5: https://senderek.ie/fedora/cryptlib-perlfiles.tar.gz
Source6: https://senderek.ie/fedora/cryptlib-tools.tar.gz
Source7: https://senderek.ie/fedora/claes
Source8: https://senderek.ie/fedora/claes.sig
Source9: cryptlibConverter.py3-final
# soname is now libcl.so.3.4
Patch1: flagspatch
Patch2: configpatch
Patch3: errorpatch
Patch4: testpatch
Patch5: m64patch
Patch6: setuppatch
Patch0: m64patch
Patch1: testpatch
ExclusiveArch: x86_64 aarch64 ppc64le
@ -156,18 +153,21 @@ mkdir %{name}-%{version}
cd %{name}-%{version}
/usr/bin/unzip -a %{SOURCE0}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch 0 -p1
%patch 1 -p1
# enable ADDFLAGS
sed -i '97s/-I./-I. \$(ADDFLAGS)/' makefile
# enable JAVA in config
sed -i 's/\/\* #define USE_JAVA \*\// #define USE_JAVA /' misc/config.h
# remove pre-build jar file
rm %{_builddir}/%{name}-%{version}/bindings/cryptlib.jar
# adapt perl files in bindings
cd %{_builddir}/%{name}-%{version}/bindings
/usr/bin/tar xpzf %{SOURCE5}
/usr/bin/cp %{SOURCE9} %{_builddir}/%{name}-%{version}/tools/cryptlibConverter.py3
%build
cd %{name}-%{version}
@ -184,7 +184,7 @@ cp /etc/alternatives/java_sdk/include/linux/jni_md.h .
make clean
make shared ADDFLAGS="%{optflags}"
ln -s libcl.so.3.4.6 libcl.so
ln -s libcl.so.3.4.7 libcl.so
ln -s libcl.so libcl.so.3.4
make stestlib ADDFLAGS="%{optflags}"
@ -206,9 +206,9 @@ javadoc cryptlib
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_datadir}/licenses/%{name}
mkdir -p %{buildroot}%{_docdir}/%{name}
cp %{_builddir}/%{name}-%{version}/libcl.so.3.4.6 %{buildroot}%{_libdir}
cp %{_builddir}/%{name}-%{version}/libcl.so.3.4.7 %{buildroot}%{_libdir}
cd %{buildroot}%{_libdir}
ln -s libcl.so.3.4.6 libcl.so.3.4
ln -s libcl.so.3.4.7 libcl.so.3.4
ln -s libcl.so.3.4 libcl.so
# install header files
@ -280,9 +280,11 @@ mkdir -p %{buildroot}%{_bindir}
cp %{SOURCE7} %{buildroot}%{_bindir}
cp /%{buildroot}%{cryptlibdir}/tools/clsha1 %{buildroot}%{_bindir}
cp /%{buildroot}%{cryptlibdir}/tools/clsha2 %{buildroot}%{_bindir}
cp /%{buildroot}%{cryptlibdir}/tools/clkeys %{buildroot}%{_bindir}
cp /%{buildroot}%{cryptlibdir}/tools/man/clsha1.1 %{buildroot}%{_mandir}/man1
cp /%{buildroot}%{cryptlibdir}/tools/man/clsha2.1 %{buildroot}%{_mandir}/man1
cp /%{buildroot}%{cryptlibdir}/tools/man/claes.1 %{buildroot}%{_mandir}/man1
cp /%{buildroot}%{cryptlibdir}/tools/man/clkeys.1 %{buildroot}%{_mandir}/man1
%check
# checks are performed after install
@ -293,7 +295,7 @@ cp /%{buildroot}%{cryptlibdir}/tools/man/claes.1 %{buildroot}%{_mandir}/man1
echo "Running tests on the cryptlib library. This will take a few minutes."
cp %{buildroot}%{cryptlibdir}/c/cryptlib-test.c .
sed -i '41s/<cryptlib\/cryptlib.h>/\".\/cryptlib.h\"/' cryptlib-test.c
gcc -o cryptlib-test cryptlib-test.c -L. libcl.so.3.4.6
gcc -o cryptlib-test cryptlib-test.c -L. libcl.so.3.4.7
./cryptlib-test
%endif
@ -302,7 +304,7 @@ cp /%{buildroot}%{cryptlibdir}/tools/man/claes.1 %{buildroot}%{_mandir}/man1
%files
%{_libdir}/libcl.so.3.4.6
%{_libdir}/libcl.so.3.4.7
%{_libdir}/libcl.so.3.4
%{_libdir}/libcl.so
@ -343,13 +345,18 @@ cp /%{buildroot}%{cryptlibdir}/tools/man/claes.1 %{buildroot}%{_mandir}/man1
%{_bindir}/clsha1
%{_bindir}/clsha2
%{_bindir}/claes
%{_bindir}/clkeys
%{_mandir}/man1/clsha2.1.gz
%{_mandir}/man1/clsha1.1.gz
%{_mandir}/man1/claes.1.gz
%{_mandir}/man1/clkeys.1.gz
%changelog
* Wed Nov 01 2023 Ralf Senderek <innovation@senderek.ie> - 3.4.7-1
- Update to version 3.4.7
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.6-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

2474
cryptlibConverter.py3-final Normal file
View File

File diff suppressed because it is too large Load Diff

14
m64patch
View File

@ -1,11 +1,11 @@
--- cl-original/tools/ccopts.sh 2022-03-04 19:32:14.000000000 +0100
+++ cl-patched/tools/ccopts.sh 2023-04-05 11:19:59.034814258 +0200
@@ -897,7 +897,7 @@
--- cl-original/tools/ccopts.sh 2023-11-01 09:49:13.035146404 +0100
+++ cl-patched/tools/ccopts.sh 2023-11-01 10:14:41.633786631 +0100
@@ -1062,7 +1062,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 -m64 -mtune=generic" ;
- CCARGS="$CCARGS -march=x86-64-v3" ;
+ CCARGS="$CCARGS -m64" ;
fi
if [ "$ARCH" = "x86_64" ] ; then
CCARGS="$CCARGS -fPIC" ;
elif [ "$COMPILER_VER" -ge 45 ] ; then
if [ $GENERICBUILD -gt 0 ] ; then

8
sources
View File

@ -1,5 +1,5 @@
SHA512 (cl346_fedora.zip.sig) = 64e66b074823eeb42d2bdaa6d7136c2b3100aede2575a86ceb2257f3859511f2e1d57c3a9cfdc4e96ccc28ef0de66798bae31c51dc582dc9aa528e3d5a33b7f6
SHA512 (cl346_fedora.zip) = a6149c91ce262f5aed253e0e1de297f690b5ecfa194c06fe4a68d233a450666bce3ca51473fbe17b88aa6fede058ec9b91b6cf7378c7b192de312a503cbd7a93
SHA512 (cl347_fedora.zip) = c6be4baee9f9df1ecb4c18bcaca03869c05645c0ee96fa95dcd66b065bba221c06f783e6015092f37fb80aa9456f18d444566ffe5b4eed84eb0d2cbe463cd7cd
SHA512 (cl347_fedora.zip.sig) = e8235d5b2631f1ea265fc11c7158dcb711caa7a7157ce38059a1348b98debd447608a5fd34c349182240e6e5bcc04705d8cd37ccd07c570566359159168bb3f5
SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6
SHA512 (cryptlib-tests.tar.gz) = 3c32ed3af34617decec5edce97bb54d8a5a242b2214d2055aca6ed71f500fe4cfb8df2d3a1bfb13e003060eccdbb4428042b15b4bc8580cb2eaeedd8f61776d0
SHA512 (cryptlib-tools.tar.gz) = f4ec55cc218ae4ea5a50d2881577c4b4df7b0b1829cc077ae73d3154d65e77957ea663b8156e61fe4ec9f3b16b4a413a85a974ca89bd7773b0a72541058f518c
SHA512 (cryptlib-tests.tar.gz) = 0242a32b2844db2483be70ac6ca62508a3ff078b17ff147dc1d50162d941690105c2430b226bd55fa228978e4544f1775fcfb16fa713a0d2d7227d0a10764d27
SHA512 (cryptlib-tools.tar.gz) = e8dc18a56be44fba608348fee58b8dcdb65adeb25a9b06f2fbdbb2331ab7d80de6d0ac744c91fb3083b2491d9862e47df656f067c46f444b0d1036de32c9d759

34
testpatch
View File

@ -1,14 +1,22 @@
--- cl-original/test/certs.c 2022-02-25 19:58:23.896919893 +0100
+++ cl-patched/test/certs.c 2022-02-25 19:59:14.352826858 +0100
@@ -50,9 +50,9 @@
--- cl-original/test/tls.c 2023-11-01 09:55:40.720018502 +0100
+++ cl-patched/test/tls.c 2023-11-01 09:59:32.916344778 +0100
@@ -3082,7 +3082,18 @@
}
int testSessionTLSLocalServerSocketClientServer( void )
{
- return( tlsClientServer( TLS_TEST_LOCALSERVER ) );
+ #ifdef WINDOWS_THREADS
+ return( tlsClientServer( TLS_TEST_LOCALSERVER ) );
+ #else
+ /* On some Unix systems the client fails with an ECONNREFUSED which
+ means that the server thread is stuck in the accept() in
+ connectServerSocket(), so it never exits and the client ends up
+ waiting forever in waitForThread() for the server thread stuck in
+ accept(). To deal with this we skip the test, since there's no way
+ to tell which systems will hang and which won't */
+
+ return( TRUE );
+ #endif /* WINDOWS_THREADS */
}
#define ONE_YEAR_TIME ( 365 * 86400L )
#if defined( __MWERKS__ ) || defined( SYMANTEC_C ) || defined( __MRC__ )
- #define CERTTIME_DATETEST ( ( ( 2021 - 1970 ) * ONE_YEAR_TIME ) + 2082844800L )
+ #define CERTTIME_DATETEST ( ( ( 2022 - 1970 ) * ONE_YEAR_TIME ) + 2082844800L )
#else
- #define CERTTIME_DATETEST ( ( 2021 - 1970 ) * ONE_YEAR_TIME )
+ #define CERTTIME_DATETEST ( ( 2022 - 1970 ) * ONE_YEAR_TIME )
#endif /* Macintosh-specific weird epoch */
#if ( ULONG_MAX > 0xFFFFFFFFUL ) || defined( _M_X64 )
#define SYSTEM_64BIT
#ifdef WINDOWS_THREADS