Skip to content

Commit d90dba0

Browse files
JohnnynatorJohnnynator
committed
New package: openssl-1.1.1j
1 parent 93b7dea commit d90dba0

File tree

8 files changed

+205
-0
lines changed

8 files changed

+205
-0
lines changed

‎common/shlibs

+2
Original file line numberDiff line numberDiff line change
@@ -1760,6 +1760,8 @@ libid3.so id3lib-3.8.3_1
17601760
libid3-3.8.so.3 id3lib-3.8.3_1
17611761
libgirara-gtk3.so.3 girara-0.2.8_1
17621762
libjq.so.1 jq-devel-1.4_1
1763+
libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
1764+
libssl.so.1.1 libssl1.1-1.1.1f_1
17631765
libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
17641766
libportmidi.so portmidi-217_1
17651767
libWildMidi.so.2 libwildmidi-0.4.3_1

‎srcpkgs/libcrypto1.1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
openssl

‎srcpkgs/libssl1.1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
openssl

‎srcpkgs/openssl-c_rehash

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
openssl

‎srcpkgs/openssl-devel

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
openssl

‎srcpkgs/openssl/patches/ppc-auxv.patch

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--- crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000
2+
+++ crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000
3+
@@ -207,11 +207,9 @@
4+
return 0;
5+
}
6+
7+
-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
8+
-# if __GLIBC_PREREQ(2, 16)
9+
-# include <sys/auxv.h>
10+
-# define OSSL_IMPLEMENT_GETAUXVAL
11+
-# endif
12+
+#if defined(__linux__)
13+
+# include <sys/auxv.h>
14+
+# define OSSL_IMPLEMENT_GETAUXVAL
15+
#endif
16+
17+
/* I wish <sys/auxv.h> was universally available */

‎srcpkgs/openssl/patches/ppc64.patch

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
2+
From: Andy Polyakov <appro@openssl.org>
3+
Date: Sun, 5 May 2019 18:25:50 +0200
4+
Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
This is a big endian ELFv2 configuration. ELFv2 was already being
10+
used for little endian, and big endian was traditionally ELFv1
11+
but there are practical configurations that use ELFv2 with big
12+
endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
13+
14+
Reviewed-by: Paul Dale <paul.dale@oracle.com>
15+
Reviewed-by: Richard Levitte <levitte@openssl.org>
16+
(Merged from https://github.com/openssl/openssl/pull/8883)
17+
---
18+
crypto/perlasm/ppc-xlate.pl | 8 ++++----
19+
1 file changed, 4 insertions(+), 4 deletions(-)
20+
21+
diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
22+
index e52f2f6ea62..5fcd0526dff 100755
23+
--- crypto/perlasm/ppc-xlate.pl
24+
+++ crypto/perlasm/ppc-xlate.pl
25+
@@ -49,7 +49,7 @@
26+
/osx/ && do { $name = "_$name";
27+
last;
28+
};
29+
- /linux.*(32|64le)/
30+
+ /linux.*(32|64(le|v2))/
31+
&& do { $ret .= ".globl $name";
32+
if (!$$type) {
33+
$ret .= "\n.type $name,\@function";
34+
@@ -80,7 +80,7 @@
35+
};
36+
my $text = sub {
37+
my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
38+
- $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/);
39+
+ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64(le|v2)/);
40+
$ret;
41+
};
42+
my $machine = sub {
43+
@@ -186,7 +186,7 @@
44+
45+
# Some ABIs specify vrsave, special-purpose register #256, as reserved
46+
# for system use.
47+
-my $no_vrsave = ($flavour =~ /aix|linux64le/);
48+
+my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
49+
my $mtspr = sub {
50+
my ($f,$idx,$ra) = @_;
51+
if ($idx == 256 && $no_vrsave) {
52+
@@ -318,7 +318,7 @@ sub vfour {
53+
if ($label) {
54+
my $xlated = ($GLOBALS{$label} or $label);
55+
print "$xlated:";
56+
- if ($flavour =~ /linux.*64le/) {
57+
+ if ($flavour =~ /linux.*64(le|v2)/) {
58+
if ($TYPES{$label} =~ /function/) {
59+
printf "\n.localentry %s,0\n",$xlated;
60+
}
61+
62+
From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
63+
From: Andy Polyakov <appro@openssl.org>
64+
Date: Sun, 5 May 2019 18:30:55 +0200
65+
Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
66+
67+
If _CALL_ELF is defined to be 2, it's an ELFv2 system.
68+
Conditionally switch to the v2 perlasm scheme.
69+
70+
Reviewed-by: Paul Dale <paul.dale@oracle.com>
71+
Reviewed-by: Richard Levitte <levitte@openssl.org>
72+
(Merged from https://github.com/openssl/openssl/pull/8883)
73+
---
74+
Configure | 10 +++++++---
75+
1 file changed, 7 insertions(+), 3 deletions(-)
76+
77+
diff --git a/Configure b/Configure
78+
index 22082deb4c7..e303d98deb3 100755
79+
--- Configure
80+
+++ Configure
81+
@@ -1402,8 +1402,15 @@
82+
my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
83+
my %predefined_CXX = $config{CXX}
84+
? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
85+
: ();
86+
87+
+unless ($disabled{asm}) {
88+
+ # big endian systems can use ELFv2 ABI
89+
+ if ($target eq "linux-ppc64") {
90+
+ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
91+
+ }
92+
+}
93+
+
94+
# Check for makedepend capabilities.
95+
if (!$disabled{makedepend}) {
96+
if ($config{target} =~ /^(VC|vms)-/) {

‎srcpkgs/openssl/template

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# Template file for 'openssl'
2+
pkgname=openssl
3+
version=1.1.1j
4+
revision=1
5+
bootstrap=yes
6+
build_style=configure
7+
configure_script="./Configure"
8+
configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
9+
shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
10+
-Wa,--noexecstack"
11+
make_cmd=make
12+
make_build_args='MAKEDEPPROG="$(CC)'
13+
make_check_target=test
14+
make_install_args="MANSUFFIX=ssl"
15+
short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
16+
maintainer="John <johnz@posteo.net>"
17+
license="OpenSSL-License"
18+
homepage="https://www.openssl.org"
19+
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
20+
checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
21+
conf_files="/etc/ssl/openssl.cnf"
22+
replaces="openssl>=0"
23+
24+
build_options=asm
25+
26+
if [ "$CHROOT_READY" ]; then
27+
hostmakedepends="perl"
28+
build_options_default="asm"
29+
fi
30+
31+
case $XBPS_TARGET_MACHINE in
32+
x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
33+
i686*) configure_args+=" linux-elf";;
34+
aarch64*) configure_args+=" linux-aarch64";;
35+
ppc64le*) configure_args+=" linux-ppc64le";;
36+
ppc64*) configure_args+=" linux-ppc64";;
37+
ppc*) configure_args+=" linux-ppc";;
38+
arm*) configure_args+=" linux-armv4";;
39+
mips*) configure_args+=" linux-mips32 -mips32";;
40+
*) broken="$XBPS_TARGET_MACHINE";;
41+
esac
42+
43+
pre_configure() {
44+
configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
45+
}
46+
47+
pre_build() {
48+
make ${makejobs} depend
49+
}
50+
51+
libcrypto1.1_package() {
52+
short_desc+=" - crypto library"
53+
pkg_install() {
54+
vmove "usr/lib/libcrypto.so.*"
55+
vmove usr/lib/engines-1.1
56+
}
57+
}
58+
59+
libssl1.1_package() {
60+
short_desc+=" - SSL/TLS library"
61+
pkg_install() {
62+
vmove "usr/lib/libssl.so.*"
63+
}
64+
}
65+
66+
openssl-c_rehash_package() {
67+
short_desc+=" - c_rehash utility"
68+
depends="openssl perl"
69+
pkg_install() {
70+
vmove usr/bin/c_rehash
71+
}
72+
}
73+
74+
openssl-devel_package() {
75+
depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
76+
replaces="libressl-devel>=0"
77+
short_desc+=" - development files"
78+
pkg_install() {
79+
vmove usr/share/man/man3
80+
vmove usr/share/doc
81+
vmove usr/include
82+
vmove usr/lib/pkgconfig
83+
vmove "usr/lib/*.a"
84+
vmove "usr/lib/*.so"
85+
}
86+
}

0 commit comments

Comments
 (0)