Merge remote-tracking branch 'upstream/master'

Author: lrvick

builder-hex0

@@ -98,7 +98,7 @@ def prepare(self, target, using_kernel=False, kernel_bootstrap=False, target_siz
                 mkfs_args = ['-d', os.path.join(target.path, 'external')]
                 target.add_disk("external", filesystem="ext3", mkfs_args=mkfs_args)
         elif using_kernel:
-            mkfs_args = ['-d', os.path.join(target.path, 'disk')]
+            mkfs_args = ['-F', '-d', os.path.join(target.path, 'disk')]
             target.add_disk("disk",
                             filesystem="ext3",
                             size=(str(target_size) + "M") if target_size else "16G",

lib/generator.py

@@ -417,8 +417,8 @@ bzip2 1.0.8
 ``bzip2`` is rebuilt unpatched with the new tcc and musl fixing issues
 with reading files from stdin that existed in the previous build.
 
-m4 1.4.7
-========
+m4 1.4.10
+=========
 
 ``m4`` is the first piece of software we need in the autotools suite,
 flex 2.6.4 and bison. It allows macros to be defined and files to be
@@ -1224,3 +1224,46 @@ to ensure the compiler is suitable for downstream consumption;
   really be handled by the libc, which is what most distributions do.
 * LTO now fully functions correctly, despite both the linker and the compiler
   being static binaries.
+
+libmd 1.1.0
+===========
+
+libmd provides message digest functions. In GNU/Linux, this is typically
+provided by glibc, but we need libmd to provide it since we are using musl.
+
+libbsd 0.11.8
+=============
+
+libbsd provides BSD-centric functions. We need this in order to build shadow,
+which expects either glibc or libbsd.
+
+shadow 4.14.3
+=============
+
+shadow provides a variety of command line utilites to work with users and
+groups, avoiding the need for manual modification of ``/etc/passwd`` and
+``/etc/group``. This allows unprivileged users to be created by, or for,
+post-bootstrap build systems.
+
+opendoas 6.8.2
+==============
+
+opendoas is a port of 'doas' from OpenBSD to Linux. It has all functions of sudo
+that could be conceivably needed in live-bootstrap, and is much simpler to
+build. This allows build systems that expect sudo after live-bootstrap to use
+it.
+
+gzip 1.13
+=========
+
+The version of gzip we have been using up until now is really old, all the way
+back from mes libc era! Somehow we've managed not to have any problems with it,
+though. This builds a gzip that is properly packaged and can be handled by all
+modern build systems.
+
+diffutils 3.10
+==============
+
+We already have a perfectly functional diffutils, but some core modern software
+does require newer diffutils (understandably, given our diffutils is from 1994).
+This also gives the additional diffutils commands ``diff3`` and ``sdiff``.

parts.rst

@@ -168,6 +168,9 @@ def check_types():
     else:
         args.swap = 0
 
+    # Set constant umask
+    os.umask(0o022)
+
     # bootstrap.cfg
     try:
         os.remove(os.path.join('steps', 'bootstrap.cfg'))

rootfs.py

@@ -7,10 +7,10 @@
 #define MAX_TOKEN 64
 #define MAX_STRING 2048
 
+#include <bootstrappable.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bootstrappable.h>
 
 struct Token {
 	char *val;
@@ -22,7 +22,7 @@ typedef struct Token Token;
 #define TYPE_IMPROVE 2
 #define TYPE_DEFINE 3
 #define TYPE_JUMP 4
-#define TYPE_MAINT 5
+#define TYPE_UNINSTALL 5
 
 struct Directive {
 	Token *tok;
@@ -212,12 +212,12 @@ Token *fill(Token *tok, Directive *directive, int type) {
 
 Token *logic(Token *tok, char **val) {
 	/* logic = "("
-	 *         (name |
-	 *         (name "==" value) |
-         *         (name "!=" value) |
-	 *         (logic "||" logic) |
-	 *         (logic "&&" logic))
-	 *         ")"
+	 *	 (name |
+	 *	 (name "==" value) |
+	 *	 (name "!=" value) |
+	 *	 (logic "||" logic) |
+	 *	 (logic "&&" logic))
+	 *	 ")"
 	 */
 
 	char *lhs = tok->val;
@@ -237,15 +237,15 @@ Token *logic(Token *tok, char **val) {
 			lhs = "False";
 		}
 	} else if (strcmp(tok->val, "!=") == 0) {
-                /* Case for inequality. */
-                rhs = tok->next->val;
-                tok = tok->next->next;
-                if (strcmp(get_var(lhs), rhs) == 0) {
-                        lhs = "False";
-                } else {
-                        lhs = "True";
-                }
-        } else {
+		/* Case for inequality. */
+		rhs = tok->next->val;
+		tok = tok->next->next;
+		if (strcmp(get_var(lhs), rhs) == 0) {
+			lhs = "False";
+		} else {
+			lhs = "True";
+		}
+	} else {
 		fputs("Expected == or != after ", stderr);
 		fputs(lhs, stderr);
 		fputs(" in logic\n", stderr);
@@ -360,19 +360,31 @@ Token *define(Token *tok, Directive *directive) {
 }
 
 int interpret(Directive *directive) {
-	/* directive = (build | improve | define | jump | maint) predicate? */
+	/* directive = (build | improve | define | jump | uninstall) predicate? */
 	Token *tok = directive->tok;
 	if (strcmp(tok->val, "build:") == 0) {
 		tok = fill(tok->next, directive, TYPE_BUILD);
 	} else if (strcmp(tok->val, "improve:") == 0) {
 		tok = fill(tok->next, directive, TYPE_IMPROVE);
 	} else if (strcmp(tok->val, "jump:") == 0) {
 		tok = fill(tok->next, directive, TYPE_JUMP);
-	} else if (strcmp(tok->val, "maint:") == 0) {
-		tok = fill(tok->next, directive, TYPE_MAINT);
 	} else if (strcmp(tok->val, "define:") == 0) {
 		tok = define(tok->next, directive);
 		return 1; /* There is no codegen for a define. */
+	} else if (strcmp(tok->val, "uninstall:") == 0) {
+		tok = fill(tok->next, directive, TYPE_UNINSTALL);
+		while (tok != NULL) {
+			if (strcmp(tok->val, "(") == 0) {
+				break;
+			}
+			if (strlen(directive->arg) + strlen(tok->val) + 1 > MAX_STRING) {
+				fputs("somehow you have managed to have too many uninstall arguments.\n", stderr);
+				exit(1);
+			}
+			directive->arg = strcat(directive->arg, " ");
+			directive->arg = strcat(directive->arg, tok->val);
+			tok = tok->next;
+		}
 	}
 
 	if (tok != NULL) {
@@ -557,7 +569,7 @@ void generate(Directive *directives) {
 					 */
 					generate_preseed_jump(counter);
 				}
-				bash_build = 1;
+				bash_build += 1;
 				/* Create call to new script. */
 				output_call_script(out, "", int2str(counter, 10, 0), bash_build, 0);
 				fclose(out);
@@ -620,8 +632,10 @@ void generate(Directive *directives) {
 			fclose(out);
 			out = start_script(counter, bash_build);
 			counter += 1;
-		} else if (directive->type == TYPE_MAINT) {
-			output_call_script(out, "maint", directive->arg, bash_build, 1);
+		} else if (directive->type == TYPE_UNINSTALL) {
+			fputs("uninstall ", out);
+			fputs(directive->arg, out);
+			fputs("\n", out);
 		}
 	}
 	fclose(out);

seed/script-generator.c

@@ -1,13 +1,13 @@
-2dac610769286171ca81e736d729f5227938596cf44a0a8a764009715c55d23b  autoconf-2.52_0.tar.bz2
-7345a49227ed69774e01097c514f1ebd3abaeed0b2b9136b7f5ee1b0fe573390  autoconf-2.53_0.tar.bz2
-22418f18b0dbf0476efb1823dcebdf70d7619113ca10076ba9b078ab3597a578  autoconf-2.54_0.tar.bz2
-8e74f93f12599f883ba62fe2bf4f69c70270ce368f71aa782f8f42a36a752d19  autoconf-2.55_0.tar.bz2
-1bd66ca8cc6300e192afe06cd90b1250f02ca64539a4f3e98a872333ec04f44b  autoconf-2.57_0.tar.bz2
-83235c739887f0d801e410e922553a6fd7723cbd0c9b2e96106e20538abb3a3b  autoconf-2.59_0.tar.bz2
-8912ae2a24ea40a7cd3ccab5e97dd109db7be4a86f40458ac836568aa7437b6a  autoconf-2.61_0.tar.bz2
-d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4  autoconf-2.64_0.tar.bz2
-298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b  autoconf-2.69_0.tar.bz2
-8c2401edf1c68910005bbcb8b8e84727a46f7d9643d2ad1267bd0259078dadc4  autoconf-2.71_0.tar.bz2
+b74448efbd2174ac7e9be469710a5a69e5218392ee6d81bd0837dc7a956626db  autoconf-2.52_0.tar.bz2
+97854afe32b6f79df6344d6e9cb8ebf1b011d87bda2a5b03716d602df6123e65  autoconf-2.53_0.tar.bz2
+22eb03cf83aed5234bb4242d412c7459ef83d3a490b0edf700eb04c66584c755  autoconf-2.54_0.tar.bz2
+639cf40f168ae7ca581e31ce956d6e640926fb8f7ccccc91ad7c84ce14bafff0  autoconf-2.55_0.tar.bz2
+229ac87bab8d6efaaeef6c2d7966c0326b048caef58f349add1b1ea759a75978  autoconf-2.57_0.tar.bz2
+cadbb48282d6ab4ad8e208e4714576a673221794afe4cf79df22c49abe08b867  autoconf-2.59_0.tar.bz2
+bc7628f88f4972bb6f5977ecdafe361b923eb1a7b3eaf98c3f21b49bf788d68a  autoconf-2.61_0.tar.bz2
+6f43e3a5b9ecaa7944b980da443450b71cc08dc382856ec1172c5be82486b8d3  autoconf-2.64_0.tar.bz2
+25eab7b767c44ba43373ed3f6015c3499ed168e21d2156538d0986b2b14cb7bb  autoconf-2.69_0.tar.bz2
+bc992209e05fdd9bf271a2705d5e4892f0212289f8edf4123813ec96e8bdc3e5  autoconf-2.71_0.tar.bz2
 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b  autoconf-archive-2021.02.19_0.tar.bz2
 439fc68ab7d0a9a46caca2c7cbefbdb6ffe906f927e07d150e102bb76b393c37  autogen-5.18.16_0.tar.bz2
 02a426e82a52d4a2cd7e73fe3dc5a2c58b3ed100f24a92c57e42511fd86e247c  automake-1.10.3_0.tar.bz2
@@ -39,6 +39,7 @@ c95fd8c51c3bfbd4d08a4a50d0033ee85394e6efe4ff82703c050e4dbc4347bf  coreutils-6.10
 f9efd6600ceb91918078078ff44a33f2a4fb4a59edb804866aebd288c2cfb24e  curl-8.5.0_1.tar.bz2
 1d4dec2d1885a6b5499a0f0d55e9c2c65dab532c4c593d848b6a542f67789627  dhcpcd-10.0.1_0.tar.bz2
 abb9f6fe46c57ea809100b71497e04905deaad345d64485532bf6ef7f2a07f2c  diffutils-2.7_0.tar.bz2
+cd135d51b7ecab31c510344b176b358c444e919d13554c4b18f657e71c5aff3e  diffutils-3.10_0.tar.bz2
 bda6afcd3a390a34a57443269a4857ccc470129f7a557981778c145fd841cbd1  dist-3.5-236_0.tar.bz2
 3a4c5143a241364019afd39af067f1e8433bab78b04096870d9bf2c70ec6ded8  e2fsprogs-1.45.7_0.tar.bz2
 9c6f7e156f299f1d0948537e28f00d40e727a3debae3cce158e9bce827136214  ed-1.4_0.tar.bz2
@@ -59,20 +60,24 @@ dc67fc1b132fa3945349efe74c5b2197bd0b6babf4d29d2deddd04f09d9af680  gettext-0.21_0
 62edfa633f64202b2d29199d11d56a897654a441c7ae39a4d59ca5fe75199f61  gperf-3.1_0.tar.bz2
 276e073496931ff7d4caaabb53079412b88de953def88aec966c1f8506293e88  grep-2.4_0.tar.bz2
 8e612afb9a439aa8bf5db0fc2589eec890a6017690412d5c8e88a5838730b42c  grep-3.7_0.tar.bz2
+8035da0f42b40509a1f68c91164f20fec624cf8b61017aa4e135473e547dddf4  grub-2.06_0.tar.bz2
 e2a85aad6d51e52c9a30afeed058f95172fde1215f77243549274672990f6237  guile-3.0.9_0.tar.bz2
+6585ae3bc8149ec0e3fba766278fa30e2d7f0e7d1b9a9a4a457e0afa15b109c9  gzip-1.13_0.tar.bz2
 8d2015b87337abbf287f7a39ee4cf53514120b5d3e90a93fe7d533dcc43f14fa  help2man-1.36.4_0.tar.bz2
 f650c3b24de6edd49cd662c9e9ce11f7b0b5ea6df66d561b46a032b08fc34faa  kbd-1.15_0.tar.bz2
 50a0f881161c68fe7c9ec6836b11a905b0d54e08e99b2476e8d1f5ac3212769e  kexec-linux-1.0.0_0.tar.bz2
 1be7bf0319635b8bd22fd3c1a5a88ea267730a9a2e3cfff37473a5fea0779efb  kexec-tools-2.0.22_0.tar.bz2
 453c10220178f097e1ab26fac6dffbee63b61890cdb8d7d24dcd6acad6ad08a3  libarchive-3.5.2_0.tar.bz2
 36550df491767bb24d2ccab304ce70a3b4956e7c0c0e0c343d922fd57cdafbdd  libatomic_ops-7.6.10_0.tar.bz2
+fea96776b929569b98bc1740a9977cf8c0eff1d999a08d766bcc0f40c7b1380c  libbsd-0.11.8_0.tar.bz2
 b39826742e236890f3562cdf19492e7ef4224b271f3e75ddeab1f07982b03ebe  libffi-3.3_0.tar.bz2
+0f6aefeb587b3d14d8ea73d7750f946a23d3e59a76a0ee5cdcdcc8132bccf73d  libmd-1.1.0_0.tar.bz2
 daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29  libtool-2.2.4_0.tar.bz2
 6cefa575362149620f8008a32c8af54f0198a18bc6ab910bd3cead196c1507d7  libtool-2.4.7_0.tar.bz2
 503007bbcddcf4e49d26514c59b4c9501f8b42f0c994a59dfdc388b1ae6b7900  libunistring-0.9.10_0.tar.bz2
 576c04a4b2ccbfe6b48f5f16e8bd59469e359bdc77458ed82a4025da98ad6dcb  linux-4.9.10_0.tar.bz2
 d15c922973c15a8206e09020e8cfe6a78f7e93614de212f2b37ff80163799c6c  linux-headers-4.9.10_0.tar.bz2
-bd3885a389d3e058081e099850f95aa7938ce1d9b88a187aea6b7196124fbcfe  m4-1.4.7_0.tar.bz2
+a1fb0cb2744e7442dbc106df69b84180b8544060a286006649a73b81613cdd24  m4-1.4.10_0.tar.bz2
 e69554b0a77b419ddd5d0a0e418ba4005ecd0f6784c92a6928a0270bd929a098  make-3.82_0.tar.bz2
 6d24960d6a987f68a7e0e3abf6edb52d2e0fe4c86f6ba45327e9634dbf7d40b4  make-4.2.1_0.tar.bz2
 17cd976bc0f6e897c6fffe43dd7c55d93ce0adadf1b4dc72925b80e2d266519f  mpc-1.2.1_0.tar.bz2
@@ -83,36 +88,38 @@ d58d85c4be26d90f111f273929a4998d05294fe5aa37c4842d5aecaa593e6079  musl-1.1.24_2.
 81f79a0faf58e105c5f12d9f538d3ea7578a3b361e633ab8f47324ec23ec9de6  musl-1.2.4_0.tar.bz2
 6dc5e763b747b66f72692c6820d7f46b7f4cf2e2fe05229a1d01c03919c1c936  musl-1.2.4_1.tar.bz2
 820203286127e7c22cee9f1b3cff664431f10d14c3f22f00b3e771fd849fd449  musl-1.2.4_2.tar.bz2
+a18c4b2e5de2bfe5bb3ee9d360484fcfebad3df042f1859d4aa333dd60f55e56  opendoas-6.8.2_0.tar.bz2
 c490016e49bbf77e7f63071f7aa60e8290a0c67f017846def1c3f65bd10d5712  openssl-1.1.1l_0.tar.bz2
 71864d042cdc564b65eab21360902c714e9b43f80a19689c5600589529b267e7  patch-2.7.6_0.tar.bz2
 5ae7fe43d62d1064c123d9813017015e5e8d5107d0e70f0199576141416ff81d  perl-5.000_0.tar.bz2
 4994c55e3832649600f190079bd4779c463478a092b167098b1d00eff3358fbe  perl-5.003_0.tar.bz2
-74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6  perl-5.10.1_0.tar.bz2
-fdccd3ba27a44d2149f159040414a04b39bfc72673ba36f50051b61199cc425c  perl-5.32.1_0.tar.bz2
-101a791b6843b997ec10d5ce6dc32af2637f687772674eb6f1cdc1c8ff836a03  perl-5.6.2_0.tar.bz2
 ae6c84e55c2d9bcd7b80bf780ae6921fe890608123c9ba904e1b7d90759ade3d  perl5.004-05_0.tar.bz2
 8cedd2240bbbd5bca65a1362998ed73884756aa7ff5208226d3fa22c68868052  perl5.005-03_0.tar.bz2
+74d64a8af080022432fa94dba449090419d25b103d247710dc0b6102a4ad86a6  perl-5.10.1_0.tar.bz2
+bbbfde31441fab7fe8b825409fae8b2cd1032950d8f5a32fb8b9cf1555e11a70  perl-5.32.1_0.tar.bz2
+101a791b6843b997ec10d5ce6dc32af2637f687772674eb6f1cdc1c8ff836a03  perl-5.6.2_0.tar.bz2
 1b9d4260edf7b2241d10e4c4ad17d0f90047bd4bf42f2487a7133902529e9dfe  pkg-config-0.29.2_0.tar.bz2
-1e882c3206f9d1de2a9be8b5c6ae4cc65e80a4de607bd521058577bf4169c0e9  python-2.0.1_0.tar.bz2
-aba9710341db75b78c7bc1eb4ef45b9496e23f7a356128af6c2b116ee0f3f31a  python-2.0.1_1.tar.bz2
-d497c9b614194b941620bb5c5111fc72eca8cafd7d4f476eacb24fb7f909b614  python-2.3.7_0.tar.bz2
-8a977205933431c2a4207f647cb683b570dfdb0146e21abf5fab3f8426e1356b  python-2.3.7_1.tar.bz2
-34e5083ed3e72da5aa5950acebf9e95464089d693e3d6a047a2b69b6103f5ca9  python-2.5.6_0.tar.bz2
+2f7198009e4d021d52ee4ce86241b4936fb88349c20cc8b6c286261368878c3c  python-2.0.1_0.tar.bz2
+b5d86ddc98cfbc684b03f1c84c786caaad810d5e4c7be38089f324eb3c276ad9  python-2.0.1_1.tar.bz2
+396577cdd0cc61d76420a1771c64156e49e8f9d00430c82feb88ad933b341632  python-2.3.7_0.tar.bz2
+2499cb7f10f292c3506fbf1b6a876195179ec98edfe7b8c357140137a1449492  python-2.3.7_1.tar.bz2
+2dd06364e281da421a16251fa2258df201efd180461718f5a000012c4b2bdfe5  python-2.5.6_0.tar.bz2
+52ffb1ea6f2b893a6fd26f930c8ff63f78ddcc31ac3ec9c2ddade555205aa1ef  python-3.11.1_0.tar.bz2
 3508248f299b73c50e3607c4c294d40face05170476a5026b0821aed69025863  python-3.1.5_0.tar.bz2
 12b1ffc7ec98ba8f807160b93ba69a694d5395567c3bcac1e49e8f8d1d50de43  python-3.1.5_1.tar.bz2
-52ffb1ea6f2b893a6fd26f930c8ff63f78ddcc31ac3ec9c2ddade555205aa1ef  python-3.11.1_0.tar.bz2
 60b93253a2078f849f81e7e1ed6233e30702f03b1893640eee95671d814f5514  python-3.3.7_0.tar.bz2
 da7c8ec579dd225c0d8bee63d95aeeb27ac2d5a60d4eefe298508cbf86bf506c  python-3.4.10_0.tar.bz2
 0be505f63205b4bc1b1421896c610468ad1a2194bbc4c9abf58f61685c2023d1  python-3.8.16_0.tar.bz2
 34c51d3df85585a8aee7691b3500a5c3c7442b06a6f57231b76970bdd6e99bf9  sed-4.0.9_0.tar.bz2
 e8daec00b2c2de7b18efbec057dc9290eed06668806c6f5a48914d4a5cd95eb4  sed-4.8_0.tar.bz2
+96bd9f051aa665f6836efe3642127df6987b529ed53f1c539293fc049f0f4c28  shadow-4.14.3_0.tar.bz2
 912d8f344104f1322255d6210c7c7e1371413ab530b2c6796e6aa565c74bf647  tar-1.34_0.tar.bz2
 1667937d5d646f2bb7ec7ab54a23ddd65a0ae3ca7d5e597f3fbcd5163031d2ef  tcc-0.9.27_0.tar.bz2
 b20cea098c8ff635a0ce9f99430d7c9a75d081194941ab54dc92dbc8af3776a4  tcc-0.9.27_1.tar.bz2
 8e8cc802fccdb907cd74501dccce1ee85ffb0150b33b4719f86d6720f5b09a7a  tcc-0.9.27_2.tar.bz2
 d4fe9460ca561fc2f546f9730f19f541b17dac0bcc42eb190abba856588c3593  tcc-0.9.27_3.tar.bz2
 50ebaa1d8fcc4a03a43d431eb71e2f435cc8712ae47d400564df3716037d553a  texinfo-6.7_0.tar.bz2
-229d9189adac10ad2a2c76fc147a4c317fc5b34026cef1c47edc9159aee480da  util-linux-2.19.1_0.tar.bz2
+858f3c9b3e824d6cdff8009de171fb1ac6932adc227efd854aebf29aba0bbf7c  util-linux-2.19.1_0.tar.bz2
 ecdb7ffeb9256f6a9760be70969fe5dea9cde6a538cc88595281fe44340e98a1  which-2.21_0.tar.bz2
 3fade2079cc91f2c5624ff7247220059caee82e7de493332103d7a78155400b2  xz-5.4.1_0.tar.bz2
 ca8ec9876a7334f5f87e1159e0efe343b8b497ffb0dea8b548223035ecd67f9e  zlib-1.2.13_0.tar.bz2

steps/SHA256SUMS.pkgs

@@ -47,10 +47,7 @@ make
 
 # Install
 install bash ${PREFIX}/bin/
-mkdir /bin/
-ln -s ${PREFIX}/bin/bash /bin/bash
-ln -s ${PREFIX}/bin/bash /bin/sh
-ln -s ${PREFIX}/bin/bash ${PREFIX}/bin/sh
+install bash ${PREFIX}/bin/sh
 
 cd ../..
 

steps/bash-2.05b/pass1.kaem

@@ -53,9 +53,5 @@ src_compile() {
 
 src_install() {
     install -D bash "${DESTDIR}${PREFIX}/bin/bash"
-    # Work around weird symlink bug
     install bash "${DESTDIR}${PREFIX}/bin/sh"
-
-    # Needs special handling b/c is currently running - tar doesn't like this
-    rm -f "${PREFIX}/bin/bash" "${PREFIX}/bin/sh"
 }

steps/bash-5.2.15/pass1.sh

@@ -22,10 +22,3 @@ src_prepare() {
 
     cp "${mk_dir}/pass2.mk" Makefile
 }
-
-src_install() {
-    default
-
-    # perl later requires /bin/pwd
-    ln -s "${PREFIX}/bin/pwd" /bin/pwd
-}