Attachment 210174 Details for Bug 242826 – svn-diff-newsboat-libressl

[patch] svn-diff-newsboat-libressl

patch-libressl (text/plain), 3.38 KB, created by Walter Schwarzenfeld on 2019-12-23 12:49:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-12-23 12:49:52 UTC

Size: 3.38 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 520711)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	newsboat
> PORTVERSION=	2.18
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	https://newsboat.org/releases/${PORTVERSION}/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>Index: files/patch-libressl
>===================================================================
>--- files/patch-libressl	(nonexistent)
>+++ files/patch-libressl	(working copy)
>@@ -0,0 +1,62 @@
>+--- cargo-crates/openssl-sys-0.9.46/build/main.rs.orig	2019-12-23 12:35:08 UTC
>++++ cargo-crates/openssl-sys-0.9.46/build/main.rs
>+@@ -183,28 +183,33 @@ See rust-openssl README for more information:
>+     if let Some(libressl_version) = libressl_version {
>+         println!("cargo:libressl_version_number={:x}", libressl_version);
>+ 
>++	let major = (libressl_version >> 28) as u8;
>+         let minor = (libressl_version >> 20) as u8;
>+         let fix = (libressl_version >> 12) as u8;
>+-        let (minor, fix) = match (minor, fix) {
>+-            (5, 0) => ('5', '0'),
>+-            (5, 1) => ('5', '1'),
>+-            (5, 2) => ('5', '2'),
>+-            (5, _) => ('5', 'x'),
>+-            (6, 0) => ('6', '0'),
>+-            (6, 1) => ('6', '1'),
>+-            (6, 2) => ('6', '2'),
>+-            (6, _) => ('6', 'x'),
>+-            (7, _) => ('7', 'x'),
>+-            (8, 0) => ('8', '0'),
>+-            (8, 1) => ('8', '1'),
>+-            (8, _) => ('8', 'x'),
>+-            (9, 0) => ('9', '0'),
>+-            (9, _) => ('9', 'x'),
>+-            _ => version_error(),
>++        let (major, minor, fix) = match (major, minor, fix) {
>++            (2, 5, 0) => ('2', '5', '0'),
>++            (2, 5, 1) => ('2', '5', '1'),
>++            (2, 5, 2) => ('2', '5', '2'),
>++            (2, 5, _) => ('2', '5', 'x'),
>++            (2, 6, 0) => ('2', '6', '0'),
>++            (2, 6, 1) => ('2', '6', '1'),
>++            (2, 6, 2) => ('2', '6', '2'),
>++            (2, 6, _) => ('2', '6', 'x'),
>++            (2, 7, _) => ('2', '7', 'x'),
>++            (2, 8, 0) => ('2', '8', '0'),
>++            (2, 8, 1) => ('2', '8', '1'),
>++            (2, 8, _) => ('2', '8', 'x'),
>++            (2, 9, 0) => ('2', '9', '0'),
>++            (2, 9, _) => ('2', '9', 'x'),
>++            (3, 0, 0) => ('3', '0', '0'),
>++            (3, 0, 1) => ('3', '0', '1'),
>++	     (3, 0, 2) => ('3', '0', '2'),	
>++            (3, 0, _) => ('3', '0', 'x'), 
>++		_ => version_error(),
>+         };
>+ 
>+         println!("cargo:libressl=true");
>+-        println!("cargo:libressl_version=2{}{}", minor, fix);
>++        println!("cargo:libressl_version={}{}{}", major, minor, fix);
>+         println!("cargo:version=101");
>+         Version::Libressl
>+     } else {
>+@@ -240,7 +245,7 @@ fn version_error() -> ! {
>+         "
>+ 
>+ This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
>+-through 2.9.x, but a different version of OpenSSL was found. The build is now aborting
>++through 3.0.x, but a different version of OpenSSL was found. The build is now aborting
>+ due to this version mismatch.
>+ 
>+ "
>
>Property changes on: files/patch-libressl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 242826: 210174 | 210454