pthbs

commit 8e5fc5a0384c011525fd8151234593e237546440
parent 83f0559fb01938b3b8a19caec7eb71aef4adf2db
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 14:31:24 +0100

Require TLS binaries in s6-networking

Diffstat:
M
packages/default.environment
 | 
2
+-
M
packages/s6-networking
 | 
4
++++
M
packages/userspace.environment
 | 
2
+-
M
templates/pkg/s6-networking
 | 
6
++++++

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/packages/default.environment b/packages/default.environment
@@ -15,7 +15,7 @@
 #+mdevd.855642d48dd50e5da9c9a1aa39c9e3e6b2591fcbfb6c3c5aaa923ed7ad3aa160
 #+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
 #+libressl.a087ee244e4ac7ad15304e99e603fa31a783a58b671a7ce6add769036c525298
-#+s6-networking.bbddbc5fc18b5354e4a9c441affc78af1be5abdb7eba481d1c7a8a8e1ce36feb
+#+s6-networking.e362ccf0413aef245a469af2e1272896c8dcfee43aba14dc200cd32368271848
 #+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
 #+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -30,6 +30,10 @@ make DESTDIR="$pthbs_destdir" install
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
 BEGIN {
+	x["./command/s6-tcpclient"]=1
+	x["./command/s6-tcpserver"]=1
+	x["./command/s6-tlsclient"]=1
+	x["./command/s6-tlsserver"]=1
 }
 
 function r1(s) {
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -15,7 +15,7 @@
 #+mdevd.855642d48dd50e5da9c9a1aa39c9e3e6b2591fcbfb6c3c5aaa923ed7ad3aa160
 #+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
 #+libressl.a087ee244e4ac7ad15304e99e603fa31a783a58b671a7ce6add769036c525298
-#+s6-networking.bbddbc5fc18b5354e4a9c441affc78af1be5abdb7eba481d1c7a8a8e1ce36feb
+#+s6-networking.e362ccf0413aef245a469af2e1272896c8dcfee43aba14dc200cd32368271848
 #+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
 #+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
 #+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
diff --git a/templates/pkg/s6-networking b/templates/pkg/s6-networking
@@ -6,3 +6,9 @@
 #+{{pkg_install_name("libressl")}}
 {%- endblock %}
 {%- block extra_configure %}--enable-ssl=libtls{% endblock %}
+{% block genlinks_begin %}
+	x["./command/s6-tcpclient"]=1
+	x["./command/s6-tcpserver"]=1
+	x["./command/s6-tlsclient"]=1
+	x["./command/s6-tlsserver"]=1
+{% endblock -%}