From 96f8a9141e3948c55372d27b322331d7bc7abb11 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 1 Jun 2021 14:12:20 -0400
Subject: [PATCH] Support openssl3

Cargo culted code from
https://gitlab.com/redhat/centos-stream/rpms/rust/-/commit/c6ba79677381562cbcc479418d8474db8c4e82e4
https://gitlab.com/redhat/centos-stream/rpms/rust/-/commit/8231fb16216b98637ac61dceb21afc5037ae5db2

Resolves: rhbz#1964825
---
 .gitignore      |  1 +
 rpm-ostree.spec | 15 ++++++++++++++-
 sources         |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a1d2df2..091ed41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,4 @@
 /rpm-ostree-2021.1.tar.xz
 /rpm-ostree-2021.2.tar.xz
 /rpm-ostree-2021.5.tar.xz
+/rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index b250314..460450a 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -4,12 +4,17 @@
 Summary: Hybrid image/package system
 Name: rpm-ostree
 Version: 2021.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
 # in the upstream git.  It also contains vendored Rust sources.
 Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
+# Initial support for OpenSSL 3.0.0-alpha16
+# https://github.com/sfackler/rust-openssl/pull/1264
+%global rust_openssl_commit 770ba32702abd2b4cab80727958c27ac3043c3ec
+%global rust_openssl rust-openssl-%{rust_openssl_commit}
+Source103:      https://github.com/sfackler/rust-openssl/archive/%{rust_openssl_commit}/%{rust_openssl}.tar.gz
 
 ExclusiveArch: %{rust_arches}
 
@@ -133,6 +138,11 @@ The %{name}-devel package includes the header files for %{name}-libs.
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
+rm -rf vendor/openssl{,-sys,-errors}/*
+tar -xf %{SOURCE103} -C vendor/ --strip-components=1 %{rust_openssl}/openssl{,-sys}/
+# https://blogs.gnome.org/mcatanzaro/2020/05/18/patching-vendored-rust-dependencies/
+echo '{"files": {}, "package": "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"}' > vendor/openssl/.cargo-checksum.json
+echo '{"files": {}, "package": "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"}' > vendor/openssl-sys/.cargo-checksum.json
 
 %build
 env NOCONFIGURE=1 ./autogen.sh
@@ -208,6 +218,9 @@ $PYTHON autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Tue Jun 01 2021 Colin Walters <walters@verbum.org> - 2021.5-2
+- Support OpenSSL 3
+
 * Wed May 12 2021 Luca BRUNO <lucab@lucabruno.net> - 2021.5-1
 - New upstream version
   https://github.com/coreos/rpm-ostree/releases/tag/v2021.5
diff --git a/sources b/sources
index 9465cff..67be6e0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+SHA512 (rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz) = 82888c18beafae8cd8122fe91d00fd32c60ab1ed47db4da691ca762b5102eee4cbfcd6f333fcb1769ba1b65b655f726050b1deccdfdf7ec7b21728c51cd2c750
 SHA512 (rpm-ostree-2021.5.tar.xz) = f7802e15110255ba450ce03802552f517f7e235be46ada4229ec3904c63e741f23964802c67598ec7cedb05322b4c6f31e026336fe3ae5ef5ff3c60f68ce6810