commit 83f0559fb01938b3b8a19caec7eb71aef4adf2db
parent 6f6e104045b42d5ed1227ce0e5e897bd064b49a4
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Thu, 22 Feb 2024 14:24:00 +0100
Fix s6-networking dependency
Diffstat:
8 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/packages/default.environment b/packages/default.environment
@@ -5,7 +5,7 @@
#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
-#+rsync.9319bdad97ecb0583bc2298660449fc01148ba22d0c32120185f5238c930aed6
+#+rsync.976af96e406a4cad11b09cf42ceed2699038b88d6ae0913455bf1bc5cdf1d910
#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
#+s6-rc.58107751b764b74aa183fbb780aa7a146da18596d038f83c00acfd823acbde8e
@@ -14,8 +14,8 @@
#+s6-linux-init.2c3c03a7e8ac0115768554a7959984f01be8283c02d0b38208ee17839fa8fe25
#+mdevd.855642d48dd50e5da9c9a1aa39c9e3e6b2591fcbfb6c3c5aaa923ed7ad3aa160
#+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
-#+libressl.8ba4396249c436d3382e9163717e1fe0c80017e1f6e4af5de226b1db681050dd
-#+s6-networking.e7ad51c3d91b34bdf1945116b64655c4787e66e54931b7eb5cdf2daeafccacc6
+#+libressl.a087ee244e4ac7ad15304e99e603fa31a783a58b671a7ce6add769036c525298
+#+s6-networking.bbddbc5fc18b5354e4a9c441affc78af1be5abdb7eba481d1c7a8a8e1ce36feb
#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
#+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
@@ -28,4 +28,4 @@
#+core-system-rc.d1343a44b2baa7d2732a7de0df109009c04d81dbe6d22964887f5af83598179c
#+core-system-scripts.a6948d0ca8f36e41bf5f0ec5acc13bc2fc6c9787282984ff089482ee5c587a9d
#+core-system-init.ee01d7c8fb94d813161d6db6d89a33f14955f3066a925a00c1cb330f83c9d5a5
-#+linux.9529e17e85bee1927f947b7275d9fdff0e5dfd1952418b2eff589b39e7e22684-
\ No newline at end of file
+#+linux.c21eb54792cc5b7c4df9de554a3c4b1bd6f15cf18764d359b9dafaa017d6d863+
\ No newline at end of file
diff --git a/packages/libressl b/packages/libressl
@@ -75,6 +75,7 @@ BEGIN {
x["./command/ocspcheck"]=1
x["./man/man1/openssl.1"]=1
x["./library/libssl.a"]=1
+ x["./include/tls.h"]=1
}
function r1(s) {
diff --git a/packages/linux b/packages/linux
@@ -6,7 +6,7 @@
#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
-#+rsync.9319bdad97ecb0583bc2298660449fc01148ba22d0c32120185f5238c930aed6
+#+rsync.976af96e406a4cad11b09cf42ceed2699038b88d6ae0913455bf1bc5cdf1d910
#+libelf-compat.3023655d655211fc0f061928c09b8b5374a966ea08fd54ac43ff7876a7a73f5b
#@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
#@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
diff --git a/packages/rsync b/packages/rsync
@@ -5,7 +5,7 @@
#+busybox-diffutils.28aa9a4a515da839eaf2e9873bccf363e8eb4829bff3307d2f000204690dfc82
#+m4.b4d536e5f08f9c11575bfc61d943c9714bc556ed473eedb0520288720ff13871
#+popt.adfcea1cb6aed424e16f20b3f3579c7332129f040d0110c68e301688ff4d66a7
-#+libressl.8ba4396249c436d3382e9163717e1fe0c80017e1f6e4af5de226b1db681050dd
+#+libressl.a087ee244e4ac7ad15304e99e603fa31a783a58b671a7ce6add769036c525298
#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
autotools() {
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -6,6 +6,7 @@
#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
#+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
+#+libressl.a087ee244e4ac7ad15304e99e603fa31a783a58b671a7ce6add769036c525298
#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
: ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -5,7 +5,7 @@
#+patch.7db533886b0c97e42c2299ae6ba70110cbf5a1275cd8af96c451d3aef41b37cd
#+flex.7b04266c765678562eba707b9f5c6ed36e09ff1d1bbb9b67ac5f69bdccb333d1
#+bison.0e105559f3b96f9bfad01e4b5dc3f59028c200fb375ae1fa53d3ac43da123d43
-#+rsync.9319bdad97ecb0583bc2298660449fc01148ba22d0c32120185f5238c930aed6
+#+rsync.976af96e406a4cad11b09cf42ceed2699038b88d6ae0913455bf1bc5cdf1d910
#+execline.4231ed2621e13740b0c4f69c295a89e650e097aabb04c11b9c2e364faa1ed270
#+s6.56e6aee60eb92a8813446a002362d5cead66e3dec8fcd8c5760bdd34309bc71d
#+s6-rc.58107751b764b74aa183fbb780aa7a146da18596d038f83c00acfd823acbde8e
@@ -14,8 +14,8 @@
#+s6-linux-init.2c3c03a7e8ac0115768554a7959984f01be8283c02d0b38208ee17839fa8fe25
#+mdevd.855642d48dd50e5da9c9a1aa39c9e3e6b2591fcbfb6c3c5aaa923ed7ad3aa160
#+s6-dns.32fea0415dab978da4e40fda106ab76386f8ce11a827b6b2ff40733b023a6137
-#+libressl.8ba4396249c436d3382e9163717e1fe0c80017e1f6e4af5de226b1db681050dd
-#+s6-networking.e7ad51c3d91b34bdf1945116b64655c4787e66e54931b7eb5cdf2daeafccacc6
+#+libressl.a087ee244e4ac7ad15304e99e603fa31a783a58b671a7ce6add769036c525298
+#+s6-networking.bbddbc5fc18b5354e4a9c441affc78af1be5abdb7eba481d1c7a8a8e1ce36feb
#+zsh.f8b4dc59a1d38643db3a4ec70dca58f74f4c9407c809b0fc519402f0bcccfbdb
#+pthbs-banginstall.089f7542767b49f891e4acbca5ddf214ee7f45ba958f866fdbc514d6f7e39276
#+aat.d556760cb62a490b4c514160640bacb082c68d6e70f7a0b690723614bda81a2f
diff --git a/templates/pkg/libressl b/templates/pkg/libressl
@@ -15,5 +15,6 @@ check_static command/ocspcheck
x["./command/ocspcheck"]=1
x["./man/man1/openssl.1"]=1
x["./library/libssl.a"]=1
+ x["./include/tls.h"]=1
{% endblock %}
diff --git a/templates/pkg/s6-networking b/templates/pkg/s6-networking
@@ -3,5 +3,6 @@
#+{{pkg_install_name("execline")}}
#+{{pkg_install_name("s6")}}
#+{{pkg_install_name("s6-dns")}}
+#+{{pkg_install_name("libressl")}}
{%- endblock %}
{%- block extra_configure %}--enable-ssl=libtls{% endblock %}
