From 9c167d9123daa871ce4d5b6862243130a72807cd Mon Sep 17 00:00:00 2001 From: Dmitry Belyavskiy Date: Sun, 29 Jan 2023 12:23:49 +0100 Subject: [PATCH] Updating gost-engine to 3.0.1 Temporary switching off -Werror --- .gitignore | 2 ++ 01-engine-nowerror.patch | 18 ++++++++++++++++++ openssl-gost-engine.spec | 15 +++++++++++---- sources | 2 +- 4 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 01-engine-nowerror.patch diff --git a/.gitignore b/.gitignore index be92793..e718650 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /engine-1.1.0.3.tar.gz /engine-1.1.1.0.tar.gz /openssl-gost-engine-3.0.0.tar.gz +/engine-3.0.1.tar.gz +/openssl-gost-engine-3.0.1.tar.gz diff --git a/01-engine-nowerror.patch b/01-engine-nowerror.patch new file mode 100644 index 0000000..690eb7e --- /dev/null +++ b/01-engine-nowerror.patch @@ -0,0 +1,18 @@ +diff -up engine-3.0.1/CMakeLists.txt.silent engine-3.0.1/CMakeLists.txt +--- engine-3.0.1/CMakeLists.txt.silent 2023-01-29 12:09:13.187905422 +0100 ++++ engine-3.0.1/CMakeLists.txt 2023-01-29 12:09:34.270083655 +0100 +@@ -29,12 +29,12 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang") + set(CMAKE_C_FLAGS_RELEASE -O2) + set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -ggdb") +- add_compile_options(-Werror -Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -Qunused-arguments -Wno-deprecated-declarations) ++ add_compile_options(-Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -Qunused-arguments -Wno-deprecated-declarations) + elseif(CMAKE_C_COMPILER_ID MATCHES "GNU") + set(CMAKE_C_FLAGS_RELEASE -O2) + set(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -ggdb") +- add_compile_options(-Werror -Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -Wno-error=unknown-pragmas -Wno-error=pragmas -Wno-deprecated-declarations) ++ add_compile_options(-Wall -Wno-unused-parameter -Wno-unused-function -Wno-missing-braces -Wno-error=unknown-pragmas -Wno-error=pragmas -Wno-deprecated-declarations) + elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS) diff --git a/openssl-gost-engine.spec b/openssl-gost-engine.spec index a687724..9acd98e 100644 --- a/openssl-gost-engine.spec +++ b/openssl-gost-engine.spec @@ -1,13 +1,13 @@ Name: openssl-gost-engine -Version: 3.0.0 -Release: 4%{?dist} +Version: 3.0.1 +Release: 1%{?dist} URL: https://github.com/gost-engine/engine License: OpenSSL Summary: A reference implementation of the Russian GOST crypto algorithms for OpenSSL - Source: https://github.com/gost-engine/engine/archive/v%{version}/%{name}-%{version}.tar.gz +Patch1: 01-engine-nowerror.patch BuildRequires: make BuildRequires: cmake-rpm-macros gcc perl-Test-Simple @@ -26,8 +26,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} GOST file digesting utilities. %global _enginesdir %(pkg-config --variable=enginesdir libcrypto) +%global _providersdir %(pkg-config --variable=modulesdir libcrypto) %prep -%setup -n engine-%version -q +%autosetup -n engine-%version %build %cmake -B "%{_vpath_builddir}" @@ -38,7 +39,9 @@ GOST file digesting utilities. mkdir -p %buildroot%_bindir mkdir -p %buildroot%_mandir/man1 mkdir -p %buildroot%_enginesdir +mkdir -p %buildroot%_providersdir cp "%{_vpath_builddir}"/bin/gost.so README.gost %buildroot%_enginesdir/ +cp "%{_vpath_builddir}"/bin/gostprov.so %buildroot%_providersdir/ cp "%{_vpath_builddir}"/bin/gost*sum %buildroot%_bindir/ cp gost*sum.1 %buildroot%_mandir/man1/ @@ -54,6 +57,7 @@ OPENSSL_ENGINES="$PWD/%{_vpath_builddir}/bin" \ %files %_enginesdir/gost.so +%_providersdir/gostprov.so %doc %_enginesdir/README.gost %files -n gostsum @@ -61,6 +65,9 @@ OPENSSL_ENGINES="$PWD/%{_vpath_builddir}/bin" \ %_mandir/man1/gost*sum* %changelog +* Sun Jan 29 2023 Dmitry Belyavskiy - 3.0.1-1 +- Update to version 3.0.1 + * Thu Jan 19 2023 Fedora Release Engineering - 3.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index d90e850..94429f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openssl-gost-engine-3.0.0.tar.gz) = 180cfbd013bf9959659744c49c886afa67911e1722db1dc3189f94f5320a51fc3b48ed937e57cdfe33f0e63cbf3597a41483fbda534fb8932997f21bebb1bb73 +SHA512 (openssl-gost-engine-3.0.1.tar.gz) = eb45ec59447f76f1ecaef8dcb0deddc3f45280001642c2dec631478c3b099eb0375e21bb0dbc90fb8f1192184cb92ef041394abfb493099840e4bfc1607f1457