commit aca3a319978ffdc9860d192cb231d7710562383a
parent ec663264d531740c67db64aca2bf17e728b40224
Author: ccx <ccx@te2000.cz>
Date: Sat, 23 Mar 2024 02:21:25 +0000
Fix spawn-pty, debug symbols in skalibs
Diffstat:
26 files changed, 108 insertions(+), 101 deletions(-)
diff --git a/files/spawn-pty.c b/files/spawn-pty.c
@@ -78,8 +78,10 @@ void exec_terminal(const char *term_env, const char **ptmx_argv, const char **pt
}
}
+typedef const char * arg_t;
+
int main(const int argc, const char **argv) {
- char ptmx_argv[argc];
+ arg_t ptmx_argv[argc];
const char *term_env = argv[1];
int n = 2;
while(n < argc - 1) {
@@ -89,7 +91,8 @@ int main(const int argc, const char **argv) {
exec_terminal(term_env, ptmx_argv, &argv[n + 1]);
return 111;
case ' ':
- ptmx_argv[n - 2] = &argv[n++][1];
+ ptmx_argv[n - 2] = &argv[n][1];
+ n++;
break;
default:
strerr_dieusage(100, "spawn-pty: improperly terminated block");
diff --git a/packages/applyuidgid-caps b/packages/applyuidgid-caps
@@ -2,7 +2,7 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
#+libcap.3528f93ae9873fceae62855cb7c0fa521ac2c3cfabe71bf58ba01483136bf5fd
#@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
diff --git a/packages/containers b/packages/containers
@@ -2,7 +2,7 @@
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb
#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
#@git:a43ba149e373c838e6e237ba95d103b42d4d0093:containers
: ${JOBS:=1}
diff --git a/packages/containers.environment b/packages/containers.environment
@@ -1,16 +1,16 @@
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
-#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00
-#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
+#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592
+#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7
#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb
#+confz.6658089fa0f90962e97d41b3fd8400d7ea37c6872828f5f7bd122a2d07a9c467
-#+containers.4293ba352fa6d85ddc3fe5cafa3fff76a81a0223f03aa5b6482bed7b1df9cf72
+#+containers.ba1536b2219e1801ccf05cc164d1f0baaac1978389c24bc81a2d7ff248cb1d20
#+xbps.9831b74b8d46bb8c240d6ba606b13d3a80d67804ddbce5e828bef08377d0f9b0
#+zstd.ab99ab40fa027a935e6012884c3988d7161dc0c6ff10c06566c0a92c694bca07
#+apk-tools.c9cdb867562a26201a1618e0b1bf2147e6cee6aff1a6901909ee911a4462327a
#+alpine-keys.c541ae09189f19994476df864795dd7c26486939981309be95de258ab1554fa1
#+getent.15c11d87a5194766f1ba7b78feac3b77792756cfb12a84c5f5d0f2c7c1cfd25d
#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2
-#+pidns_run.e610612c1b58806fb58add7abaefcd0e1f456fba6421abe1b60753056578a057-
\ No newline at end of file
+#+pidns_run.1b51b40570a993155e0dc1de2efb01d15f2852180272e763630b9500ea475846+
\ No newline at end of file
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
-#+system-config.9e22a1e41800fd6c2e289d12e964fcb06b50724a6321ee1edd5af0ed622c1667
-#+system-config-rc.debb34bff96677bb1165c223046bb8a7f9ac4679b1097e63c112c69e052667c9
+#+system-config.6b00881bc47e9b51d527ee48fdf42706de04be62202c8bbd901a56bafa8272cd
+#+system-config-rc.aec407b2160901bd2b0104834cd2f5c74518430f2382ba9606c1c93f8396989c
#+system-config-scripts.ac300ce9214b7e302ac630c3335cd537000ec030b409ee951e53c563d9f71891
-#+system-config-init.f4b1edebb482644bfccfff6a2d70ff51a4a77fb28c58c1cbc5451614362d70ec
+#+system-config-init.16c92d4d3234c0c4133ad094ecbd20037e0324bdff9f265be3ea5d9796aa949c
#+system-config-zsh.1f09219345bc5468ae634bec90576c270cf60dc0b7c71ebaecb6d61d019072d9
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
@@ -11,23 +11,23 @@
#+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0
#+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64
#+rsync.b356835b04c5d49533ce9cd7660fd7d61f50d1c1d527b123f46e3eb2f25d3989
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
-#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45
-#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00
-#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885
-#+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d
-#+mdevd.d0ffd7f79efbd9ff9af5e2a93e8fe5fae0d994325eb28e2af7e5d6783c50afb3
-#+s6-dns.c5b96ce0ad6fe55db7f000d9b5401897829075b1d2a5d9c60e738fc93c3b7db1
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
+#+s6-rc.b779b39c6ffc3d538714d5b2b767f13fd5a4987ecaf7a618e639101098aa4b86
+#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592
+#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7
+#+s6-linux-init.19ec878452398fbf9de39f5dd23cd8545f703b10c73b53b6c9443db9d9274e71
+#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b
+#+s6-dns.0e04114b7f9f8118d544eb4f9e2f67dc31ae9d098d5bca7c82eec5711807b6d7
#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab
-#+s6-networking.1d103641e11df88a43703c764e73ad46439950e82f6b64fc9f8b317b1bfde901
+#+s6-networking.2b546788c0342db01904ab3b4bb4161b8b0d3065e51f86299f5506001c54b61a
#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb
#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1
#+aat.e073f6b23349ea7153987ad737fc80f909241ae4a0c0a22adc12392fcad71597
#+confz.6658089fa0f90962e97d41b3fd8400d7ea37c6872828f5f7bd122a2d07a9c467
-#+containers.4293ba352fa6d85ddc3fe5cafa3fff76a81a0223f03aa5b6482bed7b1df9cf72
+#+containers.ba1536b2219e1801ccf05cc164d1f0baaac1978389c24bc81a2d7ff248cb1d20
#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2
-#+logincaps.ab41dbf1ff5851875ca90ba6889df9da8b8a5e86ed2789e3fec0f6d805b61882
+#+logincaps.b0e776a021bae4381e976e264617f074ffb191eb510c378b9b2186bedaf4f97d
#+snaprep.42b7b97b7530a211dd0f01680c9b15362aa2e7249bc27cea0deb0632f7535bb1
#+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c
#+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb
@@ -37,6 +37,6 @@
#+getconf.d16039d91561f2bb7f430eb2250f1e7c03d59ddeea80a9c55c21e293fb528fd9
#+iconv.0b381a2e57a5e7b3df6b6a68d72230eec4e5ef2f6a460509c94d3d502fe1f2cf
#+libcap.3528f93ae9873fceae62855cb7c0fa521ac2c3cfabe71bf58ba01483136bf5fd
-#+applyuidgid-caps.e36af59c076e13332a716eb4cdf6571c93d9cde48fb0bdb98acb5a770e25bb30
-#+nosuid.ae35bf3fa1605f01e99b2c4c54b11da0156890c3ce38de1e26618f5db06b84f6
-#+spawn-pty.a75672830ff10360bfe41044c2a3582eb81a34472e40c39ed6a7e1c6fc263c74-
\ No newline at end of file
+#+applyuidgid-caps.25f0135c22be3d3dcd34e06378e41b98cdc5201319131e99da81ae2af1af7767
+#+nosuid.0e8db424c6fe3c4f9543a126159dc59afc81fc28df33e5287121d28f71c574b5
+#+spawn-pty.5f007fa455875e601548d11d4e65b875424342420c0c6edd53452e007bc60ec7+
\ No newline at end of file
diff --git a/packages/execline b/packages/execline
@@ -2,7 +2,7 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
#@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
: ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 'execline'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/logincaps b/packages/logincaps
@@ -2,7 +2,7 @@
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb
#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#@git:74a5987415c09fdac410eaeb26a8fd79be49906a:logincaps
diff --git a/packages/mdevd b/packages/mdevd
@@ -2,8 +2,8 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
#@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd
: ${JOBS:=1}
@@ -15,7 +15,7 @@ cd 'mdevd'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/mdevd.environment b/packages/mdevd.environment
@@ -1,5 +1,5 @@
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
#+mdev-scripts.650e56bda7f6be74be2a29ac756ffef0dc765f2557640d6764908c8f5e98930e
-#+mdevd.d0ffd7f79efbd9ff9af5e2a93e8fe5fae0d994325eb28e2af7e5d6783c50afb3-
\ No newline at end of file
+#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b+
\ No newline at end of file
diff --git a/packages/nosuid b/packages/nosuid
@@ -2,7 +2,7 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
#@sha256:d53f929459d390275a98f948b570697c03b55384fd2536b8a5d72950d194c0c4:nosuid.c
name=nosuid
diff --git a/packages/pidns_run b/packages/pidns_run
@@ -2,7 +2,7 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
#@sha256:c7be49de876eea64554e2e46bcaa7059083bcd6210c5007fd9030e0a6e57a0dd:pidns_run.c
name=pidns_run
diff --git a/packages/s6 b/packages/s6
@@ -3,8 +3,8 @@
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
#@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6
#@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch
@@ -19,7 +19,7 @@ patch -up 1 -i ../s6_clone3_newpid.patch
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-dns b/packages/s6-dns
@@ -2,7 +2,7 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
#@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns
: ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 's6-dns'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-linux-init b/packages/s6-linux-init
@@ -2,9 +2,9 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
#@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init
: ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-linux-init'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils
@@ -2,7 +2,7 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
#@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils
: ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 's6-linux-utils'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-networking b/packages/s6-networking
@@ -2,10 +2,10 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
-#+s6-dns.c5b96ce0ad6fe55db7f000d9b5401897829075b1d2a5d9c60e738fc93c3b7db1
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
+#+s6-dns.0e04114b7f9f8118d544eb4f9e2f67dc31ae9d098d5bca7c82eec5711807b6d7
#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab
#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
@@ -18,7 +18,7 @@ cd 's6-networking'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils
@@ -2,7 +2,7 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
#@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils
: ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 's6-portable-utils'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/s6-rc b/packages/s6-rc
@@ -2,9 +2,9 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
#@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc
: ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-rc'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \
+ --with-sysdeps='/versions/skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/skalibs b/packages/skalibs
@@ -11,6 +11,8 @@ export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++"
export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld"
export AR="$pthbs_build_environment/command/x86_64-linux-musl-ar"
+export CFLAGS="-O2 -ggdb"
+
prefix=/versions/$pthbs_package
cd skalibs
./configure \
diff --git a/packages/spawn-pty b/packages/spawn-pty
@@ -2,8 +2,8 @@
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e
-#@sha256:a4d063770b6765c3e14a74d97d3879910ac399303c2a699fee756522531f85f8:spawn-pty.c
+#+skalibs.b3931b1ec501dfd4603e293b20d0db46cb7644cf99225e6175060852b34f365f
+#@sha256:c2bd8f5b6b4eb8bb5497b4c9dc17f29dfdb12a2222f20a0af6fd296791ae188c:spawn-pty.c
name=spawn-pty
check_static() {
@@ -33,7 +33,7 @@ def_dest() {
build_env_static
def_prefix
-gcc -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -lskarnet
+gcc -ggdb -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -lskarnet
install -d "$pthbs_destdir/$prefix/command"
install -m 755 $name "$pthbs_destdir/$prefix/command"
diff --git a/packages/system-config b/packages/system-config
@@ -5,15 +5,15 @@
#+aat.e073f6b23349ea7153987ad737fc80f909241ae4a0c0a22adc12392fcad71597
#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2
#+rsync.b356835b04c5d49533ce9cd7660fd7d61f50d1c1d527b123f46e3eb2f25d3989
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
#+kbd.4d0b59602cb299724eca17b59bddd6fbb1a72ad73b0103801da528856c31d461
-#+mdevd.d0ffd7f79efbd9ff9af5e2a93e8fe5fae0d994325eb28e2af7e5d6783c50afb3
-#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885
-#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
+#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b
+#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7
+#+s6-rc.b779b39c6ffc3d538714d5b2b767f13fd5a4987ecaf7a618e639101098aa4b86
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb
#+system-config-scripts.ac300ce9214b7e302ac630c3335cd537000ec030b409ee951e53c563d9f71891
-#+logincaps.ab41dbf1ff5851875ca90ba6889df9da8b8a5e86ed2789e3fec0f6d805b61882
+#+logincaps.b0e776a021bae4381e976e264617f074ffb191eb510c378b9b2186bedaf4f97d
#@git:4363567448b3ab6940f68178d6c2201e681333ca:system-config
def_prefix() {
@@ -52,8 +52,8 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.c219f69c3045c2d079b30ca9ffe589ef85c3a1fc83fd19cc808dce1b0e0045c7' \
- 'pthbs_path_mdevd=/versions/env.9ff4ae1aa76157d331d77b75c4dec8d6fd85395776d90a931bfb285a671a5c32' \
+ 'pthbs_path_containers=/versions/env.559d4b383bb53eeafe68c3ff519e5d3cc8e99de4f62c48dfa45778a637e6db90' \
+ 'pthbs_path_mdevd=/versions/env.dce5c0ff43039f06c93975c7be7c6f2b1cf85f9eec6c01257957bba99c6a6635' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
sort -u build/execfile | while IFS= read exename; do
diff --git a/packages/system-config-init b/packages/system-config-init
@@ -1,13 +1,13 @@
#!/usr/bin/env pthbs-build
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
-#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45
-#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00
-#+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+system-config-rc.debb34bff96677bb1165c223046bb8a7f9ac4679b1097e63c112c69e052667c9
-
-s6rcdb=/versions/system-config-rc.debb34bff96677bb1165c223046bb8a7f9ac4679b1097e63c112c69e052667c9/config/s6-rc-db
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
+#+s6-rc.b779b39c6ffc3d538714d5b2b767f13fd5a4987ecaf7a618e639101098aa4b86
+#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592
+#+s6-linux-init.19ec878452398fbf9de39f5dd23cd8545f703b10c73b53b6c9443db9d9274e71
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+system-config-rc.aec407b2160901bd2b0104834cd2f5c74518430f2382ba9606c1c93f8396989c
+
+s6rcdb=/versions/system-config-rc.aec407b2160901bd2b0104834cd2f5c74518430f2382ba9606c1c93f8396989c/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/packages/system-config-rc b/packages/system-config-rc
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded
-#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45
+#+s6-rc.b779b39c6ffc3d538714d5b2b767f13fd5a4987ecaf7a618e639101098aa4b86
#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2
-#+system-config.9e22a1e41800fd6c2e289d12e964fcb06b50724a6321ee1edd5af0ed622c1667
+#+system-config.6b00881bc47e9b51d527ee48fdf42706de04be62202c8bbd901a56bafa8272cd
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.9e22a1e41800fd6c2e289d12e964fcb06b50724a6321ee1edd5af0ed622c1667/config/s6-rc-source
+src=/versions/system-config.6b00881bc47e9b51d527ee48fdf42706de04be62202c8bbd901a56bafa8272cd/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/packages/userspace.environment b/packages/userspace.environment
@@ -6,23 +6,23 @@
#+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0
#+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64
#+rsync.b356835b04c5d49533ce9cd7660fd7d61f50d1c1d527b123f46e3eb2f25d3989
-#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7
-#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45
-#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00
-#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885
-#+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d
-#+mdevd.d0ffd7f79efbd9ff9af5e2a93e8fe5fae0d994325eb28e2af7e5d6783c50afb3
-#+s6-dns.c5b96ce0ad6fe55db7f000d9b5401897829075b1d2a5d9c60e738fc93c3b7db1
+#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
+#+s6.899fa291725e92bad1d55d8712da5f7057d49c386a61ab283fe9eed66f5eac31
+#+s6-rc.b779b39c6ffc3d538714d5b2b767f13fd5a4987ecaf7a618e639101098aa4b86
+#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592
+#+s6-linux-utils.1061454b63433995a826b1dd134a1d9f36486f9dabb108325157e6541b6f50a7
+#+s6-linux-init.19ec878452398fbf9de39f5dd23cd8545f703b10c73b53b6c9443db9d9274e71
+#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b
+#+s6-dns.0e04114b7f9f8118d544eb4f9e2f67dc31ae9d098d5bca7c82eec5711807b6d7
#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab
-#+s6-networking.1d103641e11df88a43703c764e73ad46439950e82f6b64fc9f8b317b1bfde901
+#+s6-networking.2b546788c0342db01904ab3b4bb4161b8b0d3065e51f86299f5506001c54b61a
#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb
#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1
#+aat.e073f6b23349ea7153987ad737fc80f909241ae4a0c0a22adc12392fcad71597
#+confz.6658089fa0f90962e97d41b3fd8400d7ea37c6872828f5f7bd122a2d07a9c467
-#+containers.4293ba352fa6d85ddc3fe5cafa3fff76a81a0223f03aa5b6482bed7b1df9cf72
+#+containers.ba1536b2219e1801ccf05cc164d1f0baaac1978389c24bc81a2d7ff248cb1d20
#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2
-#+logincaps.ab41dbf1ff5851875ca90ba6889df9da8b8a5e86ed2789e3fec0f6d805b61882
+#+logincaps.b0e776a021bae4381e976e264617f074ffb191eb510c378b9b2186bedaf4f97d
#+snaprep.42b7b97b7530a211dd0f01680c9b15362aa2e7249bc27cea0deb0632f7535bb1
#+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c
#+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb
@@ -32,6 +32,6 @@
#+getconf.d16039d91561f2bb7f430eb2250f1e7c03d59ddeea80a9c55c21e293fb528fd9
#+iconv.0b381a2e57a5e7b3df6b6a68d72230eec4e5ef2f6a460509c94d3d502fe1f2cf
#+libcap.3528f93ae9873fceae62855cb7c0fa521ac2c3cfabe71bf58ba01483136bf5fd
-#+applyuidgid-caps.e36af59c076e13332a716eb4cdf6571c93d9cde48fb0bdb98acb5a770e25bb30
-#+nosuid.ae35bf3fa1605f01e99b2c4c54b11da0156890c3ce38de1e26618f5db06b84f6
-#+spawn-pty.a75672830ff10360bfe41044c2a3582eb81a34472e40c39ed6a7e1c6fc263c74-
\ No newline at end of file
+#+applyuidgid-caps.25f0135c22be3d3dcd34e06378e41b98cdc5201319131e99da81ae2af1af7767
+#+nosuid.0e8db424c6fe3c4f9543a126159dc59afc81fc28df33e5287121d28f71c574b5
+#+spawn-pty.5f007fa455875e601548d11d4e65b875424342420c0c6edd53452e007bc60ec7+
\ No newline at end of file
diff --git a/templates/pkg/skalibs b/templates/pkg/skalibs
@@ -12,6 +12,8 @@ export CXX="$pthbs_build_environment/command/{{triplet}}-g++"
export LD="$pthbs_build_environment/command/{{triplet}}-ld"
export AR="$pthbs_build_environment/command/{{triplet}}-ar"
+export CFLAGS="-O2 -ggdb"
+
prefix={{versions}}/$pthbs_package
cd skalibs
./configure \
diff --git a/templates/pkg/spawn-pty b/templates/pkg/spawn-pty
@@ -13,7 +13,7 @@ name=spawn-pty
build_env_static
def_prefix
-gcc -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -lskarnet
+gcc -ggdb -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -lskarnet
install -d "$pthbs_destdir/$prefix/command"
install -m 755 $name "$pthbs_destdir/$prefix/command"
