commit 7524c11c2503a5b0fb336a625ca0e228fff93be0 parent 3258a0dc6eac8f6cc0a06ee533151d9fd82e2088 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 4 May 2025 11:34:01 +0000 switch to openssl + libretls Diffstat:
44 files changed, 614 insertions(+), 93 deletions(-)
diff --git a/downloadlist.sha256 b/downloadlist.sha256 @@ -56,3 +56,5 @@ f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb 189200 https:// c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6 65889 https://github.com/argp-standalone/argp-standalone/archive/refs/tags/1.5.0.tar.gz e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17 2642452 https://github.com/strace/strace/releases/download/v6.13/strace-6.13.tar.xz ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157 958468 https://github.com/libunwind/libunwind/releases/download/v1.8.1/libunwind-1.8.1.tar.gz +712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539 18102481 https://github.com/openssl/openssl/releases/download/openssl-3.3.3/openssl-3.3.3.tar.gz +3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5 432142 https://causal.agency/libretls/libretls-3.8.1.tar.gz diff --git a/templates/pkg/apk-tools b/templates/pkg/apk-tools @@ -5,7 +5,7 @@ #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("patch")}} -#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("openssl")}} #+{{pkg_install_name("zstd")}} #+{{pkg_install_name("pkgconf-pkg-config")}} #@git:{{submodule.current[name]}}:{{name}} diff --git a/templates/pkg/curl b/templates/pkg/curl @@ -1,6 +1,6 @@ {% extends "autotools" %} {%- block extra_deps %} -#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("openssl")}} #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. {%- endblock %} {% block at_script %} diff --git a/templates/pkg/git b/templates/pkg/git @@ -5,7 +5,7 @@ #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("m4")}} -#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("openssl")}} #+{{pkg_install_name("curl")}} #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. diff --git a/templates/pkg/libretls b/templates/pkg/libretls @@ -0,0 +1,17 @@ +{% extends "autotools" %} +{%- block extra_deps %} +#@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. +{%- endblock %} +{% block at_script %} + +export LDFLAGS="--static" +autotools_static libretls-3.8.1 + +{% endblock %} +{% block genlinks_begin %} + x["./man/man3/tls_connect.3"]=1 + x["./library/libtls.a"]=1 + x["./library/pkgconfig/libtls.pc"]=1 + x["./include/tls.h"]=1 +{% endblock %} + diff --git a/templates/pkg/openssl b/templates/pkg/openssl @@ -0,0 +1,20 @@ +{% extends "autotools" %} +{%- block extra_deps %} +#@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. +{%- endblock %} +{% block at_script %} + +export LDFLAGS="--static" +autotools_static openssl-3.3.2 --sysconfdir=/etc +check_static command/openssl +check_static command/ocspcheck + +{% endblock %} +{% block genlinks_begin %} + x["./command/openssl"]=1 + 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/rsync b/templates/pkg/rsync @@ -1,7 +1,7 @@ {% extends "autotools" %} {%- block extra_deps %} #+{{pkg_install_name("popt")}} -#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("openssl")}} #+{{pkg_install_name("zstd")}} #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. {%- endblock %} diff --git a/templates/pkg/s6-networking b/templates/pkg/s6-networking @@ -3,7 +3,7 @@ #+{{pkg_install_name("execline")}} #+{{pkg_install_name("s6")}} #+{{pkg_install_name("s6-dns")}} -#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("libretls")}} {%- endblock %} {%- block extra_configure %}--enable-ssl=libtls{% endblock %} {% block genlinks_begin %} diff --git a/templates/pkg/userspace.environment b/templates/pkg/userspace.environment @@ -15,7 +15,7 @@ #+{{pkg_install_name("s6-linux-init")}} #+{{pkg_install_name("mdevd")}} #+{{pkg_install_name("s6-dns")}} -#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("openssl")}} #+{{pkg_install_name("s6-networking")}} #+{{pkg_install_name("zsh")}} #+{{pkg_install_name("pthbs-banginstall")}} diff --git a/templates/pkg/xbps b/templates/pkg/xbps @@ -1,7 +1,7 @@ {% extends "autotools" %} {%- block extra_deps %} #+{{pkg_install_name("libarchive")}} -#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("openssl")}} #+{{pkg_install_name("pkgconf-pkg-config")}} #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. {%- endblock %} diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -4,7 +4,7 @@ #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 +#+openssl.2c2c2863bef5b161e9446014822c66c8aee8f406b1327d0ce141d9301f5002d8 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -4,8 +4,8 @@ #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4 -#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152 -#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9 +#+apk-tools.cf757b603c47f982c9991faa6da495436141b1544172f4845815ef0285c62408 +#+xbps.bb257526dbb0df496606544dc56376ad206449eae65710a35d2d9145fc94110a #+container-bin-image.89bd98f6272aeb7e6ed82d39fe88da6cff6c053965a304fbe00cc95ba7087501 #@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers @@ -43,8 +43,8 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "$pkgdir/deps/command" -ln -sf '/home/ccx/versions/apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/home/ccx/versions/xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.cf757b603c47f982c9991faa6da495436141b1544172f4845815ef0285c62408/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/xbps.bb257526dbb0df496606544dc56376ad206449eae65710a35d2d9145fc94110a/command/xbps-install.static' "$pkgdir/deps/command/" for f in '/home/ccx/versions/alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4'/keys/alpine/*/*; do test -f "$f" @@ -54,7 +54,7 @@ for f in '/home/ccx/versions/alpine-keys.dedc78b0b50e461d33a449adf40691698925b5e done mkdir -p "$pkgdir/deps/keys/void" -for f in '/home/ccx/versions/xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9'/keys/void/*; do +for f in '/home/ccx/versions/xbps.bb257526dbb0df496606544dc56376ad206449eae65710a35d2d9145fc94110a'/keys/void/*; do ln -sf "$f" "$pkgdir/deps/keys/void/" done diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,10 +7,10 @@ #+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.38e3f5f372f53a7dfa8c22a131e7c9a672ca2f16568d413497d6a21189f1dffe -#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9 +#+containers.7b54ef0b76b4c2e063b57fe77b257f5b9ad39f7ecc32f19d6afe6107929a1b4e +#+xbps.bb257526dbb0df496606544dc56376ad206449eae65710a35d2d9145fc94110a #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c -#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152 +#+apk-tools.cf757b603c47f982c9991faa6da495436141b1544172f4845815ef0285c62408 #+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -4,7 +4,7 @@ #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 +#+openssl.2c2c2863bef5b161e9446014822c66c8aee8f406b1327d0ce141d9301f5002d8 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. build_env_static() { diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f -#+rsync.8ddf33e53ecdd1f6b001cfb4ab0ed5f7db674fd7fd4ad2594eaa9976f2f2d212 +#+rsync.6017cabe1b5e88f7671444c808d5f8503c83aed9629f3ec07338b6facca69e75 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 -#+s6-networking.fb3f247e7cd6c979c5ec8f70d1c3aec89c16fad02a5f14db79c44acbeda62b4f +#+openssl.2c2c2863bef5b161e9446014822c66c8aee8f406b1327d0ce141d9301f5002d8 +#+s6-networking.98358e966abda3c2ca65b1628cab7584105733551d0b173830e981be1e4a4a83 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.38e3f5f372f53a7dfa8c22a131e7c9a672ca2f16568d413497d6a21189f1dffe +#+containers.7b54ef0b76b4c2e063b57fe77b257f5b9ad39f7ecc32f19d6afe6107929a1b4e #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba -#+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc -#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9 -#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152 +#+curl.f6fd7b939fc1ec40a7bb18669179caecd87bf57c710670f4b20fd07f12c543fc +#+git.f3e99854e5b1852e684e7050ae2eeab1d0b4692ebde8eb97a7a22bf3bc5b2196 +#+xbps.bb257526dbb0df496606544dc56376ad206449eae65710a35d2d9145fc94110a +#+apk-tools.cf757b603c47f982c9991faa6da495436141b1544172f4845815ef0285c62408 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 @@ -37,8 +37,8 @@ #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 -#+system-config.c8c99de553c3fcbdd7f58978d2ce989e8fbfbb4c0516f21441d4213feb709c35 -#+system-config-rc.d762b1e568c23d5b9d74644d7fd871cc0b2efc74f2c15c99836a6320b659c6cd +#+system-config.6853e16bdc3c7f6fe67273351397d5ea74d9885268dcaa9dad37ae38908d293a +#+system-config-rc.f0b18f599e01a691de2f93f32e769878f2efdee9fbcd72d8a08fd84df75cf1ce #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.fd956e165c29c9d759f8c41a87de782b553ebe928e00c57afd0253f691587f65 +#+system-config-init.e061b5eebd00a88d7fc99855b155b1b9e66029f4ce9c9fa522b5cfa1c129d2a6 #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 \ No newline at end of file diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -4,8 +4,8 @@ #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 -#+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba +#+openssl.2c2c2863bef5b161e9446014822c66c8aee8f406b1327d0ce141d9301f5002d8 +#+curl.f6fd7b939fc1ec40a7bb18669179caecd87bf57c710670f4b20fd07f12c543fc #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. check_static() { diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux.8ea7ad155c631d697c347bfeaca34ed671b9ea2f58fca4cc75552ac26c92bd76- \ No newline at end of file +#+linux.e28499dc30caa86191487d6d6182ffc29ace5126218fb66a13ca371d529bee0a+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libretls b/variants/ccx-x86_64/libretls @@ -0,0 +1,119 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 +#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b +#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 +#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc +#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 +#@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +autotools_config() { + prefix=/home/ccx/versions/$pthbs_package + ./configure -C \ + --prefix="$prefix" \ + --build="$(${CC:-gcc} -dumpmachine)" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --infodir="$prefix/info" \ + --localedir="$prefix/locale" \ + --mandir="$prefix/man" \ + --libdir="$prefix/library" \ + --docdir="$prefix/doc/libretls" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ + --localstatedir='/var/pthbs' \ + "$@" + +} + +autotools() { + cd "$1" + shift + autotools_config "$@" + make -j${JOBS:-1} -l$((1+${JOBS:-1})) + make DESTDIR="$pthbs_destdir" install +} + +autotools_static() { + build_env_static + autotools "$@" --enable-static --disable-shared +} +check_static() { + local exe || true + exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + + +export LDFLAGS="--static" +autotools_static libretls-3.8.1 + + + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./man/man3/tls_connect.3"]=1 + x["./library/libtls.a"]=1 + x["./library/pkgconfig/libtls.pc"]=1 + x["./include/tls.h"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -6,7 +6,7 @@ #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f -#+rsync.8ddf33e53ecdd1f6b001cfb4ab0ed5f7db674fd7fd4ad2594eaa9976f2f2d212 +#+rsync.6017cabe1b5e88f7671444c808d5f8503c83aed9629f3ec07338b6facca69e75 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+libelf.fd68f03f03caea1e71ca235bd8e1c0d4dc9fe6b5556ff45c3892c4940218c018 #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 diff --git a/variants/ccx-x86_64/openssl b/variants/ccx-x86_64/openssl @@ -0,0 +1,122 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 +#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b +#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 +#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc +#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 +#@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +autotools_config() { + prefix=/home/ccx/versions/$pthbs_package + ./configure -C \ + --prefix="$prefix" \ + --build="$(${CC:-gcc} -dumpmachine)" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --infodir="$prefix/info" \ + --localedir="$prefix/locale" \ + --mandir="$prefix/man" \ + --libdir="$prefix/library" \ + --docdir="$prefix/doc/openssl" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ + --localstatedir='/var/pthbs' \ + "$@" + +} + +autotools() { + cd "$1" + shift + autotools_config "$@" + make -j${JOBS:-1} -l$((1+${JOBS:-1})) + make DESTDIR="$pthbs_destdir" install +} + +autotools_static() { + build_env_static + autotools "$@" --enable-static --disable-shared +} +check_static() { + local exe || true + exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + + +export LDFLAGS="--static" +autotools_static openssl-3.3.2 --sysconfdir=/etc +check_static command/openssl +check_static command/ocspcheck + + + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/openssl"]=1 + x["./command/ocspcheck"]=1 + x["./man/man1/openssl.1"]=1 + x["./library/libssl.a"]=1 + x["./include/tls.h"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -5,7 +5,7 @@ #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 #+popt.a38a6063ecb9f52c0c2017119d9d6c9eefe1ae820f9f11f693b2a4c07ae4ff31 -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 +#+openssl.2c2c2863bef5b161e9446014822c66c8aee8f406b1327d0ce141d9301f5002d8 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -6,7 +6,7 @@ #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 +#+libretls.a7cac02cc2951f888a6ebaefb17b6041b780cb73981915fcf0dc8161b1811fed #@git:2c7b780bdb204caac3faf5613051d71a58de4017:s6-networking : ${JOBS:=1} diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -4,7 +4,7 @@ #+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 -#+rsync.8ddf33e53ecdd1f6b001cfb4ab0ed5f7db674fd7fd4ad2594eaa9976f2f2d212 +#+rsync.6017cabe1b5e88f7671444c808d5f8503c83aed9629f3ec07338b6facca69e75 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+kbd.4b136e1e449b21180ac16ee7980c30135e6c24a4deb5a4ba600a3e8c431e0b9e #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa @@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.67e6347b41fa684ba12d8a4e5bf899dfa0462e7cdcd4ca07c2b7fd0a81812f7f' \ + 'pthbs_path_containers=/home/ccx/versions/env.4712d640134fb29817b581914a7bd86a8c13778bed5e2e737ac78d43a10e67c8' \ 'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -5,9 +5,9 @@ #+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132 #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f -#+system-config-rc.d762b1e568c23d5b9d74644d7fd871cc0b2efc74f2c15c99836a6320b659c6cd +#+system-config-rc.f0b18f599e01a691de2f93f32e769878f2efdee9fbcd72d8a08fd84df75cf1ce -s6rcdb=/home/ccx/versions/system-config-rc.d762b1e568c23d5b9d74644d7fd871cc0b2efc74f2c15c99836a6320b659c6cd/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.f0b18f599e01a691de2f93f32e769878f2efdee9fbcd72d8a08fd84df75cf1ce/config/s6-rc-db prefix=/home/ccx/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -3,7 +3,7 @@ #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 -#+system-config.c8c99de553c3fcbdd7f58978d2ce989e8fbfbb4c0516f21441d4213feb709c35 +#+system-config.6853e16bdc3c7f6fe67273351397d5ea74d9885268dcaa9dad37ae38908d293a def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.c8c99de553c3fcbdd7f58978d2ce989e8fbfbb4c0516f21441d4213feb709c35/config/s6-rc-source +src=/home/ccx/versions/system-config.6853e16bdc3c7f6fe67273351397d5ea74d9885268dcaa9dad37ae38908d293a/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -6,7 +6,7 @@ #+patch.05834624d74752d1cbe386cd61dbd0dd98d69aad7777828dcf07390ab8772d4b #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f -#+rsync.8ddf33e53ecdd1f6b001cfb4ab0ed5f7db674fd7fd4ad2594eaa9976f2f2d212 +#+rsync.6017cabe1b5e88f7671444c808d5f8503c83aed9629f3ec07338b6facca69e75 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 -#+s6-networking.fb3f247e7cd6c979c5ec8f70d1c3aec89c16fad02a5f14db79c44acbeda62b4f +#+openssl.2c2c2863bef5b161e9446014822c66c8aee8f406b1327d0ce141d9301f5002d8 +#+s6-networking.98358e966abda3c2ca65b1628cab7584105733551d0b173830e981be1e4a4a83 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.38e3f5f372f53a7dfa8c22a131e7c9a672ca2f16568d413497d6a21189f1dffe +#+containers.7b54ef0b76b4c2e063b57fe77b257f5b9ad39f7ecc32f19d6afe6107929a1b4e #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba -#+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc -#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9 -#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152 +#+curl.f6fd7b939fc1ec40a7bb18669179caecd87bf57c710670f4b20fd07f12c543fc +#+git.f3e99854e5b1852e684e7050ae2eeab1d0b4692ebde8eb97a7a22bf3bc5b2196 +#+xbps.bb257526dbb0df496606544dc56376ad206449eae65710a35d2d9145fc94110a +#+apk-tools.cf757b603c47f982c9991faa6da495436141b1544172f4845815ef0285c62408 #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -5,7 +5,7 @@ #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75 #+libarchive.3dfc995086b5c4926acf7fa472ceb8bba6ab906d05f85a8069a8092957317d0c -#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9 +#+openssl.2c2c2863bef5b161e9446014822c66c8aee8f406b1327d0ce141d9301f5002d8 #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -4,7 +4,7 @@ #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 +#+openssl.cc6368d46dda2920f17e75bd7b423c7d43bec454e32a6552e304399a824fd98f #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -4,8 +4,8 @@ #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1 -#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf -#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473 +#+apk-tools.3959dddf5b507fe3fdff13eac1332f9b448ebd1a8fd2430e07d82c66c2f37496 +#+xbps.6e93f03de1c20c427aad42b8368d6513f6a981a1b0de7d43b196e5d3c29d522b #+container-bin-image.079430bf4556198a982a83b2559cb822dc9215370b16cfd0f41efa283dae7f08 #@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers @@ -43,8 +43,8 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "$pkgdir/deps/command" -ln -sf '/versions/apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/versions/xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/versions/apk-tools.3959dddf5b507fe3fdff13eac1332f9b448ebd1a8fd2430e07d82c66c2f37496/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/versions/xbps.6e93f03de1c20c427aad42b8368d6513f6a981a1b0de7d43b196e5d3c29d522b/command/xbps-install.static' "$pkgdir/deps/command/" for f in '/versions/alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1'/keys/alpine/*/*; do test -f "$f" @@ -54,7 +54,7 @@ for f in '/versions/alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6 done mkdir -p "$pkgdir/deps/keys/void" -for f in '/versions/xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473'/keys/void/*; do +for f in '/versions/xbps.6e93f03de1c20c427aad42b8368d6513f6a981a1b0de7d43b196e5d3c29d522b'/keys/void/*; do ln -sf "$f" "$pkgdir/deps/keys/void/" done diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,10 +7,10 @@ #+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.d3539a3ab6bcf1c4e7502efbb6b9acb89247e3e2b06ba556b8ef62d14545ede7 -#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473 +#+containers.c80c01b2cb77d5aff6367213f9bdcdb83c685010d5e167d3afe39dce04f4a318 +#+xbps.6e93f03de1c20c427aad42b8368d6513f6a981a1b0de7d43b196e5d3c29d522b #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 -#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf +#+apk-tools.3959dddf5b507fe3fdff13eac1332f9b448ebd1a8fd2430e07d82c66c2f37496 #+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -4,7 +4,7 @@ #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 +#+openssl.cc6368d46dda2920f17e75bd7b423c7d43bec454e32a6552e304399a824fd98f #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. build_env_static() { diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0 -#+rsync.0d38ed5b8c53de378afb90bb4162a0adc58ffce7c9ddc40cacdb6db2cda01a15 +#+rsync.72b389c9ffb79711055d91df36e55277d03260117f34a0b3e9c39ac870dc0868 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 -#+s6-networking.209e6bfa214a98dcd814b74f8a9ccd803cc7e97f5939a65911d1d03b9c58c3a6 +#+openssl.cc6368d46dda2920f17e75bd7b423c7d43bec454e32a6552e304399a824fd98f +#+s6-networking.b126cfa3ab3b9c32becfb1c1a3185c1ed6401f5414402176b6a98f4f83e93d10 #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.d3539a3ab6bcf1c4e7502efbb6b9acb89247e3e2b06ba556b8ef62d14545ede7 +#+containers.c80c01b2cb77d5aff6367213f9bdcdb83c685010d5e167d3afe39dce04f4a318 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a -#+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7 -#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473 -#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf +#+curl.d9bfe5d0b2a6f8d8c087f27970063c9af1def33aef0cd595a1007e7eaff85ecf +#+git.a69bb7b8e95f3a0d6157bd9d32bb663387c310cc12c07c5e8b252ba66d1ea7ff +#+xbps.6e93f03de1c20c427aad42b8368d6513f6a981a1b0de7d43b196e5d3c29d522b +#+apk-tools.3959dddf5b507fe3fdff13eac1332f9b448ebd1a8fd2430e07d82c66c2f37496 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 @@ -37,8 +37,8 @@ #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 -#+system-config.4db0834024b042913272468c7329d12f4c133de4ba4bac9a5cad4173624c1f2a -#+system-config-rc.f3ef59ea8c1d0d695dea3f9f4dceecb25fe502fa67c6367e1353c667c4ad2fac +#+system-config.309df2ccef7a4e67ea86bcd5700c406cbc01688230745b1cc93254068877379a +#+system-config-rc.1d02a2b5a3f97b8f1aa366825714ff486266230f157a91d72c554390563a5faf #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.36781682a9a5cdbbafb6e09117ab2c426b62d59df428ff13507e11c1cca56868 +#+system-config-init.511980cadf30c6c6715fa51611789e355a2138eaca353c05095cac22201d5c8b #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f \ No newline at end of file diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -4,8 +4,8 @@ #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 -#+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a +#+openssl.cc6368d46dda2920f17e75bd7b423c7d43bec454e32a6552e304399a824fd98f +#+curl.d9bfe5d0b2a6f8d8c087f27970063c9af1def33aef0cd595a1007e7eaff85ecf #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. check_static() { diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux.a04946f7ad966739877a96deda07ee15085059b2989fd7d46f759401e5b37404- \ No newline at end of file +#+linux.b2cf0220bb7cb316bba1226b4ebad5aa0856c8f22c30ccbc0e1ff5b6f8bb67c6+ \ No newline at end of file diff --git a/variants/root-x86_64/libretls b/variants/root-x86_64/libretls @@ -0,0 +1,119 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc +#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 +#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 +#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 +#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 +#@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +autotools_config() { + prefix=/versions/$pthbs_package + ./configure -C \ + --prefix="$prefix" \ + --build="$(${CC:-gcc} -dumpmachine)" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --infodir="$prefix/info" \ + --localedir="$prefix/locale" \ + --mandir="$prefix/man" \ + --libdir="$prefix/library" \ + --docdir="$prefix/doc/libretls" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ + --localstatedir='/var/pthbs' \ + "$@" + +} + +autotools() { + cd "$1" + shift + autotools_config "$@" + make -j${JOBS:-1} -l$((1+${JOBS:-1})) + make DESTDIR="$pthbs_destdir" install +} + +autotools_static() { + build_env_static + autotools "$@" --enable-static --disable-shared +} +check_static() { + local exe || true + exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + + +export LDFLAGS="--static" +autotools_static libretls-3.8.1 + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./man/man3/tls_connect.3"]=1 + x["./library/libtls.a"]=1 + x["./library/pkgconfig/libtls.pc"]=1 + x["./include/tls.h"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -6,7 +6,7 @@ #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0 -#+rsync.0d38ed5b8c53de378afb90bb4162a0adc58ffce7c9ddc40cacdb6db2cda01a15 +#+rsync.72b389c9ffb79711055d91df36e55277d03260117f34a0b3e9c39ac870dc0868 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+libelf.b129c20086c9a39a997886caaa57b3f7c5be24fd0ceb34289b62e794ff722ed0 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 diff --git a/variants/root-x86_64/openssl b/variants/root-x86_64/openssl @@ -0,0 +1,122 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc +#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 +#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 +#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 +#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 +#@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +autotools_config() { + prefix=/versions/$pthbs_package + ./configure -C \ + --prefix="$prefix" \ + --build="$(${CC:-gcc} -dumpmachine)" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --infodir="$prefix/info" \ + --localedir="$prefix/locale" \ + --mandir="$prefix/man" \ + --libdir="$prefix/library" \ + --docdir="$prefix/doc/openssl" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ + --localstatedir='/var/pthbs' \ + "$@" + +} + +autotools() { + cd "$1" + shift + autotools_config "$@" + make -j${JOBS:-1} -l$((1+${JOBS:-1})) + make DESTDIR="$pthbs_destdir" install +} + +autotools_static() { + build_env_static + autotools "$@" --enable-static --disable-shared +} +check_static() { + local exe || true + exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + + +export LDFLAGS="--static" +autotools_static openssl-3.3.2 --sysconfdir=/etc +check_static command/openssl +check_static command/ocspcheck + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/openssl"]=1 + x["./command/ocspcheck"]=1 + x["./man/man1/openssl.1"]=1 + x["./library/libssl.a"]=1 + x["./include/tls.h"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } +$2 == "data" { link($0); next } +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -5,7 +5,7 @@ #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 #+popt.3e3f8b71a43e7c837dff32830175ac07372bc54fbba39564ec0b609dd3c8d8d0 -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 +#+openssl.cc6368d46dda2920f17e75bd7b423c7d43bec454e32a6552e304399a824fd98f #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -6,7 +6,7 @@ #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 +#+libretls.78afae2db65bbd06c9f3949d0acda43e75fb3f97813406e07ea1d435332c4d81 #@git:2c7b780bdb204caac3faf5613051d71a58de4017:s6-networking : ${JOBS:=1} diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -4,7 +4,7 @@ #+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 -#+rsync.0d38ed5b8c53de378afb90bb4162a0adc58ffce7c9ddc40cacdb6db2cda01a15 +#+rsync.72b389c9ffb79711055d91df36e55277d03260117f34a0b3e9c39ac870dc0868 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+kbd.2a0ad895612242729ff63f689075b1bff9295cba0f3eac9c23d79aedf88f6f54 #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 @@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.d2f638b679f8f23a9400e54af77164cbf11d8fa71073526ec40e63521f1b13b3' \ + 'pthbs_path_containers=/versions/env.2c988af47b8afb260560784126c2ebcc00004aaddbfd505aa4142d1aa3666e49' \ 'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -5,9 +5,9 @@ #+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3 #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 -#+system-config-rc.f3ef59ea8c1d0d695dea3f9f4dceecb25fe502fa67c6367e1353c667c4ad2fac +#+system-config-rc.1d02a2b5a3f97b8f1aa366825714ff486266230f157a91d72c554390563a5faf -s6rcdb=/versions/system-config-rc.f3ef59ea8c1d0d695dea3f9f4dceecb25fe502fa67c6367e1353c667c4ad2fac/config/s6-rc-db +s6rcdb=/versions/system-config-rc.1d02a2b5a3f97b8f1aa366825714ff486266230f157a91d72c554390563a5faf/config/s6-rc-db prefix=/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -3,7 +3,7 @@ #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 -#+system-config.4db0834024b042913272468c7329d12f4c133de4ba4bac9a5cad4173624c1f2a +#+system-config.309df2ccef7a4e67ea86bcd5700c406cbc01688230745b1cc93254068877379a def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.4db0834024b042913272468c7329d12f4c133de4ba4bac9a5cad4173624c1f2a/config/s6-rc-source +src=/versions/system-config.309df2ccef7a4e67ea86bcd5700c406cbc01688230745b1cc93254068877379a/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -6,7 +6,7 @@ #+patch.9d8b2c370a0ccf6e5ad48c27070ff1da2d30d41327fd5711a76cf570b34ae523 #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0 -#+rsync.0d38ed5b8c53de378afb90bb4162a0adc58ffce7c9ddc40cacdb6db2cda01a15 +#+rsync.72b389c9ffb79711055d91df36e55277d03260117f34a0b3e9c39ac870dc0868 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 -#+s6-networking.209e6bfa214a98dcd814b74f8a9ccd803cc7e97f5939a65911d1d03b9c58c3a6 +#+openssl.cc6368d46dda2920f17e75bd7b423c7d43bec454e32a6552e304399a824fd98f +#+s6-networking.b126cfa3ab3b9c32becfb1c1a3185c1ed6401f5414402176b6a98f4f83e93d10 #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.d3539a3ab6bcf1c4e7502efbb6b9acb89247e3e2b06ba556b8ef62d14545ede7 +#+containers.c80c01b2cb77d5aff6367213f9bdcdb83c685010d5e167d3afe39dce04f4a318 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a -#+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7 -#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473 -#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf +#+curl.d9bfe5d0b2a6f8d8c087f27970063c9af1def33aef0cd595a1007e7eaff85ecf +#+git.a69bb7b8e95f3a0d6157bd9d32bb663387c310cc12c07c5e8b252ba66d1ea7ff +#+xbps.6e93f03de1c20c427aad42b8368d6513f6a981a1b0de7d43b196e5d3c29d522b +#+apk-tools.3959dddf5b507fe3fdff13eac1332f9b448ebd1a8fd2430e07d82c66c2f37496 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -5,7 +5,7 @@ #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3 #+libarchive.27442e0362163a464fbcc3f60b8a8ccfba7afeb95fed8e412af2983b40d27f27 -#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139 +#+openssl.cc6368d46dda2920f17e75bd7b423c7d43bec454e32a6552e304399a824fd98f #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.