diff options
Diffstat (limited to 'core')
228 files changed, 751 insertions, 743 deletions
diff --git a/core/b3sum/build b/core/b3sum/build new file mode 100755 index 00000000..cc2b98a4 --- /dev/null +++ b/core/b3sum/build @@ -0,0 +1,15 @@ +#!/bin/sh -e + +asm=1 +case $3 in i*86) asm=0; esac + +mk() { + make \ + PREFIX=/usr \ + LDFLAGS="$LDFLAGS -static" \ + WITH_ASM="$asm" \ + "$@" +} + +mk +mk DESTDIR="$1" install diff --git a/core/b3sum/checksums b/core/b3sum/checksums new file mode 100644 index 00000000..22c21cad --- /dev/null +++ b/core/b3sum/checksums @@ -0,0 +1 @@ +5f91e0ac4301ccf49dd81264d3a6705e788296bb85cd0f7fb044e096728b7991 b1de822a.tar.gz diff --git a/core/b3sum/meta b/core/b3sum/meta new file mode 100644 index 00000000..4fc2acea --- /dev/null +++ b/core/b3sum/meta @@ -0,0 +1,3 @@ +description: Compute BLAKE3 message digests +license: CC0-1.0 +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/b3sum/sources b/core/b3sum/sources new file mode 100644 index 00000000..947c515b --- /dev/null +++ b/core/b3sum/sources @@ -0,0 +1 @@ +https://git.sr.ht/~mcf/b3sum/archive/b1de822a.tar.gz diff --git a/core/ca-certificates/version b/core/b3sum/version index 82026115..82026115 100644 --- a/core/ca-certificates/version +++ b/core/b3sum/version diff --git a/core/baselayout/build b/core/baselayout/build index d55a8d0f..b194829d 100755 --- a/core/baselayout/build +++ b/core/baselayout/build @@ -5,12 +5,6 @@ # The fallback is for backwards compatibility, this will be dropped later. sys_arch=${3:-$(uname -m)} -kinstall_t() { - mod=$1 dir=$2; mkdir -p "$2" - shift 2 - for file do cp "$file" "$dir"; chmod "$mod" "$file"; done -} - # Setup base directories. for d in boot dev etc home mnt usr var opt run; do mkdir -pm 755 "$1/$d" @@ -66,10 +60,9 @@ done ln -s ../man "$1/usr/local/share/man" # /etc skeleton files. -kinstall_t 644 "$1/etc" fstab group host.conf hosts issue keymap os-release \ - passwd profile securetty shells mime.types -kinstall_t 600 "$1/etc" crypttab shadow - -kinstall_t 755 "$1/usr/bin" install-sv +clinst -Dm644 -t "$1/etc" +clinst -Dm644 -t "$1/etc" fstab group host.conf hosts issue keymap os-release \ + passwd profile securetty shells mime.types +clinst -Dm600 -t "$1/etc" crypttab shadow ln -s /proc/self/mounts "$1/etc/mtab" diff --git a/core/baselayout/checksums b/core/baselayout/checksums index b4b4e3d2..9a7938d6 100644 --- a/core/baselayout/checksums +++ b/core/baselayout/checksums @@ -1,5 +1,4 @@ 3698c87cc3af757f0302f6d7f034350b1b22a7f25b2f71944292d0fb3de67cd7 crypttab -898834c6adcadd039e56b7c362ae357a54166a7c01348c6413a4117e662e4605 install-sv f85cb0b07f49ff20c4838c267ffb093a136fb5bfdf01badcb03eced852ffea89 fstab 38c9f4047ba597248ef199a77afbd36f873cfa4aeb70de90bac7f237faf2ecba group a0fa9cd303cf7f1718f51e5624a671a418946718b790508b8988bccd542c6451 host.conf diff --git a/core/baselayout/depends b/core/baselayout/depends new file mode 100644 index 00000000..9adf49ca --- /dev/null +++ b/core/baselayout/depends @@ -0,0 +1 @@ +cl-utils diff --git a/core/baselayout/files/install-sv b/core/baselayout/files/install-sv deleted file mode 100755 index 509b2516..00000000 --- a/core/baselayout/files/install-sv +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -e -# Carbs Linux service installer - -usage() { - printf '%s\n' \ - "usage: ${0##*/} [FILE...]" \ - "or: ${0##*/} [-a NAME FILE]" "" \ - "You can set the DESTDIR environment variable to set a different root." - exit 1 -} - -svname='' -case "$1" in - --help|-h|'') usage ;; - -a) [ "$#" -eq 3 ] || usage - svname=$2; shift 2 -esac - -for service; do - # Remove .run suffix and the directory name for service files. - sv=${svname:-${service%.run}} sv=${sv##*/} - - # Create the service directories and copy the service file to them. - mkdir -p "$DESTDIR/etc/sysmgr" "$DESTDIR/etc/sv/$sv" - cp "$service" "$DESTDIR/etc/sysmgr/$sv" - cp "$service" "$DESTDIR/etc/sv/$sv/run" - - # Set permissions for the services. - chmod 0755 "$DESTDIR/etc/sysmgr/$sv" "$DESTDIR/etc/sv/$sv/run" - - # Create supervise directories for runit. - ln -s "/run/runit/supervise.$sv" "$DESTDIR/etc/sv/$sv/supervise" - -done diff --git a/core/baselayout/meta b/core/baselayout/meta new file mode 100644 index 00000000..9fe201c4 --- /dev/null +++ b/core/baselayout/meta @@ -0,0 +1,3 @@ +description: Carbs Linux base directories / scripts / configuration +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/baselayout/sources b/core/baselayout/sources index 44f9434f..a663d479 100644 --- a/core/baselayout/sources +++ b/core/baselayout/sources @@ -1,5 +1,4 @@ files/crypttab -files/install-sv files/fstab files/group files/host.conf diff --git a/core/baselayout/version b/core/baselayout/version index cba3471e..606c19ac 100644 --- a/core/baselayout/version +++ b/core/baselayout/version @@ -1 +1 @@ -2 1 +3 1 diff --git a/core/bearssl/build b/core/bearssl/build deleted file mode 100755 index c0e5e7f2..00000000 --- a/core/bearssl/build +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -e - -for patch in *.patch; do - patch -p1 < "$patch" -done - -kinstall() { - mkdir -p "${3%/*}"; cp "$2" "$3" - chmod "$1" "$3" -} - -make "CC=${CC:=cc}" "AR=${AR:=ar}" LD=$CC - -# Build static binary for bearssl, word splitting on CFLAGS is intentional. -# shellcheck disable=2086 -"$CC" -static $CFLAGS \ - -I ./inc \ - -include tools/brssl.h \ - tools/*.c \ - build/libbearssl.a \ - -o brssl - -kinstall 755 brssl "$1/usr/bin/brssl" -kinstall 644 build/libbearssl.a "$1/usr/lib/libbearssl.a" -kinstall 755 build/libbearssl.so "$1/usr/lib/libbearssl.so" - -mv inc "$1/usr/include" diff --git a/core/bearssl/checksums b/core/bearssl/checksums deleted file mode 100644 index 86e8e8a6..00000000 --- a/core/bearssl/checksums +++ /dev/null @@ -1,4 +0,0 @@ -6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14 bearssl-0.6.tar.gz -ad783bbbbb58bbdad66af299c5a0ea5389474a7d7256391673fe94e88f11fbef 0001-Add-missing-return-in-client-single-EC-choose-functi.patch -414fd90fc27353ae3ca2478b68891715088de8b6cf6b81927ed8337df63f47e4 0002-Add-functions-to-retrieve-certificate-validity-perio.patch -a738717ddfb68c95813f869a1f2cc6a6cd60cdb9b548c854896d4992dce6b3f5 0003-brssl-client-add-option-to-ignore-EOF.patch diff --git a/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch b/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch deleted file mode 100644 index 421bbc7f..00000000 --- a/core/bearssl/patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a5c3ea02385205858128e414873a0150cd8bceda Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Fri, 31 Jan 2020 15:11:32 -0800 -Subject: [PATCH] Add missing return in client single EC choose function - -Otherwise, static ECDH is never selected. ---- - src/ssl/ssl_ccert_single_ec.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ssl/ssl_ccert_single_ec.c b/src/ssl/ssl_ccert_single_ec.c -index 93ebcde..2e1e54f 100644 ---- a/src/ssl/ssl_ccert_single_ec.c -+++ b/src/ssl/ssl_ccert_single_ec.c -@@ -69,6 +69,7 @@ cc_choose(const br_ssl_client_certificate_class **pctx, - choices->hash_id = -1; - choices->chain = zc->chain; - choices->chain_len = zc->chain_len; -+ return; - } - } - --- -2.25.0 - diff --git a/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch b/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch deleted file mode 100644 index 8377da4d..00000000 --- a/core/bearssl/patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 31fdee5b9d8fc63c850222768dcd097e43da0116 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Thu, 26 Mar 2020 14:17:19 -0700 -Subject: [PATCH] Add functions to retrieve certificate validity period from - br_x509_decoder. - ---- - inc/bearssl_x509.h | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -diff --git a/inc/bearssl_x509.h b/inc/bearssl_x509.h -index 49d2fba..9d43e15 100644 ---- a/inc/bearssl_x509.h -+++ b/inc/bearssl_x509.h -@@ -1045,6 +1045,42 @@ br_x509_decoder_last_error(br_x509_decoder_context *ctx) - return 0; - } - -+/** -+ * \brief Get the time when the certificate becomes valid. -+ * -+ * The time is represented the same as in `br_x509_minimal_set_time()`. -+ * These values should not be read before decoding completed successfully. -+ * -+ * \param ctx X.509 decoder context. -+ * \param days receives the days since January 1st, 0 AD. -+ * \param seconds receives the seconds since midnight (0 to 86400). -+ */ -+static inline void -+br_x509_decoder_get_notbefore(br_x509_decoder_context *ctx, -+ uint32_t *days, uint32_t *seconds) -+{ -+ *days = ctx->notbefore_days; -+ *seconds = ctx->notbefore_seconds; -+} -+ -+/** -+ * \brief Get the time when the certificate is no longer valid. -+ * -+ * The time is represented the same as in `br_x509_minimal_set_time()`. -+ * These values should not be read before decoding completed successfully. -+ * -+ * \param ctx X.509 decoder context. -+ * \param days receives the days since January 1st, 0 AD. -+ * \param seconds receives the seconds since midnight (0 to 86400). -+ */ -+static inline void -+br_x509_decoder_get_notafter(br_x509_decoder_context *ctx, -+ uint32_t *days, uint32_t *seconds) -+{ -+ *days = ctx->notafter_days; -+ *seconds = ctx->notafter_seconds; -+} -+ - /** - * \brief Get the "isCA" flag from an X.509 decoder context. - * --- -2.26.0 - diff --git a/core/bearssl/patches/0003-brssl-client-add-option-to-ignore-EOF.patch b/core/bearssl/patches/0003-brssl-client-add-option-to-ignore-EOF.patch deleted file mode 100644 index 684710f8..00000000 --- a/core/bearssl/patches/0003-brssl-client-add-option-to-ignore-EOF.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 694cf4248db1664936ce43e33db0b4c5dc35bad7 Mon Sep 17 00:00:00 2001 -From: Cem Keylan <cem@ckyln.com> -Date: Wed, 17 Feb 2021 22:39:35 +0300 -Subject: [PATCH] brssl client: add option to ignore EOF. - -I have added a -igneof option to the bearssl client, so that I can -patch busybox to use bearssl instead of openssl. I did not add the -option to the server, because I have personally never used it, and -don't have a use case. ---- - tools/brssl.h | 1 + - tools/client.c | 9 ++++++++- - tools/sslio.c | 10 +++++++--- - 3 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/tools/brssl.h b/tools/brssl.h -index a23ba00..15876eb 100644 ---- a/tools/brssl.h -+++ b/tools/brssl.h -@@ -514,6 +514,7 @@ int run_ssl_engine(br_ssl_engine_context *eng, - - #define RUN_ENGINE_VERBOSE 0x0001 /* enable verbose messages */ - #define RUN_ENGINE_TRACE 0x0002 /* hex dump of records */ -+#define RUN_ENGINE_IGNEOF 0x0004 /* do not exit after EOF */ - - /* - * Do the "client" command. Returned value is 0 on success, -1 on failure. -diff --git a/tools/client.c b/tools/client.c -index 9838857..3388b09 100644 ---- a/tools/client.c -+++ b/tools/client.c -@@ -467,6 +467,8 @@ usage_client(void) - fprintf(stderr, - " -trace activate extra debug messages (dump of all packets)\n"); - fprintf(stderr, -+" -igneof do not exit after stdin is closed\n"); -+ fprintf(stderr, - " -sni name use this specific name for SNI\n"); - fprintf(stderr, - " -nosni do not send any SNI\n"); -@@ -511,6 +513,7 @@ do_client(int argc, char *argv[]) - int retcode; - int verbose; - int trace; -+ int igneof; - int i, bidi; - const char *server_name; - char *host; -@@ -543,6 +546,7 @@ do_client(int argc, char *argv[]) - retcode = 0; - verbose = 1; - trace = 0; -+ igneof = 0; - server_name = NULL; - host = NULL; - port = NULL; -@@ -584,6 +588,8 @@ do_client(int argc, char *argv[]) - verbose = 0; - } else if (eqstr(arg, "-trace")) { - trace = 1; -+ } else if (eqstr(arg, "-igneof")) { -+ igneof = 1; - } else if (eqstr(arg, "-sni")) { - if (++ i >= argc) { - fprintf(stderr, -@@ -1077,7 +1083,8 @@ do_client(int argc, char *argv[]) - */ - if (run_ssl_engine(&cc.eng, fd, - (verbose ? RUN_ENGINE_VERBOSE : 0) -- | (trace ? RUN_ENGINE_TRACE : 0)) != 0) -+ | (trace ? RUN_ENGINE_TRACE : 0) -+ | (igneof ? RUN_ENGINE_IGNEOF : 0)) != 0) - { - goto client_exit_error; - } else { -diff --git a/tools/sslio.c b/tools/sslio.c -index ef7dd3f..fc6e0f0 100644 ---- a/tools/sslio.c -+++ b/tools/sslio.c -@@ -250,6 +250,7 @@ run_ssl_engine(br_ssl_engine_context *cc, unsigned long fd, unsigned flags) - int retcode; - int verbose; - int trace; -+ int igneof; - #ifdef _WIN32 - WSAEVENT fd_event; - int can_send, can_recv; -@@ -261,6 +262,7 @@ run_ssl_engine(br_ssl_engine_context *cc, unsigned long fd, unsigned flags) - retcode = 0; - verbose = (flags & RUN_ENGINE_VERBOSE) != 0; - trace = (flags & RUN_ENGINE_TRACE) != 0; -+ igneof = (flags & RUN_ENGINE_IGNEOF) != 0; - - /* - * Print algorithm details. -@@ -730,10 +732,12 @@ run_ssl_engine(br_ssl_engine_context *cc, unsigned long fd, unsigned flags) - rlen = read(0, buf, len); - #endif - if (rlen <= 0) { -- if (verbose) { -- fprintf(stderr, "stdin closed...\n"); -+ if (!igneof) { -+ if (verbose) { -+ fprintf(stderr, "stdin closed...\n"); -+ } -+ br_ssl_engine_close(cc); - } -- br_ssl_engine_close(cc); - } else if (!run_command(cc, buf, rlen)) { - br_ssl_engine_sendapp_ack(cc, rlen); - } --- -2.30.1 - diff --git a/core/bearssl/sources b/core/bearssl/sources deleted file mode 100644 index b03853d9..00000000 --- a/core/bearssl/sources +++ /dev/null @@ -1,4 +0,0 @@ -https://bearssl.org/bearssl-0.6.tar.gz -patches/0001-Add-missing-return-in-client-single-EC-choose-functi.patch -patches/0002-Add-functions-to-retrieve-certificate-validity-perio.patch -patches/0003-brssl-client-add-option-to-ignore-EOF.patch diff --git a/core/bearssl/version b/core/bearssl/version deleted file mode 100644 index fe09a3c0..00000000 --- a/core/bearssl/version +++ /dev/null @@ -1 +0,0 @@ -0.6 3 diff --git a/core/binutils/build b/core/binutils/build index 67a1af16..644cb89d 100755 --- a/core/binutils/build +++ b/core/binutils/build @@ -9,13 +9,15 @@ case ${3:-$(uname -m)} in --host=x86_64-pc-linux-musl" esac -cat > makeinfo <<EOF +cpt l -q texinfo || { + cat > makeinfo <<EOF #!/bin/sh printf 'makeinfo (GNU texinfo) 5.2\n' EOF -chmod +x makeinfo -export PATH=$PATH:$PWD + chmod +x makeinfo + export PATH="$PATH:$PWD" +} # Word splitting is intentional here. # shellcheck disable=2086 @@ -29,6 +31,7 @@ export PATH=$PATH:$PWD --disable-nls \ --disable-readline \ --disable-gprof \ + --disable-gprofng \ --with-mmap \ --with-system-zlib diff --git a/core/binutils/checksums b/core/binutils/checksums index f870b8fd..b1eb2e11 100644 --- a/core/binutils/checksums +++ b/core/binutils/checksums @@ -1 +1,2 @@ -e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0 binutils-2.36.1.tar.xz +%BLAKE3 +41ff0592df8c1e8ec5eb086d418e792331c0c49040218462d6c1224b4fa36d04 binutils-2.42.tar.xz diff --git a/core/binutils/meta b/core/binutils/meta new file mode 100644 index 00000000..24e84809 --- /dev/null +++ b/core/binutils/meta @@ -0,0 +1,3 @@ +description: GNU binary utilities +license: GPL-3.0-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/binutils/sources b/core/binutils/sources index bba397f6..d7d4df8a 100644 --- a/core/binutils/sources +++ b/core/binutils/sources @@ -1 +1 @@ -https://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz +https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz diff --git a/core/binutils/version b/core/binutils/version index acefb626..51dff859 100644 --- a/core/binutils/version +++ b/core/binutils/version @@ -1 +1 @@ -2.36.1 1 +2.42 1 diff --git a/core/busybox/build b/core/busybox/build index 28320a46..c4144f19 100755 --- a/core/busybox/build +++ b/core/busybox/build @@ -6,18 +6,35 @@ kinstall() { chmod "$1" "$3" } -for patch in *.patch; do +for patch in patches/*.patch; do patch -p1 < "$patch" done # Build and install regular busybox. # This excludes utilities which require 'suid' to function. -make CC="${CC:-gcc}" +make CC="${CC:=gcc}" make CONFIG_PREFIX="$1/usr" install # Rename the binary temporarily. mv "$1/usr/bin/busybox" "$1/usr/bin/busybox-nosuid" +# Build and install recovery busybox. +# The only difference of this configuration is that it includes a recovery +# shell. +clsed '/SH_STANDALONE/cCONFIG_FEATURE_SH_STANDALONE=y' .config + +# Create an embedded script for recovery sh +mkdir embed + +# We are not trying to expand here. +# shellcheck disable=SC2016 +printf '[ "$SHLVL" -gt 20 ] && exit 1; exec -a ash "$0" "$@"\n' > embed/rcsh +chmod +x embed/rcsh + +make CC="$CC" +make CONFIG_PREFIX="$1/usr" install +mv "$1/usr/bin/busybox" "$1/usr/bin/rcsh" + # Build and install suid busybox. # This _only_ includes utlities which require 'suid' to function. cp -f .config-suid .config @@ -42,7 +59,7 @@ done chmod u+s "$1/usr/bin/busybox-suid" # Install runit and sysmgr services. -DESTDIR=$1 install-sv crond.run mdev.run ntpd.run syslogd.run acpid.run +clsv -d "$1" crond.run mdev.run ntpd.run syslogd.run acpid.run # Install configurations for ntp, init, and mdev. kinstall 644 ntp.conf "$1/etc/ntp.conf" diff --git a/core/busybox/checksums b/core/busybox/checksums index f2d45ccc..02e2693c 100644 --- a/core/busybox/checksums +++ b/core/busybox/checksums @@ -1,17 +1,20 @@ -5416643ac976310a864b1c1ff5a683508258c38441c19912980cd651bcdb45ea v1.33.0.tar.gz -03f4244bffd116f621659bde52d9454a49160e61cc61e9db024186da80c06e13 .config -93e5b0c5395bcc695a578f1e7d30ba65434c77ee856343b2124d35a0ef66148b .config-suid -ebd61afac770d3d9cae5c411f44002496fb18b28cf7b77520072a3909852246e acpid.run -814dea14ac612125e97dcc1d619219b2c9dfc14850bf48d858421fb2c98eca12 crond.run -c8b3502bf493336542247683f8d291753130141e5b20ecfda7077936751e83a7 inittab -af4c302ed9ae6fa1cd8aa51c6f94de11550625e6f1dc0b138605e3429214d082 mdev.conf -224d522c70c349cf656994e4d7f9a34cbe3ece7da253357828649d1187601436 mdev.run -3999bb8986a55b14389196ad70f810c9333ebdf5e03c0fbca2d100a6e8ba3d7e ntpd.run -4a5981f4b0d791fe9b84b0b2e01ae905f6565c8245b3cd603e6decf34ddad71a syslogd.run -2c6012579f669ea790785bb522a879a2005aad0d7977f96863918d3ed3cb03dd ntp.conf -8ce7d65bc9a6da2003bd4dfd89aa355fd8f24fc1fafc37400400f7ac10958caf udhcpc.script -8d84b1719dca2a751c09072c20cd782a3c47f119a68d35316f89d851daf67b88 fsck-resolve-uuid.patch -e31be17d2e058c0bde645f12b38dd6d5a22f8751204304a2df994fc7e523ae9c modprobe-kernel-version.patch -09c2f601fec4e5c10664c22f787dafb9424efe219bf826727c356da90dfd60d5 adduser-no-setgid.patch -f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396 install-fix-chown.patch -68e0c7d5e96902d3b890e89d9b018ae11d53ed3104bfedd624a1485df58b11cb print-unicode.patch +%BLAKE3 +dfdfc1b9aa41d5134e087d904c0a5f6958825f0e94db1d2cb5ea93088247c886 busybox-1.36.1.tar.bz2 +fc5dc136704ed568e6eed3c2c68e687d59427f9cad9bdf36f661b01548211781 .config +eed1e459d62265c81a95107ce88b53ac51592e52d45176a02bcbec7a4f494f1b .config-suid +38c992e63b5639a896a8bd4d8dcf92e220cb96f057d203ba78c5288d59fa0051 acpid.run +743a8fb68c58ed50a1344f8e74026b6b9558ae3c54eb94ff352fdbc4e2d22966 crond.run +4ce27a5bdb8d3fea1f206dde8879d414978d76d3f8d16f48e419d0c7a06edd11 inittab +cb7481478bc34e6d3858cbde2112328c82532a33bd41120f2818b620af51f3ff mdev.conf +dfb198e819f40a559bef89536a657b363fd06328afdb0a881489afb61f6a43e1 mdev.run +f900fc7a2244edee0b235943bd34474eef752164473e642521b0903a8495aa9a ntpd.run +50a50f58ddbffe914a90b7d24fd61ccb786dada38091641740444dc147bfcd2a syslogd.run +ef647235176f05979eca96b8ec7a078f2dc429a88817944ffb1a41f3c8a66929 ntp.conf +4dbd1be865eed963a3a96dcfb040f878e81bc3e874c598006f347e3826a47e64 udhcpc.script +2fc84cd00bba1a27bb692fb61f7b06307bd2a618161c1f019efd5a8432b0f3c5 fsck-resolve-uuid.patch +038f41d3761d38ee42d2d40dd0a1be6f3ad119a1d6a21e8e0742fcfd011fe8c8 modprobe-kernel-version.patch +f62969ee1426bea40ffd603cb01aa4f6e264930ce29a0266b776f5d08253772a adduser-no-setgid.patch +35eaf7a72b7489fb48db7005ef7d232958389fcddd54d6adbfec3c7838628c19 install-fix-chown.patch +fd866b53f9d1ca305c15b93bc2699caaf1c930f093326bb737cc33fa2455787e print-unicode.patch +2490e4471d7349f396fd7cbd07c81726220b9356bb2f680a3d6d43fe6717256f libressl.patch +a25ecd4e21995b6df1ee2476a283fe81cec675cfe9efa34e92bd4d3412acedff less_t.patch diff --git a/core/busybox/depends b/core/busybox/depends index 491a13c6..6e35b012 100644 --- a/core/busybox/depends +++ b/core/busybox/depends @@ -1,3 +1,3 @@ bzip2 -gzip linux-headers make +pigz diff --git a/core/busybox/files/.config b/core/busybox/files/.config index 27045dc1..dc51fd60 100644 --- a/core/busybox/files/.config +++ b/core/busybox/files/.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.33.0 -# Thu Feb 18 03:12:21 2021 +# Busybox version: 1.36.1 +# Fri Jun 2 20:15:17 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,10 +93,16 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_NON_POSIX_CP=y +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y @@ -120,14 +126,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -162,6 +163,8 @@ CONFIG_BZIP2_SMALL=0 CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y +CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y +CONFIG_FEATURE_CPIO_RENUMBER_INODES=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_GZIP is not set @@ -197,6 +200,22 @@ CONFIG_FEATURE_UNZIP_XZ=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +CONFIG_FEATURE_TIMEZONE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -207,11 +226,13 @@ CONFIG_CHOWN=y CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y CONFIG_CHROOT=y CONFIG_CKSUM=y +# CONFIG_CRC32 is not set CONFIG_COMM=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_FEATURE_CP_REFLINK=y CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_FEATURE_DATE_NANO=y @@ -223,6 +244,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -316,13 +338,13 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y CONFIG_TIMEOUT=y CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="Carbs Linux" @@ -343,21 +365,6 @@ CONFIG_WHOAMI=y CONFIG_YES=y # -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# # Console Utilities # CONFIG_CHVT=y @@ -377,7 +384,7 @@ CONFIG_DEFAULT_SETFONT_DIR="" CONFIG_FEATURE_LOADFONT_PSF2=y CONFIG_FEATURE_LOADFONT_RAW=y CONFIG_LOADKMAP=y -# CONFIG_OPENVT is not set +CONFIG_OPENVT=y CONFIG_RESET=y CONFIG_RESIZE=y CONFIG_FEATURE_RESIZE_PRINT=y @@ -424,6 +431,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -437,6 +445,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -445,7 +454,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y CONFIG_FIND=y CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_ATIME=y +CONFIG_FEATURE_FIND_CTIME=y CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_AMIN=y +CONFIG_FEATURE_FIND_CMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_EXECUTABLE=y @@ -453,6 +466,7 @@ CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_SAMEFILE=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y @@ -743,6 +757,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_ASCII is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set CONFIG_BC=y @@ -823,10 +838,12 @@ CONFIG_READAHEAD=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y # CONFIG_SETFATTR is not set # CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set CONFIG_TIME=y +CONFIG_TREE=y # CONFIG_TS is not set CONFIG_TTYSIZE=y # CONFIG_UBIATTACH is not set @@ -838,6 +855,7 @@ CONFIG_TTYSIZE=y # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -846,6 +864,9 @@ CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y # CONFIG_FEATURE_TLS_SHA1 is not set CONFIG_ARP=y CONFIG_ARPING=y @@ -864,6 +885,7 @@ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y # CONFIG_DNSDOMAINNAME is not set CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80 CONFIG_FEATURE_HTTPD_RANGES=y CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y @@ -956,6 +978,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y CONFIG_TELNETD=y CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23 CONFIG_FEATURE_TELNETD_INETD_WAIT=y CONFIG_TFTP=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y @@ -966,7 +989,7 @@ CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y # CONFIG_TFTP_DEBUG is not set CONFIG_TLS=y -# CONFIG_TRACEROUTE is not set +CONFIG_TRACEROUTE=y CONFIG_TRACEROUTE6=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y @@ -976,24 +999,24 @@ CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_FTP=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_FEATURE_WGET_HTTPS=y -CONFIG_FEATURE_WGET_BEARSSL=y -CONFIG_WGET_BEARSSL_CA_CERTIFICATE=y -CONFIG_WGET_BEARSSL_CA_CERTIFICATE_FILE="/etc/certificates/cert.pem" +CONFIG_FEATURE_WGET_OPENSSL=y CONFIG_WHOIS=y # CONFIG_ZCIP is not set -# CONFIG_UDHCPD is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_DUMPLEASES is not set -# CONFIG_DHCPRELAY is not set +CONFIG_UDHCPD=y +CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_DUMPLEASES=y +CONFIG_DHCPRELAY=y CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/etc/udhcpc" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="/etc/udhcpc6" CONFIG_UDHCPC6=y CONFIG_FEATURE_UDHCPC6_RFC3646=y CONFIG_FEATURE_UDHCPC6_RFC4704=y @@ -1003,7 +1026,8 @@ CONFIG_FEATURE_UDHCPC6_RFC5970=y # # Common options for DHCP applets # -# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" +CONFIG_FEATURE_UDHCP_PORT=y CONFIG_UDHCP_DEBUG=2 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_FEATURE_UDHCP_RFC3397=y @@ -1020,17 +1044,19 @@ CONFIG_LPQ=y # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="us-ascii" CONFIG_MAKEMIME=y CONFIG_POPMAILDIR=y CONFIG_FEATURE_POPMAILDIR_DELIVERY=y CONFIG_REFORMIME=y CONFIG_FEATURE_REFORMIME_COMPAT=y CONFIG_SENDMAIL=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" # # Process Utilities # +CONFIG_FEATURE_FAST_TOP=y +CONFIG_FEATURE_SHOW_THREADS=y CONFIG_FREE=y CONFIG_FUSER=y CONFIG_IOSTAT=y @@ -1069,7 +1095,6 @@ CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_WATCH=y -CONFIG_FEATURE_SHOW_THREADS=y # # Runit Utilities @@ -1126,6 +1151,7 @@ CONFIG_ASH_MAIL=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +# CONFIG_ASH_SLEEP is not set CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y @@ -1134,8 +1160,8 @@ CONFIG_ASH_CMDCMD=y # CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set diff --git a/core/busybox/files/.config-suid b/core/busybox/files/.config-suid index 93a9d8fe..3c600754 100644 --- a/core/busybox/files/.config-suid +++ b/core/busybox/files/.config-suid @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.33.0 -# Thu Feb 18 03:15:02 2021 +# Busybox version: 1.36.1 +# Fri Jun 2 20:18:14 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -93,10 +93,16 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_ETC_SERVICES is not set +# CONFIG_FEATURE_NON_POSIX_CP is not set +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +# CONFIG_FEATURE_USE_SENDFILE is not set +CONFIG_FEATURE_COPYBUF_KB=4 +# CONFIG_MONOTONIC_SYSCALL is not set +# CONFIG_IOCTL_HEX2STR_ERROR is not set # CONFIG_FEATURE_EDITING is not set CONFIG_FEATURE_EDITING_MAX_LEN=0 # CONFIG_FEATURE_EDITING_VI is not set @@ -120,14 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set -# CONFIG_FEATURE_NON_POSIX_CP is not set -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -# CONFIG_FEATURE_USE_SENDFILE is not set -CONFIG_FEATURE_COPYBUF_KB=4 -# CONFIG_FEATURE_SKIP_ROOTFS is not set -# CONFIG_MONOTONIC_SYSCALL is not set -# CONFIG_IOCTL_HEX2STR_ERROR is not set -# CONFIG_FEATURE_HWIB is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -162,6 +163,8 @@ CONFIG_BZIP2_SMALL=0 # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set # CONFIG_FEATURE_CPIO_P is not set +# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set +# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_GZIP is not set @@ -197,6 +200,14 @@ CONFIG_GZIP_FAST=0 # # Coreutils # +# CONFIG_FEATURE_VERBOSE is not set + +# +# Common options for date and touch +# +# CONFIG_FEATURE_TIMEZONE is not set +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set +# CONFIG_FEATURE_HUMAN_READABLE is not set # CONFIG_BASENAME is not set # CONFIG_CAT is not set # CONFIG_FEATURE_CATN is not set @@ -207,11 +218,13 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set # CONFIG_CHROOT is not set # CONFIG_CKSUM is not set +# CONFIG_CRC32 is not set # CONFIG_COMM is not set # CONFIG_CP is not set # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_FEATURE_CP_REFLINK is not set # CONFIG_CUT is not set +# CONFIG_FEATURE_CUT_REGEX is not set # CONFIG_DATE is not set # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set @@ -223,6 +236,7 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_DD_STATUS is not set # CONFIG_DF is not set # CONFIG_FEATURE_DF_FANCY is not set +# CONFIG_FEATURE_SKIP_ROOTFS is not set # CONFIG_DIRNAME is not set # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -312,13 +326,13 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_TEST_64 is not set # CONFIG_TIMEOUT is not set # CONFIG_TOUCH is not set -# CONFIG_FEATURE_TOUCH_NODEREF is not set # CONFIG_FEATURE_TOUCH_SUSV3 is not set # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_TRUE is not set # CONFIG_TRUNCATE is not set +# CONFIG_TSORT is not set # CONFIG_TTY is not set # CONFIG_UNAME is not set CONFIG_UNAME_OSNAME="" @@ -339,13 +353,6 @@ CONFIG_UNAME_OSNAME="" # CONFIG_YES is not set # -# Common options -# -# CONFIG_FEATURE_VERBOSE is not set -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set -# CONFIG_FEATURE_HUMAN_READABLE is not set - -# # Console Utilities # # CONFIG_CHVT is not set @@ -408,6 +415,7 @@ CONFIG_DEFAULT_SETFONT_DIR="" CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_8BIT is not set # CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_COLON_EXPAND is not set # CONFIG_FEATURE_VI_YANKMARK is not set # CONFIG_FEATURE_VI_SEARCH is not set # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -421,6 +429,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_UNDO is not set # CONFIG_FEATURE_VI_UNDO_QUEUE is not set CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 +# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -429,7 +438,11 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FIND is not set # CONFIG_FEATURE_FIND_PRINT0 is not set # CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_ATIME is not set +# CONFIG_FEATURE_FIND_CTIME is not set # CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_AMIN is not set +# CONFIG_FEATURE_FIND_CMIN is not set # CONFIG_FEATURE_FIND_PERM is not set # CONFIG_FEATURE_FIND_TYPE is not set # CONFIG_FEATURE_FIND_EXECUTABLE is not set @@ -437,6 +450,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FEATURE_FIND_MAXDEPTH is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_SAMEFILE is not set # CONFIG_FEATURE_FIND_EXEC is not set # CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set @@ -719,6 +733,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_ASCII is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BC is not set @@ -799,10 +814,12 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +# CONFIG_SEEDRNG is not set # CONFIG_SETFATTR is not set # CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set # CONFIG_TIME is not set +# CONFIG_TREE is not set # CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -814,14 +831,18 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities # -# CONFIG_FEATURE_IPV6 is not set +CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set -# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +# CONFIG_FEATURE_HWIB is not set # CONFIG_FEATURE_TLS_SHA1 is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set @@ -840,6 +861,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_HOSTNAME is not set # CONFIG_DNSDOMAINNAME is not set # CONFIG_HTTPD is not set +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0 # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set @@ -916,7 +938,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_FEATURE_NTPD_CONF is not set # CONFIG_FEATURE_NTP_AUTH is not set CONFIG_PING=y -# CONFIG_PING6 is not set +CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set # CONFIG_ROUTE is not set @@ -932,6 +954,7 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_FEATURE_TELNET_WIDTH is not set # CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set @@ -952,12 +975,11 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_WGET is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_FTP is not set # CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_TIMEOUT is not set # CONFIG_FEATURE_WGET_HTTPS is not set -# CONFIG_FEATURE_WGET_BEARSSL is not set -# CONFIG_WGET_BEARSSL_CA_CERTIFICATE is not set -CONFIG_WGET_BEARSSL_CA_CERTIFICATE_FILE="" +# CONFIG_FEATURE_WGET_OPENSSL is not set # CONFIG_WHOIS is not set # CONFIG_ZCIP is not set # CONFIG_UDHCPD is not set @@ -970,11 +992,13 @@ CONFIG_DHCPD_LEASES_FILE="" # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC6_DEFAULT_SCRIPT="" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set +CONFIG_UDHCPC_DEFAULT_INTERFACE="" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 @@ -992,17 +1016,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_MAKEMIME is not set # CONFIG_POPMAILDIR is not set # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set # CONFIG_REFORMIME is not set # CONFIG_FEATURE_REFORMIME_COMPAT is not set # CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_SHOW_THREADS is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_IOSTAT is not set @@ -1041,7 +1067,6 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_WATCH is not set -# CONFIG_FEATURE_SHOW_THREADS is not set # # Runit Utilities @@ -1098,6 +1123,7 @@ CONFIG_BASH_IS_NONE=y # CONFIG_ASH_ECHO is not set # CONFIG_ASH_PRINTF is not set # CONFIG_ASH_TEST is not set +# CONFIG_ASH_SLEEP is not set # CONFIG_ASH_HELP is not set # CONFIG_ASH_GETOPTS is not set # CONFIG_ASH_CMDCMD is not set @@ -1106,8 +1132,8 @@ CONFIG_BASH_IS_NONE=y # CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +# CONFIG_HUSH_LINENO_VAR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set diff --git a/core/busybox/meta b/core/busybox/meta new file mode 100644 index 00000000..c7590cf9 --- /dev/null +++ b/core/busybox/meta @@ -0,0 +1,3 @@ +description: Swiss Army Knife of Embedded Linux +license: GPL-2.0-only +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/busybox/patches/less_t.patch b/core/busybox/patches/less_t.patch new file mode 100644 index 00000000..8a19b9b2 --- /dev/null +++ b/core/busybox/patches/less_t.patch @@ -0,0 +1,28 @@ +Accept and ignore the -T flag for compatibility. +--- busybox/miscutils/less.c.orig 2021-08-10 22:16:57.493134340 +0300 ++++ busybox/miscutils/less.c 2021-08-10 22:18:15.421458884 +0300 +@@ -179,6 +179,7 @@ + FLAG_F = 1 << 6, + FLAG_S = (1 << 7) * ENABLE_FEATURE_LESS_TRUNCATE, + FLAG_R = (1 << 8) * ENABLE_FEATURE_LESS_RAW, ++ FLAG_T = 1 << 9, + /* hijack command line options variable for internal state vars */ + LESS_STATE_MATCH_BACKWARDS = 1 << 15, + }; +@@ -1807,6 +1808,7 @@ + int less_main(int argc, char **argv) + { + char *tty_name; ++ char *str_ignored; + int tty_fd; + + INIT_G(); +@@ -1820,7 +1822,7 @@ + getopt32(argv, "EMmN~IF" + IF_FEATURE_LESS_TRUNCATE("S") + IF_FEATURE_LESS_RAW("R") +- /*ignored:*/"sX" ++ /*ignored:*/"sXT:", &str_ignored + ); + argv += optind; + num_files = argc - optind; diff --git a/core/busybox/patches/libressl.patch b/core/busybox/patches/libressl.patch new file mode 100644 index 00000000..ac132332 --- /dev/null +++ b/core/busybox/patches/libressl.patch @@ -0,0 +1,44 @@ +busybox wget calls OpenSSL-specific options for higher security. It IS a +bummer that libressl does not support these, but we are patching busybox for +the time being. +--- busybox/networking/wget.c.orig 2021-03-18 17:26:14.456704013 +0300 ++++ busybox/networking/wget.c 2021-03-18 17:26:18.400719891 +0300 +@@ -670,8 +670,7 @@ + pid = xvfork(); + if (pid == 0) { + /* Child */ +- char *argv[13]; +- char **argp; ++ char *argv[9]; + + close(sp[0]); + xmove_fd(sp[1], 0); +@@ -694,25 +693,13 @@ + * TLS server_name (SNI) field are FQDNs (DNS hostnames). + * IPv4 and IPv6 addresses, port numbers are not allowed. + */ +- argp = &argv[5]; + if (!is_ip_address(servername)) { +- *argp++ = (char*)"-servername"; //[5] +- *argp++ = (char*)servername; //[6] ++ argv[5] = (char*)"-servername"; ++ argv[6] = (char*)servername; + } + if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) { +- /* Abort on bad server certificate */ +- *argp++ = (char*)"-verify"; //[7] +- *argp++ = (char*)"100"; //[8] +- *argp++ = (char*)"-verify_return_error"; //[9] +- if (!is_ip_address(servername)) { +- *argp++ = (char*)"-verify_hostname"; //[10] +- *argp++ = (char*)servername; //[11] +- } else { +- *argp++ = (char*)"-verify_ip"; //[10] +- *argp++ = (char*)host; //[11] +- } ++ argv[7] = (char*)"-verify_return_error"; + } +- //[12] (or earlier) is NULL terminator + + BB_EXECVP(argv[0], argv); + xmove_fd(3, 2); diff --git a/core/busybox/sources b/core/busybox/sources index 914f36a8..5f8fb716 100644 --- a/core/busybox/sources +++ b/core/busybox/sources @@ -1,4 +1,4 @@ -https://github.com/CarbsLinux/busybox/archive/v1.33.0.tar.gz +https://busybox.net/downloads/busybox-1.36.1.tar.bz2 files/.config files/.config-suid files/acpid.run @@ -10,8 +10,10 @@ files/ntpd.run files/syslogd.run files/ntp.conf files/udhcpc.script -patches/fsck-resolve-uuid.patch -patches/modprobe-kernel-version.patch -patches/adduser-no-setgid.patch -patches/install-fix-chown.patch -patches/print-unicode.patch +patches/fsck-resolve-uuid.patch patches +patches/modprobe-kernel-version.patch patches +patches/adduser-no-setgid.patch patches +patches/install-fix-chown.patch patches +patches/print-unicode.patch patches +patches/libressl.patch patches +patches/less_t.patch patches diff --git a/core/busybox/version b/core/busybox/version index 6186c060..fd85f73d 100644 --- a/core/busybox/version +++ b/core/busybox/version @@ -1 +1 @@ -1.33.0 2 +1.36.1 1 diff --git a/core/byacc/build b/core/byacc/build index cc21d9ed..8ed78043 100755 --- a/core/byacc/build +++ b/core/byacc/build @@ -4,6 +4,7 @@ export LDFLAGS="$LDFLAGS -static" ./configure \ --prefix=/usr \ + --enable-btyacc \ --program-transform='s/^/b/' make diff --git a/core/byacc/checksums b/core/byacc/checksums index 5bd8ce62..26320682 100644 --- a/core/byacc/checksums +++ b/core/byacc/checksums @@ -1 +1,2 @@ -9e7d7768587141e7784492615dfefc70a8e00410043b63901efedc1b50c19b97 byacc-20210109.tgz +%BLAKE3 +1f548f43861c383a5caaf5ec56332af8b3d45cdd2d3dd70b7585c65ae3a661ef byacc-20240109.tgz diff --git a/core/byacc/meta b/core/byacc/meta new file mode 100644 index 00000000..c11a3741 --- /dev/null +++ b/core/byacc/meta @@ -0,0 +1,3 @@ +description: Berkeley yacc +license: Public Domain +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/byacc/sources b/core/byacc/sources index 87471968..8c5b5fff 100644 --- a/core/byacc/sources +++ b/core/byacc/sources @@ -1 +1 @@ -ftp://ftp.invisible-island.net/byacc/byacc-20210109.tgz +https://invisible-island.net/archives/byacc/byacc-20240109.tgz diff --git a/core/byacc/version b/core/byacc/version index deee4073..24b2fd09 100644 --- a/core/byacc/version +++ b/core/byacc/version @@ -1 +1 @@ -20210109 1 +20240109 1 diff --git a/core/bzip2/build b/core/bzip2/build index ac1055b2..3eabb4a2 100755 --- a/core/bzip2/build +++ b/core/bzip2/build @@ -4,13 +4,13 @@ make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" bzip2recover libbz2.a for bin in bzip2-shared bzdiff bzgrep bzip2recover bzmore; do - install -Dm755 "$bin" "$1/usr/bin/${bin%%-shared}" + clinst -Dm755 "$bin" "$1/usr/bin/${bin%%-shared}" done -install -Dm755 libbz2.so.1.0.8 "$1/usr/lib/libbz2.so.1.0.8" -install -Dm644 libbz2.a "$1/usr/lib/libbz2.a" -install -Dm644 bzip2.1 "$1/usr/share/man/man1/bzip2.1" -install -Dm644 bzlib.h "$1/usr/include/bzlib.h" +clinst -Dm755 libbz2.so.1.0.8 "$1/usr/lib/libbz2.so.1.0.8" +clinst -Dm644 libbz2.a "$1/usr/lib/libbz2.a" +clinst -Dm644 bzip2.1 "$1/usr/share/man/man1/bzip2.1" +clinst -Dm644 bzlib.h "$1/usr/include/bzlib.h" for lib in libbz2.so libbz2.so.1 libbz2.so.1.0; do ln -sf libbz2.so.1.0.8 "$1/usr/lib/$lib" diff --git a/core/bzip2/meta b/core/bzip2/meta new file mode 100644 index 00000000..716cbd1c --- /dev/null +++ b/core/bzip2/meta @@ -0,0 +1,3 @@ +description: Data compressor +license: bzip2-1.0.8 +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/ca-certificates/build b/core/ca-certificates/build deleted file mode 100755 index 0f8263d8..00000000 --- a/core/ca-certificates/build +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -install -Dm755 cert.sh "$1/usr/bin/update-certdata" diff --git a/core/ca-certificates/checksums b/core/ca-certificates/checksums deleted file mode 100644 index ec462a46..00000000 --- a/core/ca-certificates/checksums +++ /dev/null @@ -1 +0,0 @@ -556ce672b222179d5a3e0a3c5fcce3126571d3d321701b0017244a0c879e50a4 cert.sh diff --git a/core/ca-certificates/files/cert.sh b/core/ca-certificates/files/cert.sh deleted file mode 100755 index 8ab33928..00000000 --- a/core/ca-certificates/files/cert.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# -# update-certdata - -DEST="$CPT_ROOT/etc/certificates" - -[ -d "$DEST" ] || mkdir -p "$DEST" - -[ -w "$DEST" ] || { - printf '%s\n' "${0##*/}: root required to update CA certificates." >&2 - exit 1 -} - -wget https://curl.haxx.se/ca/cacert.pem -O "$DEST/cert.pem" -printf '%s\n' "${0##*/}: updated cert.pem" diff --git a/core/ca-certificates/post-install b/core/ca-certificates/post-install deleted file mode 100755 index 8ee4d0ea..00000000 --- a/core/ca-certificates/post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/bin/update-certdata diff --git a/core/ca-certificates/sources b/core/ca-certificates/sources deleted file mode 100644 index 198fd03e..00000000 --- a/core/ca-certificates/sources +++ /dev/null @@ -1 +0,0 @@ -files/cert.sh diff --git a/core/carbs-docs/build b/core/carbs-docs/build index a62579de..c208b139 100755 --- a/core/carbs-docs/build +++ b/core/carbs-docs/build @@ -1,3 +1,3 @@ #!/bin/sh -e -DESTDIR=$1 PREFIX=/usr redo install +make DESTDIR="$1" PREFIX=/usr install diff --git a/core/carbs-docs/checksums b/core/carbs-docs/checksums index 9d813c7d..a73b8922 100644 --- a/core/carbs-docs/checksums +++ b/core/carbs-docs/checksums @@ -1 +1,2 @@ -6a2ef60f3b0f83ba6929cb27be75db60760d9b369cec82be4f627b882d4d0e06 carbs-docs-20201226.tar.xz +%BLAKE3 +dc82c97b499189c73e6079a9c9a566fa483cd54fd74fca78d74edc57c6ea4da2 carbs-docs-2024.03.tar.xz diff --git a/core/carbs-docs/depends b/core/carbs-docs/depends deleted file mode 100644 index 4794c157..00000000 --- a/core/carbs-docs/depends +++ /dev/null @@ -1 +0,0 @@ -redo make diff --git a/core/carbs-docs/meta b/core/carbs-docs/meta new file mode 100644 index 00000000..10189c68 --- /dev/null +++ b/core/carbs-docs/meta @@ -0,0 +1,3 @@ +description: Carbs Linux documentation +license: GFDL-1.3 +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/carbs-docs/sources b/core/carbs-docs/sources index 51ea7140..efc2cb2f 100644 --- a/core/carbs-docs/sources +++ b/core/carbs-docs/sources @@ -1 +1 @@ -https://github.com/CarbsLinux/docs/releases/download/20201226/carbs-docs-20201226.tar.xz +https://dl.carbslinux.org/distfiles/carbs-docs-2024.03.tar.xz diff --git a/core/carbs-docs/version b/core/carbs-docs/version index 661cf3d0..ef4cb4cc 100644 --- a/core/carbs-docs/version +++ b/core/carbs-docs/version @@ -1 +1 @@ -20201226 1 +2024.03 1 diff --git a/core/carbs-init/build b/core/carbs-init/build index c46dc3e2..b2b1e639 100755 --- a/core/carbs-init/build +++ b/core/carbs-init/build @@ -1,5 +1,7 @@ #!/bin/sh -e -patch -p1 < respawn-fix.patch +for patch in *.patch; do + patch -p1 < "$patch" +done make DESTDIR="$1" install diff --git a/core/carbs-init/checksums b/core/carbs-init/checksums index f955dca2..28a64745 100644 --- a/core/carbs-init/checksums +++ b/core/carbs-init/checksums @@ -1,2 +1,4 @@ -264278beed9d9824994d17b8470bb2b348d32770cd76507dc141074339daffdb 1.2.2.tar.gz -6127641969ece64f657ce1883d31ea84e55b059cfd611cb9b0d01c238b4f38df respawn-fix.patch +%BLAKE3 +fa98711a4f22e170b7a45df79b461b76a0762cdab8a4a21620017e908e9b8173 1.2.2.tar.gz +130b82bf18025e79bad4fc60309afe05740bd589c54731352dfb08e9810455fd respawn-fix.patch +08669189a6abba83d4b542121b6a8c7bc1114ad97ed84061d4e2502c1360092a fd.patch diff --git a/core/carbs-init/meta b/core/carbs-init/meta new file mode 100644 index 00000000..a174464b --- /dev/null +++ b/core/carbs-init/meta @@ -0,0 +1,3 @@ +description: Carbs Linux init scripts +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/carbs-init/patches/fd.patch b/core/carbs-init/patches/fd.patch new file mode 100644 index 00000000..ff5af2da --- /dev/null +++ b/core/carbs-init/patches/fd.patch @@ -0,0 +1,13 @@ +diff --git a/rc.boot b/rc.boot +index 49d7fa5..ba5d3dd 100755 +--- a/rc.boot ++++ b/rc.boot +@@ -27,7 +27,7 @@ out "Mounting pseudo filesystems..."; { + mnt mode=1777,nosuid,nodev tmpfs shm /dev/shm + + { +- ln -sf /proc/self/fs /dev/fd ++ ln -sf /proc/self/fd /dev/fd + ln -sf fd/0 /dev/stdin + ln -sf fd/1 /dev/stdout + ln -sf fd/2 /dev/stderr diff --git a/core/carbs-init/files/respawn-fix.patch b/core/carbs-init/patches/respawn-fix.patch index 12761e89..12761e89 100644 --- a/core/carbs-init/files/respawn-fix.patch +++ b/core/carbs-init/patches/respawn-fix.patch diff --git a/core/carbs-init/sources b/core/carbs-init/sources index eac26e54..848b4813 100644 --- a/core/carbs-init/sources +++ b/core/carbs-init/sources @@ -1,2 +1,3 @@ https://github.com/CarbsLinux/init/archive/1.2.2.tar.gz -files/respawn-fix.patch +patches/respawn-fix.patch +patches/fd.patch diff --git a/core/carbs-init/version b/core/carbs-init/version index dae8d4e3..78fba327 100644 --- a/core/carbs-init/version +++ b/core/carbs-init/version @@ -1 +1 @@ -1.2.2 3 +1.2.2 4 diff --git a/core/cl-utils/build b/core/cl-utils/build new file mode 100755 index 00000000..c208b139 --- /dev/null +++ b/core/cl-utils/build @@ -0,0 +1,3 @@ +#!/bin/sh -e + +make DESTDIR="$1" PREFIX=/usr install diff --git a/core/cl-utils/checksums b/core/cl-utils/checksums new file mode 100644 index 00000000..e7a591e6 --- /dev/null +++ b/core/cl-utils/checksums @@ -0,0 +1 @@ +f42d68f79e335b70490599763b43d304fb636311106ef86a2cd2559528d426d3 cl-utils-1.1.0.tar.gz diff --git a/core/cl-utils/meta b/core/cl-utils/meta new file mode 100644 index 00000000..5a30066b --- /dev/null +++ b/core/cl-utils/meta @@ -0,0 +1,3 @@ +description: Carbs Linux repository utilities +license: Public Domain +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/cl-utils/sources b/core/cl-utils/sources new file mode 100644 index 00000000..21f2a94a --- /dev/null +++ b/core/cl-utils/sources @@ -0,0 +1 @@ +https://fossil.carbslinux.org/cl-utils/tarball/1.1.0/cl-utils-1.1.0.tar.gz diff --git a/core/cl-utils/version b/core/cl-utils/version new file mode 100644 index 00000000..7281bb52 --- /dev/null +++ b/core/cl-utils/version @@ -0,0 +1 @@ +1.1.0 1 diff --git a/core/cpt/build b/core/cpt/build index 20ced110..6b2e4e0f 100755 --- a/core/cpt/build +++ b/core/cpt/build @@ -1,8 +1,10 @@ #!/bin/sh -e -make PREFIX=/usr DESTDIR="$1" install +./configure \ + --prefix=/usr -install -Dm644 cpt-base "$1/etc/cpt-base" -install -Dm755 news "$1/usr/bin/cpt-news" +make +make DESTDIR="$1" install -install -Dm755 src/cpt "$1/usr/bin/cpt" +clinst -Dm644 cpt-base "$1/etc/cpt/base" +clinst -Dm755 news "$1/usr/bin/cpt-news" diff --git a/core/cpt/checksums b/core/cpt/checksums index 22ee2191..02b0b4ec 100644 --- a/core/cpt/checksums +++ b/core/cpt/checksums @@ -1,3 +1,3 @@ -bae58efd68ed95294666363a433a0de8e0133906da9dd5f6ba5aaddc05394a0c 5.1.2.tar.gz +69931e1e3068219a8afeb4dbc5a6ce6d24c39defb648a0efcaff0f8fe64f3e1f cpt-7.0.2.tar.xz 1f6d1470f254164898fc5a3ab5ddf1c57c873c3cfbfd0acb519a8f242265540a news -e1401cff417a903e72355edf878ef946eb674a051cb2cfeda356863d21495e76 cpt-base +ab1fe74142b1fb1339b4ede5c5a8bcf9f97b7d6c5abfb59a7094be0959210482 cpt-base diff --git a/core/cpt/depends b/core/cpt/depends index a615eba9..637fa0b3 100644 --- a/core/cpt/depends +++ b/core/cpt/depends @@ -1,2 +1,5 @@ +b3sum +cl-utils curl +otools rsync diff --git a/core/cpt/files/cpt-base b/core/cpt/files/cpt-base index ad4d1dc7..c2922e15 100644 --- a/core/cpt/files/cpt-base +++ b/core/cpt/files/cpt-base @@ -7,17 +7,16 @@ binutils byacc busybox bzip2 -ca-certificates curl flex gcc git rsync -gzip +pigz +otools cpt -bearssl +libressl linux-headers -m4 make musl pkgconf diff --git a/core/cpt/message b/core/cpt/message deleted file mode 100644 index 271062b6..00000000 --- a/core/cpt/message +++ /dev/null @@ -1,5 +0,0 @@ -[1mNOTE[m - - 'cpt-news' tool was added to see news about the distribution. Feel free to - check it out and give your feedback. - diff --git a/core/cpt/meta b/core/cpt/meta new file mode 100644 index 00000000..12ed1da0 --- /dev/null +++ b/core/cpt/meta @@ -0,0 +1,3 @@ +description: Carbs Packaging Tools +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/cpt/post-install b/core/cpt/post-install deleted file mode 100755 index 7f98b4d9..00000000 --- a/core/cpt/post-install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -grep -q '\.la$' "$CPT_ROOT/var/db/cpt/installed/"*/manifest || exit 0 - -find "$CPT_ROOT/usr/lib" \ - ! -type d \ - -name '*.la' \ - -exec rm -f -- {} + - -find "$CPT_ROOT/var/db/cpt/installed" \ - ! -type d \ - -name manifest \ - -exec sed -i '/.*\.la$/d' {} + diff --git a/core/cpt/sources b/core/cpt/sources index d228981c..01785819 100644 --- a/core/cpt/sources +++ b/core/cpt/sources @@ -1,3 +1,3 @@ -https://github.com/carbslinux/cpt/archive/5.1.2.tar.gz +https://fossil.carbslinux.org/cpt/uv/cpt-7.0.2.tar.xz files/news files/cpt-base diff --git a/core/cpt/version b/core/cpt/version index 27b49972..e796a3f2 100644 --- a/core/cpt/version +++ b/core/cpt/version @@ -1 +1 @@ -5.1.2 2 +7.0.2 1 diff --git a/core/curl/build b/core/curl/build index f27b1522..69513e7c 100755 --- a/core/curl/build +++ b/core/curl/build @@ -7,6 +7,7 @@ --enable-hidden-symbols \ --without-libidn \ --without-libidn2 \ + --without-nghttp2 \ --disable-manual \ --disable-ldap \ --disable-ares \ @@ -14,11 +15,13 @@ --without-librtmp \ --without-icu \ --without-libpsl \ + --with-openssl \ --without-zstd \ - --with-pic \ - --with-bearssl \ - --with-ca-bundle=/etc/certificates/cert.pem \ - --without-ssl + --without-brotli \ + --with-pic -make curl_LDFLAGS=-all-static +make make DESTDIR="$1" install +rm -f src/curl +make LDFLAGS=-all-static +clinst -Dm755 src/curl "$1/usr/bin/curl" diff --git a/core/curl/checksums b/core/curl/checksums index 488f5041..1205d42b 100644 --- a/core/curl/checksums +++ b/core/curl/checksums @@ -1 +1,2 @@ -fe0c49d8468249000bda75bcfdf9e30ff7e9a86d35f1a21f428d79c389d55675 curl-7.75.0.tar.xz +%BLAKE3 +09c6e7c7ab6caf8d3efedfc312ff159cf372fe7978778aa266ddd8743e803856 curl-8.6.0.tar.xz diff --git a/core/curl/depends b/core/curl/depends index cf6ff53d..9ee911ae 100644 --- a/core/curl/depends +++ b/core/curl/depends @@ -1,3 +1,2 @@ -bearssl -ca-certificates +libressl zlib diff --git a/core/curl/meta b/core/curl/meta new file mode 100644 index 00000000..e8349e99 --- /dev/null +++ b/core/curl/meta @@ -0,0 +1,3 @@ +description: Multiprotocol file transfer software +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/curl/sources b/core/curl/sources index 511a9a70..8d203fce 100644 --- a/core/curl/sources +++ b/core/curl/sources @@ -1 +1 @@ -https://curl.haxx.se/download/curl-7.75.0.tar.xz +https://curl.haxx.se/download/curl-8.6.0.tar.xz diff --git a/core/curl/version b/core/curl/version index 31f8225b..31b934bb 100644 --- a/core/curl/version +++ b/core/curl/version @@ -1 +1 @@ -7.75.0 1 +8.6.0 1 diff --git a/core/dosfstools/meta b/core/dosfstools/meta new file mode 100644 index 00000000..f67b0376 --- /dev/null +++ b/core/dosfstools/meta @@ -0,0 +1,3 @@ +description: DOS filesystem tools +license: GPL-3.0-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/e2fsprogs/checksums b/core/e2fsprogs/checksums index 079cb4a5..181bfba3 100644 --- a/core/e2fsprogs/checksums +++ b/core/e2fsprogs/checksums @@ -1 +1,2 @@ -23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168 e2fsprogs-1.46.2.tar.xz +%BLAKE3 +c989a483ff86f065593010b72b1f158af28669821c4c710b40ed15c427fa356c e2fsprogs-1.47.0.tar.xz diff --git a/core/e2fsprogs/meta b/core/e2fsprogs/meta new file mode 100644 index 00000000..a149e11a --- /dev/null +++ b/core/e2fsprogs/meta @@ -0,0 +1,3 @@ +description: Ext2/3/4 Filesystem Utilities +license: GPL-2.0-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/e2fsprogs/sources b/core/e2fsprogs/sources index dc9a0ccc..65525062 100644 --- a/core/e2fsprogs/sources +++ b/core/e2fsprogs/sources @@ -1 +1 @@ -https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/e2fsprogs-1.46.2.tar.xz +https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.0/e2fsprogs-1.47.0.tar.xz diff --git a/core/e2fsprogs/version b/core/e2fsprogs/version index 49efa082..50c78713 100644 --- a/core/e2fsprogs/version +++ b/core/e2fsprogs/version @@ -1 +1 @@ -1.46.2 1 +1.47.0 1 diff --git a/core/eudev/build b/core/eudev/build index fcd759e3..ca1dcaeb 100755 --- a/core/eudev/build +++ b/core/eudev/build @@ -1,18 +1,14 @@ #!/bin/sh -e -kinstall() { - mkdir -p "${2%/*}"; cp "$3" "$2" - chmod "$1" "$2" -} - ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ --enable-hwdb \ + --enable-manpages \ --disable-introspection make make DESTDIR="$1" install -DESTDIR=$1 install-sv udevd.run +clsv -d "$1" udevd.run diff --git a/core/eudev/checksums b/core/eudev/checksums index 4a540a61..dafaeb92 100644 --- a/core/eudev/checksums +++ b/core/eudev/checksums @@ -1,2 +1,3 @@ -87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034 eudev-3.2.10.tar.gz -5b965dc067c5f411a3342f867e11ccfcf689cc1bf5957b0da4521c528be4ce5e udevd.run +%BLAKE3 +093ed8eecbeda7d4af31e05fbbf8b5ef5e6fb2ce06e3fd7948a26c09a1e57c4b eudev-3.2.14.tar.gz +8face624fb1e8e6bbca79f3cf08d470681e9acb6fb8e8d460629defeb4e80a83 udevd.run diff --git a/core/eudev/meta b/core/eudev/meta new file mode 100644 index 00000000..85914bd2 --- /dev/null +++ b/core/eudev/meta @@ -0,0 +1,3 @@ +description: userland device daemon +license: GPL-2.0-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/eudev/sources b/core/eudev/sources index f982123f..3e90b390 100644 --- a/core/eudev/sources +++ b/core/eudev/sources @@ -1,2 +1,2 @@ -https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz +https://github.com/eudev-project/eudev/releases/download/v3.2.14/eudev-3.2.14.tar.gz files/udevd.run diff --git a/core/eudev/version b/core/eudev/version index 8197f4c4..780d8e31 100644 --- a/core/eudev/version +++ b/core/eudev/version @@ -1 +1 @@ -3.2.10 1 +3.2.14 1 diff --git a/core/flex/depends b/core/flex/depends deleted file mode 100644 index e8fb4a13..00000000 --- a/core/flex/depends +++ /dev/null @@ -1 +0,0 @@ -m4 make diff --git a/core/flex/meta b/core/flex/meta new file mode 100644 index 00000000..dd07ed6f --- /dev/null +++ b/core/flex/meta @@ -0,0 +1,3 @@ +description: Fast Lexical Analyzer +license: Custom +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/m4/build b/core/fossil/build index bbd53ee2..1ba98ceb 100755 --- a/core/m4/build +++ b/core/fossil/build @@ -1,9 +1,10 @@ #!/bin/sh -e -export LDFLAGS="$LDFLAGS -static" - ./configure \ - --prefix=/usr + --prefix=/usr \ + --static make make DESTDIR="$1" install + +clman -d "$1" fossil.1 diff --git a/core/fossil/checksums b/core/fossil/checksums new file mode 100644 index 00000000..969c3ecd --- /dev/null +++ b/core/fossil/checksums @@ -0,0 +1,2 @@ +%BLAKE3 +81afc572baf8e24a396fc01d611f3561938c2f628290abcd230fe8f0dd329800 Fossil-version-2.23.tar.gz diff --git a/core/fossil/depends b/core/fossil/depends new file mode 100644 index 00000000..3788ab13 --- /dev/null +++ b/core/fossil/depends @@ -0,0 +1,2 @@ +libressl make +zlib make diff --git a/core/fossil/meta b/core/fossil/meta new file mode 100644 index 00000000..3f7dee82 --- /dev/null +++ b/core/fossil/meta @@ -0,0 +1,3 @@ +description: Distributed Version Control System +license: BSD-2-Clause +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/fossil/sources b/core/fossil/sources new file mode 100644 index 00000000..48826423 --- /dev/null +++ b/core/fossil/sources @@ -0,0 +1 @@ +https://fossil-scm.org/home/tarball/version-2.23/Fossil-version-2.23.tar.gz diff --git a/core/fossil/version b/core/fossil/version new file mode 100644 index 00000000..638f155f --- /dev/null +++ b/core/fossil/version @@ -0,0 +1 @@ +2.23 1 diff --git a/core/gcc/build b/core/gcc/build index b22d8e6d..23f78b98 100755 --- a/core/gcc/build +++ b/core/gcc/build @@ -2,23 +2,17 @@ sys_arch=${3:-$(uname -m)} -sed_i() { - for file; do :; done - sed "$@" > _ - cat _ > "$file"; rm -f _ -} - # Make sure gmp is built with generic options. cp gcc/gmp/configfsf.guess gcc/gmp/config.guess cp gcc/gmp/configfsf.sub gcc/gmp/config.sub if [ "${sys_arch#i*86}" ]; then # Do not create lib64 directories - sed_i '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64 - sed_i 's/lib64/lib/' gcc/gcc/config/i386/linux64.h + clsed '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64 + clsed 's/lib64/lib/' gcc/gcc/config/i386/linux64.h else # Apply libssp patch for i686. - (cd gcc; patch -Np1 < ../musl-libssp.patch) + patch -d gcc -p1 < musl-libssp.patch fi case "$sys_arch" in @@ -33,6 +27,8 @@ cd gcc-build export libat_cv_have_ifunc=no +# Word splitting is intentional +# shellcheck disable=2086 ../gcc/configure \ --prefix=/usr \ --disable-multilib \ @@ -71,13 +67,13 @@ find "$1" -name libgij.a -exec rm -f {} + ln -s gcc "$1/usr/bin/cc" # POSIX compliance. -install -Dm755 ../c99 "$1/usr/bin/c99" +clinst -Dm755 ../c99 "$1/usr/bin/c99" # Symlink for LTO. { mkdir -p "$1/usr/lib/bfd-plugins" - ln -s "/usr/libexec/gcc/$sys_arch-pc-linux-musl/9.2.0/liblto_plugin.so" \ + ln -s "/usr/libexec/gcc/$sys_arch-pc-linux-musl/$2/liblto_plugin.so" \ "$1/usr/lib/bfd-plugins/liblto_plugin.so" } diff --git a/core/gcc/checksums b/core/gcc/checksums index 95a7b1eb..571deb53 100644 --- a/core/gcc/checksums +++ b/core/gcc/checksums @@ -1,6 +1,7 @@ -b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c gcc-10.2.0.tar.xz -258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526 gmp-6.2.0.tar.xz -1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a mpfr-4.0.2.tar.xz -6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e mpc-1.1.0.tar.gz -765614b3396d70bca3fa0ae4a813632486c6dca320e2bd13c8c39dca52be4a4c c99 -4ece19529edb8e681e1778e977e2ba1d47984ccfcb82505e8b898bb29d659625 musl-libssp.patch +%BLAKE3 +875af4d704560973ada577955392735ded87e6fd304bd0cbaf8ac795390501c7 gcc-13.2.0.tar.xz +52cecfbbe286820d1f8bc118769008acb6451bd074fe6dea9e868d54b2ada855 gmp-6.2.1.tar.xz +4e95c8d9eda9a18d01dd3ac5879437c51aa0357b6feb997aa4aeb30762a903e1 mpfr-4.2.0.tar.xz +86d083c43c08e98d4470c006a01e0df727c8ff56ddd2956b170566ba8c9a46de mpc-1.3.1.tar.gz +0930e07dc2c5bf1172f3fd003a1be7abc3c0c420ce5bd76bc2e514c63800adcb c99 +30c25e440a4ac72bf7dc50e564b94a8c4ef43e4b2030c12d3042a78fb3cbc825 musl-libssp.patch diff --git a/core/gcc/meta b/core/gcc/meta new file mode 100644 index 00000000..fe87fa76 --- /dev/null +++ b/core/gcc/meta @@ -0,0 +1,3 @@ +description: GNU Compiler Collection +license: GPL-3.0-or-later, LGPL-2.1-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/gcc/sources b/core/gcc/sources index 5da8ded9..5ca396bf 100644 --- a/core/gcc/sources +++ b/core/gcc/sources @@ -1,6 +1,6 @@ -https://gcc.gnu.org/pub/gcc/releases/gcc-10.2.0/gcc-10.2.0.tar.xz gcc -https://ftp.gnu.org/gnu/gmp/gmp-6.2.0.tar.xz gcc/gmp -https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz gcc/mpfr -https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz gcc/mpc +https://gcc.gnu.org/pub/gcc/releases/gcc-13.2.0/gcc-13.2.0.tar.xz gcc +https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz gcc/gmp +https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.0.tar.xz gcc/mpfr +https://ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz gcc/mpc files/c99 patches/musl-libssp.patch diff --git a/core/gcc/version b/core/gcc/version index 1564eb7c..510ef747 100644 --- a/core/gcc/version +++ b/core/gcc/version @@ -1 +1 @@ -10.2.0 1 +13.2.0 1 diff --git a/core/git/build b/core/git/build index a0228ee5..66665b66 100755 --- a/core/git/build +++ b/core/git/build @@ -1,7 +1,5 @@ #!/bin/sh -e -sed -i '/^\#include.*openssl.*\.h/d' git-compat-util.h - cat > config.mak <<EOF NO_GETTEXT=YesPlease NO_SVN_TESTS=YesPlease @@ -9,11 +7,11 @@ NO_TCLTK=YesPlease NO_EXPAT=YesPlease NO_NSEC=YesPlease NO_PYTHON=YesPlease -NO_PERL=YesPlease NO_SYS_POLL_H=1 -NO_OPENSSL=YesPlease NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 +NO_CURL= +CURL_LDFLAGS=$(pkgconf --static --libs libcurl) EOF export LDFLAGS="$LDFLAGS -static" @@ -27,23 +25,5 @@ export LDFLAGS="$LDFLAGS -static" make make DESTDIR="$1" install -for man in man1/*.1 man5/*.5 man7/*.7; do - install -Dm644 "$man" "$1/usr/share/man/$man" -done - - -# Build and install remote-http helper. This doesn't happen by default when -# building static git. -set -x -export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -I$PWD -I$PWD/compat/regex -I$PWD/xdiff -include config.h" -for obj in http http-walker; do - # shellcheck disable=2086 - "${CC:=cc}" $CFLAGS -c "$obj.c" -done - -# shellcheck disable=2086,2046 -"$CC" $LDFLAGS $CFLAGS -o "$1/usr/libexec/git-core/git-remote-http" remote-curl.c http.o http-walker.o libgit.a common-main.o xdiff/lib.a $(pkg-config --static --libs zlib libcurl) - -for remote in https ftp ftps; do - ln -sf git-remote-http "$1/usr/libexec/git-core/git-remote-$remote" -done +# Install manual pages +clman -d "$1" man[0-9]/*.[0-9] diff --git a/core/git/checksums b/core/git/checksums index edd04151..8a1414a8 100644 --- a/core/git/checksums +++ b/core/git/checksums @@ -1,2 +1,3 @@ -f988a8a095089978dab2932af4edb22b4d7d67d67b81aaa1986fa29ef45d9467 git-2.30.1.tar.xz -30fc7ecbd964bb19a2ca1a695fe7af430740e09bd1c134cd3730783abec5b904 git-manpages-2.30.1.tar.xz +%BLAKE3 +d6ffc162607d747e9727ca2bc528b9a2f481c6cc9bd4568c4b8e50d443f31eb0 git-2.43.2.tar.xz +f9ebfe1bcc7e42bf41056fb959c51e0b29e7d0f95f24d44e6fb6177a7696320a git-manpages-2.43.2.tar.xz diff --git a/core/git/depends b/core/git/depends index 0a37ab16..7a3c084e 100644 --- a/core/git/depends +++ b/core/git/depends @@ -1,4 +1,4 @@ -bearssl make curl make +libressl make pkgconf make zlib make diff --git a/core/git/meta b/core/git/meta new file mode 100644 index 00000000..db6a5c11 --- /dev/null +++ b/core/git/meta @@ -0,0 +1,3 @@ +description: Distributed Version Control System +license: GPL-2.0-only +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/git/sources b/core/git/sources index a87f20e9..755aeb83 100644 --- a/core/git/sources +++ b/core/git/sources @@ -1,2 +1,2 @@ -https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.30.1.tar.xz -https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.1.tar.xz +https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.43.2.tar.xz +https://www.kernel.org/pub/software/scm/git/git-manpages-2.43.2.tar.xz diff --git a/core/git/version b/core/git/version index ed09e751..44f5c7a0 100644 --- a/core/git/version +++ b/core/git/version @@ -1 +1 @@ -2.30.1 1 +2.43.2 1 diff --git a/core/gzip/checksums b/core/gzip/checksums deleted file mode 100644 index 7fdb7201..00000000 --- a/core/gzip/checksums +++ /dev/null @@ -1 +0,0 @@ -2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d pigz-2.6.tar.gz diff --git a/core/gzip/sources b/core/gzip/sources deleted file mode 100644 index 1cd53f62..00000000 --- a/core/gzip/sources +++ /dev/null @@ -1 +0,0 @@ -https://zlib.net/pigz/pigz-2.6.tar.gz diff --git a/core/gzip/version b/core/gzip/version deleted file mode 100644 index 2223c8e0..00000000 --- a/core/gzip/version +++ /dev/null @@ -1 +0,0 @@ -1.10 4 diff --git a/core/libnl-tiny/build b/core/libnl-tiny/build new file mode 100755 index 00000000..55b9ddc8 --- /dev/null +++ b/core/libnl-tiny/build @@ -0,0 +1,3 @@ +#!/bin/sh -e + +make ALL_LIBS=libnl-tiny.a prefix=/usr DESTDIR="$1" all install diff --git a/core/libnl-tiny/checksums b/core/libnl-tiny/checksums new file mode 100644 index 00000000..f1a35c99 --- /dev/null +++ b/core/libnl-tiny/checksums @@ -0,0 +1,2 @@ +%BLAKE3 +d08d8c719d98d3ee9682173f0de0e3768abe024b95c60729b0c7385224a1e840 39ec78b.tar.gz diff --git a/core/libnl-tiny/meta b/core/libnl-tiny/meta new file mode 100644 index 00000000..ae522447 --- /dev/null +++ b/core/libnl-tiny/meta @@ -0,0 +1,3 @@ +description: Tiny Netlink Core Library +license: LGPL-2.1-only +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/libnl-tiny/sources b/core/libnl-tiny/sources new file mode 100644 index 00000000..029836fb --- /dev/null +++ b/core/libnl-tiny/sources @@ -0,0 +1 @@ +https://github.com/sabotage-linux/libnl-tiny/archive/39ec78b.tar.gz diff --git a/core/libnl-tiny/version b/core/libnl-tiny/version new file mode 100644 index 00000000..82026115 --- /dev/null +++ b/core/libnl-tiny/version @@ -0,0 +1 @@ +git 2 diff --git a/core/libnl/build b/core/libnl/build deleted file mode 100755 index 66821950..00000000 --- a/core/libnl/build +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -e - -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-shared - -make LDFLAGS="$LDFLAGS -static" CCLD="${CC:-cc} -all-static" -make DESTDIR="$1" install diff --git a/core/libnl/checksums b/core/libnl/checksums deleted file mode 100644 index 44ea30a5..00000000 --- a/core/libnl/checksums +++ /dev/null @@ -1 +0,0 @@ -352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa libnl-3.5.0.tar.gz diff --git a/core/libnl/depends b/core/libnl/depends deleted file mode 100644 index 66860bea..00000000 --- a/core/libnl/depends +++ /dev/null @@ -1 +0,0 @@ -libtool make diff --git a/core/libnl/sources b/core/libnl/sources deleted file mode 100644 index 47e8b9d1..00000000 --- a/core/libnl/sources +++ /dev/null @@ -1 +0,0 @@ -https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz diff --git a/core/libnl/version b/core/libnl/version deleted file mode 100644 index 026c9823..00000000 --- a/core/libnl/version +++ /dev/null @@ -1 +0,0 @@ -3.5.0 2 diff --git a/core/libressl/build b/core/libressl/build new file mode 100755 index 00000000..8f6c62a1 --- /dev/null +++ b/core/libressl/build @@ -0,0 +1,13 @@ +#!/bin/sh -e + +./configure \ + --prefix=/usr \ + --sysconfdir=/etc + +make +make DESTDIR="$1" install + +clinst -Dm755 -t "$1/etc/ssl" update-certdata.sh + +# Link ca-certificates to cert.pem +ln -s ../cert.pem "$1/etc/ssl/certs/ca-certificates.crt" diff --git a/core/libressl/checksums b/core/libressl/checksums new file mode 100644 index 00000000..e569a650 --- /dev/null +++ b/core/libressl/checksums @@ -0,0 +1,3 @@ +%BLAKE3 +1b867b5c7653fcb9075b45c85ea34595493da153c5a4f1cdf258bddbb9129227 libressl-3.7.3.tar.gz +028a88ed4224d4a09cda1631f54d2afee683d3020cb954e5974b006791de5c8b update-certdata.sh diff --git a/core/libressl/files/update-certdata.sh b/core/libressl/files/update-certdata.sh new file mode 100755 index 00000000..611f944d --- /dev/null +++ b/core/libressl/files/update-certdata.sh @@ -0,0 +1,14 @@ +#!/bin/sh -e +# +# update-certdata.sh + +[ -w "$CPT_ROOT/etc/ssl" ] || { + printf '%s\n' "${0##*/}: root required to update CA certificates." >&2 + exit 1 +} + +cd "$CPT_ROOT/etc/ssl" && { + wget https://curl.haxx.se/ca/cacert.pem + mv -f cacert.pem cert.pem + printf '%s\n' "${0##*/}: updated cert.pem" +} diff --git a/core/libressl/meta b/core/libressl/meta new file mode 100644 index 00000000..7047d57b --- /dev/null +++ b/core/libressl/meta @@ -0,0 +1,3 @@ +description: TLS and SSL library +license: OpenSSL +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/libressl/post-install b/core/libressl/post-install new file mode 100755 index 00000000..f39088e7 --- /dev/null +++ b/core/libressl/post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +"$CPT_ROOT/etc/ssl/update-certdata.sh" diff --git a/core/libressl/sources b/core/libressl/sources new file mode 100644 index 00000000..9aa393b5 --- /dev/null +++ b/core/libressl/sources @@ -0,0 +1,2 @@ +https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.3.tar.gz +files/update-certdata.sh diff --git a/core/libressl/test b/core/libressl/test new file mode 100755 index 00000000..aabdfc94 --- /dev/null +++ b/core/libressl/test @@ -0,0 +1,2 @@ +#!/bin/sh -e +make check diff --git a/core/libressl/version b/core/libressl/version new file mode 100644 index 00000000..3f0b66c4 --- /dev/null +++ b/core/libressl/version @@ -0,0 +1 @@ +3.7.3 1 diff --git a/core/libtls-bearssl/meta b/core/libtls-bearssl/meta new file mode 100644 index 00000000..e38c3e38 --- /dev/null +++ b/core/libtls-bearssl/meta @@ -0,0 +1,3 @@ +description: TLS library implementation for BearSSL +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/linux-headers/build b/core/linux-headers/build index 198aeff4..4dfd545d 100755 --- a/core/linux-headers/build +++ b/core/linux-headers/build @@ -1,6 +1,3 @@ #!/bin/sh -e -# Switched back to the rsync installation method -# as it is back to core, and sbase find causes a -# faulty manifest generation. -make headers_install INSTALL_HDR_PATH="$1/usr" +make PREFIX=/usr ARCH=x86 DESTDIR="$1" install diff --git a/core/linux-headers/checksums b/core/linux-headers/checksums index 2177392f..8166f3e0 100644 --- a/core/linux-headers/checksums +++ b/core/linux-headers/checksums @@ -1 +1,2 @@ -88e59fafc9653cb7eef501cef3eda677843027735fd11325a75e353b10770dc5 linux-5.11.4.tar.xz +%BLAKE3 +34b36a3c8142999ecc86be5564db502b7d4d82114a40ac4b32289c6c3d070142 linux-headers-6.7.6.tar.gz diff --git a/core/linux-headers/meta b/core/linux-headers/meta new file mode 100644 index 00000000..24d29dc6 --- /dev/null +++ b/core/linux-headers/meta @@ -0,0 +1,3 @@ +description: Linux kernel headers +license: GPL-2.0-only +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/linux-headers/sources b/core/linux-headers/sources index 26bad2db..92bdd2a8 100644 --- a/core/linux-headers/sources +++ b/core/linux-headers/sources @@ -1 +1 @@ -https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.4.tar.xz +https://fossil.carbslinux.org/linux-headers/tarball/6.7.6/linux-headers-6.7.6.tar.gz diff --git a/core/linux-headers/version b/core/linux-headers/version index c5cf130b..5651f125 100644 --- a/core/linux-headers/version +++ b/core/linux-headers/version @@ -1 +1 @@ -5.11.4 1 +6.7.6 1 diff --git a/core/m4/checksums b/core/m4/checksums deleted file mode 100644 index 1357398a..00000000 --- a/core/m4/checksums +++ /dev/null @@ -1 +0,0 @@ -f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 m4-1.4.18.tar.xz diff --git a/core/m4/sources b/core/m4/sources deleted file mode 100644 index 07be0f71..00000000 --- a/core/m4/sources +++ /dev/null @@ -1 +0,0 @@ -https://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz diff --git a/core/m4/version b/core/m4/version deleted file mode 100644 index 3f61745a..00000000 --- a/core/m4/version +++ /dev/null @@ -1 +0,0 @@ -1.4.18 3 diff --git a/core/make/checksums b/core/make/checksums index 8ce10bc9..ec383bd8 100644 --- a/core/make/checksums +++ b/core/make/checksums @@ -1 +1,2 @@ -e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19 make-4.3.tar.gz +%BLAKE3 +a7d8aee97b7e9a525ef561afa84eea0d929f246e3aafa420231c0602151cf9eb make-4.4.1.tar.gz diff --git a/core/make/meta b/core/make/meta new file mode 100644 index 00000000..99684041 --- /dev/null +++ b/core/make/meta @@ -0,0 +1,3 @@ +description: GNU Make build utility +license: GPL-3.0-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/make/sources b/core/make/sources index 038f47fa..ebbd0bc3 100644 --- a/core/make/sources +++ b/core/make/sources @@ -1 +1 @@ -https://ftp.gnu.org/gnu/make/make-4.3.tar.gz +https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz diff --git a/core/make/version b/core/make/version index e47357bf..2cb41e4b 100644 --- a/core/make/version +++ b/core/make/version @@ -1 +1 @@ -4.3 2 +4.4.1 1 diff --git a/core/mandoc/build b/core/mandoc/build deleted file mode 100755 index 324e4138..00000000 --- a/core/mandoc/build +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -e - -sed_i() { - for file; do :; done - sed "$@" > _ - cat _ > "$file"; rm -f _ -} - -sed_i '/int dummy/d' compat_err.c -sed_i 's,"more -s","less",g' main.c -sed_i "s/CC=.*/CC='$CC'/" configure - -cat > configure.local <<EOF -PREFIX=/usr -MANDIR=/usr/share/man -LIBDIR=/usr/lib -SBINDIR=/usr/bin -CC="${CC:-gcc}" -CFLAGS="$CFLAGS" -LDFLAGS="$LDFLAGS -static" -MANPATH_DEFAULT=/usr/share/man -LN="ln -sf" -EOF - -MANPATH_BASE=/usr/share/man ./configure -make -make -j1 DESTDIR="$1" base-install lib-install - -# Make binaries writable. -chmod u+w "$1/usr/bin/"* - -# Remove all development files. -rm -rf "$1/usr/include" \ - "$1/usr/lib" \ - "$1/usr/share/man/man3" diff --git a/core/mandoc/checksums b/core/mandoc/checksums deleted file mode 100644 index 05dfea01..00000000 --- a/core/mandoc/checksums +++ /dev/null @@ -1 +0,0 @@ -8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7 mandoc-1.14.5.tar.gz diff --git a/core/mandoc/depends b/core/mandoc/depends deleted file mode 100644 index 17a6d43d..00000000 --- a/core/mandoc/depends +++ /dev/null @@ -1 +0,0 @@ -zlib make diff --git a/core/mandoc/sources b/core/mandoc/sources deleted file mode 100644 index 85f63e7e..00000000 --- a/core/mandoc/sources +++ /dev/null @@ -1 +0,0 @@ -https://fossies.org/linux/misc/mandoc-1.14.5.tar.gz diff --git a/core/mandoc/version b/core/mandoc/version deleted file mode 100644 index f026b185..00000000 --- a/core/mandoc/version +++ /dev/null @@ -1 +0,0 @@ -1.14.5 3 diff --git a/core/minit/build b/core/minit/build deleted file mode 100755 index 38a9de6f..00000000 --- a/core/minit/build +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e - -make -make DESTDIR="$1" PREFIX=/usr install - -ln -s minit "$1/usr/bin/init" - -install -Dm755 reboot "$1/usr/bin/reboot" -install -Dm755 poweroff "$1/usr/bin/poweroff" -install -Dm644 minit.post.shutdown "$1/etc/init/minit.post.shutdown" diff --git a/core/minit/checksums b/core/minit/checksums deleted file mode 100644 index 8b57b92b..00000000 --- a/core/minit/checksums +++ /dev/null @@ -1,4 +0,0 @@ -5ccf4eb8e663be2483ad469470453a7622a0f79d25d9aee8b216867c419888dd 0.1.0.tar.gz -4da8b0c2771a9046a7ce2ded49beb5297045e9979796e5e4b390168286f05379 poweroff -f638aaa23383da584d3a56347a8e279abdc7c9c521661ef54a5bc8b955c5632b reboot -4588e3c6337c1f92d3120bebd774fdcd2a85d70f150d68293527798c6e5a031d minit.post.shutdown diff --git a/core/minit/files/minit.post.shutdown b/core/minit/files/minit.post.shutdown deleted file mode 100644 index 747db7f1..00000000 --- a/core/minit/files/minit.post.shutdown +++ /dev/null @@ -1 +0,0 @@ -case "$1" in poweroff) /bin/kill -s USR2 1 ;; reboot) /bin/kill -s QUIT 1 ;; esac diff --git a/core/minit/files/poweroff b/core/minit/files/poweroff deleted file mode 100644 index 69d8731e..00000000 --- a/core/minit/files/poweroff +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/bin/kill -s USR1 1 diff --git a/core/minit/files/reboot b/core/minit/files/reboot deleted file mode 100644 index 266afb92..00000000 --- a/core/minit/files/reboot +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/bin/kill -s INT 1 diff --git a/core/minit/message b/core/minit/message deleted file mode 100644 index 217d82e5..00000000 --- a/core/minit/message +++ /dev/null @@ -1,16 +0,0 @@ -[1m!! IMPORTANT !![m - -In order to start using minit, -you have to uncomment some entries on -your [1m/etc/init/launch-services.boot[m - -These depend on which getty you are -using, and whether you are using a -system supervisor or not. - -NOTE: If you are currently booted with - busybox-init you can poweroff/reboot - by running - - busybox-init poweroff - busybox-init reboot diff --git a/core/minit/sources b/core/minit/sources deleted file mode 100644 index c898877a..00000000 --- a/core/minit/sources +++ /dev/null @@ -1,4 +0,0 @@ -https://github.com/cemkeylan/minit/archive/0.1.0.tar.gz -files/poweroff -files/reboot -files/minit.post.shutdown diff --git a/core/minit/version b/core/minit/version deleted file mode 100644 index 7d459d01..00000000 --- a/core/minit/version +++ /dev/null @@ -1 +0,0 @@ -0.1.0 2 diff --git a/core/musl/build b/core/musl/build index e48ce47f..a7ab1741 100755 --- a/core/musl/build +++ b/core/musl/build @@ -5,15 +5,16 @@ # we are only supporting i686 and x86_64. sys_arch="$(uname -m)" -kinstall_t() { - # install -Dm* -t alternative - # usage: kinstall_t 755 /usr/bin file file2 file3 - mod=$1 dir=$2; mkdir -p "$dir" - shift 2 - for file; do - cp "$file" "$dir" - chmod "$mod" "$dir/$file" - done +# Bootstrap if the package isn't installed yet. +cpt l -q musl || { + ./configure \ + --prefix="$PWD/tmp" + + make ALL_TOOLS+=obj/musl-gcc + make ALL_TOOLS+=obj/musl-gcc lib/musl-gcc.specs + make ALL_TOOLS+=obj/musl-gcc install + cp lib/musl-gcc.specs "$PWD/tmp/lib" + export CC="$PWD/tmp/bin/musl-gcc" } ./configure \ @@ -34,15 +35,10 @@ case "$sys_arch" in esac # Install BSD compatibility headers. -kinstall_t 755 "$1/usr/include/sys" cdefs.h queue.h tree.h +clinst -Dm644 -t "$1/usr/include/sys" cdefs.h queue.h tree.h # Install getconf. "${CC:=cc}" --static getconf.c -o "$1/usr/bin/getconf" -case $sys_arch in i*86) - "$CC" -c __stack_chk_fail_local.c -o __stack_chk_fail_local.o - ar r "$1/usr/lib/libssp_nonshared.a" __stack_chk_fail_local.o -esac - # Install getent -kinstall_t 755 "$1/usr/bin" getent +clinst -Dm755 -t "$1/usr/bin" getent diff --git a/core/musl/checksums b/core/musl/checksums index fe5203f2..395933dd 100644 --- a/core/musl/checksums +++ b/core/musl/checksums @@ -1,7 +1,8 @@ -9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz -30bb6d7e0e0b61fcd95d830c376c829a614bce4683c1b97e06c201ec2c6e839a cdefs.h -c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h -e1e498a79bf160a5766fa560f2b07b206fe89fe21a62600c77d72e00a6992f92 tree.h -d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c -18f323b671fb40a53732c05cdaa6f2e8b8603051c546e73fda5447944dc7c037 getent -299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c +%BLAKE3 +fc33d5ebf5812ddc4a409b5e5abe620e216ad0378273fdafb73795d52e1722c6 musl-1.2.4.tar.gz +936eb5830af322af38a1d08d02cc1d31ae95efdbc2e381b0e5fa6e91eebe693e cdefs.h +619fd80e4d195caa65ee96b4338a1e68ed16bdc41cbe90ac15730c359bca8209 queue.h +c712195c178941f6c90ab09c99639a06e49c240c932c632189033d961af05279 tree.h +9949f50c6d3b639a65986fd8a0cd44e9b9ea886ae137ba53e300f20545ee3118 getconf.c +5175d496208956bf62391765e69266694fcc957cb6feaacb65819466f7218f7b getent +acf8e5701761f8b10449445487906c37b70fee5031dc1c140e704a97ced5de3c __stack_chk_fail_local.c diff --git a/core/musl/files/cdefs.h b/core/musl/files/cdefs.h index 209a623c..209a623c 100755..100644 --- a/core/musl/files/cdefs.h +++ b/core/musl/files/cdefs.h diff --git a/core/musl/files/queue.h b/core/musl/files/queue.h index a38499a2..a38499a2 100755..100644 --- a/core/musl/files/queue.h +++ b/core/musl/files/queue.h diff --git a/core/musl/files/tree.h b/core/musl/files/tree.h index eaea56aa..eaea56aa 100755..100644 --- a/core/musl/files/tree.h +++ b/core/musl/files/tree.h diff --git a/core/musl/meta b/core/musl/meta new file mode 100644 index 00000000..7cbe8973 --- /dev/null +++ b/core/musl/meta @@ -0,0 +1,3 @@ +description: Musl C library +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/musl/sources b/core/musl/sources index 40571d85..28ad9b95 100644 --- a/core/musl/sources +++ b/core/musl/sources @@ -1,4 +1,4 @@ -https://www.musl-libc.org/releases/musl-1.2.2.tar.gz +https://www.musl-libc.org/releases/musl-1.2.4.tar.gz files/cdefs.h files/queue.h files/tree.h diff --git a/core/musl/version b/core/musl/version index 52669276..d66671c6 100644 --- a/core/musl/version +++ b/core/musl/version @@ -1 +1 @@ -1.2.2 1 +1.2.4 1 diff --git a/core/neatvi/build b/core/neatvi/build index 0bc99d13..7ccfd7e4 100755 --- a/core/neatvi/build +++ b/core/neatvi/build @@ -1,5 +1,5 @@ #!/bin/sh -e make LDFLAGS="$LDFLAGS -static" -install -Dm755 vi "$1/usr/bin/vi" +clinst -Dm755 vi "$1/usr/bin/vi" ln -sf vi "$1/usr/bin/ex" diff --git a/core/neatvi/checksums b/core/neatvi/checksums index 4f69611f..f3720555 100644 --- a/core/neatvi/checksums +++ b/core/neatvi/checksums @@ -1,2 +1,2 @@ -a861714d97e5b2d28698b7b7e13e393bb94a381def68d260a0e2908ee3d48591 08.tar.gz -8598a7289eebfa607f0db3c11c997b7e02aeaa9dc2efbf117352bb3749095b44 conf.h +%BLAKE3 +5b130182f7f72e5f4824970023bb2a9fe4b8038d6d6bdba7ff97fd3aa176e0cc 14.tar.gz diff --git a/core/neatvi/meta b/core/neatvi/meta new file mode 100644 index 00000000..f869403e --- /dev/null +++ b/core/neatvi/meta @@ -0,0 +1,3 @@ +description: ex/vi text editor +license: ISC +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/neatvi/sources b/core/neatvi/sources index 6eca3821..8aa78171 100644 --- a/core/neatvi/sources +++ b/core/neatvi/sources @@ -1,2 +1 @@ -https://github.com/aligrudi/neatvi/archive/08.tar.gz -files/conf.h +https://github.com/aligrudi/neatvi/archive/refs/tags/14.tar.gz diff --git a/core/neatvi/version b/core/neatvi/version index a6837700..b0c51f3b 100644 --- a/core/neatvi/version +++ b/core/neatvi/version @@ -1 +1 @@ -08 1 +14 1 diff --git a/core/otools/build b/core/otools/build index 71b410c4..b90aeebe 100755 --- a/core/otools/build +++ b/core/otools/build @@ -1,8 +1,12 @@ #!/bin/sh -e -:> testfile -less -F -T testfile testfile 2>/dev/null && echo CFLAGS += -DHAVE_LESS_T >> config.mk -rm -f testfile +export LDFLAGS="$LDFLAGS -static" + +./configure \ + --prefix=/usr \ + --with-system-zlib make -make PREFIX=/usr DESTDIR="$1" install +make DESTDIR="$1" install + +clinst -Dm644 doas.conf "$1/etc/doas.conf" diff --git a/core/otools/checksums b/core/otools/checksums index 75b20da9..c0a29e02 100644 --- a/core/otools/checksums +++ b/core/otools/checksums @@ -1 +1,3 @@ -117ec008b3f33ee7f674ff99f5f2ce589cb2eb3d83706bab61ef281d48ee2d9f 1.2.tar.gz +%BLAKE3 +fa653d1da088694c1f5c12135b2dfceddcb490cc9a4fb292f14234e0714954f5 otools-1.5.1.tar.gz +c65711680a15cf51a32771ed0a6a09a4e09332d7e07d6b37090f5b1fb5684545 doas.conf diff --git a/core/otools/depends b/core/otools/depends index 0c25cd78..cc6cc869 100644 --- a/core/otools/depends +++ b/core/otools/depends @@ -1,2 +1,3 @@ -libtls-bearssl make +cl-utils make +libressl make zlib make diff --git a/core/otools/files/doas.conf b/core/otools/files/doas.conf new file mode 100644 index 00000000..7f84cea7 --- /dev/null +++ b/core/otools/files/doas.conf @@ -0,0 +1,17 @@ +# /etc/doas.conf +# See doas.conf(5) for details. + +# Allow root to do anything by default +permit nopass root + +# This is required if you want to use cpt with 'doas' +# permit :wheel cmd env +# +# Same without asking password +# permit nopass :wheel cmd env + +# In order to accept all commands +# permit :wheel +# +# Same without asking password +# permit nopass :wheel diff --git a/core/otools/meta b/core/otools/meta new file mode 100644 index 00000000..9251a6df --- /dev/null +++ b/core/otools/meta @@ -0,0 +1,3 @@ +description: Ports of OpenBSD mandoc, doas, signify, pax, and more +license: BSD-3-Clause +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/otools/sources b/core/otools/sources index 5865d4e4..69487f32 100644 --- a/core/otools/sources +++ b/core/otools/sources @@ -1 +1,2 @@ -https://github.com/CarbsLinux/otools/archive/1.2.tar.gz +https://git.carbslinux.org/otools/snapshot/otools-1.5.1.tar.gz +files/doas.conf diff --git a/core/otools/version b/core/otools/version index f76d8346..0872adad 100644 --- a/core/otools/version +++ b/core/otools/version @@ -1 +1 @@ -1.2 1 +1.5.1 1 diff --git a/core/gzip/build b/core/pigz/build index 8d190a07..e3f68273 100755 --- a/core/gzip/build +++ b/core/pigz/build @@ -6,4 +6,6 @@ install -Dm755 pigz "$1/usr/bin/pigz" install -Dm644 pigz.1 "$1/usr/share/man/man1/pigz.1" ln -sf pigz "$1/usr/bin/gzip" +ln -sf pigz "$1/usr/bin/gunzip" ln -sf pigz.1 "$1/usr/share/man/man1/gzip.1" +ln -sf pigz.1 "$1/usr/share/man/man1/gunzip.1" diff --git a/core/pigz/checksums b/core/pigz/checksums new file mode 100644 index 00000000..bf682d4f --- /dev/null +++ b/core/pigz/checksums @@ -0,0 +1,2 @@ +%BLAKE3 +fa165f414a12851806d9d54920879dd989917b9aa410aec671c602b18773b236 pigz-2.8.tar.gz diff --git a/core/gzip/depends b/core/pigz/depends index 17a6d43d..17a6d43d 100644 --- a/core/gzip/depends +++ b/core/pigz/depends diff --git a/core/pigz/meta b/core/pigz/meta new file mode 100644 index 00000000..0532ffbb --- /dev/null +++ b/core/pigz/meta @@ -0,0 +1,3 @@ +description: A parallel implementation of gzip +license: Zlib +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/pigz/sources b/core/pigz/sources new file mode 100644 index 00000000..a65f50b7 --- /dev/null +++ b/core/pigz/sources @@ -0,0 +1 @@ +https://zlib.net/pigz/pigz-2.8.tar.gz diff --git a/core/pigz/version b/core/pigz/version new file mode 100644 index 00000000..5d860172 --- /dev/null +++ b/core/pigz/version @@ -0,0 +1 @@ +2.8 1 diff --git a/core/pkgconf/checksums b/core/pkgconf/checksums index 8254b8ab..e6382271 100644 --- a/core/pkgconf/checksums +++ b/core/pkgconf/checksums @@ -1 +1,2 @@ -b846aea51cf696c3392a0ae58bef93e2e72f8e7073ca6ad1ed8b01c85871f9c0 pkgconf-1.7.3.tar.xz +%BLAKE3 +17d04b5700bec0025f7a052065af2e7dd6c7d011299aa4d19439bc0376b96154 pkgconf-2.1.1.tar.xz diff --git a/core/pkgconf/meta b/core/pkgconf/meta new file mode 100644 index 00000000..56c7b7eb --- /dev/null +++ b/core/pkgconf/meta @@ -0,0 +1,3 @@ +description: Compiler/Linker configuration helper +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/pkgconf/sources b/core/pkgconf/sources index 0904da9a..06b9427f 100644 --- a/core/pkgconf/sources +++ b/core/pkgconf/sources @@ -1 +1 @@ -http://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.3.tar.xz +http://distfiles.dereferenced.org/pkgconf/pkgconf-2.1.1.tar.xz diff --git a/core/pkgconf/version b/core/pkgconf/version index d35fe2c5..05565a80 100644 --- a/core/pkgconf/version +++ b/core/pkgconf/version @@ -1 +1 @@ -1.7.3 2 +2.1.1 1 diff --git a/core/redo/build b/core/redo/build deleted file mode 100755 index cfc0450a..00000000 --- a/core/redo/build +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -e - -"${CC:=cc}" -Os -Wall -Wextra -Wwrite-strings -c -o redo.o redo.c -"$CC" -static -o redo redo.c - -for file in redo redo-sources redo-targets; do - install -Dm755 "$file" "$1/usr/bin/$file" -done - -for file in redo-ifcreate redo-ifchange redo-always; do - ln -sf redo "$1/usr/bin/$file" -done diff --git a/core/redo/checksums b/core/redo/checksums deleted file mode 100644 index 3e5c8fc3..00000000 --- a/core/redo/checksums +++ /dev/null @@ -1 +0,0 @@ -f0394dd4d3285b4898ce79f9206e04abcf0f5122f1df3832583d27a964ee65d4 v0.3.tar.gz diff --git a/core/redo/sources b/core/redo/sources deleted file mode 100644 index 456d9037..00000000 --- a/core/redo/sources +++ /dev/null @@ -1 +0,0 @@ -https://github.com/leahneukirchen/redo-c/archive/v0.3.tar.gz diff --git a/core/redo/version b/core/redo/version deleted file mode 100644 index cc15c623..00000000 --- a/core/redo/version +++ /dev/null @@ -1 +0,0 @@ -0.3 1 diff --git a/core/rsync/checksums b/core/rsync/checksums index 4c0f123f..483ab981 100644 --- a/core/rsync/checksums +++ b/core/rsync/checksums @@ -1,2 +1,3 @@ -becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e rsync-3.2.3.tar.gz -301240aecba5b8fbda8310c841ef61e3c1f312a55378f6079f8d65ae1bd811f2 mkproto.awk +%BLAKE3 +36f619e948cbb5dde312ba70398f1e35b66e25a8e9788a9bfe4356866795d39f rsync-3.2.7.tar.gz +e22f5e6fed3fb52d80134cb7f1950a626e84845428296c8c0135cb9097f03548 mkproto.awk diff --git a/core/rsync/meta b/core/rsync/meta new file mode 100644 index 00000000..bd7775a7 --- /dev/null +++ b/core/rsync/meta @@ -0,0 +1,3 @@ +description: Incremental file transfer tool +license: GPL-3.0-only +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/rsync/sources b/core/rsync/sources index 8cf17405..ce6a898b 100644 --- a/core/rsync/sources +++ b/core/rsync/sources @@ -1,2 +1,2 @@ -https://download.samba.org/pub/rsync/src/rsync-3.2.3.tar.gz +https://download.samba.org/pub/rsync/src/rsync-3.2.7.tar.gz files/mkproto.awk diff --git a/core/rsync/version b/core/rsync/version index 088245e7..ebadbe1f 100644 --- a/core/rsync/version +++ b/core/rsync/version @@ -1 +1 @@ -3.2.3 1 +3.2.7 1 diff --git a/core/runit/build b/core/runit/build index 17aec618..63eb086d 100755 --- a/core/runit/build +++ b/core/runit/build @@ -6,26 +6,23 @@ cd "runit-$2" ( cd src - sed 's@sbin/runit@usr/bin/runit@g' -i runit.h + clsed 's@sbin/runit@usr/bin/runit@g' runit.h printf '%s -D_GNU_SOURCE -static\n' "${CC-cc}" "$CFLAGS" > conf-cc printf '%s %s -static -Wl,-z -Wl,noexecstack\n' "${CC-cc}" "$CFLAGS" > conf-ld - sed -i 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c + clsed 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c make - for bin in chpst runit runit-init runsv runsvchdir runsvdir sv svlogd \ - utmpset ../../poweroff ../../reboot; do - install -Dm755 "$bin" "$1/usr/bin/${bin}" - done + clinst -Dm755 -t "$1/usr/bin" chpst runit runit-init runsv runsvchdir \ + runsvdir sv svlogd utmpset ../../poweroff \ + ../../reboot ) -for manpage in man/*; do - install -Dm644 "$manpage" "$1/usr/share/man/man8/${manpage##*/}" -done +clman -d "$1" man/* mkdir -p "$1/var/service" "$1/etc/runit" ln -s runit-init "$1/usr/bin/init" ln -s /usr/lib/init/rc.boot "$1/etc/runit/1" ln -s /usr/lib/init/rc.shutdown "$1/etc/runit/3" -install -Dm755 ../2 "$1/etc/runit/2" +clinst -Dm755 ../2 "$1/etc/runit/2" diff --git a/core/runit/meta b/core/runit/meta new file mode 100644 index 00000000..7473c06b --- /dev/null +++ b/core/runit/meta @@ -0,0 +1,3 @@ +description: init and service supervision suite +license: BSD-3-Clause +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/samurai/build b/core/samurai/build new file mode 100755 index 00000000..8503932d --- /dev/null +++ b/core/samurai/build @@ -0,0 +1,21 @@ +#!/bin/sh -e + +export LDFLAGS="$LDFLAGS -static" + +# Samurai is faster than make, so we prefer using it instead if available +if cpt l -q samurai; then + cat - ninja.in <<EOF> build.ninja +destdir = $1 +cc = ${CC:-cc} +cflags = -std=c99 -Wall -Wextra -Wpedantic -Wno-unused-parameter $CFLAGS +ldflags = -static $LDFLAGS +EOF + ninja + ninja install +else + make PREFIX=/usr LDFLAGS="$LDFLAGS" + make PREFIX=/usr DESTDIR="$1" install +fi + +ln -s samu "$1/usr/bin/ninja" +ln -s samu.1 "$1/usr/share/man/man1/ninja.1" diff --git a/core/samurai/checksums b/core/samurai/checksums new file mode 100644 index 00000000..fc23909e --- /dev/null +++ b/core/samurai/checksums @@ -0,0 +1,3 @@ +%BLAKE3 +9f0315f1f6e123eb32c8cdb5fe98bcca1f1d2f4ca2617675476568cf3ddc07da samurai-1.2.tar.gz +f0012d84a4697d81793f89d5387dbcbd43a43ee8cab93357a8d1082dce0ce3d1 ninja.in diff --git a/core/samurai/files/ninja.in b/core/samurai/files/ninja.in new file mode 100644 index 00000000..c648e47c --- /dev/null +++ b/core/samurai/files/ninja.in @@ -0,0 +1,33 @@ +rule cc + command = $cc $cflags -c -o $out $in + description = Compiling C object $out +rule link + command = $cc $ldflags -o $out $in + description = Linking $out +rule custom + command = $COMMAND + description = $DESC + +build build.o: cc build.c +build deps.o: cc deps.c +build env.o: cc env.c +build graph.o: cc graph.c +build htab.o: cc htab.c +build log.o: cc log.c +build parse.o: cc parse.c +build samu.o: cc samu.c +build scan.o: cc scan.c +build tool.o: cc tool.c +build tree.o: cc tree.c +build util.o: cc util.c +build samu: link build.o deps.o env.o graph.o htab.o log.o parse.o samu.o scan.o tool.o tree.o util.o +build install: phony bin-install man-install +build PHONY: phony +build bin-install: custom PHONY samu + COMMAND = clinst -Dm755 samu $destdir/usr/bin/samu + DESC = Installing samu +build man-install: custom PHONY + COMMAND = clman -d $destdir samu.1 + DESC = Installing manual page samu.1 + +default samu diff --git a/core/samurai/meta b/core/samurai/meta new file mode 100644 index 00000000..7f8d1339 --- /dev/null +++ b/core/samurai/meta @@ -0,0 +1,3 @@ +description: Ninja-compatible build tool written in C99 +license: MIT, Apache-2.0 +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/samurai/sources b/core/samurai/sources new file mode 100644 index 00000000..e10d2035 --- /dev/null +++ b/core/samurai/sources @@ -0,0 +1,2 @@ +https://github.com/michaelforney/samurai/releases/download/1.2/samurai-1.2.tar.gz +files/ninja.in diff --git a/core/samurai/version b/core/samurai/version new file mode 100644 index 00000000..f76d8346 --- /dev/null +++ b/core/samurai/version @@ -0,0 +1 @@ +1.2 1 diff --git a/core/sbase/checksums b/core/sbase/checksums index e5031ad2..dd0d77e0 100644 --- a/core/sbase/checksums +++ b/core/sbase/checksums @@ -1 +1 @@ -1e76a9b7cb2feb1ceb1ce6d3203aff30003f8d238910a6ac2033e13038425b3b sbase-20200704.tar.xz +9838bbb583d556dcae9ce467d5d1c3079015665af7d9cad8141375c1102fda8b 3eb89c44.tar.gz diff --git a/core/sbase/meta b/core/sbase/meta new file mode 100644 index 00000000..8aa8d719 --- /dev/null +++ b/core/sbase/meta @@ -0,0 +1,3 @@ +description: suckless unix tools +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/sbase/sources b/core/sbase/sources index 214f75c5..b13359ec 100644 --- a/core/sbase/sources +++ b/core/sbase/sources @@ -1 +1 @@ -https://dl.carbslinux.org/distfiles/sbase-20200704.tar.xz +https://git.sr.ht/~mcf/sbase/archive/3eb89c44.tar.gz diff --git a/core/sbase/version b/core/sbase/version index 1e48510d..816d33f7 100644 --- a/core/sbase/version +++ b/core/sbase/version @@ -1 +1 @@ -git 3 +git 4 diff --git a/core/sinit/build b/core/sinit/build index e85d78aa..288f4a53 100755 --- a/core/sinit/build +++ b/core/sinit/build @@ -3,5 +3,5 @@ make CFLAGS="$CFLAGS -static" PREFIX=/usr DESTDIR="$1" install ln -s sinit "$1/usr/bin/init" -install -Dm755 poweroff "$1/usr/bin/poweroff" -install -Dm755 reboot "$1/usr/bin/reboot" +clinst -Dm755 poweroff "$1/usr/bin/poweroff" +clinst -Dm755 reboot "$1/usr/bin/reboot" diff --git a/core/sinit/message b/core/sinit/message index 45aa34a2..742b089d 100644 --- a/core/sinit/message +++ b/core/sinit/message @@ -1,9 +1,5 @@ !! IMPORTANT !! -To start using sinit, edit /etc/init/sinit-launch-services.boot and uncomment -the getty function, and optionally uncomment the runit function if you deem -necessary. - sinit is installed as /usr/bin/sinit. It can fully replace busybox init by running the following command. diff --git a/core/sinit/meta b/core/sinit/meta new file mode 100644 index 00000000..165aebf3 --- /dev/null +++ b/core/sinit/meta @@ -0,0 +1,3 @@ +description: suckless init scheme +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/sysmgr/build b/core/sysmgr/build index 15625a56..34d336a5 100755 --- a/core/sysmgr/build +++ b/core/sysmgr/build @@ -3,4 +3,4 @@ make make DESTDIR="$1" PREFIX=/usr install -install -Dm644 sysmgr.boot "$1/etc/init/sysmgr.boot" +clinst -Dm644 sysmgr.boot "$1/etc/init/sysmgr.boot" diff --git a/core/sysmgr/meta b/core/sysmgr/meta new file mode 100644 index 00000000..7179ecd6 --- /dev/null +++ b/core/sysmgr/meta @@ -0,0 +1,3 @@ +description: simplistic service supervision daemon +license: MIT +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/util-linux/checksums b/core/util-linux/checksums index 2edb1f26..3b58d33f 100644 --- a/core/util-linux/checksums +++ b/core/util-linux/checksums @@ -1 +1,2 @@ -f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f util-linux-2.36.2.tar.xz +%BLAKE3 +69d498a93b08e1bc6dbf44ef78661c8fc8e52b086150eb13ef52290308c6525c util-linux-2.39.3.tar.xz diff --git a/core/util-linux/meta b/core/util-linux/meta new file mode 100644 index 00000000..41c7e020 --- /dev/null +++ b/core/util-linux/meta @@ -0,0 +1,3 @@ +description: Linux utilities +license: GPL-2.0-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/util-linux/sources b/core/util-linux/sources index 518f0df8..58d2a98c 100644 --- a/core/util-linux/sources +++ b/core/util-linux/sources @@ -1 +1 @@ -https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.2.tar.xz +https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.3.tar.xz diff --git a/core/util-linux/version b/core/util-linux/version index 8f4b52d0..ded98bd6 100644 --- a/core/util-linux/version +++ b/core/util-linux/version @@ -1 +1 @@ -2.36.2 1 +2.39.3 1 diff --git a/core/xz/build b/core/xz/build index 6daf22f8..606cc351 100755 --- a/core/xz/build +++ b/core/xz/build @@ -5,3 +5,15 @@ make make DESTDIR="$1" install + +# Link the binaries statically +cd src +rm -f xz/xz lzmainfo/lzmainfo xzdec/lzmadec xzdec/xzdec + +make LDFLAGS=-all-static -C xz +make LDFLAGS=-all-static -C lzmainfo +make LDFLAGS=-all-static -C xzdec + +for bin in xz/xz lzmainfo/lzmainfo xzdec/lzmadec xzdec/xzdec; do + clinst -m755 "$bin" "$1/usr/bin/${bin##*/}" +done diff --git a/core/xz/checksums b/core/xz/checksums index 030e2e2a..2480b54b 100644 --- a/core/xz/checksums +++ b/core/xz/checksums @@ -1 +1,2 @@ -5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df xz-5.2.5.tar.bz2 +%BLAKE3 +750a05793aeba3cd68d1d5425db3a527c73a89ab8c3a29401236d531548099af xz-5.4.6.tar.bz2 diff --git a/core/xz/meta b/core/xz/meta new file mode 100644 index 00000000..ab43cb4f --- /dev/null +++ b/core/xz/meta @@ -0,0 +1,3 @@ +description: XZ compression utilities +license: GPL-3.0-or-later, LGPL-2.1-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/xz/sources b/core/xz/sources index 3309a027..7f576a65 100644 --- a/core/xz/sources +++ b/core/xz/sources @@ -1 +1 @@ -https://fossies.org/linux/misc/xz-5.2.5.tar.bz2 +https://fossies.org/linux/misc/xz-5.4.6.tar.bz2 diff --git a/core/xz/version b/core/xz/version index a1938eb9..fe0075d2 100644 --- a/core/xz/version +++ b/core/xz/version @@ -1 +1 @@ -5.2.5 3 +5.4.6 1 diff --git a/core/zlib/checksums b/core/zlib/checksums index 5051c98a..7ebda789 100644 --- a/core/zlib/checksums +++ b/core/zlib/checksums @@ -1 +1,2 @@ -c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 zlib-1.2.11.tar.gz +%BLAKE3 +207c3b0862cb4e3686f8405f76a98c38dbad9c94bcf4be4b9efca0716aba51ec zlib-1.3.1.tar.gz diff --git a/core/zlib/meta b/core/zlib/meta new file mode 100644 index 00000000..90a2865b --- /dev/null +++ b/core/zlib/meta @@ -0,0 +1,3 @@ +description: Standard compression and decompression library +license: Zlib +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/zlib/sources b/core/zlib/sources index 17f901f4..32136e3e 100644 --- a/core/zlib/sources +++ b/core/zlib/sources @@ -1 +1 @@ -https://zlib.net/zlib-1.2.11.tar.gz +https://zlib.net/zlib-1.3.1.tar.gz diff --git a/core/zlib/version b/core/zlib/version index 41acf3fe..957d07e2 100644 --- a/core/zlib/version +++ b/core/zlib/version @@ -1 +1 @@ -1.2.11 3 +1.3.1 1 diff --git a/core/zstd/build b/core/zstd/build index 28bda353..530e31bf 100755 --- a/core/zstd/build +++ b/core/zstd/build @@ -1,4 +1,5 @@ #!/bin/sh -e -make PREFIX=/usr +make PREFIX=/usr lib-release +make PREFIX=/usr LDFLAGS="$LDFLAGS -static" zstd-release make DESTDIR="$1" PREFIX=/usr install diff --git a/core/zstd/checksums b/core/zstd/checksums index c122d448..551d891b 100644 --- a/core/zstd/checksums +++ b/core/zstd/checksums @@ -1 +1,2 @@ -acf714d98e3db7b876e5b540cbf6dee298f60eb3c0723104f6d3f065cd60d6a8 v1.4.9.tar.gz +%BLAKE3 +801670f3299554803759beb939eea69b0aa8d70495a962c88e8c723b6575f696 v1.5.5.tar.gz diff --git a/core/zstd/meta b/core/zstd/meta new file mode 100644 index 00000000..2dbcf07a --- /dev/null +++ b/core/zstd/meta @@ -0,0 +1,3 @@ +description: Z standard compression utilities +license: BSD-3-Clause, GPL-2.0-or-later +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/core/zstd/sources b/core/zstd/sources index 2762b5b2..6da0473e 100644 --- a/core/zstd/sources +++ b/core/zstd/sources @@ -1 +1 @@ -https://github.com/facebook/zstd/archive/v1.4.9.tar.gz +https://github.com/facebook/zstd/archive/v1.5.5.tar.gz diff --git a/core/zstd/version b/core/zstd/version index 8bb19669..013c2474 100644 --- a/core/zstd/version +++ b/core/zstd/version @@ -1 +1 @@ -1.4.9 1 +1.5.5 1 |