Merge pull request #1 from olegsolovev/libressl:rosa2019.1

Version 3.2.0 up

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  libressl-3.0.2.git20200319.tar.gz: 88a2cf55c423b7ea60fc5ccc3f2539b99221790f
+  libressl-3.2.0.tar.gz: de3c762ffaba7c60101f92d2a419e886a199de03

SUSE-extra-symver.patch

@@ -1,20 +1,22 @@
-From f2969c659b4cbccbb3766f72926a9a829b17d561 Mon Sep 17 00:00:00 2001
+From 11a5823b7300099137473775d7ad2128b4420490 Mon Sep 17 00:00:00 2001
 From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 4 Dec 2017 21:25:11 +0100
+Date: Thu, 9 Jul 2020 14:11:14 +0000
-Subject: [PATCH 8/8] SUSE extra symver
+Subject: [PATCH] SUSE-extra-symver.patch
+
+Redefined by Oleg Solvev <o.solovev@rosalinux.ru>
 
 Add symbol versions into the library to be on par with openssl.
 ---
- libressl/crypto/Makefile.am | 6 +++++-
+ crypto/Makefile.am | 7 ++++++-
- libressl/ssl/Makefile.am    | 6 +++++-
+ ssl/Makefile.am    | 7 ++++++-
- libressl/tls/Makefile.am    | 6 +++++-
+ tls/Makefile.am    | 7 ++++++-
- 3 files changed, 15 insertions(+), 3 deletions(-)
+ 3 files changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/crypto/Makefile.am b/crypto/Makefile.am
-index 156a756..1e54634 100644
+index b897c00..3a96361 100644
 --- a/crypto/Makefile.am
 +++ b/crypto/Makefile.am
-@@ -93,7 +93,11 @@ if HOST_WIN
+@@ -93,7 +93,12 @@ if HOST_WIN
  	-mv crypto_portable.sym.tmp crypto_portable.sym
  endif
  
@@ -24,30 +26,33 @@ index 156a756..1e54634 100644
 +
 +libcrypto_la_DEPENDENCIES = crypto2.sym libcompat.la
 +libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -Wl,--version-script=crypto2.sym
++
+ EXTRA_libcrypto_la_DEPENDENCIES = crypto_portable.sym
  libcrypto_la_LIBADD = libcompat.la
  if !HAVE_EXPLICIT_BZERO
- libcrypto_la_LIBADD += libcompatnoopt.la
 diff --git a/ssl/Makefile.am b/ssl/Makefile.am
-index 2651181..6191b80 100644
+index a7bb8a3..e01138d 100644
 --- a/ssl/Makefile.am
 +++ b/ssl/Makefile.am
-@@ -7,6 +7,11 @@ EXTRA_DIST += CMakeLists.txt
+@@ -7,7 +7,12 @@ EXTRA_DIST += CMakeLists.txt
  EXTRA_DIST += ssl.sym
  
  libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym
+-libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)
 +ssl2.sym: ssl.sym
 +	(echo 'LIBRESSL { global: '; sed -e 's/\(.*\)/\1;/' <$<; echo 'local: *; };') >$@
 +
 +libssl_la_DEPENDENCIES = ssl2.sym
 +libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -Wl,--version-script=ssl2.sym
- libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)
++ libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(PLATFORM_LDADD)
  
  libssl_la_SOURCES = bio_ssl.c
+ libssl_la_SOURCES += bs_ber.c
 diff --git a/tls/Makefile.am b/tls/Makefile.am
-index 942abf9..0be3f5d 100644
+index 942abf9..a722ef1 100644
 --- a/tls/Makefile.am
 +++ b/tls/Makefile.am
-@@ -6,7 +6,11 @@ EXTRA_DIST = VERSION
+@@ -6,7 +6,12 @@ EXTRA_DIST = VERSION
  EXTRA_DIST += CMakeLists.txt
  EXTRA_DIST += tls.sym
  
@@ -57,6 +62,10 @@ index 942abf9..0be3f5d 100644
 +
 +libtls_la_DEPENDENCIES = tls2.sym
 +libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -Wl,--version-script=tls2.sym
++
  libtls_la_LIBADD = $(abs_top_builddir)/ssl/libssl.la
  libtls_la_LIBADD += $(abs_top_builddir)/crypto/libcrypto.la
  libtls_la_LIBADD += $(PLATFORM_LDADD)
+-- 
+2.26.2
+

libressl.spec

@@ -58,28 +58,15 @@
 %define libcrypto_pkg %mklibname crypto_libressl %{libcrypto_sover}
 %define libtls_pkg %mklibname tls_libressl %{libtls_sover}
 
-%define base_version 3.0.2
+%define base_version 3.2.0
-%define git_date 20200319
 Summary:		LibreSSL utils and libs coexisting with OpenSSL
 Name:			libressl
-Version:		%{base_version}.git%{git_date}
+Version:		3.2.0        
-Release:		25
+Release:		1
 # The code is distributed under ISC license except of original OpenSSL code
 License:		ISC and BSD-like
 Group:			System/Base
 Url:			http://libressl.org
-# Using a git snapshot, because CMS (Cryptographic Message Syntax)
-# was enabled later than v3.0.2, includes a lot of commits and is needed.
-# Ability to sign files using SHA-512 and not only SHA-1 is also needed.
-# TODO: switch to release tarballs in next versions.
-# https://bugzilla.kernel.org/show_bug.cgi?id=202159
-# To make a tarball from git:
-# git clone https://github.com/libressl-portable/portable.git
-# cd portable && ./autogen.sh && ./dist.sh
-# Built from:
-# - libressl-portable/portable commit b462bfdb
-# - libressl-portable/openbsd  commit 1203000a
-#Source0:		http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-%{version}.tar.gz
 Source0:		libressl-%{version}.tar.gz
 Source10:		libressl.rpmlintrc
 # TODO: add printing config location to `openssl version`
@@ -201,7 +188,7 @@ pkg-config sets -I%{_libdir} in CFLAGS.
 %{_olibdir}/pkgconfig/*.pc
 %{_includedir}
 %{_mandir}/*/*
-%{_omandir}/man3/*
+%doc %{_omandir}/man3/*
 %{_rpmmacrodir}/*libressl*
 #-------------------------------------------------------------------------------------
 
@@ -265,7 +252,7 @@ capabilities.
 #-------------------------------------------------------------------------------------
 
 %prep
-%setup -q -n libressl-3.1.0
+%setup -q -n libressl-%{version}
 %patch2 -p1
 # Patch is against gits https://github.com/libressl-portable/
 # Release tarball is packaged in a tricky way
@@ -414,7 +401,7 @@ mv -v %{buildroot}/%{_openssldir}/openssl.cnf %{buildroot}/%{_openssldir}/libres
 
 # Having sovers as macros may be useful to check that binaries are linked against LibreSSL
 cat << EOF > macros.file
-%%libressl_version %{base_version}
+%%libressl_version %{version}
 %%libressl_libcrypto_sover %{libcrypto_sover}
 %%libressl_libssl_sover %{libssl_sover}
 %%libressl_libtls_sover %{libtls_sover}