commit 5f9fe8eefc21532c8ce1ac22b93fe550fb48145d parent 25687aa4a5d52ad698568dc159a9756302db87e0 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 9 May 2025 15:09:11 +0000 export CA bundle environment variables Diffstat:
33 files changed, 116 insertions(+), 89 deletions(-)
diff --git a/templates/pkg/libressl b/templates/pkg/libressl @@ -20,6 +20,15 @@ cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem cp -a certs/ca-certificates.crt cert.pem +cd "$pthbs_destdir/$prefix/" +mkdir -p env +# for s6-networking +printf >env/CADIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +# for curl +printf >env/SSL_CERT_DIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +# for git +printf >env/GIT_SSL_CAPATH '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" + {% endblock %} {% block rules %} $2 == "config" { link($0); next } @@ -32,5 +41,5 @@ $2 == "config" { link($0); next } x["./include/tls.h"]=1 x["./config/ssl/certs/0b9bc432.0"]=1 # ISRG_Root_X2.crt x["./config/ssl/certs/4042bcee.0"]=1 # ISRG_Root_X1.crt - x["./config/ssl/cert.pem"]=1 # ISRG_Root_X1.crt + x["./config/ssl/cert.pem"]=1 # merged bundle {% 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.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded #+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.501ac1a7f74a756bbe1e6cece29477bd2e163ee47b6dc1d7117d87124ee7421d -#+xbps.b49c866c995d3af88f45567e854868c678a1d2c9cf004f1a797a451268d65be7 +#+apk-tools.7c946d0be4329de18402a6a6a3ae56a7033288ef349d58e8961852f701ff9d1f +#+xbps.b32f1dfe5cebc5c82db702838fcaeee7198c0c0bbd5a8c89d624ffd007f6f468 #+container-bin-image.1b501ea4ae8d425b8ceab4df81ce7290a36bbc85d86caf02f614a451ec17ed32 #@git:e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6: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.501ac1a7f74a756bbe1e6cece29477bd2e163ee47b6dc1d7117d87124ee7421d/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/home/ccx/versions/xbps.b49c866c995d3af88f45567e854868c678a1d2c9cf004f1a797a451268d65be7/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.7c946d0be4329de18402a6a6a3ae56a7033288ef349d58e8961852f701ff9d1f/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/home/ccx/versions/xbps.b32f1dfe5cebc5c82db702838fcaeee7198c0c0bbd5a8c89d624ffd007f6f468/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.b49c866c995d3af88f45567e854868c678a1d2c9cf004f1a797a451268d65be7'/keys/void/*; do +for f in '/home/ccx/versions/xbps.b32f1dfe5cebc5c82db702838fcaeee7198c0c0bbd5a8c89d624ffd007f6f468'/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.53ac8b24574f64eea32035a90f3050fc56792ded7c3e39777bf89cb7aa1ee954 -#+xbps.b49c866c995d3af88f45567e854868c678a1d2c9cf004f1a797a451268d65be7 +#+containers.8dbba31ffaf7e2de46ef235f393d9b2581535db0a50412991f55b2f3e7329d56 +#+xbps.b32f1dfe5cebc5c82db702838fcaeee7198c0c0bbd5a8c89d624ffd007f6f468 #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c -#+apk-tools.501ac1a7f74a756bbe1e6cece29477bd2e163ee47b6dc1d7117d87124ee7421d +#+apk-tools.7c946d0be4329de18402a6a6a3ae56a7033288ef349d58e8961852f701ff9d1f #+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.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded #@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.f017f0f93cf79ca50c3721840219f17e35134de78a9496e84522971763667808 +#+rsync.49cbdde3f956d24f0f927ef6e69c06dc4df5b4c433f71e66bc3d7eb4aeb4a61e #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 -#+s6-networking.4fa2ded7e9385659c68c772bdeac4ea951be03a2c04f07041a179c0184ca5804 +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded +#+s6-networking.0b90c315094afa8e8c3700f42ca9c9169967dc749fad434314dd3f205e8cfd09 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.53ac8b24574f64eea32035a90f3050fc56792ded7c3e39777bf89cb7aa1ee954 +#+containers.8dbba31ffaf7e2de46ef235f393d9b2581535db0a50412991f55b2f3e7329d56 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.1db26ee095c2a0ca97bb72867f35eb6f224cc1fe0bc2d4e88668c8bc0a6dd5bc -#+git.add6f6ba728c5ca3fc30521e6793fbfd2151e766a9c661a9b0d31e87d0160c3a -#+xbps.b49c866c995d3af88f45567e854868c678a1d2c9cf004f1a797a451268d65be7 -#+apk-tools.501ac1a7f74a756bbe1e6cece29477bd2e163ee47b6dc1d7117d87124ee7421d +#+curl.f508c2bc25716d7b5f3c07ff3f6f50567d3bef9ad9deffde0b2d98dbca255042 +#+git.a2273fbde56bb01835d7a2ca27ffa1d9d19441bc6e55c21e01f44c8e7861c146 +#+xbps.b32f1dfe5cebc5c82db702838fcaeee7198c0c0bbd5a8c89d624ffd007f6f468 +#+apk-tools.7c946d0be4329de18402a6a6a3ae56a7033288ef349d58e8961852f701ff9d1f #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5 #+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145 @@ -37,8 +37,8 @@ #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 -#+system-config.2cbbc4b6e9e15be52d4690621c834e40515c9772da175e1006a4d0c5154d47e8 -#+system-config-rc.62b6f0682817065838a86e684d7d19578b53c180e7c92019e179aeee9911190d +#+system-config.02212fe75cf728736af0183389144b594470cd5ad5ee1b01b187e64fe842674a +#+system-config-rc.af6a07352ef8dc829dda4976f2ccbe2929bc81f4b1aedfc7fe9f98d0aeeec7f2 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.c6a3ec9f94abea4391a35dd9570c60e189dceaab472d26a76b18393023f3d4ff +#+system-config-init.f844d188733bd5e90ab9622d07547afe4f66e2d462c9822f8035c68032de39d6 #+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.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 -#+curl.1db26ee095c2a0ca97bb72867f35eb6f224cc1fe0bc2d4e88668c8bc0a6dd5bc +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded +#+curl.f508c2bc25716d7b5f3c07ff3f6f50567d3bef9ad9deffde0b2d98dbca255042 #@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.e323b5f20911c7e9036c475cc2e8ba7f2f9c40f83322e10f3f9235f9480488d0- \ No newline at end of file +#+linux.3d1da1744bf4d88393e5a5bf1b3cd687017e73dfd0aad12f613844ce8da08dd7+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -73,6 +73,15 @@ cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem cp -a certs/ca-certificates.crt cert.pem +cd "$pthbs_destdir/$prefix/" +mkdir -p env +# for s6-networking +printf >env/CADIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +# for curl +printf >env/SSL_CERT_DIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +# for git +printf >env/GIT_SSL_CAPATH '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -85,7 +94,7 @@ BEGIN { x["./include/tls.h"]=1 x["./config/ssl/certs/0b9bc432.0"]=1 # ISRG_Root_X2.crt x["./config/ssl/certs/4042bcee.0"]=1 # ISRG_Root_X1.crt - x["./config/ssl/cert.pem"]=1 # ISRG_Root_X1.crt + x["./config/ssl/cert.pem"]=1 # merged bundle } function r1(s) { 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.f017f0f93cf79ca50c3721840219f17e35134de78a9496e84522971763667808 +#+rsync.49cbdde3f956d24f0f927ef6e69c06dc4df5b4c433f71e66bc3d7eb4aeb4a61e #+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c #+libelf.fd68f03f03caea1e71ca235bd8e1c0d4dc9fe6b5556ff45c3892c4940218c018 #+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90 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.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded #+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.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded #@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.f017f0f93cf79ca50c3721840219f17e35134de78a9496e84522971763667808 +#+rsync.49cbdde3f956d24f0f927ef6e69c06dc4df5b4c433f71e66bc3d7eb4aeb4a61e #+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.58c811f9db2a77ce0c8d92448cc58e1475881966ccd19d336e9229527dcdff96' \ + 'pthbs_path_containers=/home/ccx/versions/env.6a8c2eeeb436e7e19a3fe3a4c595aa9c65cb8a87be7aea34681a1faed82f1005' \ '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.62b6f0682817065838a86e684d7d19578b53c180e7c92019e179aeee9911190d +#+system-config-rc.af6a07352ef8dc829dda4976f2ccbe2929bc81f4b1aedfc7fe9f98d0aeeec7f2 -s6rcdb=/home/ccx/versions/system-config-rc.62b6f0682817065838a86e684d7d19578b53c180e7c92019e179aeee9911190d/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.af6a07352ef8dc829dda4976f2ccbe2929bc81f4b1aedfc7fe9f98d0aeeec7f2/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.2cbbc4b6e9e15be52d4690621c834e40515c9772da175e1006a4d0c5154d47e8 +#+system-config.02212fe75cf728736af0183389144b594470cd5ad5ee1b01b187e64fe842674a def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.2cbbc4b6e9e15be52d4690621c834e40515c9772da175e1006a4d0c5154d47e8/config/s6-rc-source +src=/home/ccx/versions/system-config.02212fe75cf728736af0183389144b594470cd5ad5ee1b01b187e64fe842674a/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.f017f0f93cf79ca50c3721840219f17e35134de78a9496e84522971763667808 +#+rsync.49cbdde3f956d24f0f927ef6e69c06dc4df5b4c433f71e66bc3d7eb4aeb4a61e #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e #+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9 @@ -15,20 +15,20 @@ #+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2 #+mdevd.2c8e38fba9104da05177a2c4cc498139c506b1b3dae60c51cf54b831c1762daa #+s6-dns.91f4cab6424ef44de73cac82f7bda7d1e91a2ece09fcbe48912f431785c6db7e -#+libressl.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 -#+s6-networking.4fa2ded7e9385659c68c772bdeac4ea951be03a2c04f07041a179c0184ca5804 +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded +#+s6-networking.0b90c315094afa8e8c3700f42ca9c9169967dc749fad434314dd3f205e8cfd09 #+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f #+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2 #+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4 #+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a -#+containers.53ac8b24574f64eea32035a90f3050fc56792ded7c3e39777bf89cb7aa1ee954 +#+containers.8dbba31ffaf7e2de46ef235f393d9b2581535db0a50412991f55b2f3e7329d56 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 -#+curl.1db26ee095c2a0ca97bb72867f35eb6f224cc1fe0bc2d4e88668c8bc0a6dd5bc -#+git.add6f6ba728c5ca3fc30521e6793fbfd2151e766a9c661a9b0d31e87d0160c3a -#+xbps.b49c866c995d3af88f45567e854868c678a1d2c9cf004f1a797a451268d65be7 -#+apk-tools.501ac1a7f74a756bbe1e6cece29477bd2e163ee47b6dc1d7117d87124ee7421d +#+curl.f508c2bc25716d7b5f3c07ff3f6f50567d3bef9ad9deffde0b2d98dbca255042 +#+git.a2273fbde56bb01835d7a2ca27ffa1d9d19441bc6e55c21e01f44c8e7861c146 +#+xbps.b32f1dfe5cebc5c82db702838fcaeee7198c0c0bbd5a8c89d624ffd007f6f468 +#+apk-tools.7c946d0be4329de18402a6a6a3ae56a7033288ef349d58e8961852f701ff9d1f #+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.bf9b97db301500d077a4da7364672f36d1c76b2c55f3787a76d24c7bdd27d647 +#+libressl.e71f4ae4ad5498ec19da52570c938d0a0664f22b7bee396614833218a7070ded #+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.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 #+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.fcb5fb714bbf02b14d279b9155da39e82b9a0dbc316cea304d9a9492f35aae21 -#+xbps.f9762bafa9a89befbd4b8c0aaad83e50bbb75baf658d89d95500443e018731ea +#+apk-tools.dc58a23401c4953d813d54c9a42fa59e4c83fa738fe55b44537c65a30e172669 +#+xbps.af4e86cab8ba49eb61add71a277a3d4da557a1eb0674313f420de89fbe543e96 #+container-bin-image.8593434f8fbeac8ca87a4252750091c43dd86fdfe55394c851d99e31665f136b #@git:e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6: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.fcb5fb714bbf02b14d279b9155da39e82b9a0dbc316cea304d9a9492f35aae21/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/versions/xbps.f9762bafa9a89befbd4b8c0aaad83e50bbb75baf658d89d95500443e018731ea/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/versions/apk-tools.dc58a23401c4953d813d54c9a42fa59e4c83fa738fe55b44537c65a30e172669/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/versions/xbps.af4e86cab8ba49eb61add71a277a3d4da557a1eb0674313f420de89fbe543e96/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.f9762bafa9a89befbd4b8c0aaad83e50bbb75baf658d89d95500443e018731ea'/keys/void/*; do +for f in '/versions/xbps.af4e86cab8ba49eb61add71a277a3d4da557a1eb0674313f420de89fbe543e96'/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.de3f97081f512f22c81b228546b9c84341e560564d99943071cfa1de8e6587a9 -#+xbps.f9762bafa9a89befbd4b8c0aaad83e50bbb75baf658d89d95500443e018731ea +#+containers.15dc5f447e9df4667c4b5962da2c40e716368225b71192ba62aa93a9bced12eb +#+xbps.af4e86cab8ba49eb61add71a277a3d4da557a1eb0674313f420de89fbe543e96 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 -#+apk-tools.fcb5fb714bbf02b14d279b9155da39e82b9a0dbc316cea304d9a9492f35aae21 +#+apk-tools.dc58a23401c4953d813d54c9a42fa59e4c83fa738fe55b44537c65a30e172669 #+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.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 #@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.83a6d16e7fb35629dddc0680518fbe7aae0a7350ba55b9b3f467f3b612aad030 +#+rsync.f005d06c8561cbf4c2e8d309ec8471cf2c4dbb094d24e7fbd0ea24cf5d127442 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 -#+s6-networking.87a91abbbdcfe2ca9e038e01956dd0fa1bb21ef7e2f2ae6cb2c95c3337e437c8 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 +#+s6-networking.1965368325e1a069075fad19de27e6f2de830bf3d560dee3558aaf87efdc4fcc #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.de3f97081f512f22c81b228546b9c84341e560564d99943071cfa1de8e6587a9 +#+containers.15dc5f447e9df4667c4b5962da2c40e716368225b71192ba62aa93a9bced12eb #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.0ddfecf9a8c33edf0f1f769eec27210b5bc166ac189e49585d1979df67942c35 -#+git.a4480471d1c6bc6a78fc4ba12af32753b4ef1911c375c6b096db00a925e7c833 -#+xbps.f9762bafa9a89befbd4b8c0aaad83e50bbb75baf658d89d95500443e018731ea -#+apk-tools.fcb5fb714bbf02b14d279b9155da39e82b9a0dbc316cea304d9a9492f35aae21 +#+curl.e0b846e73e13a336f5e3691d40f8419f7fb86db619868724f11f3f81f069e38a +#+git.2143c8e20195ee042a8263287078a6e25e1efd17bd942b89554d571a9f1a0beb +#+xbps.af4e86cab8ba49eb61add71a277a3d4da557a1eb0674313f420de89fbe543e96 +#+apk-tools.dc58a23401c4953d813d54c9a42fa59e4c83fa738fe55b44537c65a30e172669 #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e #+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1 @@ -37,8 +37,8 @@ #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 -#+system-config.0b8c5d9575ca5a2ebcf34b0bc8f6a66e911ec73fa1bac67b994cf8d759dcd14e -#+system-config-rc.b738170bf448b550fbdce02ce03250d8227b1a26f253fe90005d042bb13ac2ee +#+system-config.6d47e4dbe23b0b63570e1b811292113e28ef696f202c185055dcd481d46c2164 +#+system-config-rc.a7ed129d36aac7e80d54e2f4ab17d3ce851d78869f8caa65bb43e5e72de9bd9e #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.df8f0db2863e0d832f79da6fe4bcb6a56c6a7c8e0e1002b94cb918acfd25ec54 +#+system-config-init.589dd8acd733956dad47bd6531c6b848531b91e6ed6a05b3c0b0307657a2612b #+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.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 -#+curl.0ddfecf9a8c33edf0f1f769eec27210b5bc166ac189e49585d1979df67942c35 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 +#+curl.e0b846e73e13a336f5e3691d40f8419f7fb86db619868724f11f3f81f069e38a #@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.e5e9748ae60c52afc6cc5362017ed53c3d70cd7820c10cef9e63b9be38c877c3- \ No newline at end of file +#+linux.47842ed200e8b1e30959ae24143e5a540e2c7fb6cde79d695af0cdeff6cdb135+ \ No newline at end of file diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -73,6 +73,15 @@ cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem cp -a certs/ca-certificates.crt cert.pem +cd "$pthbs_destdir/$prefix/" +mkdir -p env +# for s6-networking +printf >env/CADIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +# for curl +printf >env/SSL_CERT_DIR '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" +# for git +printf >env/GIT_SSL_CAPATH '%s\n' "$pthbs_destdir/$prefix/config/ssl/certs" + cd "$pthbs_destdir/versions/$pthbs_package" @@ -85,7 +94,7 @@ BEGIN { x["./include/tls.h"]=1 x["./config/ssl/certs/0b9bc432.0"]=1 # ISRG_Root_X2.crt x["./config/ssl/certs/4042bcee.0"]=1 # ISRG_Root_X1.crt - x["./config/ssl/cert.pem"]=1 # ISRG_Root_X1.crt + x["./config/ssl/cert.pem"]=1 # merged bundle } function r1(s) { 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.83a6d16e7fb35629dddc0680518fbe7aae0a7350ba55b9b3f467f3b612aad030 +#+rsync.f005d06c8561cbf4c2e8d309ec8471cf2c4dbb094d24e7fbd0ea24cf5d127442 #+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137 #+libelf.b129c20086c9a39a997886caaa57b3f7c5be24fd0ceb34289b62e794ff722ed0 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 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.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 #+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.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 #@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.83a6d16e7fb35629dddc0680518fbe7aae0a7350ba55b9b3f467f3b612aad030 +#+rsync.f005d06c8561cbf4c2e8d309ec8471cf2c4dbb094d24e7fbd0ea24cf5d127442 #+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.239ee934c1ed7b27b26b202b193c3a4e5b46ba219508c2542e13627b60fcc4bc' \ + 'pthbs_path_containers=/versions/env.5073c9f0174826ff0d8a5189370ebe540d93689d4484601f2150695ee089c7b8' \ '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.b738170bf448b550fbdce02ce03250d8227b1a26f253fe90005d042bb13ac2ee +#+system-config-rc.a7ed129d36aac7e80d54e2f4ab17d3ce851d78869f8caa65bb43e5e72de9bd9e -s6rcdb=/versions/system-config-rc.b738170bf448b550fbdce02ce03250d8227b1a26f253fe90005d042bb13ac2ee/config/s6-rc-db +s6rcdb=/versions/system-config-rc.a7ed129d36aac7e80d54e2f4ab17d3ce851d78869f8caa65bb43e5e72de9bd9e/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.0b8c5d9575ca5a2ebcf34b0bc8f6a66e911ec73fa1bac67b994cf8d759dcd14e +#+system-config.6d47e4dbe23b0b63570e1b811292113e28ef696f202c185055dcd481d46c2164 def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.0b8c5d9575ca5a2ebcf34b0bc8f6a66e911ec73fa1bac67b994cf8d759dcd14e/config/s6-rc-source +src=/versions/system-config.6d47e4dbe23b0b63570e1b811292113e28ef696f202c185055dcd481d46c2164/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.83a6d16e7fb35629dddc0680518fbe7aae0a7350ba55b9b3f467f3b612aad030 +#+rsync.f005d06c8561cbf4c2e8d309ec8471cf2c4dbb094d24e7fbd0ea24cf5d127442 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e #+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f @@ -15,20 +15,20 @@ #+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c #+mdevd.ce53dc40e066f620a163354acb732a70f019902cf9dbdb45571d368eaf4f67b8 #+s6-dns.e65a0e1310967e0d4b18fd597993a364969fd35d50d35ba9eb2fd3fc68ffdf4b -#+libressl.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 -#+s6-networking.87a91abbbdcfe2ca9e038e01956dd0fa1bb21ef7e2f2ae6cb2c95c3337e437c8 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 +#+s6-networking.1965368325e1a069075fad19de27e6f2de830bf3d560dee3558aaf87efdc4fcc #+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b #+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571 #+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f #+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf -#+containers.de3f97081f512f22c81b228546b9c84341e560564d99943071cfa1de8e6587a9 +#+containers.15dc5f447e9df4667c4b5962da2c40e716368225b71192ba62aa93a9bced12eb #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 -#+curl.0ddfecf9a8c33edf0f1f769eec27210b5bc166ac189e49585d1979df67942c35 -#+git.a4480471d1c6bc6a78fc4ba12af32753b4ef1911c375c6b096db00a925e7c833 -#+xbps.f9762bafa9a89befbd4b8c0aaad83e50bbb75baf658d89d95500443e018731ea -#+apk-tools.fcb5fb714bbf02b14d279b9155da39e82b9a0dbc316cea304d9a9492f35aae21 +#+curl.e0b846e73e13a336f5e3691d40f8419f7fb86db619868724f11f3f81f069e38a +#+git.2143c8e20195ee042a8263287078a6e25e1efd17bd942b89554d571a9f1a0beb +#+xbps.af4e86cab8ba49eb61add71a277a3d4da557a1eb0674313f420de89fbe543e96 +#+apk-tools.dc58a23401c4953d813d54c9a42fa59e4c83fa738fe55b44537c65a30e172669 #+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.5fba08958a4428377255635d02ae99fbc4a9b8eef9b7a852d33cdd2a41295c78 +#+libressl.c6fe18995cebede88c00b5dedabe5d0cd9f32053fd574531a72d5d5ddccd72f1 #+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.