From de85eb8d2ba66487c77da616e389dc576b1af84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= 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 " 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"