From b6ca2e84d3bfdbbfdfabe5d20ec6340300a7fc8e Mon Sep 17 00:00:00 2001 From: Ralf Senderek Date: Sat, 11 Feb 2017 18:18:09 +0100 Subject: [PATCH] cryptlib 3.4.3.1 --- .gitignore | 3 +++ cryptlib.spec | 51 +++++++++++++++++++++++---------------------------- sources | 8 +++++--- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 9bb5ca1..da79c96 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /cl343_fedora.zip /cryptlib-perlfiles.tar.gz /cryptlib-tests.tar.gz +/cl3431_fedora.zip +/cl3431_fedora.zip.sig +/cryptlib.spec diff --git a/cryptlib.spec b/cryptlib.spec index 2bcfded..e42726a 100644 --- a/cryptlib.spec +++ b/cryptlib.spec @@ -5,15 +5,15 @@ %global with_python3 0 Name: cryptlib -Version: 3.4.3 -Release: 9%{?dist} +Version: 3.4.3.1 +Release: 1%{?dist} Summary: Security library and toolkit for encryption and authentication services Group: System Environment/Libraries License: Sleepycat and OpenSSL URL: https://www.cs.auckland.ac.nz/~pgut001/cryptlib -Source0: https://crypto-bone.com/fedora/cl343_fedora.zip -Source1: https://crypto-bone.com/fedora/cl343_fedora.zip.sig +Source0: https://crypto-bone.com/fedora/cl3431_fedora.zip +Source1: https://crypto-bone.com/fedora/cl3431_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) @@ -21,17 +21,10 @@ Source2: gpgkey-3274CB29956498038A9C874BFBF6E2C28E9C98DD.asc Source3: https://crypto-bone.com/fedora/README-manual Source4: https://crypto-bone.com/fedora/cryptlib-tests.tar.gz Source5: https://crypto-bone.com/fedora/cryptlib-perlfiles.tar.gz -Source6: renamesymbols -Source7: COPYING -Patch1: sonamepatch -# soname is now libcl.so.3 -Patch2: ccflagspatch -Patch3: sessionpatch -Patch4: utilspatch -Patch5: stackprotectorstrongpatch -Patch6: javapatch -Patch7: testlibpatch +# soname is now libcl.so.3.4 +Patch1: ccflagspatch +Patch2: javapatch ExclusiveArch: x86_64 %{ix86} %{arm} @@ -161,11 +154,6 @@ cd %{name}-%{version} /usr/bin/unzip -a %{SOURCE0} %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 # remove pre-build jar file rm %{_builddir}/%{name}-%{version}/bindings/cryptlib.jar # adapt perl files in bindings @@ -175,11 +163,12 @@ cd %{_builddir}/%{name}-%{version}/bindings %build cd %{name}-%{version} -# rename cryptlib symbols that may collide with openssl symbols -%{SOURCE6} -# build java bindings chmod +x tools/mkhdr.sh tools/mkhdr.sh +# rename cryptlib symbols that may collide with openssl symbols +chmod +x tools/rename.sh +tools/rename.sh +# build java bindings cp /etc/alternatives/java_sdk/include/jni.h . cp /etc/alternatives/java_sdk/include/linux/jni_md.h . @@ -211,8 +200,8 @@ mkdir -p %{buildroot}%{_datadir}/licenses/%{name} mkdir -p %{buildroot}%{_docdir}/%{name} cp %{_builddir}/%{name}-%{version}/libcl.so.3.4.3 %{buildroot}%{_libdir} cd %{buildroot}%{_libdir} -ln -s libcl.so.3.4.3 libcl.so.3 -ln -s libcl.so.3 libcl.so +ln -s libcl.so.3.4.3 libcl.so.3.4 +ln -s libcl.so.3.4 libcl.so # install header files mkdir -p %{buildroot}/%{_includedir}/%{name} @@ -226,8 +215,6 @@ mkdir -p %{buildroot}/%{_jnidir} cp %{_builddir}/%{name}-%{version}/bindings/cryptlib.jar %{buildroot}%{_jnidir} # install docs -# apply the new license text -cp %{SOURCE7} %{_builddir}/%{name}-%{version}/COPYING cp %{_builddir}/%{name}-%{version}/COPYING %{buildroot}%{_datadir}/licenses/%{name} cp %{_builddir}/%{name}-%{version}/README %{buildroot}%{_docdir}/%{name}/README echo "No tests performed." > %{_builddir}/%{name}-%{version}/stestlib.log @@ -253,6 +240,7 @@ mkdir -p %{buildroot}%{_mandir}/man3 cd %{_builddir}/%{name}-%{version}/bindings mkdir -p %{_builddir}/include cp ../cryptlib.h %{_builddir}/include +cp ../tools/GenPerl.pl . export PERL_CRYPT_LIB_HEADER=%{_builddir}/include/cryptlib.h /usr/bin/perl Makefile.PL sed -i '/LDLOADLIBS = /s/thread/thread -L.. -lcl/' Makefile @@ -282,7 +270,7 @@ tar xpzf %{SOURCE4} # in KOJI tests must be disabled as there is no networking %if %{includetests} cd %{_builddir}/%{name}-%{version} - ln -s libcl.so.3.4.3 ./libcl.so.3 + ln -s libcl.so.3.4.3 ./libcl.so.3.4 export LD_LIBRARY_PATH=. echo "Running tests on the cryptlib library. This will take a few minutes." echo "Network access is necessary to complete all tests!" @@ -298,7 +286,8 @@ tar xpzf %{SOURCE4} %files %{_libdir}/libcl.so.3.4.3 -%{_libdir}/libcl.so.3 +%{_libdir}/libcl.so.3.4 +%{_libdir}/libcl.so %license %{_datadir}/licenses/%{name}/COPYING %doc %{_docdir}/%{name}/README @@ -336,6 +325,12 @@ tar xpzf %{SOURCE4} %changelog +* Sat Feb 11 2017 Senderek Web Security - 3.4.3.1-1 +- update to version 3.4.3.1 + +* Fri Feb 10 2017 Fedora Release Engineering - 3.4.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 31 2017 Senderek Web Security - 3.4.3-9 - compile with gcc-7.0 and -march=native diff --git a/sources b/sources index a3d30e8..7964bf0 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ -SHA512 (cl343_fedora.zip) = 51fec4dfc1b1d54948a586fca65ce94d942b0d219abf21ddf9941829aecdde0797d0ee81aa0d08b03a5e3cced1df6f4c6af386ffd0a6cf0a38f8e97590a70815 -SHA512 (cryptlib-tests.tar.gz) = 409521aa4921f38627f2b4409b832620eede03bda00f54d6d254d125298f1e167e0d8c96d6ffc94ceeba41534db09265b2820d931b12086102c3bffdff921b6b -SHA512 (cryptlib-perlfiles.tar.gz) = e95dee5a594150b5acf4fd5279da2449d819e349cc0d1b16f44d9083074b192b10fa582f5bc1e5edcde76cc3555e5dc3d994f5481fa96eb1f210366078574f0c +SHA512 (cl3431_fedora.zip) = b3dda368e94b9d100476b602941e45a2aebf76d1716193a43a28e3e10573c84f55d03140275e71763a6f9f2f456b7b05fa104016e317345dffb1d3e20fd350b4 +SHA512 (cl3431_fedora.zip.sig) = da064ad012d50721657e10fa2250df7eb54e87081890629e6d4a0643c4137ae3261b8364f83633ef6bf72de4a3da618e79db6cd4e7d34538452fb585d26d62a9 +SHA512 (cryptlib-perlfiles.tar.gz) = b975d34acfd1d99a224bbd5536483e5489feac8801a567740ec668bcef9a1eff67fddbdad53f61b2ff48bd43396e92f070ebf4de622f3edeb70428f4aaae2ff6 +SHA512 (cryptlib-tests.tar.gz) = 83bc6061f0b76e5e46100a21965b8362ab1a2c1c4fcb8bcd7b87971f9f4fd59861685b47d72394f40295076f2b2d7993223c535ed21c8ea352551b65f71e1801 +SHA512 (cryptlib.spec) = 5b543afb29419d588ba0b852e4384da4966b4522aaddf0631885740abf71c7509af24cc2454dbb6f46d2d44c63b14cf68fe424773a71eb736f33cf7f0c2c638e