[PR PATCH] libressl: update to 3.1.1.

[PR PATCH] libressl: update to 3.1.1.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages libressl
https://github.com/void-linux/void-packages/pull/21870

libressl: update to 3.1.1.
None

A patch file from https://github.com/void-linux/void-packages/pull/21870.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libressl-21870.patch --]
[-- Type: text/x-diff, Size: 3348 bytes --]

From e3f58a45e9b039a2ad6f27fde1080cae43de436b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 12 May 2020 13:56:19 +0200
Subject: [PATCH] libressl: update to 3.1.1.

---
 common/shlibs                        |  3 +++
 srcpkgs/{libcrypto45 => libcrypto46} |  0
 srcpkgs/libressl/template            | 16 ++++++++--------
 srcpkgs/{libssl47 => libssl48}       |  0
 srcpkgs/{libtls19 => libtls20}       |  0
 5 files changed, 11 insertions(+), 8 deletions(-)
 rename srcpkgs/{libcrypto45 => libcrypto46} (100%)
 rename srcpkgs/{libssl47 => libssl48} (100%)
 rename srcpkgs/{libtls19 => libtls20} (100%)

diff --git a/common/shlibs b/common/shlibs
index 580a12d9c87..a63852219cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3497,6 +3497,9 @@ libssl.so.46 libssl46-2.8.2_1
 libcrypto.so.45 libcrypto45-2.9.2_1
 libtls.so.19 libtls19-2.9.2_1
 libssl.so.47 libssl47-2.9.2_1
+libcrypto.so.46 libcrypto46-3.1.1_1
+libtls.so.20 libtls20-3.1.1_1
+libssl.so.48 libssl48-3.1.1_1
 libxmlb.so.1 libxmlb-0.1.3_1
 libvoikko.so.1 libvoikko-4.2_1
 libfstrcmp.so.0 libfstrcmp-0.7.D001_1
diff --git a/srcpkgs/libcrypto45 b/srcpkgs/libcrypto46
similarity index 100%
rename from srcpkgs/libcrypto45
rename to srcpkgs/libcrypto46
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 4790d556987..269ccd45ae9 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
 # Template file for 'libressl'
 pkgname=libressl
-version=3.0.2
-revision=2
+version=3.1.1
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
@@ -10,7 +10,7 @@ license="OpenSSL-License, SSLeay-License, ISC"
 #changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
 homepage="http://www.libressl.org/"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${pkgname}-${version}.tar.gz"
-checksum=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e
+checksum=bdc6ce5ebb3a2eafc4c475f7eeaa5f0a8e60d9bead01efb76e2e254242b6db00
 provides="openssl-${version}_${revision}"
 replaces="openssl>=0"
 conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
@@ -38,21 +38,21 @@ post_install() {
 	find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
 }
 
-libcrypto45_package() {
+libcrypto46_package() {
 	short_desc+=" - crypto library"
 	pkg_install() {
 		vmove usr/lib/libcrypto.so.*
 	}
 }
 
-libssl47_package() {
+libssl48_package() {
 	short_desc+=" - SSL/TLS library"
 	pkg_install() {
 		vmove usr/lib/libssl.so.*
 	}
 }
 
-libtls19_package() {
+libtls20_package() {
 	short_desc+=" - new TLS library"
 	pkg_install() {
 		vmove usr/lib/libtls.so.*
@@ -61,8 +61,8 @@ libtls19_package() {
 
 libressl-devel_package() {
 	short_desc+=" - development files"
-	depends="libcrypto45-${version}_${revision} libssl47-${version}_${revision}
-	 libtls19-${version}_${revision}"
+	depends="libcrypto46-${version}_${revision} libssl48-${version}_${revision}
+	 libtls20-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
diff --git a/srcpkgs/libssl47 b/srcpkgs/libssl48
similarity index 100%
rename from srcpkgs/libssl47
rename to srcpkgs/libssl48
diff --git a/srcpkgs/libtls19 b/srcpkgs/libtls20
similarity index 100%
rename from srcpkgs/libtls19
rename to srcpkgs/libtls20

Re: libressl: update to 3.1.1.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/21870#issuecomment-629636066

Comment:
So, everything compiles fine but the `openssl-sys` cargo crate, and it doesn't have a release with libressl-3.1 support yet.