mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-16 14:17:02 +02:00
openssl: update to 3.1.2
This commit is contained in:
dkwo
classabbyamp
parent
eb453e6e0e
commit
595b5584e2
7 changed files with 11 additions and 190 deletions
|
|
@ -1782,8 +1782,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-3.1.2_1
|
||||
libssl.so.3 libssl3-3.1.2_1
|
||||
libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
|
||||
libportmidi.so portmidi-217_1
|
||||
libWildMidi.so.2 libwildmidi-0.4.3_1
|
||||
|
|
|
|||
|
|
@ -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__)
|
||||
|
|
@ -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)-/) {
|
||||
|
|
@ -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
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'openssl'
|
||||
pkgname=openssl
|
||||
version=1.1.1t
|
||||
revision=2
|
||||
version=3.1.2
|
||||
revision=1
|
||||
bootstrap=yes
|
||||
build_style=configure
|
||||
configure_script="./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=a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539
|
||||
conf_files="/etc/ssl/openssl.cnf"
|
||||
replaces="libressl>=0"
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ 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 libssl3 openssl-devel"
|
||||
fi
|
||||
|
||||
case $XBPS_TARGET_MACHINE in
|
||||
|
|
@ -54,26 +54,21 @@ 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() {
|
||||
if [ ! "$CHROOT_READY" ]; then
|
||||
rm -f "${DESTDIR}/usr/bin/c_rehash"
|
||||
fi
|
||||
}
|
||||
|
||||
libcrypto1.1_package() {
|
||||
libcrypto3_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_package() {
|
||||
short_desc+=" - SSL/TLS library"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/libssl.so.*"
|
||||
|
|
@ -89,7 +84,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>=${version}_${revision} libcrypto3>=${version}_${revision}"
|
||||
replaces="libressl-devel>=0"
|
||||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue