[PR PATCH] s6-networking: add bearssl option, add devel deps.

[PR PATCH] s6-networking: add bearssl option, add devel deps.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 618 bytes --]

There is a new 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: 2659 bytes --]

From 40ff5623b8c752ab8e3597e1a50f12909abe3da4 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 the
s6-networking-devel.

Also xlint.
---
 srcpkgs/s6-networking/template | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 832b56ba251..3d61f01f7a9 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}/"
-changelog="https://skarnet.org/software/s6-networking/upgrade.html"
-distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
+homepage="https://skarnet.org/software/s6-networking"
+changelog="${homepage}/upgrade.html"
+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"

Re: [PR PATCH] [Updated] s6-networking: add bearssl option, add devel deps.

[ericonr]

[-- 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: 2681 bytes --]

From de85eb8d2ba66487c77da616e389dc576b1af84d 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 | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 832b56ba251..3d61f01f7a9 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}/"
-changelog="https://skarnet.org/software/s6-networking/upgrade.html"
-distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
+homepage="https://skarnet.org/software/s6-networking"
+changelog="${homepage}/upgrade.html"
+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"

Re: s6-networking: add bearssl option, add devel deps.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24406#issuecomment-678823836

Comment:
@lemmi could you take a look, please?

Re: s6-networking: add bearssl option, add devel deps.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24406#issuecomment-679381605

Comment:
@mobinmob what do you think about splitting this package into a `-libs` one as well?

Re: [PR REVIEW] s6-networking: add bearssl option, add devel deps.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/24406#discussion_r476332600

Comment:
I don't like that, now we can't copy/paste the changelog when looking at the template.

Re: [PR PATCH] [Updated] s6-networking: add bearssl option, add devel deps.

[ericonr]

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

Re: [PR REVIEW] s6-networking: add bearssl option, add devel deps.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24406#discussion_r476389094

Comment:
Fixed.

Re: s6-networking: add bearssl option, add devel deps.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/24406#issuecomment-680062272

Comment:
I am not sure what is the policy for splitting libs subpackages. I understand -devel and -docs, but in such small packages I do not think it make sence to split libraries. On a more general note, splitting packages caused me headaches when trying to upgrade one or two packages (bind and vala if I remember correctly)...

Re: [PR PATCH] [Merged]: s6-networking: add bearssl option, add devel deps.

[lemmi]

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

There's a merged pull request on the void-packages repository

s6-networking: add bearssl option, add devel deps.
https://github.com/void-linux/void-packages/pull/24406

Description:
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.