New package: openssl-1.1.1j
This commit is contained in:
parent
93b7dea4ba
commit
d90dba0ae2
8 changed files with 205 additions and 0 deletions
common
srcpkgs
|
@ -1760,6 +1760,8 @@ libid3.so id3lib-3.8.3_1
|
|||
libid3-3.8.so.3 id3lib-3.8.3_1
|
||||
libgirara-gtk3.so.3 girara-0.2.8_1
|
||||
libjq.so.1 jq-devel-1.4_1
|
||||
libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
|
||||
libssl.so.1.1 libssl1.1-1.1.1f_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
srcpkgs/libcrypto1.1
Symbolic link
1
srcpkgs/libcrypto1.1
Symbolic link
|
@ -0,0 +1 @@
|
|||
openssl
|
1
srcpkgs/libssl1.1
Symbolic link
1
srcpkgs/libssl1.1
Symbolic link
|
@ -0,0 +1 @@
|
|||
openssl
|
1
srcpkgs/openssl-c_rehash
Symbolic link
1
srcpkgs/openssl-c_rehash
Symbolic link
|
@ -0,0 +1 @@
|
|||
openssl
|
1
srcpkgs/openssl-devel
Symbolic link
1
srcpkgs/openssl-devel
Symbolic link
|
@ -0,0 +1 @@
|
|||
openssl
|
17
srcpkgs/openssl/patches/ppc-auxv.patch
Normal file
17
srcpkgs/openssl/patches/ppc-auxv.patch
Normal file
|
@ -0,0 +1,17 @@
|
|||
--- crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000
|
||||
+++ crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000
|
||||
@@ -207,11 +207,9 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
|
||||
-# if __GLIBC_PREREQ(2, 16)
|
||||
-# include <sys/auxv.h>
|
||||
-# define OSSL_IMPLEMENT_GETAUXVAL
|
||||
-# endif
|
||||
+#if defined(__linux__)
|
||||
+# include <sys/auxv.h>
|
||||
+# define OSSL_IMPLEMENT_GETAUXVAL
|
||||
#endif
|
||||
|
||||
/* I wish <sys/auxv.h> was universally available */
|
96
srcpkgs/openssl/patches/ppc64.patch
Normal file
96
srcpkgs/openssl/patches/ppc64.patch
Normal file
|
@ -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
|
||||
--- crypto/perlasm/ppc-xlate.pl
|
||||
+++ 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
|
||||
--- Configure
|
||||
+++ 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)-/) {
|
86
srcpkgs/openssl/template
Normal file
86
srcpkgs/openssl/template
Normal file
|
@ -0,0 +1,86 @@
|
|||
# Template file for 'openssl'
|
||||
pkgname=openssl
|
||||
version=1.1.1j
|
||||
revision=1
|
||||
bootstrap=yes
|
||||
build_style=configure
|
||||
configure_script="./Configure"
|
||||
configure_args="--prefix=/usr --openssldir=/etc/ssl --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"
|
||||
short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
|
||||
maintainer="John <johnz@posteo.net>"
|
||||
license="OpenSSL-License"
|
||||
homepage="https://www.openssl.org"
|
||||
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
|
||||
checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
|
||||
conf_files="/etc/ssl/openssl.cnf"
|
||||
replaces="openssl>=0"
|
||||
|
||||
build_options=asm
|
||||
|
||||
if [ "$CHROOT_READY" ]; then
|
||||
hostmakedepends="perl"
|
||||
build_options_default="asm"
|
||||
fi
|
||||
|
||||
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";;
|
||||
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
|
||||
}
|
||||
|
||||
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.*"
|
||||
}
|
||||
}
|
||||
|
||||
openssl-c_rehash_package() {
|
||||
short_desc+=" - c_rehash utility"
|
||||
depends="openssl perl"
|
||||
pkg_install() {
|
||||
vmove usr/bin/c_rehash
|
||||
}
|
||||
}
|
||||
|
||||
openssl-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"
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue