commit f38b7bc34502e08eafdb19dbd9f4a64e6b8b154a
parent 5fec0412d96ac99f758e68607412835bbad9bae1
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Thu, 22 Feb 2024 17:59:44 +0100
zlib validation
Diffstat:
49 files changed, 493 insertions(+), 271 deletions(-)
diff --git a/README b/README
@@ -106,7 +106,7 @@ Packaged software
* gnu-make
* mdevd
* musl-cross-make
- * including gmp, intl, mpc, mpfr, zlib
+ * including gmp, intl, mpc, mpfr, zlib?
* s6
* s6-dns
* s6-linux-init
@@ -124,23 +124,24 @@ Packaged software
* zsh
* s6-networking
* libressl
+* curl
Work in progress
~~~~~~~~~~~~~~~~
* versioned system configuration including init
+* make sure zlib works
* rsync
* add acl and xattr support
* linux
* build fully-featured kernel for real hardware
* libelf
+* git
Planned packages
~~~~~~~~~~~~~~~~
* TLS certificates
-* curl
-* git
* cgroup-tools (cgconfigparser)
* libcap (execcap tool)
* ... more iff needed
diff --git a/files/zpipe.c b/files/zpipe.c
@@ -0,0 +1,205 @@
+/* zpipe.c: example of proper use of zlib's inflate() and deflate()
+ Not copyrighted -- provided to the public domain
+ Version 1.4 11 December 2005 Mark Adler */
+
+/* Version history:
+ 1.0 30 Oct 2004 First version
+ 1.1 8 Nov 2004 Add void casting for unused return values
+ Use switch statement for inflate() return values
+ 1.2 9 Nov 2004 Add assertions to document zlib guarantees
+ 1.3 6 Apr 2005 Remove incorrect assertion in inf()
+ 1.4 11 Dec 2005 Add hack to avoid MSDOS end-of-line conversions
+ Avoid some compiler warnings for input and output buffers
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "zlib.h"
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+# include <fcntl.h>
+# include <io.h>
+# define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+# define SET_BINARY_MODE(file)
+#endif
+
+#define CHUNK 16384
+
+/* Compress from file source to file dest until EOF on source.
+ def() returns Z_OK on success, Z_MEM_ERROR if memory could not be
+ allocated for processing, Z_STREAM_ERROR if an invalid compression
+ level is supplied, Z_VERSION_ERROR if the version of zlib.h and the
+ version of the library linked do not match, or Z_ERRNO if there is
+ an error reading or writing the files. */
+int def(FILE *source, FILE *dest, int level)
+{
+ int ret, flush;
+ unsigned have;
+ z_stream strm;
+ unsigned char in[CHUNK];
+ unsigned char out[CHUNK];
+
+ /* allocate deflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ ret = deflateInit(&strm, level);
+ if (ret != Z_OK)
+ return ret;
+
+ /* compress until end of file */
+ do {
+ strm.avail_in = fread(in, 1, CHUNK, source);
+ if (ferror(source)) {
+ (void)deflateEnd(&strm);
+ return Z_ERRNO;
+ }
+ flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;
+ strm.next_in = in;
+
+ /* run deflate() on input until output buffer not full, finish
+ compression if all of source has been read in */
+ do {
+ strm.avail_out = CHUNK;
+ strm.next_out = out;
+ ret = deflate(&strm, flush); /* no bad return value */
+ assert(ret != Z_STREAM_ERROR); /* state not clobbered */
+ have = CHUNK - strm.avail_out;
+ if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
+ (void)deflateEnd(&strm);
+ return Z_ERRNO;
+ }
+ } while (strm.avail_out == 0);
+ assert(strm.avail_in == 0); /* all input will be used */
+
+ /* done when last data in file processed */
+ } while (flush != Z_FINISH);
+ assert(ret == Z_STREAM_END); /* stream will be complete */
+
+ /* clean up and return */
+ (void)deflateEnd(&strm);
+ return Z_OK;
+}
+
+/* Decompress from file source to file dest until stream ends or EOF.
+ inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be
+ allocated for processing, Z_DATA_ERROR if the deflate data is
+ invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and
+ the version of the library linked do not match, or Z_ERRNO if there
+ is an error reading or writing the files. */
+int inf(FILE *source, FILE *dest)
+{
+ int ret;
+ unsigned have;
+ z_stream strm;
+ unsigned char in[CHUNK];
+ unsigned char out[CHUNK];
+
+ /* allocate inflate state */
+ strm.zalloc = Z_NULL;
+ strm.zfree = Z_NULL;
+ strm.opaque = Z_NULL;
+ strm.avail_in = 0;
+ strm.next_in = Z_NULL;
+ ret = inflateInit(&strm);
+ if (ret != Z_OK)
+ return ret;
+
+ /* decompress until deflate stream ends or end of file */
+ do {
+ strm.avail_in = fread(in, 1, CHUNK, source);
+ if (ferror(source)) {
+ (void)inflateEnd(&strm);
+ return Z_ERRNO;
+ }
+ if (strm.avail_in == 0)
+ break;
+ strm.next_in = in;
+
+ /* run inflate() on input until output buffer not full */
+ do {
+ strm.avail_out = CHUNK;
+ strm.next_out = out;
+ ret = inflate(&strm, Z_NO_FLUSH);
+ assert(ret != Z_STREAM_ERROR); /* state not clobbered */
+ switch (ret) {
+ case Z_NEED_DICT:
+ ret = Z_DATA_ERROR; /* and fall through */
+ case Z_DATA_ERROR:
+ case Z_MEM_ERROR:
+ (void)inflateEnd(&strm);
+ return ret;
+ }
+ have = CHUNK - strm.avail_out;
+ if (fwrite(out, 1, have, dest) != have || ferror(dest)) {
+ (void)inflateEnd(&strm);
+ return Z_ERRNO;
+ }
+ } while (strm.avail_out == 0);
+
+ /* done when inflate() says it's done */
+ } while (ret != Z_STREAM_END);
+
+ /* clean up and return */
+ (void)inflateEnd(&strm);
+ return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
+}
+
+/* report a zlib or i/o error */
+void zerr(int ret)
+{
+ fputs("zpipe: ", stderr);
+ switch (ret) {
+ case Z_ERRNO:
+ if (ferror(stdin))
+ fputs("error reading stdin\n", stderr);
+ if (ferror(stdout))
+ fputs("error writing stdout\n", stderr);
+ break;
+ case Z_STREAM_ERROR:
+ fputs("invalid compression level\n", stderr);
+ break;
+ case Z_DATA_ERROR:
+ fputs("invalid or incomplete deflate data\n", stderr);
+ break;
+ case Z_MEM_ERROR:
+ fputs("out of memory\n", stderr);
+ break;
+ case Z_VERSION_ERROR:
+ fputs("zlib version mismatch!\n", stderr);
+ }
+}
+
+/* compress or decompress from stdin to stdout */
+int main(int argc, char **argv)
+{
+ int ret;
+
+ /* avoid end-of-line conversions */
+ SET_BINARY_MODE(stdin);
+ SET_BINARY_MODE(stdout);
+
+ /* do compression if no arguments */
+ if (argc == 1) {
+ ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);
+ if (ret != Z_OK)
+ zerr(ret);
+ return ret;
+ }
+
+ /* do decompression if -d specified */
+ else if (argc == 2 && strcmp(argv[1], "-d") == 0) {
+ ret = inf(stdin, stdout);
+ if (ret != Z_OK)
+ zerr(ret);
+ return ret;
+ }
+
+ /* otherwise, report usage */
+ else {
+ fputs("zpipe usage: zpipe [-d] < source > dest\n", stderr);
+ return 1;
+ }
+}
diff --git a/packages/aat b/packages/aat
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
#@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
: ${JOBS:=1}
diff --git a/packages/bison b/packages/bison
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
-#+flex.4cc0a40b9b682f6d3635bc160075834584b62fe79864f6955d530fb6ad458a52
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
+#+flex.d68f16cd45e8025c447658814fe8fdaa05c70ded82664419fe54bc5a6a5710f1
#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
autotools() {
diff --git a/packages/busybox b/packages/busybox
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
#+gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
#+busybox.623b05721c8f2129aae460e64de5710e9962ae4bd0bec65a54abe9c36e14ca7f
#@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
diff --git a/packages/busybox-diffutils b/packages/busybox-diffutils
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/busybox-login b/packages/busybox-login
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/packages/confz b/packages/confz
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
#@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
: ${JOBS:=1}
diff --git a/packages/containers b/packages/containers
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
#@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers
: ${JOBS:=1}
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+diffutils.b04f2a258e98df0a884f16a39f8c28200b316afba6dc0a0e501ae0907fef9e97
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+aat.8f9a087ca32d82b31dc5822a0c083ac8bed60b824679658f2102b1c891c6a35f
-#+fileset.b1cda31023cc9daed2e46898a1b984d20b53d26760b7b5da7b8d2956e8f0eb4d
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+diffutils.48c5393dbd5f0f458d0132c331537f68643fb873c4d3cdf75b63b4770924ea59
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+aat.f21a6f6c24ad54036c025c5abcfd8293a212431d81d723d63802c481e61876da
+#+fileset.a7acc2f17ebef9a0ccf78c540f3594d6ea08c3eec8f23f8cfd55b3fc3716c06e
#@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf
: ${JOBS:=1}
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -1,13 +1,13 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+s6.4f191f8633b14fbee01ec8d354cdc42ebd1f9d2c51e300089964dd73a585e675
-#+s6-rc.224f5705478aacbe96fa2a61bb740098260a65f2b2de89efd316cb7d7ec32af2
-#+s6-portable-utils.1996f82884a04be891f3d9c5d3dce7c4080c31663fed3d80a0d2fa5e2bce3593
-#+s6-linux-init.41986a5fbaa6322cf06cf06cc588fca5f5e80d4388b0ee968f263dc59a61ac09
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
-#+core-system-rc.9679f62e3e760eedb91f6d27366f2e6b8a25ab6ee1889f8020f5e4fe222b3297
-
-s6rcdb=/home/ccx/versions/core-system-rc.9679f62e3e760eedb91f6d27366f2e6b8a25ab6ee1889f8020f5e4fe222b3297/s6-rc-db
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+s6.da47b41c5c54b6217f1884d0fac48dd9cf18873556a8bfe51a5e48db99fdb30e
+#+s6-rc.6f05d26f7a29f4e04b405cdff363fd768677b2287fb04c7a6b82964864004b01
+#+s6-portable-utils.eb6806612d3b4f878bc408bf73a6362d4c34418f3927ed3bfd5585d2e4f10449
+#+s6-linux-init.6a1a5a116e61ba0de2c0ecec481a5a01d21589f8ab407061db203bf4106410d6
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
+#+core-system-rc.1662e7ad89f8654eb3b12d3b5192c31b6964b22ea713950551a4ed4532e453c5
+
+s6rcdb=/home/ccx/versions/core-system-rc.1662e7ad89f8654eb3b12d3b5192c31b6964b22ea713950551a4ed4532e453c5/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -1,11 +1,11 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+s6-rc.224f5705478aacbe96fa2a61bb740098260a65f2b2de89efd316cb7d7ec32af2
-#+fileset.b1cda31023cc9daed2e46898a1b984d20b53d26760b7b5da7b8d2956e8f0eb4d
-#+core-system-conf.cbbde282b079d1a595e8448cd449de28ef14ce2052b3739fc87fda8d76a53bac
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+s6-rc.6f05d26f7a29f4e04b405cdff363fd768677b2287fb04c7a6b82964864004b01
+#+fileset.a7acc2f17ebef9a0ccf78c540f3594d6ea08c3eec8f23f8cfd55b3fc3716c06e
+#+core-system-conf.6eabdfada201ba56170958394652b22da376b6a87780380dbd01f9cf77245232
-conf=/home/ccx/versions/core-system-conf.cbbde282b079d1a595e8448cd449de28ef14ce2052b3739fc87fda8d76a53bac/core-system-conf
+conf=/home/ccx/versions/core-system-conf.6eabdfada201ba56170958394652b22da376b6a87780380dbd01f9cf77245232/core-system-conf
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/core-system-scripts b/packages/core-system-scripts
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
#@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts
: ${JOBS:=1}
diff --git a/packages/curl b/packages/curl
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
-#+libressl.7806a2b0e0e16ae8a9b458b2f26fa864a048e1b5e528ffea8a95e9d2d5b15a5f
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
+#+libressl.dfbec5b57a7b0ba1b6070619b88f4b2f04dde2d14aebfb4bab9ffde78f019e96
#@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
autotools() {
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,33 +1,33 @@
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+diffutils.b04f2a258e98df0a884f16a39f8c28200b316afba6dc0a0e501ae0907fef9e97
-#+patch.0dce8b16b24a4e6d9b2943d0eb59b0b039f724418cbc9ad46bc24311b3bec570
-#+flex.4cc0a40b9b682f6d3635bc160075834584b62fe79864f6955d530fb6ad458a52
-#+bison.05d816b1f907c867d6d32417a83f4b8d1eaa5bfe81540db8901bacabdaa92c9e
-#+rsync.84ae7b1142320cc7371f876785be99b6dbd6cbc5b2e162cc73e871284d3184eb
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
-#+s6.4f191f8633b14fbee01ec8d354cdc42ebd1f9d2c51e300089964dd73a585e675
-#+s6-rc.224f5705478aacbe96fa2a61bb740098260a65f2b2de89efd316cb7d7ec32af2
-#+s6-portable-utils.1996f82884a04be891f3d9c5d3dce7c4080c31663fed3d80a0d2fa5e2bce3593
-#+s6-linux-utils.81860f28b21d99d66e743d4863fa79733c075f45da8df3eea754862f9850f4da
-#+s6-linux-init.41986a5fbaa6322cf06cf06cc588fca5f5e80d4388b0ee968f263dc59a61ac09
-#+mdevd.47a4fc281c3c2db0dae8fd7f3afe5e857a4e061afcc0e5ee3e29d3346e6d4295
-#+s6-dns.7ae5302a8c893b1c2c149f159db0b7f022b3a5045bf43e21a64e7401200422e3
-#+libressl.7806a2b0e0e16ae8a9b458b2f26fa864a048e1b5e528ffea8a95e9d2d5b15a5f
-#+s6-networking.52cd0a7e1a9d36edf70e3be089bc954df302703e1e2f2a9b8b3c42f7f63f09d7
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
-#+aat.8f9a087ca32d82b31dc5822a0c083ac8bed60b824679658f2102b1c891c6a35f
-#+confz.9e4bcfc02a1acc763e9d6caf4834a633ef1eda55ee9fd07b830e4f1a14e0c260
-#+containers.035952a955a75c2d4b718dcf08ef1649b7dd773a3e3180c0da951f9842dc8ae2
-#+fileset.b1cda31023cc9daed2e46898a1b984d20b53d26760b7b5da7b8d2956e8f0eb4d
-#+logincaps.cf9ecbaa74f2b00224b75d09d39fffb24963da86ed28309d43ba361e723ad0bd
-#+snaprep.1951acef70708a26d64bfddec3364d89b4937a4bac1178a141328f00e47f6118
-#+curl.4db5dfc71e30faa80dee1eeab0a5b575e49a0648aff221b43f4e3cc65f6e2747
-#+git.e9aa2bf42309f8061135b66df0b22cee9b3bacd9a2bf8f187a7a9b3dc7691865
-#+linux.629a8fae5cdbae310416c306801771a9542935de08023a51e5a176073f41b26b
-#+core-system-conf.cbbde282b079d1a595e8448cd449de28ef14ce2052b3739fc87fda8d76a53bac
-#+core-system-rc.9679f62e3e760eedb91f6d27366f2e6b8a25ab6ee1889f8020f5e4fe222b3297
-#+core-system-scripts.a1463946df4fbe6885a6b6a32ac6674e4a03e0bdf9196f480c57836664e47e0b
-#+core-system-init.070fc4272c3bc2e63c29e8e098678ce8240d5234b26b05c5280aff289d28c8f4-
\ No newline at end of file
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+diffutils.48c5393dbd5f0f458d0132c331537f68643fb873c4d3cdf75b63b4770924ea59
+#+patch.b85bb5d7b8371505c05abe552a0e3a7f412fe7f150359dd486a2d42c39884b62
+#+flex.d68f16cd45e8025c447658814fe8fdaa05c70ded82664419fe54bc5a6a5710f1
+#+bison.9636b0c77af01c5f301aeb1fddb1876d71a9d46c65b29f46b8573a06f057abaf
+#+rsync.0be5acdea04cdd236fa74dcba89a3c1b69bdc0430b93a4975c34cceeee0f2028
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
+#+s6.da47b41c5c54b6217f1884d0fac48dd9cf18873556a8bfe51a5e48db99fdb30e
+#+s6-rc.6f05d26f7a29f4e04b405cdff363fd768677b2287fb04c7a6b82964864004b01
+#+s6-portable-utils.eb6806612d3b4f878bc408bf73a6362d4c34418f3927ed3bfd5585d2e4f10449
+#+s6-linux-utils.c674f77b1a3182fc0fe7c4815bac7f1fec6483208fc170a55126483500793582
+#+s6-linux-init.6a1a5a116e61ba0de2c0ecec481a5a01d21589f8ab407061db203bf4106410d6
+#+mdevd.9845ef5cbbd065f2c2b9a5fd72b71b7b30f7dcf211d6d31b0c26e1f632e87853
+#+s6-dns.57258c2d21614ba9b2940a22510d4a4fede10bbac6f0ef0371ebe89003ddec6f
+#+libressl.dfbec5b57a7b0ba1b6070619b88f4b2f04dde2d14aebfb4bab9ffde78f019e96
+#+s6-networking.85734b23e3931b5af0445309168259e57ffa40a8609ca2980ce6dab846e8d746
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
+#+aat.f21a6f6c24ad54036c025c5abcfd8293a212431d81d723d63802c481e61876da
+#+confz.ba84486d8a73067ff302d62b8077ee97ec19483f16d7d4db498b3610a3f4cffe
+#+containers.0f8ae60c899a10f9824c8e07ad1ace10e764598901590fc0df1962bfc7141b70
+#+fileset.a7acc2f17ebef9a0ccf78c540f3594d6ea08c3eec8f23f8cfd55b3fc3716c06e
+#+logincaps.6628a901ccfbe22a7b18565f2d557c098e3262c406a2838c29752b4ecdc80604
+#+snaprep.0d93dc4b9bbfc075c778ca2ec5d335975482de724eea20600d2aba12be2e8f2d
+#+curl.1fa7b6fecf09f866f1c568ae6f67b31859fc3bfb6140a735ed4a4bda95289c18
+#+git.119c44298093da99bbc6450225491c63fe9ed8915669523279c8a0d4be51af67
+#+linux.d0379ac594d41984b8437e5fefc4c84543461adc6ac0e1e4f6a935478f35be33
+#+core-system-conf.6eabdfada201ba56170958394652b22da376b6a87780380dbd01f9cf77245232
+#+core-system-rc.1662e7ad89f8654eb3b12d3b5192c31b6964b22ea713950551a4ed4532e453c5
+#+core-system-scripts.e16d5c1ade8b3a957591c2427169369516f88f877550ab8bbad821d3ef528de4
+#+core-system-init.478a07e1e39a4ed5589cebae802157a94512ea8bb40a93d82e36e41d46258de8+
\ No newline at end of file
diff --git a/packages/diffutils b/packages/diffutils
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
#@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
autotools() {
diff --git a/packages/elf.h b/packages/elf.h
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
#@sha256:a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e:elf.h
installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
diff --git a/packages/elfutils b/packages/elfutils
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
#@untar:-j:sha256:39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8:.
autotools() {
@@ -61,7 +61,7 @@ check_static() {
export CFLAGS="-D_GNU_SOURCE -Wno-error -Wno-null-dereference"
-export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e/lib"
+export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3/lib"
autotools elfutils-0.189 \
--disable-nls \
diff --git a/packages/execline b/packages/execline
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
#@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline
: ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 'execline'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/fileset b/packages/fileset
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
#@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset
: ${JOBS:=1}
diff --git a/packages/flex b/packages/flex
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
#@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
autotools() {
diff --git a/packages/git b/packages/git
@@ -1,11 +1,11 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
-#+libressl.7806a2b0e0e16ae8a9b458b2f26fa864a048e1b5e528ffea8a95e9d2d5b15a5f
-#+curl.4db5dfc71e30faa80dee1eeab0a5b575e49a0648aff221b43f4e3cc65f6e2747
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
+#+libressl.dfbec5b57a7b0ba1b6070619b88f4b2f04dde2d14aebfb4bab9ffde78f019e96
+#+curl.1fa7b6fecf09f866f1c568ae6f67b31859fc3bfb6140a735ed4a4bda95289c18
#@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
check_static() {
diff --git a/packages/gnu-make b/packages/gnu-make
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
#+gnu-make.b9624624e15c9dc0974b655c3d04bc34a9bb9d46bb9a32e4a34b52e3b3e68b6f
#+busybox.623b05721c8f2129aae460e64de5710e9962ae4bd0bec65a54abe9c36e14ca7f
#@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
diff --git a/packages/kernel.environment b/packages/kernel.environment
@@ -1 +1 @@
-#+linux.629a8fae5cdbae310416c306801771a9542935de08023a51e5a176073f41b26b-
\ No newline at end of file
+#+linux.d0379ac594d41984b8437e5fefc4c84543461adc6ac0e1e4f6a935478f35be33+
\ No newline at end of file
diff --git a/packages/libelf-compat b/packages/libelf-compat
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
#@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6
#@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch
#@untar:-j:sha256:4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d:.
diff --git a/packages/libelf.h b/packages/libelf.h
@@ -1,5 +1,5 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
#@sha256:9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86:include/dwarf.h
#@sha256:0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b:include/gelf.h
#@sha256:3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e:include/libelf.h
diff --git a/packages/libressl b/packages/libressl
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
autotools() {
diff --git a/packages/linux b/packages/linux
@@ -1,13 +1,13 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+diffutils.b04f2a258e98df0a884f16a39f8c28200b316afba6dc0a0e501ae0907fef9e97
-#+patch.0dce8b16b24a4e6d9b2943d0eb59b0b039f724418cbc9ad46bc24311b3bec570
-#+flex.4cc0a40b9b682f6d3635bc160075834584b62fe79864f6955d530fb6ad458a52
-#+bison.05d816b1f907c867d6d32417a83f4b8d1eaa5bfe81540db8901bacabdaa92c9e
-#+rsync.84ae7b1142320cc7371f876785be99b6dbd6cbc5b2e162cc73e871284d3184eb
-#+libelf-compat.9f69edeca0045c22cfd4036176ed46fd7858918ec1673689508e27df2f15b617
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+diffutils.48c5393dbd5f0f458d0132c331537f68643fb873c4d3cdf75b63b4770924ea59
+#+patch.b85bb5d7b8371505c05abe552a0e3a7f412fe7f150359dd486a2d42c39884b62
+#+flex.d68f16cd45e8025c447658814fe8fdaa05c70ded82664419fe54bc5a6a5710f1
+#+bison.9636b0c77af01c5f301aeb1fddb1876d71a9d46c65b29f46b8573a06f057abaf
+#+rsync.0be5acdea04cdd236fa74dcba89a3c1b69bdc0430b93a4975c34cceeee0f2028
+#+libelf-compat.865da4cc52c629325438500fb60f27892704a132484d6d1127f899b34fa2f374
#@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
#@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
#@sha256:cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888:linux.config
diff --git a/packages/logincaps b/packages/logincaps
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
#@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps
: ${JOBS:=1}
diff --git a/packages/m4 b/packages/m4
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
autotools() {
diff --git a/packages/mdevd b/packages/mdevd
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
#@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd
: ${JOBS:=1}
@@ -15,7 +15,7 @@ cd 'mdevd'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/sysdeps' \
--with-include="$pthbs_build_environment/include" \
--with-lib="$pthbs_build_environment/library" \
--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/packages/musl-cross-make b/packages/musl-cross-make
@@ -13,6 +13,7 @@
#@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz
#@sha256:3ca74cf91b912122ba74d0bbe3faf4979c5c7ad0c5884a6000cb8cbc4e1bbcb2:musl-cross-make/patches/linux-headers-4.19.88-1/0001-asound-time64.diff
#@sha256:4213e75809588e3f32ae0fde8fb11df2dfd6e0e013762ff5ee951c3aadb7ffc0:musl-cross-make/patches/linux-6.5.4/0001-no-rsync-headers.diff
+#@sha256:68140a82582ede938159630bca0fb13a93b4bf1cb2e85b08943c26242cf8f3a6:zpipe.c
: ${JOBS:=1}
@@ -42,18 +43,19 @@ sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-mu
make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make || exit $?
make -C musl-cross-make install || exit $?
+dd=$pthbs_destdir//home/ccx/versions/$pthbs_package
+
# Override linker symlink
-for linkname in "${pthbs_destdir%/}"'/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/'ld-musl-*so*; do
+for linkname in "$dd"'/x86_64-linux-musl/lib/'ld-musl-*so*; do
ln -s -f libc.so "$linkname"
done
# Validate the compiler
-"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version
-"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' -o true true.c
-"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
+"$dd"'/bin/x86_64-linux-musl-gcc' --version
+"$dd"'/bin/x86_64-linux-musl-gcc' -o true true.c
+"$dd"'/bin/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker
grep -F "$pthbs_package" true.linker
-dd=$pthbs_destdir//home/ccx/versions/$pthbs_package
pkgs="gmp intl mpc mpfr zlib"
#pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin"
@@ -62,6 +64,12 @@ for pkg in $pkgs; do
done
cp -va musl-cross-make/gcc-11.2.0.orig/zlib/zlib.h "$dd/include/"
+# validate zlib
+"$dd"'/bin/x86_64-linux-musl-gcc' -static -lz -o zpipe zpipe.c
+./zpipe <true.c >true.c.gz
+./zpipe <true.c.gz >true.c.2
+cmp -s true.c true.c.2
+
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/packages/netbsd-curses b/packages/netbsd-curses
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
#@git:5874f9b1ced9c29d7d590d95e254b252f657a160:curses
export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so"
diff --git a/packages/patch b/packages/patch
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
#@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
autotools() {
diff --git a/packages/popt b/packages/popt
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
#@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
autotools() {
diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
#@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
diff --git a/packages/rsync b/packages/rsync
@@ -1,11 +1,11 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
-#+popt.3c2c8a70b4839c101543fa91ba281e5db6aef85139b583eed761092366961593
-#+libressl.7806a2b0e0e16ae8a9b458b2f26fa864a048e1b5e528ffea8a95e9d2d5b15a5f
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
+#+popt.6df810cde8e2d9545cb2b1f9ec11225ef466fb536a00fbe75fc1eaaf7f9b3a2e
+#+libressl.dfbec5b57a7b0ba1b6070619b88f4b2f04dde2d14aebfb4bab9ffde78f019e96
#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
autotools() {
diff --git a/packages/s6 b/packages/s6
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+patch.0dce8b16b24a4e6d9b2943d0eb59b0b039f724418cbc9ad46bc24311b3bec570
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+patch.b85bb5d7b8371505c05abe552a0e3a7f412fe7f150359dd486a2d42c39884b62
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
#@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='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/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
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
#@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns
: ${JOBS:=1}
@@ -14,7 +14,7 @@ cd 's6-dns'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/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
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
-#+s6.4f191f8633b14fbee01ec8d354cdc42ebd1f9d2c51e300089964dd73a585e675
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
+#+s6.da47b41c5c54b6217f1884d0fac48dd9cf18873556a8bfe51a5e48db99fdb30e
#@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='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/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
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
#@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='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/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
@@ -1,12 +1,12 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
-#+s6.4f191f8633b14fbee01ec8d354cdc42ebd1f9d2c51e300089964dd73a585e675
-#+s6-dns.7ae5302a8c893b1c2c149f159db0b7f022b3a5045bf43e21a64e7401200422e3
-#+libressl.7806a2b0e0e16ae8a9b458b2f26fa864a048e1b5e528ffea8a95e9d2d5b15a5f
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
+#+s6.da47b41c5c54b6217f1884d0fac48dd9cf18873556a8bfe51a5e48db99fdb30e
+#+s6-dns.57258c2d21614ba9b2940a22510d4a4fede10bbac6f0ef0371ebe89003ddec6f
+#+libressl.dfbec5b57a7b0ba1b6070619b88f4b2f04dde2d14aebfb4bab9ffde78f019e96
#@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking
: ${JOBS:=1}
@@ -18,7 +18,7 @@ cd 's6-networking'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/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
@@ -1,8 +1,8 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
#@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='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/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
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
-#+s6.4f191f8633b14fbee01ec8d354cdc42ebd1f9d2c51e300089964dd73a585e675
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
+#+s6.da47b41c5c54b6217f1884d0fac48dd9cf18873556a8bfe51a5e48db99fdb30e
#@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc
: ${JOBS:=1}
@@ -16,7 +16,7 @@ cd 's6-rc'
--bindir="${prefix}/command" \
--libdir="${prefix}/library" \
--shebangdir="${prefix}/command" \
- --with-sysdeps='/home/ccx/versions/skalibs.06e44fd6c8468025bb8e6b19d7b10c11f707b97c7aec141c31360392082cd441/sysdeps' \
+ --with-sysdeps='/home/ccx/versions/skalibs.cfebf60188d470962f1b0c5319428b1b03f3df1995813b84a9555acd6d566812/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
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
#@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs
: ${JOBS:=1}
diff --git a/packages/snaprep b/packages/snaprep
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
#@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
: ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -1,28 +1,28 @@
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+diffutils.b04f2a258e98df0a884f16a39f8c28200b316afba6dc0a0e501ae0907fef9e97
-#+patch.0dce8b16b24a4e6d9b2943d0eb59b0b039f724418cbc9ad46bc24311b3bec570
-#+flex.4cc0a40b9b682f6d3635bc160075834584b62fe79864f6955d530fb6ad458a52
-#+bison.05d816b1f907c867d6d32417a83f4b8d1eaa5bfe81540db8901bacabdaa92c9e
-#+rsync.84ae7b1142320cc7371f876785be99b6dbd6cbc5b2e162cc73e871284d3184eb
-#+execline.5605d3db0fc5ef95c12dfb1f068968855949140120a5c19703d6a758f4042da2
-#+s6.4f191f8633b14fbee01ec8d354cdc42ebd1f9d2c51e300089964dd73a585e675
-#+s6-rc.224f5705478aacbe96fa2a61bb740098260a65f2b2de89efd316cb7d7ec32af2
-#+s6-portable-utils.1996f82884a04be891f3d9c5d3dce7c4080c31663fed3d80a0d2fa5e2bce3593
-#+s6-linux-utils.81860f28b21d99d66e743d4863fa79733c075f45da8df3eea754862f9850f4da
-#+s6-linux-init.41986a5fbaa6322cf06cf06cc588fca5f5e80d4388b0ee968f263dc59a61ac09
-#+mdevd.47a4fc281c3c2db0dae8fd7f3afe5e857a4e061afcc0e5ee3e29d3346e6d4295
-#+s6-dns.7ae5302a8c893b1c2c149f159db0b7f022b3a5045bf43e21a64e7401200422e3
-#+libressl.7806a2b0e0e16ae8a9b458b2f26fa864a048e1b5e528ffea8a95e9d2d5b15a5f
-#+s6-networking.52cd0a7e1a9d36edf70e3be089bc954df302703e1e2f2a9b8b3c42f7f63f09d7
-#+zsh.3fcf9f9f10b789a1283bbc35083c26df4d42cd77c68d5368e1ab91a5359146ec
-#+pthbs-banginstall.eaff61876d7a26891b9fdf0ccaeb8c2f7528d075ba3d983e991d2c2c33064ed4
-#+aat.8f9a087ca32d82b31dc5822a0c083ac8bed60b824679658f2102b1c891c6a35f
-#+confz.9e4bcfc02a1acc763e9d6caf4834a633ef1eda55ee9fd07b830e4f1a14e0c260
-#+containers.035952a955a75c2d4b718dcf08ef1649b7dd773a3e3180c0da951f9842dc8ae2
-#+fileset.b1cda31023cc9daed2e46898a1b984d20b53d26760b7b5da7b8d2956e8f0eb4d
-#+logincaps.cf9ecbaa74f2b00224b75d09d39fffb24963da86ed28309d43ba361e723ad0bd
-#+snaprep.1951acef70708a26d64bfddec3364d89b4937a4bac1178a141328f00e47f6118
-#+curl.4db5dfc71e30faa80dee1eeab0a5b575e49a0648aff221b43f4e3cc65f6e2747
-#+git.e9aa2bf42309f8061135b66df0b22cee9b3bacd9a2bf8f187a7a9b3dc7691865-
\ No newline at end of file
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+diffutils.48c5393dbd5f0f458d0132c331537f68643fb873c4d3cdf75b63b4770924ea59
+#+patch.b85bb5d7b8371505c05abe552a0e3a7f412fe7f150359dd486a2d42c39884b62
+#+flex.d68f16cd45e8025c447658814fe8fdaa05c70ded82664419fe54bc5a6a5710f1
+#+bison.9636b0c77af01c5f301aeb1fddb1876d71a9d46c65b29f46b8573a06f057abaf
+#+rsync.0be5acdea04cdd236fa74dcba89a3c1b69bdc0430b93a4975c34cceeee0f2028
+#+execline.b0fdab079b9612d7ec74e8e307c2758496d41bca85b228edadee0794e1c98cfa
+#+s6.da47b41c5c54b6217f1884d0fac48dd9cf18873556a8bfe51a5e48db99fdb30e
+#+s6-rc.6f05d26f7a29f4e04b405cdff363fd768677b2287fb04c7a6b82964864004b01
+#+s6-portable-utils.eb6806612d3b4f878bc408bf73a6362d4c34418f3927ed3bfd5585d2e4f10449
+#+s6-linux-utils.c674f77b1a3182fc0fe7c4815bac7f1fec6483208fc170a55126483500793582
+#+s6-linux-init.6a1a5a116e61ba0de2c0ecec481a5a01d21589f8ab407061db203bf4106410d6
+#+mdevd.9845ef5cbbd065f2c2b9a5fd72b71b7b30f7dcf211d6d31b0c26e1f632e87853
+#+s6-dns.57258c2d21614ba9b2940a22510d4a4fede10bbac6f0ef0371ebe89003ddec6f
+#+libressl.dfbec5b57a7b0ba1b6070619b88f4b2f04dde2d14aebfb4bab9ffde78f019e96
+#+s6-networking.85734b23e3931b5af0445309168259e57ffa40a8609ca2980ce6dab846e8d746
+#+zsh.ddafd216de755d8f50e43ee2ed599237c4ad1f06620d99e04b97059f618940df
+#+pthbs-banginstall.11f6ad4abb9304ea0d3d15ffdcc8ddcc1011897a72210de0190cce95aa5cdff1
+#+aat.f21a6f6c24ad54036c025c5abcfd8293a212431d81d723d63802c481e61876da
+#+confz.ba84486d8a73067ff302d62b8077ee97ec19483f16d7d4db498b3610a3f4cffe
+#+containers.0f8ae60c899a10f9824c8e07ad1ace10e764598901590fc0df1962bfc7141b70
+#+fileset.a7acc2f17ebef9a0ccf78c540f3594d6ea08c3eec8f23f8cfd55b3fc3716c06e
+#+logincaps.6628a901ccfbe22a7b18565f2d557c098e3262c406a2838c29752b4ecdc80604
+#+snaprep.0d93dc4b9bbfc075c778ca2ec5d335975482de724eea20600d2aba12be2e8f2d
+#+curl.1fa7b6fecf09f866f1c568ae6f67b31859fc3bfb6140a735ed4a4bda95289c18
+#+git.119c44298093da99bbc6450225491c63fe9ed8915669523279c8a0d4be51af67+
\ No newline at end of file
diff --git a/packages/zsh b/packages/zsh
@@ -1,10 +1,10 @@
#!/usr/bin/env pthbs-build
-#+musl-cross-make.5491031136a290f22709505e957e55fd90df0aba0c80bfaa6cb5f434d597734e
-#+gnu-make.c66e6583253e5e24901e1e030f6116cec45ba125d10b446021ea96d7a9f7ff30
-#+busybox.97f683957d53e7042851d3ff57b91a4717298cb2eba07824510998ae9ff347d8
-#+busybox-diffutils.9ba79c045b71ba1e421a971ff04b1198b6b3ea0c03b672082dfb133d8b772573
-#+m4.a20a7ff1c25463cc3f3f4d4625262e3af3f4156debe53ffe3a2025a9ad058232
-#+netbsd-curses.7853468edaebcb1c5bd128293376034dcd184112d574a0035010df1cefea1424
+#+musl-cross-make.d28e43a5311bac7fda60396162f3c4c83e39ace61210940b4e558f70a161bbd3
+#+gnu-make.37a27d25bc9bd9789c511c50e29b0dbee32070560bf170306b85a56b4b4a0235
+#+busybox.6e6145567192b204e34f4fc7b413ececf1522d161d491820f29013047573083c
+#+busybox-diffutils.536a57f25e63cfe9798ae8d650f42beb64a9c9a83c8eedaef6be0cbba358aa9e
+#+m4.65797aa81695eb1109440cced13bd176034a2ff672625a6d1e68f6420f257508
+#+netbsd-curses.7730a8d73d93d34570d712efc7af247895c5b198bb2fe8aee8ed934195955d2a
#@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh
#@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make
@@ -14,6 +14,7 @@
#@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz
#@sha256:3ca74cf91b912122ba74d0bbe3faf4979c5c7ad0c5884a6000cb8cbc4e1bbcb2:musl-cross-make/patches/linux-headers-4.19.88-1/0001-asound-time64.diff
#@sha256:4213e75809588e3f32ae0fde8fb11df2dfd6e0e013762ff5ee951c3aadb7ffc0:musl-cross-make/patches/linux-6.5.4/0001-no-rsync-headers.diff
+#@sha256:{{files["zpipe.c"]}}:zpipe.c
: ${JOBS:=1}
@@ -43,18 +44,19 @@ sed -i -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-mu
{{make}} -C musl-cross-make || exit $?
make -C musl-cross-make install || exit $?
+dd=$pthbs_destdir/{{versions}}/$pthbs_package
+
# Override linker symlink
-for linkname in "${pthbs_destdir%/}"'{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/'ld-musl-*so*; do
+for linkname in "$dd"'/{{triplet}}/lib/'ld-musl-*so*; do
ln -s -f libc.so "$linkname"
done
# Validate the compiler
-"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version
-"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' -o true true.c
-"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-readelf' --string-dump=.interp true >true.linker
+"$dd"'/bin/{{triplet}}-gcc' --version
+"$dd"'/bin/{{triplet}}-gcc' -o true true.c
+"$dd"'/bin/{{triplet}}-readelf' --string-dump=.interp true >true.linker
grep -F "$pthbs_package" true.linker
-dd=$pthbs_destdir/{{versions}}/$pthbs_package
pkgs="gmp intl mpc mpfr zlib"
#pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin"
@@ -63,6 +65,12 @@ for pkg in $pkgs; do
done
cp -va musl-cross-make/gcc-11.2.0.orig/zlib/zlib.h "$dd/include/"
+# validate zlib
+"$dd"'/bin/{{triplet}}-gcc' -static -lz -o zpipe zpipe.c
+./zpipe <true.c >true.c.gz
+./zpipe <true.c.gz >true.c.2
+cmp -s true.c true.c.2
+
{% endblock %}
{% block genlinks_begin %}
x["./bin/{{triplet}}-g++"]=1
