* [PR PATCH] [RFC] add new libtls implementation
@ 2021-01-05 1:31 ericonr
2021-01-24 21:20 ` [PR REVIEW] " Johnnynator
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: ericonr @ 2021-01-05 1:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libretls
https://github.com/void-linux/void-packages/pull/27675
[RFC] add new libtls implementation
Based on #21056 and some discussion in #20935
@leahneukirchen has suggested an alternative that is building only `libtls` from LibreSSL instead. I haven't tried this one yet.
My current propositions are:
- libretls from causal agency, which is the author of most of the software in our repos that depend on libtls
- libtls-bearssl, which is based on BearSSL instead of any sort of mix between LibreSSL/OpenSSL
A patch file from https://github.com/void-linux/void-packages/pull/27675.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libretls-27675.patch --]
[-- Type: text/x-diff, Size: 12280 bytes --]
From ab37c2553fa9de0c8889daf5902a68a9222678e3 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 1/3] New package: openssl-1.1.1f
---
common/shlibs | 2 +
srcpkgs/libcrypto1.1 | 1 +
srcpkgs/libssl1.1 | 1 +
srcpkgs/openssl-c_rehash | 1 +
srcpkgs/openssl-devel | 1 +
srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
srcpkgs/openssl/patches/ppc64.patch | 96 ++++++++++++++++++++++++++
srcpkgs/openssl/template | 88 +++++++++++++++++++++++
8 files changed, 207 insertions(+)
create mode 120000 srcpkgs/libcrypto1.1
create mode 120000 srcpkgs/libssl1.1
create mode 120000 srcpkgs/openssl-c_rehash
create mode 120000 srcpkgs/openssl-devel
create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
create mode 100644 srcpkgs/openssl/patches/ppc64.patch
create mode 100644 srcpkgs/openssl/template
diff --git a/common/shlibs b/common/shlibs
index 26a6259f6d2..ec5dc7975ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1800,6 +1800,8 @@ libjq.so.1 jq-devel-1.4_1
libcrypto.so.43 libcrypto43-2.7.2_1
libssl.so.45 libssl45-2.7.2_1
libtls.so.17 libtls17-2.7.2_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
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -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 */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/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
+--- 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)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..64812a35447
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1g
+revision=1
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib shared
+ no-async no-comp no-idea no-mdc2 no-rc5 no-ec2m no-sm2 no-sm4 no-ssl2
+ no-ssl3 no-seed no-weak-ssl-ciphers -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=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="libressl<=3.0.2_2"
+
+alternatives="openssl:openssl:/usr/bin/openssl-openssl"
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+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
+}
+
+post_install() {
+ mv ${DESTDIR}/usr/bin/openssl{,-openssl}
+}
+
+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}"
+ conflicts="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"
+ }
+}
From bdcf4f3463e4dc96567b91f8d254f0904722dcfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 Jan 2021 20:25:45 -0300
Subject: [PATCH 2/3] New package: libretls-3.3.1.
---
srcpkgs/libretls-devel | 1 +
srcpkgs/libretls/template | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
create mode 120000 srcpkgs/libretls-devel
create mode 100644 srcpkgs/libretls/template
diff --git a/srcpkgs/libretls-devel b/srcpkgs/libretls-devel
new file mode 120000
index 00000000000..9587ad2c40d
--- /dev/null
+++ b/srcpkgs/libretls-devel
@@ -0,0 +1 @@
+libretls
\ No newline at end of file
diff --git a/srcpkgs/libretls/template b/srcpkgs/libretls/template
new file mode 100644
index 00000000000..4c81c06c983
--- /dev/null
+++ b/srcpkgs/libretls/template
@@ -0,0 +1,23 @@
+# Template file for 'libretls'
+pkgname=libretls
+version=3.3.1
+revision=1
+build_style=gnu-configure
+makedepends="openssl-devel"
+short_desc="Libtls for OpenSSL"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="ISC, 3-Clause-BSD, MIT"
+homepage="https://git.causal.agency/libretls"
+distfiles="https://causal.agency/libretls/libretls-${version}.tar.gz"
+checksum=f23a29ef321eff099b8fbabdecc3a3378cfb9eca24b2bf02062554e9779c4d33
+
+libretls-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ }
+}
From 39afbb8a62da25985db052708110f11ac2d0dbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 Jan 2021 20:35:58 -0300
Subject: [PATCH 3/3] New package: libtls-bearssl-0.3.
---
srcpkgs/libtls-bearssl-devel | 1 +
srcpkgs/libtls-bearssl/template | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libtls-bearssl-devel
create mode 100644 srcpkgs/libtls-bearssl/template
diff --git a/srcpkgs/libtls-bearssl-devel b/srcpkgs/libtls-bearssl-devel
new file mode 120000
index 00000000000..a0d085ba3b1
--- /dev/null
+++ b/srcpkgs/libtls-bearssl-devel
@@ -0,0 +1 @@
+libtls-bearssl
\ No newline at end of file
diff --git a/srcpkgs/libtls-bearssl/template b/srcpkgs/libtls-bearssl/template
new file mode 100644
index 00000000000..5cc4c53d396
--- /dev/null
+++ b/srcpkgs/libtls-bearssl/template
@@ -0,0 +1,25 @@
+# Template file for 'libtls-bearssl'
+pkgname=libtls-bearssl
+version=0.3
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="bearssl-devel"
+short_desc="Libtls implemented on top of BearSSL"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://sr.ht/~mcf/libtls-bearssl"
+distfiles="https://github.com/michaelforney/libtls-bearssl/releases/download/${version}/libtls-bearssl-${version}.tar.gz"
+checksum=bcbcb423326c6ee41ae350788d4d50534632924ba8617fa170cc401be8d3a6e9
+
+libtls-bearssl-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] [RFC] add new libtls implementation
2021-01-05 1:31 [PR PATCH] [RFC] add new libtls implementation ericonr
@ 2021-01-24 21:20 ` Johnnynator
2021-02-11 19:02 ` ericonr
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Johnnynator @ 2021-01-24 21:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/27675#discussion_r563351320
Comment:
Misses `pkg-config` in `hostmakedepends`
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC] add new libtls implementation
2021-01-05 1:31 [PR PATCH] [RFC] add new libtls implementation ericonr
2021-01-24 21:20 ` [PR REVIEW] " Johnnynator
@ 2021-02-11 19:02 ` ericonr
2021-02-11 19:55 ` [PR PATCH] [Updated] " ericonr
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-11 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27675#issuecomment-777717365
Comment:
The `libtls-standalone` option is https://gitlab.alpinelinux.org/alpine/aports/-/blob/6012e47e379b125867e0dddada4ce1af2d589d5a/main/libtls-standalone/APKBUILD , but it is unmaintained (was only moved back to main because other things depend on it), and idk if all these workarounds are necessary with recent LibreSSL.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] add new libtls implementation
2021-01-05 1:31 [PR PATCH] [RFC] add new libtls implementation ericonr
2021-01-24 21:20 ` [PR REVIEW] " Johnnynator
2021-02-11 19:02 ` ericonr
@ 2021-02-11 19:55 ` ericonr
2021-02-13 14:29 ` leahneukirchen
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-11 19:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 845 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages libretls
https://github.com/void-linux/void-packages/pull/27675
[RFC] add new libtls implementation
Based on #21056 and some discussion in #20935
@leahneukirchen has suggested an alternative that is building only `libtls` from LibreSSL instead. I haven't tried this one yet.( See https://github.com/libressl-portable/portable/commit/fe42a8011b25797afa48cf0359c7e2753b2ece5f )
My current propositions are:
- libretls from causal agency, who is the author of most of the software in our repos that depend on libtls
- libtls-bearssl, which is based on BearSSL instead of any sort of mix between LibreSSL/OpenSSL
A patch file from https://github.com/void-linux/void-packages/pull/27675.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libretls-27675.patch --]
[-- Type: text/x-diff, Size: 12406 bytes --]
From 297107c3f05353450a74237fd146c28fa34a402f Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 1/3] New package: openssl-1.1.1f
---
common/shlibs | 5 ++
srcpkgs/libcrypto1.1 | 1 +
srcpkgs/libssl1.1 | 1 +
srcpkgs/openssl-c_rehash | 1 +
srcpkgs/openssl-devel | 1 +
srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
srcpkgs/openssl/patches/ppc64.patch | 96 ++++++++++++++++++++++++++
srcpkgs/openssl/template | 88 +++++++++++++++++++++++
8 files changed, 210 insertions(+)
create mode 120000 srcpkgs/libcrypto1.1
create mode 120000 srcpkgs/libssl1.1
create mode 120000 srcpkgs/openssl-c_rehash
create mode 120000 srcpkgs/openssl-devel
create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
create mode 100644 srcpkgs/openssl/patches/ppc64.patch
create mode 100644 srcpkgs/openssl/template
diff --git a/common/shlibs b/common/shlibs
index c9d19402628..e2c999d4793 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ 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.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_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
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -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 */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/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
+--- 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)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..64812a35447
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1g
+revision=1
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib shared
+ no-async no-comp no-idea no-mdc2 no-rc5 no-ec2m no-sm2 no-sm4 no-ssl2
+ no-ssl3 no-seed no-weak-ssl-ciphers -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=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="libressl<=3.0.2_2"
+
+alternatives="openssl:openssl:/usr/bin/openssl-openssl"
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+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
+}
+
+post_install() {
+ mv ${DESTDIR}/usr/bin/openssl{,-openssl}
+}
+
+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}"
+ conflicts="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"
+ }
+}
From e4858a5a63fb2fcb9c14f45791c19dfc35650e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 Jan 2021 20:25:45 -0300
Subject: [PATCH 2/3] New package: libretls-3.3.1.
---
srcpkgs/libretls-devel | 1 +
srcpkgs/libretls/template | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 120000 srcpkgs/libretls-devel
create mode 100644 srcpkgs/libretls/template
diff --git a/srcpkgs/libretls-devel b/srcpkgs/libretls-devel
new file mode 120000
index 00000000000..9587ad2c40d
--- /dev/null
+++ b/srcpkgs/libretls-devel
@@ -0,0 +1 @@
+libretls
\ No newline at end of file
diff --git a/srcpkgs/libretls/template b/srcpkgs/libretls/template
new file mode 100644
index 00000000000..fe275fcfb68
--- /dev/null
+++ b/srcpkgs/libretls/template
@@ -0,0 +1,24 @@
+# Template file for 'libretls'
+pkgname=libretls
+version=3.3.1
+revision=1
+build_style=gnu-configure
+hostmakedepnds="pkg-config"
+makedepends="openssl-devel"
+short_desc="Libtls for OpenSSL"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="ISC, 3-Clause-BSD, MIT"
+homepage="https://git.causal.agency/libretls"
+distfiles="https://causal.agency/libretls/libretls-${version}.tar.gz"
+checksum=f23a29ef321eff099b8fbabdecc3a3378cfb9eca24b2bf02062554e9779c4d33
+
+libretls-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ }
+}
From 90587487b647dd8e95cd328ee5b1c1de67d445c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 4 Jan 2021 20:35:58 -0300
Subject: [PATCH 3/3] New package: libtls-bearssl-0.3.
---
srcpkgs/libtls-bearssl-devel | 1 +
srcpkgs/libtls-bearssl/template | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 120000 srcpkgs/libtls-bearssl-devel
create mode 100644 srcpkgs/libtls-bearssl/template
diff --git a/srcpkgs/libtls-bearssl-devel b/srcpkgs/libtls-bearssl-devel
new file mode 120000
index 00000000000..a0d085ba3b1
--- /dev/null
+++ b/srcpkgs/libtls-bearssl-devel
@@ -0,0 +1 @@
+libtls-bearssl
\ No newline at end of file
diff --git a/srcpkgs/libtls-bearssl/template b/srcpkgs/libtls-bearssl/template
new file mode 100644
index 00000000000..5cc4c53d396
--- /dev/null
+++ b/srcpkgs/libtls-bearssl/template
@@ -0,0 +1,25 @@
+# Template file for 'libtls-bearssl'
+pkgname=libtls-bearssl
+version=0.3
+revision=1
+build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="bearssl-devel"
+short_desc="Libtls implemented on top of BearSSL"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://sr.ht/~mcf/libtls-bearssl"
+distfiles="https://github.com/michaelforney/libtls-bearssl/releases/download/${version}/libtls-bearssl-${version}.tar.gz"
+checksum=bcbcb423326c6ee41ae350788d4d50534632924ba8617fa170cc401be8d3a6e9
+
+libtls-bearssl-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC] add new libtls implementation
2021-01-05 1:31 [PR PATCH] [RFC] add new libtls implementation ericonr
` (2 preceding siblings ...)
2021-02-11 19:55 ` [PR PATCH] [Updated] " ericonr
@ 2021-02-13 14:29 ` leahneukirchen
2021-02-21 22:54 ` ericonr
2021-02-21 22:54 ` [PR PATCH] [Closed]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: leahneukirchen @ 2021-02-13 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/27675#issuecomment-778627208
Comment:
LibreSSL libtls: #28732
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC] add new libtls implementation
2021-01-05 1:31 [PR PATCH] [RFC] add new libtls implementation ericonr
` (3 preceding siblings ...)
2021-02-13 14:29 ` leahneukirchen
@ 2021-02-21 22:54 ` ericonr
2021-02-21 22:54 ` [PR PATCH] [Closed]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-21 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27675#issuecomment-782943247
Comment:
Closing in favor of leah's approach.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: [RFC] add new libtls implementation
2021-01-05 1:31 [PR PATCH] [RFC] add new libtls implementation ericonr
` (4 preceding siblings ...)
2021-02-21 22:54 ` ericonr
@ 2021-02-21 22:54 ` ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-21 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 688 bytes --]
There's a closed pull request on the void-packages repository
[RFC] add new libtls implementation
https://github.com/void-linux/void-packages/pull/27675
Description:
Based on #21056 and some discussion in #20935
@leahneukirchen has suggested an alternative that is building only `libtls` from LibreSSL instead. I haven't tried this one yet.( See https://github.com/libressl-portable/portable/commit/fe42a8011b25797afa48cf0359c7e2753b2ece5f )
My current propositions are:
- libretls from causal agency, who is the author of most of the software in our repos that depend on libtls
- libtls-bearssl, which is based on BearSSL instead of any sort of mix between LibreSSL/OpenSSL
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-02-21 22:54 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-05 1:31 [PR PATCH] [RFC] add new libtls implementation ericonr
2021-01-24 21:20 ` [PR REVIEW] " Johnnynator
2021-02-11 19:02 ` ericonr
2021-02-11 19:55 ` [PR PATCH] [Updated] " ericonr
2021-02-13 14:29 ` leahneukirchen
2021-02-21 22:54 ` ericonr
2021-02-21 22:54 ` [PR PATCH] [Closed]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).