2021-03-25 22:13:53 -07:00
|
|
|
{ lib, skawarePackages
|
2018-07-27 00:10:10 -07:00
|
|
|
|
|
|
|
# Whether to build the TLS/SSL tools and what library to use
|
2021-03-21 11:56:02 -07:00
|
|
|
# acceptable values: "bearssl", "libressl", false
|
|
|
|
, sslSupport ? "bearssl" , libressl, bearssl
|
2018-07-27 00:10:10 -07:00
|
|
|
}:
|
2014-08-29 22:07:45 -07:00
|
|
|
|
2018-09-02 14:31:26 -07:00
|
|
|
with skawarePackages;
|
2014-08-29 22:07:45 -07:00
|
|
|
let
|
2018-07-27 00:10:10 -07:00
|
|
|
sslSupportEnabled = sslSupport != false;
|
|
|
|
sslLibs = {
|
2019-08-13 14:52:01 -07:00
|
|
|
libressl = libressl;
|
2021-03-21 11:56:02 -07:00
|
|
|
bearssl = bearssl;
|
2018-07-27 00:10:10 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
in
|
|
|
|
assert sslSupportEnabled -> sslLibs ? ${sslSupport};
|
|
|
|
|
2014-08-29 22:07:45 -07:00
|
|
|
|
2018-09-02 14:31:26 -07:00
|
|
|
buildPackage {
|
|
|
|
pname = "s6-networking";
|
skawarePackages: 2021-02 release
Includes the following version changes:
- skalibs: 2.10.0.1 -> 2.10.0.2
- execline: 2.7.0.0 -> 2.8.0.0
- s6-networking: 2.4.0.0 -> 2.4.1.0
- s6-linux-init: 1.0.6.0 -> 1.0.6.1
- s6: 2.10.0.0 -> 2.10.0.2
Upstream maintainer notes:
------------------------------------------------------------
Mon, 15 Feb 2021 19:50:14 +0000
Hello,
New versions of some of the skarnet.org packages are available.
skalibs-2.10.0.2: bugfixes
execline-2.8.0.0: major version bump, but few and low-impact changes
s6-2.10.0.2: bugfixes
s6-linux-init-1.0.6.1: bugfixes
s6-networking-2.4.1.0: minor version bump
Some details:
* execline-2.8.0.0
----------------
- The if program now propagates its child's exit code by default if it
exits.
- The backtick program's -i behaviour (exit on child failure or
presence of a null character in its output) is now the default. Other
behaviours in case of child failure can be obtained via -I, -x or -D
options; -x is the new one.
- These changes are compatible with all the common uses of if and
backtick, but break compatibility in edge cases, which is why a
major version bump is required. This has nothing in common with the
previous major version bump, which had massive changes all over the
place; this one should go smoothly, and will only impact very specific
uses of backtick.
execline now has man pages, thanks to the untiring flexibeast!
The repository can be found here:
https://github.com/flexibeast/execline-man-pages
Please allow some time for the man pages to be updated to reflect
the current HTML documentation. Currently, the man pages document
execline-2.7.0.1; they are accurate for 2.8.0.0 except for the if and
backtick changes.
* s6-linux-init-1.0.6.1
---------------------
- Bugfixes.
- When s6-linux-init is built with utmps, the default utmp user for
s6-linux-init-maker was set to "utmp". That was a bug: now, by default,
s6-linux-init-maker does not create the utmp services if the -U option
is not given. If you used s6-linux-init-maker without the -U option
and still need the utmps services, you should explicitly set "-U utmp".
https://skarnet.org/software/s6-linux-init/
git://git.skarnet.org/s6-linux-init
* s6-networking-2.4.1.0
---------------------
- Bugfixes (nothing security-related).
- It is now possible to define a maximum amount of time spent in the
TLS handshake no matter how s6-networking has been built. (The -K
option has been implemented for the libtls backend.)
- When SNI has been required, the TLS-related binaries now export
the SSL TLS SNI SERVERNAME option to their application; the variable
contains the relevant server name.
https://skarnet.org/software/s6-networking/
git://git.skarnet.org/s6-networking
s6-networking has man pages as well:
https://github.com/flexibeast/s6-networking-man-pages
Enjoy,
Bug-reports welcome.
--
Laurent
------------------------------------------------------------
Copied from: http://skarnet.org/cgi-bin/archive.cgi?1:mss:1535:202102:lpehbljhhcpaopbnkkbf
2021-02-20 06:00:52 -08:00
|
|
|
version = "2.4.1.0";
|
|
|
|
sha256 = "023wnayv1gddklnsh3qv7i5jfy2fisbp24wa0nzjg0nfq3p807yc";
|
2014-08-29 22:07:45 -07:00
|
|
|
|
2018-09-02 14:31:26 -07:00
|
|
|
description = "A suite of small networking utilities for Unix systems";
|
2014-08-29 22:07:45 -07:00
|
|
|
|
2018-07-22 08:03:19 -07:00
|
|
|
outputs = [ "bin" "lib" "dev" "doc" "out" ];
|
|
|
|
|
2018-09-02 08:04:57 -07:00
|
|
|
# TODO: nsss support
|
2014-12-23 08:06:27 -08:00
|
|
|
configureFlags = [
|
2018-07-22 08:03:19 -07:00
|
|
|
"--libdir=\${lib}/lib"
|
|
|
|
"--libexecdir=\${lib}/libexec"
|
|
|
|
"--dynlibdir=\${lib}/lib"
|
|
|
|
"--bindir=\${bin}/bin"
|
|
|
|
"--includedir=\${dev}/include"
|
|
|
|
"--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
|
|
|
|
"--with-include=${skalibs.dev}/include"
|
|
|
|
"--with-include=${execline.dev}/include"
|
|
|
|
"--with-include=${s6.dev}/include"
|
|
|
|
"--with-include=${s6-dns.dev}/include"
|
|
|
|
"--with-lib=${skalibs.lib}/lib"
|
|
|
|
"--with-lib=${execline.lib}/lib"
|
|
|
|
"--with-lib=${s6.out}/lib"
|
|
|
|
"--with-lib=${s6-dns.lib}/lib"
|
|
|
|
"--with-dynlib=${skalibs.lib}/lib"
|
|
|
|
"--with-dynlib=${execline.lib}/lib"
|
|
|
|
"--with-dynlib=${s6.out}/lib"
|
|
|
|
"--with-dynlib=${s6-dns.lib}/lib"
|
2016-04-01 08:20:13 -07:00
|
|
|
]
|
2018-07-27 00:10:10 -07:00
|
|
|
++ (lib.optionals sslSupportEnabled [
|
|
|
|
"--enable-ssl=${sslSupport}"
|
|
|
|
"--with-include=${lib.getDev sslLibs.${sslSupport}}/include"
|
|
|
|
"--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib"
|
2018-09-02 14:31:26 -07:00
|
|
|
"--with-dynlib=${lib.getLib sslLibs.${sslSupport}}/lib"
|
|
|
|
]);
|
2014-08-29 22:07:45 -07:00
|
|
|
|
2018-07-22 08:03:19 -07:00
|
|
|
postInstall = ''
|
2018-09-02 14:31:26 -07:00
|
|
|
# remove all s6 executables from build directory
|
|
|
|
rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
|
|
|
|
rm minidentd
|
2021-03-21 11:56:02 -07:00
|
|
|
rm libs6net.* libstls.* libs6tls.* libsbearssl.*
|
2018-09-02 14:31:26 -07:00
|
|
|
|
2018-07-22 08:03:19 -07:00
|
|
|
mv doc $doc/share/doc/s6-networking/html
|
|
|
|
'';
|
|
|
|
|
2014-08-29 22:07:45 -07:00
|
|
|
}
|