From dc79de3b295ca99eef49b5b63e6c2c3b1da2f980 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:21 +0100 Subject: [PATCH] s6-networking: change libressl buildoption to libtls --- srcpkgs/s6-networking/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index de517c3f3a3..963cbaa3e9d 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -3,11 +3,11 @@ pkgname=s6-networking version=2.4.1.0 revision=1 build_style=configure -configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl) +configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls) $(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 $(vopt_if libressl libressl-devel) skalibs-devel +makedepends="execline-devel $(vopt_if libtls libtls-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 " @@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html" distfiles="${homepage}/${pkgname}-${version}.tar.gz" checksum=cc1f80eec0ce8227bf058a1371978e4e78274b3c1b0fa82d9dadbdb0bdb27c08 -build_options="bearssl libressl" +build_options="bearssl libtls" build_options_default="bearssl" desc_option_bearssl="Use BearSSL as SSL library" -desc_option_libressl="Use LibreSSL as SSL library" -vopt_conflict bearssl libressl +desc_option_libtls="Use LibreSSL as SSL library" +vopt_conflict bearssl libtls case "$XBPS_TARGET_MACHINE" in *-musl) @@ -46,7 +46,7 @@ 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)" + $(vopt_if libtls libtls-devel) $(vopt_if bearssl bearssl-devel)" pkg_install() { vmove usr/include vmove "usr/lib/*.a"