From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] s6-networking: add bearssl option, add devel deps.
Date: Tue, 25 Aug 2020 13:51:47 +0200 [thread overview]
Message-ID: <20200825115147.bZnXRhcow0yeF67FOjKLey0zOXsH5NZq8Oug-remYAQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24406@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages s6
https://github.com/void-linux/void-packages/pull/24406
s6-networking: add bearssl option, add devel deps.
s6-networking can also be built with BearSSL support, with full
functionality. The devel package for the chosen SSL library and
skalibs-devel are necessary for development with s6-networking
libraries, so they have been added as dependencies to the
s6-networking-devel.
Also xlint.
A patch file from https://github.com/void-linux/void-packages/pull/24406.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s6-24406.patch --]
[-- Type: text/x-diff, Size: 2641 bytes --]
From da6fb3933776b67c4b1e9c1aff47a98c9b40b792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 22 Aug 2020 01:18:39 -0300
Subject: [PATCH] s6-networking: add bearssl option, add devel deps.
s6-networking can also be built with BearSSL support with full
functionality. The devel package for the chosen SSL library and
skalibs-devel are necessary for development with s6-networking
libraries, so they have been added as dependencies to
s6-networking-devel.
The template has also been xlintified.
---
srcpkgs/s6-networking/template | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 832b56ba251..50ff6abbc1f 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,20 +1,28 @@
# Template file for 's6-networking'
pkgname=s6-networking
version=2.3.1.2
-revision=2
+revision=3
build_style=configure
-configure_args="--libdir=/usr/lib --enable-ssl=libressl
+configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+ $(vopt_if bearssl --enable-ssl=bearssl)
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
--with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel libressl-devel skalibs-devel s6-devel s6-dns-devel"
+makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+ s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
short_desc="Suite of small network utilities for Unix systems"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="ISC"
-homepage="https://skarnet.org/software/${pkgname}/"
+homepage="https://skarnet.org/software/s6-networking"
changelog="https://skarnet.org/software/s6-networking/upgrade.html"
-distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
+distfiles="${homepage}/${pkgname}-${version}.tar.gz"
checksum=d953dbfdf9020bb27e873328df1b644f8a7b6a3972a4288b1f20edeaf85b4980
+build_options="bearssl libressl"
+build_options_default="libressl"
+desc_option_bearssl="Use BearSSL as SSL library"
+desc_option_libressl="Use LibreSSL as SSL library"
+vopt_conflict bearssl libressl
+
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
esac
@@ -35,6 +43,8 @@ s6-networking-doc_package() {
}
s6-networking-devel_package() {
short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} skalibs-devel
+ $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
next prev parent reply other threads:[~2020-08-25 11:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-22 4:27 [PR PATCH] " ericonr
2020-08-22 4:53 ` [PR PATCH] [Updated] " ericonr
2020-08-23 20:54 ` ericonr
2020-08-24 21:42 ` ericonr
2020-08-25 10:04 ` [PR REVIEW] " Duncaen
2020-08-25 11:51 ` ericonr [this message]
2020-08-25 11:52 ` ericonr
2020-08-25 14:32 ` mobinmob
2020-09-02 1:20 ` [PR PATCH] [Merged]: " lemmi
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=20200825115147.bZnXRhcow0yeF67FOjKLey0zOXsH5NZq8Oug-remYAQ@z \
--to=ericonr@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).