* Re: New package: openssl3-3.0.3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
@ 2022-06-16 14:30 ` dkwo
2022-06-17 7:49 ` [PR PATCH] [Updated] " dkwo
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-16 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1157728146
Comment:
the armv7l:
`/usr/lib/gcc/armv7l-linux-gnueabihf/10.2.1/../../../../armv7l-linux-gnueabihf/bin/ld: cannot find -latomic`
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3-3.0.3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
2022-06-16 14:30 ` dkwo
@ 2022-06-17 7:49 ` dkwo
2022-06-17 7:51 ` dkwo
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-17 7:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3-3.0.3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, x86_64-musl
It currently fails two tests:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
not ok 2 - check that there are no missing symbols in libcrypto.so.3
not ok 4 - check that there are no missing symbols in libssl.so.3
80-test_ssl_new.t (Wstat: 256 Tests: 30 Failed: 1)
Failed test: 12
Non-zero exit status: 1
```
First failure is also seen in openssl-1.1.1o update (it seems related to our having an ancient nm (binutils), and the way it outputs), the second is fixed in 3.0.4.
Before I try to build anything using this or report the first issue upstream,
I wanted to make sure I'm not doing anything stupid.
Also, I can adapt current openssl patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4246 bytes --]
From 9c84aad46cfcfb7a155ab7550b4b63750928d22a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.3
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 88 +++++++++++++++++++++++++++++++++++++++
5 files changed, 93 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index d60d6fd74abf..7d16020c53e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,7 +1756,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..751fd7bab286
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.3
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=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";;
+ 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
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+ make ${makejobs} depend
+}
+
+post_install() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3-3.0.3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
2022-06-16 14:30 ` dkwo
2022-06-17 7:49 ` [PR PATCH] [Updated] " dkwo
@ 2022-06-17 7:51 ` dkwo
2022-06-17 8:08 ` dkwo
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-17 7:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3-3.0.3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, x86_64-musl
It currently fails two tests:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
not ok 2 - check that there are no missing symbols in libcrypto.so.3
not ok 4 - check that there are no missing symbols in libssl.so.3
80-test_ssl_new.t (Wstat: 256 Tests: 30 Failed: 1)
Failed test: 12
Non-zero exit status: 1
```
First failure is also seen in openssl-1.1.1o update (it seems related to our having an ancient nm (binutils), and the way it outputs), the second is fixed in 3.0.4.
Before I try to build anything using this or report the first issue upstream,
I wanted to make sure I'm not doing anything stupid.
Also, I can adapt current openssl patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4239 bytes --]
From 099d082061e3db4a0cd55bef48bb2af74865f7a8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.3
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 88 +++++++++++++++++++++++++++++++++++++++
5 files changed, 93 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index d60d6fd74abf..7d16020c53e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,7 +1756,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..a7c0c74639b3
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.3
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=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";;
+ 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
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+ configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+ make ${makejobs} depend
+}
+
+post_install() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3-3.0.3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (2 preceding siblings ...)
2022-06-17 7:51 ` dkwo
@ 2022-06-17 8:08 ` dkwo
2022-06-18 13:30 ` dkwo
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-17 8:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3-3.0.3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, x86_64-musl
It currently fails two tests:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
not ok 2 - check that there are no missing symbols in libcrypto.so.3
not ok 4 - check that there are no missing symbols in libssl.so.3
80-test_ssl_new.t (Wstat: 256 Tests: 30 Failed: 1)
Failed test: 12
Non-zero exit status: 1
```
First failure is also seen in openssl-1.1.1o update (it seems related to our having an ancient nm (binutils), and the way it outputs), the second is fixed in 3.0.4.
Before I try to build anything using this or report the first issue upstream,
I wanted to make sure I'm not doing anything stupid.
Also, I can adapt current openssl patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4203 bytes --]
From a35d5ddce422e1143dd97eb77b9ae2eacaa8405f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.3
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 85 +++++++++++++++++++++++++++++++++++++++
5 files changed, 90 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index d60d6fd74abf..7d16020c53e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,7 +1756,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..0a0050bca697
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,85 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.3
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=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";;
+ ppcle*) configure_args+=" linux-ppcle";;
+ ppc*) configure_args+=" linux-ppc";;
+ armv7*) makedepends+=" libatomic-devel";;
+ 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() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3-3.0.3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (3 preceding siblings ...)
2022-06-17 8:08 ` dkwo
@ 2022-06-18 13:30 ` dkwo
2022-06-18 13:40 ` dkwo
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-18 13:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3-3.0.3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, x86_64-musl
It currently fails two tests:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
not ok 2 - check that there are no missing symbols in libcrypto.so.3
not ok 4 - check that there are no missing symbols in libssl.so.3
80-test_ssl_new.t (Wstat: 256 Tests: 30 Failed: 1)
Failed test: 12
Non-zero exit status: 1
```
First failure is also seen in openssl-1.1.1o update (it seems related to our having an ancient nm (binutils), and the way it outputs), the second is fixed in 3.0.4.
Before I try to build anything using this or report the first issue upstream,
I wanted to make sure I'm not doing anything stupid.
Also, I can adapt current openssl patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4246 bytes --]
From 1507631590dcb3d05705f7de95d6df7fff11002d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.3
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 88 +++++++++++++++++++++++++++++++++++++++
5 files changed, 93 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index d60d6fd74abf..7d16020c53e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,7 +1756,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..69d910246d46
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.3
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+ build_options_default="asm"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+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";;
+ 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
+}
+
+post_install() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3-3.0.3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (4 preceding siblings ...)
2022-06-18 13:30 ` dkwo
@ 2022-06-18 13:40 ` dkwo
2022-06-18 13:52 ` dkwo
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-18 13:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3-3.0.3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, x86_64-musl
It currently fails two tests:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
not ok 2 - check that there are no missing symbols in libcrypto.so.3
not ok 4 - check that there are no missing symbols in libssl.so.3
80-test_ssl_new.t (Wstat: 256 Tests: 30 Failed: 1)
Failed test: 12
Non-zero exit status: 1
```
First failure is also seen in openssl-1.1.1o update (it seems related to our having an ancient nm (binutils), and the way it outputs), the second is fixed in 3.0.4.
Before I try to build anything using this or report the first issue upstream,
I wanted to make sure I'm not doing anything stupid.
Also, I can adapt current openssl patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4239 bytes --]
From 3286b4b29ac7d5f1d9e8894f39d7905ad3336abb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.3
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 88 +++++++++++++++++++++++++++++++++++++++
5 files changed, 93 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index d60d6fd74abf..7d16020c53e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,7 +1756,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..08b49d0651e8
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.3
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+ build_options_default="asm"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+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";;
+ 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
+}
+
+post_install() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3-3.0.3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (5 preceding siblings ...)
2022-06-18 13:40 ` dkwo
@ 2022-06-18 13:52 ` dkwo
2022-06-22 14:35 ` New package: openssl3 dkwo
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-18 13:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 320 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1157728146
Comment:
The armv7l has error
`/usr/lib/gcc/armv7l-linux-gnueabihf/10.2.1/../../../../armv7l-linux-gnueabihf/bin/ld: cannot find -latomic`
even after adding libatomic-devel to makedepends.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (6 preceding siblings ...)
2022-06-18 13:52 ` dkwo
@ 2022-06-22 14:35 ` dkwo
2022-06-22 14:37 ` [PR PATCH] [Updated] " dkwo
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-22 14:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1157728146
Comment:
The armv7l has error `/usr/lib/gcc/armv7l-linux-gnueabihf/10.2.1/../../../../armv7l-linux-gnueabihf/bin/ld: cannot find -latomic` even after adding libatomic-devel to makedepends.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (7 preceding siblings ...)
2022-06-22 14:35 ` New package: openssl3 dkwo
@ 2022-06-22 14:37 ` dkwo
2022-06-22 14:37 ` dkwo
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-22 14:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, `x86_64-musl`
- removed the c_rehash utility
- added a check for `"$XBPS_TARGET_NO_ATOMIC8" makedepends+=" libatomic-devel"`
It currently fails:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
```
This failure is also seen in openssl-1.1.1o update, and it seems related to our having an ancient nm (binutils), and the way it outputs. I can adapt current ppc patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4239 bytes --]
From e3874ede066d13f8d0fade15b3c2555e6f2d4924 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.4
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 88 +++++++++++++++++++++++++++++++++++++++
5 files changed, 93 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index d60d6fd74abf..7d16020c53e0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,7 +1756,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..879e0efa3e2b
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.4
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+ build_options_default="asm"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+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";;
+ 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
+}
+
+post_install() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (8 preceding siblings ...)
2022-06-22 14:37 ` [PR PATCH] [Updated] " dkwo
@ 2022-06-22 14:37 ` dkwo
2022-06-22 15:41 ` leahneukirchen
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-22 14:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1163188880
Comment:
@leahneukirchen Do you now what could be missing for armv7l ?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (9 preceding siblings ...)
2022-06-22 14:37 ` dkwo
@ 2022-06-22 15:41 ` leahneukirchen
2022-06-22 16:14 ` [PR PATCH] [Updated] " dkwo
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: leahneukirchen @ 2022-06-22 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1163278304
Comment:
Add libatomic-devel unconditionally?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (10 preceding siblings ...)
2022-06-22 15:41 ` leahneukirchen
@ 2022-06-22 16:14 ` dkwo
2022-06-22 17:18 ` dkwo
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-22 16:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, `x86_64-musl`
- removed the c_rehash utility
- added a check for `"$XBPS_TARGET_NO_ATOMIC8" makedepends+=" libatomic-devel"`
It currently fails:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
```
This failure is also seen in openssl-1.1.1o update, and it seems related to our having an ancient nm (binutils), and the way it outputs. I can adapt current ppc patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4240 bytes --]
From 1065baa8294232d8eadc408fed4aae4c285ca06f Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.4
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 88 +++++++++++++++++++++++++++++++++++++++
5 files changed, 93 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index 91d4514ed285..52b1839c03f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1757,7 +1757,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..b52cac0ee079
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,88 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.4
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+ build_options_default="asm"
+fi
+
+#if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+makedepends+=" libatomic-devel"
+#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";;
+ 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
+}
+
+post_install() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (11 preceding siblings ...)
2022-06-22 16:14 ` [PR PATCH] [Updated] " dkwo
@ 2022-06-22 17:18 ` dkwo
2022-06-22 17:20 ` dkwo
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-22 17:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages ossl3
https://github.com/void-linux/void-packages/pull/37576
New package: openssl3
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, `x86_64-musl`
- removed the c_rehash utility
- added a check for `"$XBPS_TARGET_NO_ATOMIC8" makedepends+=" libatomic-devel"`
It currently fails:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
```
This failure is also seen in openssl-1.1.1o update, and it seems related to our having an ancient nm (binutils), and the way it outputs. I can adapt current ppc patches later if needed.
A patch file from https://github.com/void-linux/void-packages/pull/37576.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ossl3-37576.patch --]
[-- Type: text/x-diff, Size: 4378 bytes --]
From a0b51e596c40786332cc49e4668d4c42d70adbe6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 15 Jun 2022 19:25:30 +0200
Subject: [PATCH] New package: openssl3-3.0.4
---
common/shlibs | 2 +
srcpkgs/libcrypto3.0 | 1 +
srcpkgs/libssl3.0 | 1 +
srcpkgs/openssl3.0-devel | 1 +
srcpkgs/openssl3/template | 93 +++++++++++++++++++++++++++++++++++++++
5 files changed, 98 insertions(+)
create mode 120000 srcpkgs/libcrypto3.0
create mode 120000 srcpkgs/libssl3.0
create mode 120000 srcpkgs/openssl3.0-devel
create mode 100644 srcpkgs/openssl3/template
diff --git a/common/shlibs b/common/shlibs
index 91d4514ed285..52b1839c03f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1757,7 +1757,9 @@ libid3-3.8.so.3 id3lib-3.8.3_1
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
+libcrypto.so.3 libcrypto3.0-3.0.3_1
libssl.so.1.1 libssl1.1-1.1.1f_1
+libssl.so.3 libssl3.0-3.0.3_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/libcrypto3.0 b/srcpkgs/libcrypto3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libcrypto3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/libssl3.0 b/srcpkgs/libssl3.0
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/libssl3.0
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3.0-devel b/srcpkgs/openssl3.0-devel
new file mode 120000
index 000000000000..deb4b92de834
--- /dev/null
+++ b/srcpkgs/openssl3.0-devel
@@ -0,0 +1 @@
+openssl3
\ No newline at end of file
diff --git a/srcpkgs/openssl3/template b/srcpkgs/openssl3/template
new file mode 100644
index 000000000000..0a15b07d3fc1
--- /dev/null
+++ b/srcpkgs/openssl3/template
@@ -0,0 +1,93 @@
+# Template file for 'openssl3'
+pkgname=openssl3
+version=3.0.4
+revision=1
+# bootstrap=yes
+wrksrc=openssl-${version}
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl3 --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="dkwo <npiazza@disroot.org>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f
+conf_files="/etc/ssl3/openssl.cnf"
+replaces="libressl>=0"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+ build_options_default="asm"
+fi
+
+# due to our libatomic issues
+makedepends+=" libatomic-devel"
+
+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
+}
+
+do_check() {
+ # due to our binutils being too old
+ rm -f test/recipes/01-test_symbol_presence.t
+ ${make_check_pre} make ${make_check_args} test
+}
+
+post_install() {
+ rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto3.0_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-3
+ }
+}
+
+libssl3.0_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl3.0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${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"
+ }
+}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (12 preceding siblings ...)
2022-06-22 17:18 ` dkwo
@ 2022-06-22 17:20 ` dkwo
2022-06-23 12:10 ` dkwo
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-22 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1163406237
Comment:
Thanks, that solves it.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (13 preceding siblings ...)
2022-06-22 17:20 ` dkwo
@ 2022-06-23 12:10 ` dkwo
2022-06-24 20:06 ` leahneukirchen
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-23 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1164329494
Comment:
Now it works, but of course it has a huge overlap with openssl. Perhaps it's simpler to have this as an update, rather than new package, as the shift will happen anyway at some point (the tricky part is rebuild anyything that shlib-requires libssl or libcrypto). To this end, is there a reason why `ca-certificates` depends on `openssl<=2.0_1` ? This seems to be the only manifest obstacle at present.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (14 preceding siblings ...)
2022-06-23 12:10 ` dkwo
@ 2022-06-24 20:06 ` leahneukirchen
2022-06-25 17:02 ` dkwo
2022-06-25 17:02 ` [PR PATCH] [Closed]: " dkwo
17 siblings, 0 replies; 19+ messages in thread
From: leahneukirchen @ 2022-06-24 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1165897788
Comment:
I agree we should just have one version of OpenSSL.
The depends is obsolete and was introduced due to libressl back then.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (15 preceding siblings ...)
2022-06-24 20:06 ` leahneukirchen
@ 2022-06-25 17:02 ` dkwo
2022-06-25 17:02 ` [PR PATCH] [Closed]: " dkwo
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-25 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/37576#issuecomment-1166325933
Comment:
ok, let me do that in a new pr.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Closed]: New package: openssl3
2022-06-15 19:48 [PR PATCH] New package: openssl3-3.0.3 dkwo
` (16 preceding siblings ...)
2022-06-25 17:02 ` dkwo
@ 2022-06-25 17:02 ` dkwo
17 siblings, 0 replies; 19+ messages in thread
From: dkwo @ 2022-06-25 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 950 bytes --]
There's a closed pull request on the void-packages repository
New package: openssl3
https://github.com/void-linux/void-packages/pull/37576
Description:
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES
- I built this PR locally for my native architecture, `x86_64-musl`
- removed the c_rehash utility
- added a check for `"$XBPS_TARGET_NO_ATOMIC8" makedepends+=" libatomic-devel"`
It currently fails:
```
01-test_symbol_presence.t (Wstat: 512 Tests: 4 Failed: 2)
Failed tests: 2, 4
Non-zero exit status: 2
```
This failure is also seen in openssl-1.1.1o update, and it seems related to our having an ancient nm (binutils), and the way it outputs. I can adapt current ppc patches later if needed.
^ permalink raw reply [flat|nested] 19+ messages in thread