Merge pull request #178 from fosslinux/network

Network

sysa/SHA256SUMS.pkgs

@@ -32,11 +32,16 @@ ae452f08ad9f7ab01f2a9bd882170e71ee6200a06f044f4aadb446cc68700016  bison-3.4.1_1.
 becc8ea1f24c531c35b520ce8bac9e8bf6e30e362fe77bf7833aed9d28af0ae6  bison-3.4.1_2.tar.bz2
 a3266333620a13f4a4c8f4f9819dc6f1fcded7f74bcb9fbf46518f3b160cf930  bison-3.4.2_0.tar.bz2
 09bef4ec506ccafc42ad925f9c038af9885cd8ebca294cf042e63a7d39e91bb5  bzip2-1.0.8_0.tar.bz2
+c484b98e580d7ef5619dc2da2318d9f1e69360a882f64aa15e0fdde0184c45fb  ca-certificates-3.78_0.tar.bz2
 2d85ff411c62c2ee9db08e20d33991ef6d28a6067e211e9641a8eaefed6aee04  coreutils-5.0_0.tar.bz2
 776ef3e13870fba6fc9cec64eaf40fb658abecc99c65724968013f8f8a177802  coreutils-6.10_0.tar.bz2
 b8992f675350658b106c3066cac0ee31440020bc9d6128bfc2fdf1fde60efd74  coreutils-8.32_0.tar.bz2
+28a1e93ed14f7fa4d3c8ca41e9b78e29ba685fbc8b6bf7ba3b6933770d68eedb  curl-7.83.0_0.tar.bz2
+99a101a3a1de8e5ed3f590cda6b1a72d68cd2e935b85e8b9b862ab26f66c7ee1  curl-7.83.0_1.tar.bz2
+a6f8f4db6bf449ed8771efefabb88833f1fc5f314d565b7714c9c8b4ba34b20c  dhcpcd-9.4.1_0.tar.bz2
 ca91a67d5d0c0ee46d064d9bf7c26efcafe712a9f86866991028478df3b34f21  diffutils-2.7_0.tar.bz2
 de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45  dist-3.5-236_0.tar.bz2
+9ed3eb8e598317d00c0f9467c956abdc5857542b699095fcc9e80c3e2d0bfc04  e2fsprogs-1.45.7_0.tar.bz2
 f55c11b091361536774b436abe86b17f759cd7a66522cd20c7a2190da92db67a  findutils-4.2.33_0.tar.bz2
 4a9042c6a481aaffe359b796e359550813a10e1c49549b4e7a69769d5214491e  flex-2.5.11_0.tar.bz2
 33afd1c66c864b486df290e682883556787c61751b8c851deb2737f0b777ffd6  flex-2.5.33_0.tar.bz2
@@ -61,7 +66,7 @@ b70fe8d9479ca4a3ad6fdbafbaf52a172c6a4a47ae8cf080beb9d25b97a7b205  libffi-3.3_0.x
 94d0f9d2f8fbc2b00fe4c0f479e5590fa70b7d856f0a643ad006787d963f99ee  libtool-2.2.4_0.tar.bz2
 9bf0aea34d1413640667645ef06947ec2c24d3fa4e4e10825a7560c6d2e3343b  libunistring-0.9.10_0.x86.xbps
 1d07aaf7049be45853fd409340cdb52bb3a1b6dfa4dbc8b69358c1ee966cd67f  linux-4.9.10_0.tar.bz2
-a878f140c5a5c2e40562800927b2281d33085c2a91479532a5220510a5926edb  linux-headers-5.10.41_0.tar.bz2
+61507b58074a3742191b606f9415f79406e5daa693ab4ba4a4543897696628ea  linux-headers-5.10.41_0.tar.bz2
 5cda10550198e613c426e45c5fffe0f7e8761296e7339e9e9a1f9da995b4865a  m4-1.4.7_0.tar.bz2
 c4fc071e0911a01efae11b8735c8e69a8963d9a545befffd01486de7589b201a  make-3.82_0.tar.bz2
 47470be468d66a85e71cbecbbf22038260c6e91408105ba0684c3ee61b39085f  make-4.2.1_0.tar.bz2
@@ -76,7 +81,7 @@ df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6  openssl-1.1.1l
 75fffc4bb14f14281bc1853455888d1d818b7027efc1e4014af1a755771a64e8  perl-5.000_0.tar.bz2
 3a709c914e7d01f5bfd12d8d859ac7135d9ac57528cb2e325448f91cfb4869b8  perl-5.003_0.tar.bz2
 4b79a1694c471663391793939f60c810aec65b03ef80f8dd811cea181f8e7fb2  perl-5.10.1_0.tar.bz2
-da3095776a4781c2c9523176d5522167ec303c582e150057c72a34ce06fb210a  perl-5.32.1_0.tar.bz2
+31eda69af533e26b0cae543e02f2024fc2663dc47605f57fa58652117cbc1460  perl-5.32.1_0.tar.bz2
 9ceb09af82397f98e99e339cb4fd3abd9f61d222ea7e6a0920e2f3a7c316c70a  perl-5.6.2_0.tar.bz2
 23ea39db272dcbbeedf2ea6e758052228b0a764be462c0562339b58ae472d83d  perl5.004-05_0.tar.bz2
 041aed738c039a8c437c6d29530fe44f55bd5fc9ac2bb54f793f6fe3a9df16fd  perl5.005-03_0.tar.bz2

sysa/SHA256SUMS.sources

@@ -20,10 +20,17 @@ ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4  bash-2.05b.tar
 e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59  binutils-2.14.tar.bz2
 7007fc89c216fbfaff5525359b02a7e5b612694df5168c74673f67055f015095  bison-3.4.1.tar.gz
 ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269  bzip2-1.0.8.tar.gz
+64f117a4749dd4a1b6c54277f63f6cf1e0eb45d290cbedaf777fbe71b8880885  CaseFolding.txt
 c25b36b8af6e0ad2a875daf4d6196bd0df28a62be7dd252e5f99a4d5d7288d95  coreutils-5.0.tar.bz2
 1d013547889f20576460249c4210632d5314531c8477378a2e046b13a8ebeb7e  coreutils-6.10.tar.gz
+247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96  curl-7.83.0.tar.bz2
 af4214b851928a53ef470ed8729122b9db910a6c0769d5d46a5de0b3e96f74f3  deblob-4.9
+eb115a5de9a32c9ad447d6ea1cddcadb53d47f6cbc2521f3fe0bebb040c39866  DerivedAge.txt
+11c8bd81ecbede4d67c7b5b693a471647d5401956707c639ae053b836cc7f5da  DerivedCombiningClass.txt
+3406825d64564bf2a37031c36a3e0f99d708aa17595b81f8b539d0f3d1a3923f  DerivedCoreProperties.txt
+adc30f140fbd0dc7f61ff9cf99da7eedfd484a26a8dafdcc9a0cd859e2199b5a  dhcpcd-9.4.1.tar.gz
 d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6  diffutils-2.7.tar.gz
+340e9de42a12d0c26dd7527e9ef055ac85586de5c61f6273ae19f88d04e55804  e2fsprogs-1.45.7.tar.gz
 813cd9405aceec5cfecbe96400d01e90ddad7b512d3034487176ce5258ab0f78  findutils-4.2.33.tar.gz
 bc79b890f35ca38d66ff89a6e3758226131e51ccbd10ef78d5ff150b7bd73689  flex-2.5.11.tar.gz
 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995  flex-2.6.4.tar.gz
@@ -46,6 +53,8 @@ c4e63399b12f5858d11c44cea8e92f21cd564f8548e488dadc84046b424c80fc  libtool-2.2.4.
 e56c9463ae649d5863df3526e0af631894e0f01cdbb02a46d0db415518450dc9  mes-0.24.tar.gz
 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3  musl-1.1.24.tar.gz
 7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4  musl-1.2.3.tar.gz
+c9ffe32e616fa085246644c2351c525788fac363872491185dab7d5ce69fefa9  NormalizationCorrections.txt
+0fdfc17093dd5482f8089cb11dcd936abdba34c4c9c324e5b8a4e5d8f943f6d3  NormalizationTest.txt
 f36e4fb7dd524dc3f4b354d3d5313f69e7ce5a6ae93711e8cf6d51eaa8d2b318  nyacc-1.00.2.tar.gz
 ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a  patch-2.5.9.tar.gz
 1ae43c8d2983404b9eec61c96e3ffa27e7b07e08215c95c015a4ab0095373ef3  perl-5.000.tar.gz
@@ -57,4 +66,5 @@ c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600  sed-4.0.9.tar.
 c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a  tar-1.12.tar.gz
 23cacd448cff2baf6ed76c2d1e2d654ff4e557046e311dfb6be7e1c631014ef8  tcc-0.9.26.tar.gz
 de23af78fca90ce32dff2dd45b3432b2334740bb9bb7b05bf60fdbfc396ceb9c  tcc-0.9.27.tar.bz2
+4997a3196eb79b4d0d6b8384560f6aeb46a062693f0abd5ba736abbff7976099  UnicodeData.txt
 f694bee56099b8d72c3843d97e27f2306aa9946741e34a27391f6f6f19c7bcd0  util-linux-2.19.1.tar.gz

sysa/curl-7.83.0/curl-7.83.0.sh

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default
+
+    # Regnerate src/tool_cb_prg.c
+    sed -i "53,74d" src/tool_cb_prg.c
+    sed -i "53 s/^/$(perl sinus.pl | sed "s/, $//")\n/" src/tool_cb_prg.c
+
+    rm src/tool_help.c src/tool_help.h src/tool_listhelp.c src/tool_hugehelp.c
+
+    # Rebuild libtool files
+    rm config.guess config.sub ltmain.sh
+    libtoolize
+
+    autoreconf -fi
+}
+
+src_configure() {
+    LDFLAGS="-static" ./configure \
+        --prefix="${PREFIX}" \
+        --build=i386-unknown-linux-gnu \
+        --without-ssl \
+        --disable-hsts
+}
+
+src_install() {
+    default
+    install -m 755 scripts/mk-ca-bundle.pl "${DESTDIR}/usr/bin/mk-ca-bundle"
+}

sysa/curl-7.83.0/files/sinus.pl

@@ -0,0 +1,8 @@
+# SPDX-FileCopyrightText: 1998-2021 Daniel Stenberg <daniel@haxx.se>
+#
+# SPDX-License-Identifier: curl
+
+my $pi = 3.1415;
+foreach my $i (1 .. 200) {
+    printf "%d, ", sin($i/200 * 2 * $pi) * 500000 + 500000;
+}

sysa/curl-7.83.0/patches/help.patch

@@ -0,0 +1,62 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: curl
+
+Regenerating help is not trivial. Help is unnecessary.
+Disable help.
+
+diff --color -ru src/Makefile.inc src/Makefile.inc
+--- src/Makefile.inc	2022-05-09 16:48:37.195346967 +1000
++++ src/Makefile.inc	2022-05-09 16:49:46.503187644 +1000
+@@ -69,11 +69,9 @@
+   tool_formparse.c \
+   tool_getparam.c \
+   tool_getpass.c \
+-  tool_help.c \
+   tool_helpers.c \
+   tool_hugehelp.c \
+   tool_libinfo.c \
+-  tool_listhelp.c \
+   tool_main.c \
+   tool_msgs.c \
+   tool_operate.c \
+@@ -111,7 +109,6 @@
+   tool_formparse.h \
+   tool_getparam.h \
+   tool_getpass.h \
+-  tool_help.h \
+   tool_helpers.h \
+   tool_hugehelp.h \
+   tool_libinfo.h \
+diff --color -ru src/tool_operate.c src/tool_operate.c
+--- src/tool_operate.c	2022-05-09 16:48:37.196347022 +1000
++++ src/tool_operate.c	2022-05-09 16:54:00.696271863 +1000
+@@ -78,7 +78,6 @@
+ #include "tool_writeout.h"
+ #include "tool_xattr.h"
+ #include "tool_vms.h"
+-#include "tool_help.h"
+ #include "tool_hugehelp.h"
+ #include "tool_progress.h"
+ #include "dynbuf.h"
+@@ -2607,19 +2606,7 @@
+     if(res) {
+       result = CURLE_OK;
+ 
+-      /* Check if we were asked for the help */
+-      if(res == PARAM_HELP_REQUESTED)
+-        tool_help(global->help_category);
+-      /* Check if we were asked for the manual */
+-      else if(res == PARAM_MANUAL_REQUESTED)
+-        hugehelp();
+-      /* Check if we were asked for the version information */
+-      else if(res == PARAM_VERSION_INFO_REQUESTED)
+-        tool_version_info();
+-      /* Check if we were asked to list the SSL engines */
+-      else if(res == PARAM_ENGINES_REQUESTED)
+-        tool_list_engines();
+-      else if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL)
++      if(res == PARAM_LIBCURL_UNSUPPORTED_PROTOCOL)
+         result = CURLE_UNSUPPORTED_PROTOCOL;
+       else if(res == PARAM_READ_ERROR)
+         result = CURLE_READ_ERROR;

sysa/dhcpcd-9.4.1/dhcpcd-9.4.1.sh

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default
+
+    rm src/dhcpcd-embedded.c.in
+}
+
+src_configure() {
+    CC=gcc ./configure \
+        --prefix="${PREFIX}" \
+        --sbindir="${PREFIX}/bin" \
+        --disable-embedded \
+        --disable-auth
+}
+
+src_install() {
+    default
+    mkdir -p "${DESTDIR}/var/db/dhcpcd"
+    mkdir -p "${DESTDIR}/var/run/dhcpcd"
+}

sysa/dhcpcd-9.4.1/patches/remove-ctassert.patch

@@ -0,0 +1,134 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: BSD-2-Clause
+
+__CTASSERT macro does not work properly on our older GCC.
+
+diff --color -ru src/arp.c src/arp.c
+--- src/arp.c	2022-05-22 13:55:30.103757852 +1000
++++ src/arp.c	2022-05-22 13:55:43.692407546 +1000
+@@ -63,9 +63,6 @@
+ /* ARP debugging can be quite noisy. Enable this for more noise! */
+ //#define	ARP_DEBUG
+ 
+-/* Assert the correct structure size for on wire */
+-__CTASSERT(sizeof(struct arphdr) == 8);
+-
+ static ssize_t
+ arp_request(const struct arp_state *astate,
+     const struct in_addr *sip)
+diff --color -ru src/auth.c src/auth.c
+--- src/auth.c	2022-05-22 13:52:30.219151581 +1000
++++ src/auth.c	2022-05-22 13:53:24.729760674 +1000
+@@ -343,9 +343,6 @@
+ 
+ 	/* RFC3318, section 5.2 - zero giaddr and hops */
+ 	if (mp == 4) {
+-		/* Assert the bootp structure is correct size. */
+-		__CTASSERT(sizeof(struct bootp) == 300);
+-
+ 		*(mm + offsetof(struct bootp, hops)) = '\0';
+ 		memset(mm + offsetof(struct bootp, giaddr), 0, 4);
+ 	}
+diff --color -ru src/dhcp6.c src/dhcp6.c
+--- src/dhcp6.c	2022-05-22 13:52:30.219151581 +1000
++++ src/dhcp6.c	2022-05-22 13:53:33.455178213 +1000
+@@ -84,33 +84,28 @@
+ 	uint8_t xid[3];
+ 	/* followed by options */
+ };
+-__CTASSERT(sizeof(struct dhcp6_message) == 4);
+ 
+ struct dhcp6_option {
+ 	uint16_t code;
+ 	uint16_t len;
+ 	/* followed by data */
+ };
+-__CTASSERT(sizeof(struct dhcp6_option) == 4);
+ 
+ struct dhcp6_ia_na {
+ 	uint8_t iaid[4];
+ 	uint32_t t1;
+ 	uint32_t t2;
+ };
+-__CTASSERT(sizeof(struct dhcp6_ia_na) == 12);
+ 
+ struct dhcp6_ia_ta {
+ 	uint8_t iaid[4];
+ };
+-__CTASSERT(sizeof(struct dhcp6_ia_ta) == 4);
+ 
+ struct dhcp6_ia_addr {
+ 	struct in6_addr addr;
+ 	uint32_t pltime;
+ 	uint32_t vltime;
+ };
+-__CTASSERT(sizeof(struct dhcp6_ia_addr) == 16 + 8);
+ 
+ /* XXX FIXME: This is the only packed structure and it does not align.
+  * Maybe manually decode it? */
+@@ -120,7 +115,6 @@
+ 	uint8_t prefix_len;
+ 	struct in6_addr prefix;
+ } __packed;
+-__CTASSERT(sizeof(struct dhcp6_pd_addr) == 8 + 1 + 16);
+ 
+ struct dhcp6_op {
+ 	uint16_t type;
+diff --color -ru src/dhcp.c src/dhcp.c
+--- src/dhcp.c	2022-05-22 13:52:30.219151581 +1000
++++ src/dhcp.c	2022-05-22 13:53:08.074963614 +1000
+@@ -98,11 +98,6 @@
+ #define IP_RECVPKTINFO IP_PKTINFO
+ #endif
+ 
+-/* Assert the correct structure size for on wire */
+-__CTASSERT(sizeof(struct ip)		== 20);
+-__CTASSERT(sizeof(struct udphdr)	== 8);
+-__CTASSERT(sizeof(struct bootp)		== 300);
+-
+ struct dhcp_op {
+ 	uint8_t value;
+ 	const char *name;
+diff --color -ru src/if-bsd.c src/if-bsd.c
+--- src/if-bsd.c	2022-05-22 13:52:30.219151581 +1000
++++ src/if-bsd.c	2022-05-22 13:53:31.686093557 +1000
+@@ -1589,7 +1589,6 @@
+ #endif
+ }
+ 
+-__CTASSERT(offsetof(struct rt_msghdr, rtm_msglen) == 0);
+ int
+ if_handlelink(struct dhcpcd_ctx *ctx)
+ {
+diff --color -ru src/ipv6nd.c src/ipv6nd.c
+--- src/ipv6nd.c	2022-05-22 13:52:30.219151581 +1000
++++ src/ipv6nd.c	2022-05-22 13:53:30.092017279 +1000
+@@ -80,7 +80,6 @@
+ 	uint32_t	nd_opt_rdnss_lifetime;
+         /* followed by list of IP prefixes */
+ };
+-__CTASSERT(sizeof(struct nd_opt_rdnss) == 8);
+ #endif
+ 
+ #ifndef ND_OPT_DNSSL
+@@ -92,7 +91,6 @@
+ 	uint32_t	nd_opt_dnssl_lifetime;
+ 	/* followed by list of DNS servers */
+ };
+-__CTASSERT(sizeof(struct nd_opt_rdnss) == 8);
+ #endif
+ 
+ /* Impossible options, so we can easily add extras */
+diff --color -ru src/privsep-root.c src/privsep-root.c
+--- src/privsep-root.c	2022-05-22 13:52:30.220151629 +1000
++++ src/privsep-root.c	2022-05-22 13:53:28.152924488 +1000
+@@ -56,8 +56,6 @@
+ #include "sa.h"
+ #include "script.h"
+ 
+-__CTASSERT(sizeof(ioctl_request_t) <= sizeof(unsigned long));
+-
+ struct psr_error
+ {
+ 	ssize_t psr_result;

sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh

@@ -0,0 +1,49 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_unpack() {
+    default
+
+    # Get remaining utf files
+    cp ${DISTFILES}/*.txt ${pkg}/
+}
+
+src_prepare() {
+    default
+
+    # Rebuild libtool files
+    rm config/config.guess config/config.sub config/ltmain.sh
+    libtoolize -i
+
+    autoreconf -fi
+
+    # Remove bison parser generated
+    rm intl/plural.y
+
+    # Setup for regeneratation of lib/ext2fs/utf8data.h
+    rm lib/ext2fs/utf8data.h
+
+    # Fix compile_et
+    sed -r -i "s/ > ?outfile//" lib/et/et_c.awk lib/et/et_h.awk lib/ss/ct_c.awk
+
+    # Disable int
+    sed -i "s/@LIBINTL@//" MCONFIG.in
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" \
+        --sbindir="${PREFIX}/bin" \
+        with_udev_rules_dir=no \
+        with_systemd_unit_dir=no
+}
+
+src_compile() {
+    # Regen utf8data
+    make -C util mkutf8data
+    util/mkutf8data -o lib/ext2fs/utf8data.h
+    # Why does mkutf8data generate something not usable by build?
+    sed -i "s/nfkdi/nfdi/g" lib/ext2fs/utf8data.h
+
+    default
+}

sysa/e2fsprogs-1.45.7/patches/gawk-fix.patch

@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+Our version of gawk does not seem to like printing, at least in the way that
+this attempts to use it. Instead, make it print to console and use working
+bash redirects.
+
+--- lib/et/compile_et.sh.in	2022-05-18 19:26:17.182054784 +1000
++++ lib/et/compile_et.sh.in	2022-05-18 19:30:16.489294776 +1000
+@@ -44,14 +44,14 @@
+     exit 1;
+ fi
+ 
+-$AWK -f "${DIR}/et_h.awk" "outfile=${BASE}.h.$$" "outfn=${BASE}.h" "$ROOT.et"
++$AWK -f "${DIR}/et_h.awk" "$ROOT.et" > ${BASE}.h
+ if test -f ${BASE}.h && cmp -s ${BASE}.h.$$ ${BASE}.h ; then
+     rm -f ${BASE}.h.$$
+ else
+     mv -f ${BASE}.h.$$ ${BASE}.h
+     chmod a-w ${BASE}.h
+ fi
+-$AWK -f "${DIR}/et_c.awk" "outfile=${BASE}.c.$$" "outfn=${BASE}.c" "$ROOT.et"
++$AWK -f "${DIR}/et_c.awk" "$ROOT.et" > ${BASE}.c
+ if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then
+     rm -f ${BASE}.c.$$
+ else
+--- lib/ss/mk_cmds.sh.in	2022-05-18 19:33:16.024962919 +1000
++++ lib/ss/mk_cmds.sh.in	2022-05-18 19:33:39.650576476 +1000
+@@ -43,7 +43,7 @@
+ fi
+ 
+ ${SED} -f "${DIR}/ct_c.sed"  "${FILE}" \
+-	| ${AWK} -f "${DIR}/ct_c.awk" "rootname=${ROOT}" "outfile=${TMP}" -
++	| ${AWK} -f "${DIR}/ct_c.awk" "rootname=${ROOT}" - > "${TMP}"
+ 
+ if grep "^#__ERROR_IN_FILE" "${TMP}" > /dev/null; then
+ 	rm "${TMP}"

sysa/e2fsprogs-1.45.7/patches/remove-intl.patch

@@ -0,0 +1,82 @@
+# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+Disable gettext, which we do not have at this time, along with pkg-config.
+
+--- configure.ac	2022-05-18 15:12:53.633061872 +1000
++++ configure.ac	2022-05-18 19:09:13.351790066 +1000
+@@ -860,20 +860,7 @@
+ dnl
+ MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
+ AC_SUBST_FILE(MAKEFILE_LIBRARY)
+-dnl
+-dnl Add internationalization support, using gettext.
+-dnl
+-GETTEXT_PACKAGE=e2fsprogs
+-PACKAGE=e2fsprogs
+-VERSION="$E2FSPROGS_VERSION"
+-VERSION=0.14.1
+-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [package name for gettext])
+-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [version for gettext])
+-AC_SUBST(GETTEXT_PACKAGE)
+-AC_SUBST(PACKAGE)
+-AC_SUBST(VERSION)
+ 
+-AM_GNU_GETTEXT
+ dnl
+ dnl End of configuration options
+ dnl
+@@ -1637,15 +1624,6 @@
+   [with_udev_rules_dir=yes])
+ AS_IF([test "x${with_udev_rules_dir}" != "xno"],
+   [
+-	AS_IF([test "x${with_udev_rules_dir}" = "xyes"],
+-	  [
+-		PKG_CHECK_MODULES([udev], [udev],
+-		  [
+-			with_udev_rules_dir="$($PKG_CONFIG --variable=udevdir udev)/rules.d"
+-		  ], [
+-			with_udev_rules_dir=""
+-		  ])
+-	  ])
+ 	AC_MSG_CHECKING([for udev rules dir])
+ 	pkg_udev_rules_dir="${with_udev_rules_dir}"
+ 	AS_IF([test -n "${pkg_udev_rules_dir}"],
+@@ -1708,16 +1686,6 @@
+   [with_systemd_unit_dir=yes])
+ AS_IF([test "x${with_systemd_unit_dir}" != "xno"],
+   [
+-	AS_IF([test "x${with_systemd_unit_dir}" = "xyes"],
+-	  [
+-		PKG_CHECK_MODULES([systemd], [systemd],
+-		  [
+-			with_systemd_unit_dir="$($PKG_CONFIG --variable=systemdsystemunitdir systemd)"
+-		  ], [
+-			with_systemd_unit_dir=""
+-		  ])
+-		m4_pattern_allow([^PKG_(MAJOR|MINOR|BUILD|REVISION)$])
+-	  ])
+ 	AC_MSG_CHECKING([for systemd system unit dir])
+ 	systemd_system_unit_dir="${with_systemd_unit_dir}"
+ 	AS_IF([test -n "${systemd_system_unit_dir}"],
+--- Makefile.in	2022-05-18 19:41:37.596959349 +1000
++++ Makefile.in	2022-05-18 19:41:41.109050161 +1000
+@@ -20,7 +20,7 @@
+ @ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
+ 
+ LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
+-	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
++	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
+ 
+ PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
+ 	$(E2SCRUB_DIR)
+@@ -22,7 +22,7 @@
+ LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
+ 	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
+ 
+-PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
++PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs \
+ 	$(E2SCRUB_DIR)
+ 
+ SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests

sysa/helpers.sh

@@ -8,7 +8,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # shellcheck source=/dev/null
-. bootstrap.cfg
+. "${SOURCES}/bootstrap.cfg"
 
 # Get a list of files
 get_files() {
@@ -147,6 +147,10 @@ build() {
         . "${build_script}"
     fi
 
+    echo "${pkg}: getting sources."
+    build_stage=src_get
+    call $build_stage
+
     echo "${pkg}: unpacking source."
     build_stage=src_unpack
     call $build_stage
@@ -192,13 +196,36 @@ build() {
     unset -f src_unpack src_prepare src_configure src_compile src_install
 }
 
+# Default get function that downloads source tarballs.
+default_src_get() {
+    # shellcheck disable=SC2153
+    cd "${DISTFILES}"
+    # shellcheck disable=SC2154
+    if [ -n "${urls}" ] && command -v curl >/dev/null 2>&1; then
+        # shellcheck disable=SC2153
+        for i in ${urls}; do
+            if ! [ -e "$(basename "${i}")" ]; then
+                curl -L "${i}" --output "$(basename "${i}")"
+                grep "$(basename "${i}")" "${SOURCES}/SHA256SUMS.sources" | sha256sum -c
+            fi
+        done
+    fi
+    cd -
+}
+
 # Default unpacking function that unpacks all source tarballs.
 default_src_unpack() {
-    distfiles=${EXTRA_DISTFILES}
-    # shellcheck disable=SC2153
-    for f in "${DISTFILES}/${pkg}."*; do
-        distfiles="$(basename "$f") ${distfiles}"
-    done
+    distfiles="${EXTRA_DISTFILES}"
+    if [ -z "${urls}" ]; then
+        # shellcheck disable=SC2153
+        for f in "${DISTFILES}/${pkg}."*; do
+            distfiles="$(basename "$f") ${distfiles}"
+        done
+    else
+        for i in ${urls}; do
+            distfiles="$(basename "${i}") ${distfiles}"
+        done
+    fi
 
     # Check for new tar
     # shellcheck disable=SC2153
@@ -377,22 +404,23 @@ canonicalise_all_files_timestamp() {
 
 populate_device_nodes() {
     # http://www.linuxfromscratch.org/lfs/view/6.1/chapter06/devices.html
-    mkdir -p "${1}/dev"
-    test -c "${1}/dev/null" || (rm -f "${1}/dev/null" &&
-                                mknod -m 666 "${1}/dev/null" c 1 3)
-    test -c "${1}/dev/zero" || mknod -m 666 "${1}/dev/zero" c 1 5
-    test -c "${1}/dev/random" || mknod -m 444 "${1}/dev/random" c 1 8
-    test -c "${1}/dev/urandom" || mknod -m 444 "${1}/dev/urandom" c 1 9
+    mkdir -p "/dev"
+    test -c "/dev/null" || (rm -f "/dev/null" &&
+                                mknod -m 666 "/dev/null" c 1 3)
+    test -c "/dev/zero" || mknod -m 666 "/dev/zero" c 1 5
+    test -c "/dev/random" || mknod -m 444 "/dev/random" c 1 8
+    test -c "/dev/urandom" || mknod -m 444 "/dev/urandom" c 1 9
 
     if [ "${CHROOT}" = False ]; then
-        test -c "${1}/dev/ptmx" || mknod -m 666 "${1}/dev/ptmx" c 5 2
-        test -c "${1}/dev/tty" || mknod -m 666 "${1}/dev/tty" c 5 0
-        test -c "${1}/dev/console" || mknod -m 666 "${1}/dev/console" c 5 1
+        test -c "/dev/ptmx" || mknod -m 666 "/dev/ptmx" c 5 2
+        test -c "/dev/tty" || mknod -m 666 "/dev/tty" c 5 0
+        test -c "/dev/console" || mknod -m 666 "/dev/console" c 5 1
     fi
 }
 
 sys_transfer() {
     local dest=$1
+    local sys_sources=$2
 
     mkdir -p "${dest}/${PREFIX}/bin" "${dest}/${PREFIX}/src"
 
@@ -400,11 +428,13 @@ sys_transfer() {
     cp "${PREFIX}/bin/bash" "${PREFIX}/bin/tar" "${PREFIX}/bin/bzip2" "${dest}${PREFIX}/bin/"
 
     # Transfer misc files
-    cp "${SOURCES}/helpers.sh" "${SOURCES}/SHA256SUMS.pkgs" "${SOURCES}/bootstrap.cfg" "${dest}/"
+    cp "${SOURCES}/helpers.sh" "${SOURCES}/SHA256SUMS.pkgs" "${SOURCES}/bootstrap.cfg" "${dest}/${PREFIX}/src"
 
-    cp -r "${PREFIX}/src/" "${dest}${PREFIX}/"
+    cp -r "${sys_sources}/"* "${dest}/${PREFIX}/src"
+    cp -f "${sys_sources}/init" "${dest}/"
+    cp -r "${PREFIX}/src/repo" "${dest}/${PREFIX}/src"
 
-    shift
+    shift 2
     # Copy additional binaries
     set -- "${@/#/${PREFIX}/bin/}"
     cp "$@" "${dest}${PREFIX}/bin/"

sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh

@@ -42,7 +42,7 @@ src_install() {
     done
 
     # Pick-and-choose asm-generic headers
-    for i in types ioctl termios termbits ioctls; do
+    for i in types ioctl termios termbits ioctls sockios socket; do
         cp "${DESTDIR}${PREFIX}/include/asm-generic/${i}.h" "${DESTDIR}${PREFIX}/include/asm/${i}.h"
     done
 

sysa/run.sh

@@ -7,8 +7,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 set -e
-# shellcheck source=sysa/helpers.sh
-. helpers.sh
 
 # shellcheck disable=SC2154
 export PREFIX="${prefix}"
@@ -19,19 +17,17 @@ export DESTDIR=/tmp/destdir
 # shellcheck disable=SC2154
 export SRCDIR="${srcdir}"
 
+# shellcheck source=sysa/helpers.sh
+. helpers.sh
+
 create_sysb() {
     # Copy everything in
     echo "Creating sysb rootfs"
-    mkdir -p "/sysb${PREFIX}"
-    for d in bin include lib libexec share src; do
-        # Minimise RAM (storage) use - use hard links
-        cp -rl "${PREFIX}/${d}" "/sysb${PREFIX}/${d}"
-    done
-    cp "${SOURCES}/helpers.sh" "${SOURCES}/SHA256SUMS.pkgs" "${SOURCES}/bootstrap.cfg" "/sysb/${SRCDIR}"
-    populate_device_nodes /sysb
+    sys_transfer /sysb_image /sysb gzip patch
+    cp -rl /sysc /sysb_image/sysc_src
     echo "Creating sysb initramfs"
-    gen_initramfs_list.sh -o "${PREFIX}/boot/initramfs-sysb.cpio.gz" /sysb
-    rm -rf /sysb # Cleanup
+    gen_initramfs_list.sh -o "${PREFIX}/boot/initramfs-sysb.cpio.gz" /sysb_image
+    rm -rf /sysb /sysb_image # Cleanup
 }
 
 go_sysb() {
@@ -222,10 +218,16 @@ build gcc-4.0.4 pass2.sh
 
 build util-linux-2.19.1
 
+build e2fsprogs-1.45.7
+
+build dhcpcd-9.4.1 '' '' dhcpcd-dhcpcd-9.4.1-1663155
+
 build kbd-1.15
 
 build make-3.82
 
+build curl-7.83.0
+
 # Clear up some RAM space
 grep '^pkg=' /after.kaem | sed 's/pkg="//' | sed 's/"$//' | while read -r p ; do
     rm -rf "${SOURCES:?}/${p:?}"
@@ -246,6 +248,6 @@ if [ "${CHROOT}" = False ]; then
 fi
 
 # In chroot mode transition directly into System C.
-SYSC=/sysc
-sys_transfer "${SYSC}" gzip patch
+SYSC=/sysc_image
+sys_transfer "${SYSC}" /sysc gzip patch
 exec chroot "${SYSC}" /init