Re: [PR PATCH] [Updated] tectonic: remove hardcoded versions

[voidlinux-github@inbox.vuxu.org]

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

There is an updated pull request by concatime against master on the void-packages repository

https://github.com/concatime/void-packages tectonic-openssl-fix
https://github.com/void-linux/void-packages/pull/14463

tectonic: remove hardcoded versions
This way, we don’t need to change theses numbers at each breaking change from libressl,
because cargo will pick the latest openssl and openssl-sys.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tectonic-openssl-fix-14463.patch --]
[-- Type: text/x-diff, Size: 2738 bytes --]

From 0686bf9d2052da292d37afa479e19dd12de64967 Mon Sep 17 00:00:00 2001
From: Issam Maghni <me@concati.me>
Date: Sat, 14 Sep 2019 19:45:47 -0400
Subject: [PATCH 1/2] tectonic: remove hardcoded versions

---
 srcpkgs/tectonic/template | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 19954ca6d7a..effe33ce097 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -13,9 +13,18 @@ changelog="https://raw.githubusercontent.com/tectonic-typesetting/tectonic/maste
 distfiles="https://github.com/tectonic-typesetting/${pkgname}/archive/v${version}.tar.gz"
 checksum=e700dc691dfd092adfe098b716992136343ddfac5eaabb1e8cfae4e63f8454c7
 
+# REMOVE THIS SECTION ON NEXT VERSION
 pre_build() {
-	cargo update --package openssl-sys --precise 0.9.46
-	cargo update --package openssl --precise 0.10.22
+	# openssl-sys v0.9.39
+	# This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
+	# through 2.8.1, but a different version of OpenSSL was found. The build is now aborting
+	# due to this version mismatch.
+	# openssl 0.10.15
+	# error[E0432]: unresolved imports `ffi::SSLv23_method`, `ffi::DTLSv1_method`
+	# error[E0432]: unresolved imports `ffi::SSLEAY_VERSION`, `ffi::SSLEAY_CFLAGS`,
+	# `ffi::SSLEAY_BUILT_ON`, `ffi::SSLEAY_PLATFORM`, `ffi::SSLEAY_DIR`, `ffi::SSLeay`,
+	# `ffi::SSLeay_version`
+	cargo update --package openssl --package openssl-sys
 }
 
 post_install() {

From 56e8420132969e50b3355ecffcf28d74a09bf8ef Mon Sep 17 00:00:00 2001
From: Issam Maghni <me@concati.me>
Date: Sun, 15 Sep 2019 11:46:32 -0400
Subject: [PATCH 2/2] tectonic: xlint fix false-positive

---
 srcpkgs/tectonic/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index effe33ce097..619616b50db 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -20,10 +20,10 @@ pre_build() {
 	# through 2.8.1, but a different version of OpenSSL was found. The build is now aborting
 	# due to this version mismatch.
 	# openssl 0.10.15
-	# error[E0432]: unresolved imports `ffi::SSLv23_method`, `ffi::DTLSv1_method`
-	# error[E0432]: unresolved imports `ffi::SSLEAY_VERSION`, `ffi::SSLEAY_CFLAGS`,
-	# `ffi::SSLEAY_BUILT_ON`, `ffi::SSLEAY_PLATFORM`, `ffi::SSLEAY_DIR`, `ffi::SSLeay`,
-	# `ffi::SSLeay_version`
+	# error[E0432]: unresolved imports ffi::SSLv23_method, ffi::DTLSv1_method
+	# error[E0432]: unresolved imports ffi::SSLEAY_VERSION, ffi::SSLEAY_CFLAGS,
+	# ffi::SSLEAY_BUILT_ON, ffi::SSLEAY_PLATFORM, ffi::SSLEAY_DIR, ffi::SSLeay,
+	# ffi::SSLeay_version
 	cargo update --package openssl --package openssl-sys
 }