Re: [PR PATCH] [Updated] update openssl to 3 series

[dkwo <dkwo@users.noreply.github.com>]

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

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

https://github.com/dkwo/void-packages openssl3
https://github.com/void-linux/void-packages/pull/37681

update openssl to 3 series
- xbps: still broken, see https://github.com/void-linux/xbps/issues/531
- use `xrevbump "bump for openssl-3.0" $(xbps-query -Rs libssl.so -p shlib-requires | cut -d ':' -f 1 | xargs -n1 xbps-uhelper getpkgname)` and same for `libcrypto`, or use `sort -u file1 file2`.
[ci skip]

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

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

From 92d6994392cff563decebd8259391662d030176e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Jun 2022 18:22:28 +0200
Subject: [PATCH 01/10] openssl: update to 3.0.8

---
 common/shlibs                           |  4 +-
 srcpkgs/{libcrypto1.1 => libcrypto3.0}  |  0
 srcpkgs/{libssl1.1 => libssl3.0}        |  0
 srcpkgs/openssl/patches/ppc-auxv.patch  | 25 -------
 srcpkgs/openssl/patches/ppc64.patch     | 96 -------------------------
 srcpkgs/openssl/patches/xxx-ppcle.patch | 53 --------------
 srcpkgs/openssl/template                | 20 +++---
 7 files changed, 14 insertions(+), 184 deletions(-)
 rename srcpkgs/{libcrypto1.1 => libcrypto3.0} (100%)
 rename srcpkgs/{libssl1.1 => libssl3.0} (100%)
 delete mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 delete mode 100644 srcpkgs/openssl/patches/ppc64.patch
 delete mode 100644 srcpkgs/openssl/patches/xxx-ppcle.patch

diff --git a/common/shlibs b/common/shlibs
index 2028226606bc..99f3933107c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1767,8 +1767,8 @@ libid3.so id3lib-3.8.3_7
 libid3-3.8.so.3 id3lib-3.8.3_7
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-1.6_2
-libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
-libssl.so.1.1 libssl1.1-1.1.1f_1
+libcrypto.so.3 libcrypto3.0-3.0.7_1
+libssl.so.3 libssl3.0-3.0.7_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto3.0
similarity index 100%
rename from srcpkgs/libcrypto1.1
rename to srcpkgs/libcrypto3.0
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl3.0
similarity index 100%
rename from srcpkgs/libssl1.1
rename to srcpkgs/libssl3.0
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
deleted file mode 100644
index 274ac2d55998..000000000000
--- a/srcpkgs/openssl/patches/ppc-auxv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/crypto/ppccap.c b/crypto/ppccap.c
-index eeaa47c..e6eeb14 100644
---- a/crypto/ppccap.c
-+++ b/crypto/ppccap.c
-@@ -207,17 +207,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
-         return 0;
- }
- 
--#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
--# if __GLIBC_PREREQ(2, 16)
--#  include <sys/auxv.h>
--#  define OSSL_IMPLEMENT_GETAUXVAL
--# elif defined(__ANDROID_API__)
--/* see https://developer.android.google.cn/ndk/guides/cpu-features */
--#  if __ANDROID_API__ >= 18
--#   include <sys/auxv.h>
--#   define OSSL_IMPLEMENT_GETAUXVAL
--#  endif
--# endif
-+#if defined(__linux__)
-+# include <sys/auxv.h>
-+# define OSSL_IMPLEMENT_GETAUXVAL
- #endif
- 
- #if defined(__FreeBSD__)
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
deleted file mode 100644
index c75ceedba2c0..000000000000
--- a/srcpkgs/openssl/patches/ppc64.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
-From: Andy Polyakov <appro@openssl.org>
-Date: Sun, 5 May 2019 18:25:50 +0200
-Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a big endian ELFv2 configuration. ELFv2 was already being
-used for little endian, and big endian was traditionally ELFv1
-but there are practical configurations that use ELFv2 with big
-endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8883)
----
- crypto/perlasm/ppc-xlate.pl | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
-index e52f2f6ea62..5fcd0526dff 100755
---- a/crypto/perlasm/ppc-xlate.pl
-+++ b/crypto/perlasm/ppc-xlate.pl
-@@ -49,7 +49,7 @@
- 	/osx/		&& do { $name = "_$name";
- 				last;
- 			      };
--	/linux.*(32|64le)/
-+	/linux.*(32|64(le|v2))/
- 			&& do {	$ret .= ".globl	$name";
- 				if (!$$type) {
- 				    $ret .= "\n.type	$name,\@function";
-@@ -80,7 +80,7 @@
- };
- my $text = sub {
-     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
--    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
-+    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
-     $ret;
- };
- my $machine = sub {
-@@ -186,7 +186,7 @@
- 
- # Some ABIs specify vrsave, special-purpose register #256, as reserved
- # for system use.
--my $no_vrsave = ($flavour =~ /aix|linux64le/);
-+my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
- my $mtspr = sub {
-     my ($f,$idx,$ra) = @_;
-     if ($idx == 256 && $no_vrsave) {
-@@ -318,7 +318,7 @@ sub vfour {
- 	if ($label) {
- 	    my $xlated = ($GLOBALS{$label} or $label);
- 	    print "$xlated:";
--	    if ($flavour =~ /linux.*64le/) {
-+	    if ($flavour =~ /linux.*64(le|v2)/) {
- 		if ($TYPES{$label} =~ /function/) {
- 		    printf "\n.localentry	%s,0\n",$xlated;
- 		}
-
-From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
-From: Andy Polyakov <appro@openssl.org>
-Date: Sun, 5 May 2019 18:30:55 +0200
-Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
-
-If _CALL_ELF is defined to be 2, it's an ELFv2 system.
-Conditionally switch to the v2 perlasm scheme.
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8883)
----
- Configure | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/Configure b/Configure
-index 22082deb4c7..e303d98deb3 100755
---- a/Configure
-+++ b/Configure
-@@ -1402,8 +1402,15 @@
- my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
- my %predefined_CXX = $config{CXX}
-     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
-     : ();
- 
-+unless ($disabled{asm}) {
-+    # big endian systems can use ELFv2 ABI
-+    if ($target eq "linux-ppc64") {
-+        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
-+    }
-+}
-+
- # Check for makedepend capabilities.
- if (!$disabled{makedepend}) {
-     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/patches/xxx-ppcle.patch b/srcpkgs/openssl/patches/xxx-ppcle.patch
deleted file mode 100644
index 2498af968899..000000000000
--- a/srcpkgs/openssl/patches/xxx-ppcle.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 56e07856a7a9f7ce3582b8cf3843f252691475a6
-Author: q66 <daniel@octaforge.org>
-Date:   Fri Mar 5 18:36:01 2021 +0100
-
-    add ppcle support
-
-diff --git Configurations/10-main.conf Configurations/10-main.conf
-index 8dc3e85..18f10c9 100644
---- a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -665,6 +665,11 @@ my %targets = (
-         perlasm_scheme   => "linux32",
-         lib_cppflags     => add("-DB_ENDIAN"),
-     },
-+    "linux-ppcle" => {
-+        inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
-+        perlasm_scheme   => "linux32le",
-+        lib_cppflags     => add("-DL_ENDIAN"),
-+    },
-     "linux-ppc64" => {
-         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
-         cflags           => add("-m64"),
-diff --git config config
-index 26225ca..6a1e830 100755
---- a/config
-+++ b/config
-@@ -543,6 +543,7 @@ case "$GUESSOS" in
- 	fi
- 	;;
-   ppc64le-*-linux2) OUT="linux-ppc64le" ;;
-+  ppcle-*-linux2) OUT="linux-ppcle" ;;
-   ppc-*-linux2) OUT="linux-ppc" ;;
-   mips64*-*-linux2)
- 	echo "WARNING! If you wish to build 64-bit library, then you have to"
-diff --git crypto/poly1305/asm/poly1305-ppc.pl crypto/poly1305/asm/poly1305-ppc.pl
-index e5d6933..3283f6b 100755
---- a/crypto/poly1305/asm/poly1305-ppc.pl
-+++ b/crypto/poly1305/asm/poly1305-ppc.pl
-@@ -314,10 +314,10 @@ $code.=<<___;
- 	beq-	Lno_key
- ___
- $code.=<<___	if ($LITTLE_ENDIAN);
--	lw	$h0,0($inp)		# load key material
--	lw	$h1,4($inp)
--	lw	$h2,8($inp)
--	lw	$h3,12($inp)
-+	lwz	$h0,0($inp)		# load key material
-+	lwz	$h1,4($inp)
-+	lwz	$h2,8($inp)
-+	lwz	$h3,12($inp)
- ___
- $code.=<<___	if (!$LITTLE_ENDIAN);
- 	li	$h1,4
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 79da0b051aad..0c2177ed397f 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'openssl'
 pkgname=openssl
-version=1.1.1t
+version=3.0.8
 revision=1
 bootstrap=yes
 build_style=configure
@@ -14,10 +14,10 @@ make_check_target=test
 make_install_args="MANSUFFIX=ssl"
 short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
 maintainer="John <me@johnnynator.dev>"
-license="OpenSSL"
+license="Apache-2.0"
 homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
+checksum=6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
 conf_files="/etc/ssl/openssl.cnf"
 replaces="libressl>=0"
 
@@ -28,7 +28,11 @@ if [ "$CHROOT_READY" ]; then
 	build_options_default="asm"
 else
 	# openssl-c_rehash depends on perl, ignore on bootstrap
-	subpackages="libcrypto1.1 libssl1.1 openssl-devel"
+	subpackages="libcrypto3.0 libssl3.0 openssl-devel"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
 fi
 
 case $XBPS_TARGET_MACHINE in
@@ -63,15 +67,15 @@ post_install() {
 	fi
 }
 
-libcrypto1.1_package() {
+libcrypto3.0_package() {
 	short_desc+=" - crypto library"
 	pkg_install() {
 		vmove "usr/lib/libcrypto.so.*"
-		vmove usr/lib/engines-1.1
+		vmove usr/lib/engines-3
 	}
 }
 
-libssl1.1_package() {
+libssl3.0_package() {
 	short_desc+=" - SSL/TLS library"
 	pkg_install() {
 		vmove "usr/lib/libssl.so.*"
@@ -87,7 +91,7 @@ openssl-c_rehash_package() {
 }
 
 openssl-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${version}_${revision}"
 	replaces="libressl-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {

From 4822eea859c2b763578d365e6e7acfc9312bcf36 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 Feb 2023 18:03:53 -0500
Subject: [PATCH 02/10] racket: depend on libssl3.0

---
 srcpkgs/racket/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 2d96716c8afe..8c6df71d5c82 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,7 +1,7 @@
 # Template file for 'racket'
 pkgname=racket
 version=8.8
-revision=1
+revision=2
 archs="aarch64* armv6* armv7* i686* x86_64*"
 build_wrksrc=src
 build_style=gnu-configure
@@ -9,7 +9,7 @@ configure_args="--enable-useprefix --enable-curses"
 make_build_args="CC_FOR_BUILD=cc"
 hostmakedepends="liberation-fonts-ttf"
 makedepends="gtk+3-devel liblz4-devel ncurses-devel sqlite-devel zlib-devel"
-depends="gtk+3 libssl1.1"
+depends="gtk+3 libssl3.0"
 short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3.0-only, MIT"

From 79e2a0e42590861eefa91940081f3756fe593f89 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Jun 2022 18:33:57 +0200
Subject: [PATCH 03/10] xbps: add patch for openssl, CFLAG

---
 srcpkgs/xbps/patches/openssl.patch | 23 +++++++++++++++++++++++
 srcpkgs/xbps/template              |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 srcpkgs/xbps/patches/openssl.patch

diff --git a/srcpkgs/xbps/patches/openssl.patch b/srcpkgs/xbps/patches/openssl.patch
new file mode 100644
index 000000000000..ca7274542422
--- /dev/null
+++ b/srcpkgs/xbps/patches/openssl.patch
@@ -0,0 +1,23 @@
+From db1766986c4389eb7e17c0e0076971b711617ef9 Mon Sep 17 00:00:00 2001
+From: Juan RP <xtraeme@gmail.com>
+Date: Thu, 16 Apr 2020 14:57:18 +0200
+Subject: [PATCH] configure: accept any openssl version.
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index da8ae75f..383bc927 100755
+--- a/configure
++++ b/configure
+@@ -704,7 +704,7 @@ fi
+ # libssl with pkg-config support is required.
+ #
+ printf "Checking for libssl via pkg-config ... "
+-if pkg-config --exists 'libssl < 1.2' && ! pkg-config --exists libtls ; then
++if pkg-config --exists 'libssl' && ! pkg-config --exists libtls ; then
+ 	echo "found OpenSSL version $(pkg-config --modversion libssl)."
+ elif pkg-config --exists libssl libtls; then
+ 	echo "found LibreSSL version $(pkg-config --modversion libssl)."
+
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 1c9373c498dc..cf5f775f1375 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -20,6 +20,8 @@ depends="ca-certificates xbps-triggers"
 make_dirs="/etc/xbps.d 0755 root root"
 
 LDFLAGS="-ldl -pthread"
+# openssl3
+CFLAGS+=" -Wno-error"
 
 if [ "$CHROOT_READY" ]; then
 	makedepends+=" atf-devel"

From cec4b514f85e188b8884d8d24648c9c2705067a5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 28 Jan 2023 16:58:32 -0500
Subject: [PATCH 04/10] git-crypt: update to 0.7.0, add CXXFLAG for openssl3

---
 srcpkgs/git-crypt/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index f5c4c79b664d..211ab8a0adab 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,7 +1,7 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
-version=0.6.0
-revision=8
+version=0.7.0
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="ENABLE_MAN=yes"
@@ -13,7 +13,14 @@ maintainer="Andy Cobaugh <andrewcobaugh@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.agwa.name/projects/git-crypt/"
 distfiles="https://github.com/AGWA/git-crypt/archive/${version}.tar.gz"
-checksum=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78
+checksum=2210a89588169ae9a54988c7fdd9717333f0c6053ff704d335631a387bd3bcff
+
+do_build() {
+	make \
+		PREFIX=/usr prefix=/usr \
+		CXXFLAGS="$CXXFLAGS -DOPENSSL_API_COMPAT=0x30000000L" \
+		${makejobs} ${make_build_args} ${make_build_target}
+}
 
 post_install() {
 	vdoc README

From 4864ce69d0161ff5f6c16f6ea8e08b997a625699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 18 Feb 2023 12:12:50 +0100
Subject: [PATCH 05/10] git-brws: bump for openssl-3.0

---
 srcpkgs/git-brws/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea5e550b0106..9ebcec181a1b 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,7 +1,7 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -12,9 +12,16 @@ homepage="https://rhysd.github.io/git-brws/"
 distfiles="https://github.com/rhysd/git-brws/archive/v${version}.tar.gz"
 checksum=3a4bbf93f0b16562260ca66c2b60c655d5bfc690d0229d11757be76d95cb81c5
 
-pre_build() {
+post_patch() {
 	# fixes an indexmap error when cross compiling
 	cargo update --package autocfg:1.0.1 --precise 1.1.0
+
+	# required for openssl3 compat
+	cargo update --package openssl-sys:0.9.58 --precise 0.9.80
+	cargo update --package openssl:0.10.30 --precise 0.10.45
+
+	# required for compatibility with Rust >= 1.64.0
+	cargo update --package socket2:0.3.15 --precise 0.3.19
 }
 
 post_install() {

From d6fecac45e289bda59161de5f86f31ade3a21bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 18 Feb 2023 12:13:29 +0100
Subject: [PATCH 06/10] git-series: bump for openssl-3.0

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

diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 6c7dc54af0c7..7f9f691abd20 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
 # Template file for 'git-series'
 pkgname=git-series
 version=0.9.1
-revision=14
+revision=15
 build_style=cargo
 hostmakedepends="cmake pkg-config perl"
 makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
 checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
 
 post_extract() {
-	cargo update --package libc --precise 0.2.55
-	cargo update --package url --precise 1.7.2
-	cargo update --package openssl-sys --precise 0.9.60
+	cargo update --package libc:0.2.17 --precise 0.2.55
+	cargo update --package url:1.2.3 --precise 1.7.2
+	cargo update --package openssl-sys:0.9.1 --precise 0.9.80
 }
 pre_build() {
 	export LIBGIT2_SYS_USE_PKG_CONFIG=yes

From 5201b2dabfe410ff40161abae23c8b665c8578ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 18 Feb 2023 12:13:51 +0100
Subject: [PATCH 07/10] signal-backup-decode: bump for openssl-3.0

---
 srcpkgs/signal-backup-decode/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 747736adeb5e..6e5a442b8d3c 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,7 +1,7 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
 version=0.2.3
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel sqlite-devel"
@@ -11,3 +11,9 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/pajowu/signal-backup-decode"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=e7727b6628004cd027e374bcd8a004d8c3e68b3ba03e82ce2c9e04ee58623ed2
+
+post_patch() {
+	# required for openssl3 compat
+	cargo update --package openssl-sys:0.9.60 --precise 0.9.80
+	cargo update --package openssl:0.10.32 --precise 0.10.45
+}

From 97ff4b05194afc6c2b34f4d75a9ec74c121c0e01 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 20 Feb 2023 15:59:28 -0500
Subject: [PATCH 08/10] taisei: add cflag to build with openssl 3

---
 srcpkgs/taisei/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index d99720f499b6..016b02d7fa3a 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -13,6 +13,8 @@ license="MIT"
 homepage="https://taisei-project.org"
 distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz"
 checksum=dbc05f1b5c31981d8711130ac283355b7bfad403895f4096a6bb7e9a3d73a3bc
+# build failure with openssl 3
+CFLAGS+=" -Wno-error"
 
 post_install() {
 	vlicense COPYING

From 998235d81f4ef7ea9cdb70ae034bafbcdd24578e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 22 Feb 2023 15:51:58 -0500
Subject: [PATCH 09/10] new package: openssl1.1-compat

---
 common/shlibs                                 |  2 +
 srcpkgs/libcrypto1.1                          |  1 +
 srcpkgs/libssl1.1                             |  1 +
 .../openssl1.1-compat/patches/ppc-auxv.patch  | 25 +++++
 srcpkgs/openssl1.1-compat/patches/ppc64.patch | 96 +++++++++++++++++++
 .../openssl1.1-compat/patches/xxx-ppcle.patch | 53 ++++++++++
 srcpkgs/openssl1.1-compat/template            | 84 ++++++++++++++++
 srcpkgs/openssl1.1-devel                      |  1 +
 8 files changed, 263 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 100644 srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl1.1-compat/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch
 create mode 100644 srcpkgs/openssl1.1-compat/template
 create mode 120000 srcpkgs/openssl1.1-devel

diff --git a/common/shlibs b/common/shlibs
index 99f3933107c7..37eccd716008 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1767,6 +1767,8 @@ libid3.so id3lib-3.8.3_7
 libid3-3.8.so.3 id3lib-3.8.3_7
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-1.6_2
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libcrypto.so.3 libcrypto3.0-3.0.7_1
 libssl.so.3 libssl3.0-3.0.7_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 000000000000..da943cea53f5
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl1.1-compat/
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 000000000000..da943cea53f5
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl1.1-compat/
\ No newline at end of file
diff --git a/srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch b/srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch
new file mode 100644
index 000000000000..274ac2d55998
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch
@@ -0,0 +1,25 @@
+diff --git a/crypto/ppccap.c b/crypto/ppccap.c
+index eeaa47c..e6eeb14 100644
+--- a/crypto/ppccap.c
++++ b/crypto/ppccap.c
+@@ -207,17 +207,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# elif defined(__ANDROID_API__)
+-/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+-#  if __ANDROID_API__ >= 18
+-#   include <sys/auxv.h>
+-#   define OSSL_IMPLEMENT_GETAUXVAL
+-#  endif
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ #if defined(__FreeBSD__)
diff --git a/srcpkgs/openssl1.1-compat/patches/ppc64.patch b/srcpkgs/openssl1.1-compat/patches/ppc64.patch
new file mode 100644
index 000000000000..c75ceedba2c0
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- a/crypto/perlasm/ppc-xlate.pl
++++ b/crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- a/Configure
++++ b/Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch b/srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch
new file mode 100644
index 000000000000..2498af968899
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch
@@ -0,0 +1,53 @@
+commit 56e07856a7a9f7ce3582b8cf3843f252691475a6
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Mar 5 18:36:01 2021 +0100
+
+    add ppcle support
+
+diff --git Configurations/10-main.conf Configurations/10-main.conf
+index 8dc3e85..18f10c9 100644
+--- a/Configurations/10-main.conf
++++ b/Configurations/10-main.conf
+@@ -665,6 +665,11 @@ my %targets = (
+         perlasm_scheme   => "linux32",
+         lib_cppflags     => add("-DB_ENDIAN"),
+     },
++    "linux-ppcle" => {
++        inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
++        perlasm_scheme   => "linux32le",
++        lib_cppflags     => add("-DL_ENDIAN"),
++    },
+     "linux-ppc64" => {
+         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
+         cflags           => add("-m64"),
+diff --git config config
+index 26225ca..6a1e830 100755
+--- a/config
++++ b/config
+@@ -543,6 +543,7 @@ case "$GUESSOS" in
+ 	fi
+ 	;;
+   ppc64le-*-linux2) OUT="linux-ppc64le" ;;
++  ppcle-*-linux2) OUT="linux-ppcle" ;;
+   ppc-*-linux2) OUT="linux-ppc" ;;
+   mips64*-*-linux2)
+ 	echo "WARNING! If you wish to build 64-bit library, then you have to"
+diff --git crypto/poly1305/asm/poly1305-ppc.pl crypto/poly1305/asm/poly1305-ppc.pl
+index e5d6933..3283f6b 100755
+--- a/crypto/poly1305/asm/poly1305-ppc.pl
++++ b/crypto/poly1305/asm/poly1305-ppc.pl
+@@ -314,10 +314,10 @@ $code.=<<___;
+ 	beq-	Lno_key
+ ___
+ $code.=<<___	if ($LITTLE_ENDIAN);
+-	lw	$h0,0($inp)		# load key material
+-	lw	$h1,4($inp)
+-	lw	$h2,8($inp)
+-	lw	$h3,12($inp)
++	lwz	$h0,0($inp)		# load key material
++	lwz	$h1,4($inp)
++	lwz	$h2,8($inp)
++	lwz	$h3,12($inp)
+ ___
+ $code.=<<___	if (!$LITTLE_ENDIAN);
+ 	li	$h1,4
diff --git a/srcpkgs/openssl1.1-compat/template b/srcpkgs/openssl1.1-compat/template
new file mode 100644
index 000000000000..3d4b7a371aff
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/template
@@ -0,0 +1,84 @@
+# Template file for 'openssl1.1-compat'
+pkgname=openssl1.1-compat
+version=1.1.1t
+revision=1
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl1.1 --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+hostmakedepends="perl"
+short_desc="Toolkit for Transport Layer Security (version 1.1)"
+maintainer="John <me@johnnynator.dev>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
+conf_files="/etc/ssl1.1/openssl.cnf"
+replaces="libressl>=0"
+
+build_options=asm
+build_options_default="asm"
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppcle*) configure_args+=" linux-ppcle";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+pre_check() {
+	# developer test, fails due to different nm output
+	rm -f test/recipes/01-test_symbol_presence.t
+}
+
+post_install() {
+	rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl1.1-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/openssl1.1-devel b/srcpkgs/openssl1.1-devel
new file mode 120000
index 000000000000..da943cea53f5
--- /dev/null
+++ b/srcpkgs/openssl1.1-devel
@@ -0,0 +1 @@
+openssl1.1-compat/
\ No newline at end of file

From 7a66e21d2404636b83a998d9cfcb82751af56847 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 22 Feb 2023 16:06:42 -0500
Subject: [PATCH 10/10] gcsf: build with openssl1.1-compat

---
 srcpkgs/gcsf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 57aa68574521..ad3072eeb542 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
 # Template file for 'gcsf'
 pkgname=gcsf
 version=0.1.28
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel openssl-devel"
+makedepends="fuse-devel openssl1.1-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"