Github messages for voidlinux
 help / color / mirror / Atom feed
From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: openssl3
Date: Wed, 22 Jun 2022 16:37:15 +0200	[thread overview]
Message-ID: <20220622143715.DE_3TtBUbT8ft2CkKfKIUveMMn_Fb0bDu2BmbH9ppKY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37576@inbox.vuxu.org>

[-- 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"
+	}
+}

  parent reply	other threads:[~2022-06-22 14:37 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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
2022-06-18 13:30 ` dkwo
2022-06-18 13:40 ` dkwo
2022-06-18 13:52 ` dkwo
2022-06-22 14:35 ` New package: openssl3 dkwo
2022-06-22 14:37 ` dkwo [this message]
2022-06-22 14:37 ` dkwo
2022-06-22 15:41 ` leahneukirchen
2022-06-22 16:14 ` [PR PATCH] [Updated] " dkwo
2022-06-22 17:18 ` dkwo
2022-06-22 17:20 ` dkwo
2022-06-23 12:10 ` dkwo
2022-06-24 20:06 ` leahneukirchen
2022-06-25 17:02 ` [PR PATCH] [Closed]: " dkwo
2022-06-25 17:02 ` dkwo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220622143715.DE_3TtBUbT8ft2CkKfKIUveMMn_Fb0bDu2BmbH9ppKY@z \
    --to=dkwo@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).