@daugasauron/dolly-image-default 0.1.4-rc.3 → 0.1.5-rc.0

package/Dollyfile

@@ -3,30 +3,27 @@ APPLICATION default
 REQUIRES HOST runtime@0
 REQUIRES HOST display@0
 REQUIRES HOST input@0
-REQUIRES HOST audio@0
 REQUIRES HOST download@0
-REQUIRES HOST dso@0
+REQUIRES HOST html@0
 REQUIRES HOST http@0
 REQUIRES HOST nena@0
 REQUIRES HOST packages@0
 REQUIRES HOST snapshot@0
-REQUIRES HOST sockets@0
-REQUIRES HOST threads@0
-REQUIRES HOST touch@0
 REQUIRES HOST upload@0
 
-# The image people open: a shell, its text tools, the terminal, curl, amy, ps
-# and the page's file exchange.
-# It holds no compiler; amy installs what a session needs, and nena enables
-# the host modules a package needs beyond these (nena@0).
-INSTALL /v0.1.4/Dollyfile-core c3aa527edcbac3332fe2aee277b392cc4e9b66b570935967f04d0bd3378ac506
-INSTALL /v0.1.4/Dollyfile-posix e8bc6b8368a186bea1a6f3f667ba0eafb30f40e1a0faac81705aab7ccb058e8f
-INSTALL /v0.1.4/Dollyfile-display d15ef860730ddefa417080c1d27cc0a26f03d5409c93805e9b3cbc5b6af61011
-INSTALL /v0.1.4/Dollyfile-curl 173c3c37eeac846ba8caa316c656cb75e5facea793eb9434337550ddaf3d32d1
-INSTALL /v0.1.4/Dollyfile-amy 90701fe1be537fae9f0e376f2dcfda377c019426cdbab48faeb9107f91bcb6de
-INSTALL /v0.1.4/Dollyfile-nena 2e851d9a70ca04b6ef01be6980cdc2e4e9e0c49a291573dde00df9558f04d249
-INSTALL /v0.1.4/Dollyfile-transfer a7a6e30cd5b1680791d91f56daecaeec446b0aeff20bdad68ae4c2c06b81df5b
-INSTALL /v0.1.4/Dollyfile-ps 39cdf2bfaa3fb52f3c161672634f9600381754e6f006971896d6f79b6b345b77
+# The image people open: a shell, its text tools, the terminal, curl, amy, ps,
+# the page's file exchange and its popups (html).
+# It holds no compiler; amy installs what a session needs, and has nena
+# enable the host modules a package needs beyond these (nena@0).
+INSTALL /v0.1.5/Dollyfile-core 7205c35aed897514d3094f14a194669f73c295b4dd0213619d90155da8467cde
+INSTALL /v0.1.5/Dollyfile-posix a98de8b50ce0a29e867194e9fe9c44a54c0ea48ccf25a0f1353431daf827cf9e
+INSTALL /v0.1.5/Dollyfile-display 2032dbc473505507c7419267f43fdb2fe76b16b0907ca27f2b157a0ec54bda35
+INSTALL /v0.1.5/Dollyfile-curl f31998555b9cca60e8ad5d7e6b5d8476aa119ecefbdc186f04461edad59f9e7d
+INSTALL /v0.1.5/Dollyfile-amy e028eb4c7768642948f7adb64ed5932d36bf85c8c0879b0203c5e59ccc1d2d39
+INSTALL /v0.1.5/Dollyfile-nena c02109a066ce2bf5c791ae4805fae4a29130b029a23276738069bde61be08175
+INSTALL /v0.1.5/Dollyfile-transfer 5ba6da77866030da273e49a2e8867ca6ef7441fa2024e90025da2239801dfe52
+INSTALL /v0.1.5/Dollyfile-html f25853f4c8e54144dddb7337e78e174ea587a23c00ae9414fc2edb71244942c9
+INSTALL /v0.1.5/Dollyfile-ps 39cdf2bfaa3fb52f3c161672634f9600381754e6f006971896d6f79b6b345b77
 REQUIRES TOOL foreground
 REQUIRES TOOL test
 REQUIRES TOOL echo

package/Dollyfile-amy

@@ -4,21 +4,21 @@ REQUIRES HOST runtime@0
 REQUIRES HOST http@0
 REQUIRES HOST packages@0
 
-# amy and the recipe engine it runs: what a session needs to install packages.
-# amy asks the site for the package index of the version it was built for.
-FROM /v0.1.4/Dollyfile-system-build 7997c05ba08220831088b2aa713c86dbf0ded0229bbfa84f411476f00269d9fc
+# amy and the recipe engine it runs (the dollyfile package): what a session needs
+# to install packages. amy asks the site for the package index of the version it
+# was built for.
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
+INSTALL /v0.1.5/Dollyfile-dollyfile b13859f330bbd05bb358dcd128e4845f53a26c2776ab83db792f7f5fe0134bb2
 REQUIRES HEADER libc
 REQUIRES HEADER http
 REQUIRES TOOL cc
 REQUIRES TOOL rm
 
-SOURCE /v0.1.4/dist/static/default/commands/amy.c 38b7b4d9551ebca083028952a10d8a99da3f62d05f7e057c1618855b700fcca8 /tmp/amy/amy.c
-SOURCE /v0.1.4/dist/static/default/commands/version.h 26530b4c4fe62f84d3a4e133a3ac1363c4b3d26673c67b0ba0c5944aa870bc18 /tmp/amy/version.h
+SOURCE /v0.1.5/dist/static/default/commands/amy.c 00ace2489776ebaf062d0127e9fe1bdca885ed2b2ca4da4d5e42cab4fa4d4706 /tmp/amy/amy.c
+SOURCE /v0.1.5/dist/static/default/commands/version.h e98d73e95952c2782f0f2637253ea87fdf9a54344d050b789ec9cb0c6171b7a0 /tmp/amy/version.h
 SLOP cc -O2 /tmp/amy/amy.c -o /bin/amy
 
 EXPORTS TOOL amy
-EXPORTS TOOL dollyfile
 SLOP amy --help > /usr/share/man/cat1/amy.1
 FILE /usr/share/man/cat1/amy.1
-FILE /usr/share/man/cat1/dollyfile.1
 SLOP rm -rf /tmp/amy

package/Dollyfile-core

@@ -4,7 +4,7 @@ REQUIRES HOST runtime@0
 
 # Slop and the commands system-build compiles beside it: a shell without the
 # compiler or the recipe engine.
-FROM /v0.1.4/Dollyfile-system-build 7997c05ba08220831088b2aa713c86dbf0ded0229bbfa84f411476f00269d9fc
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
 
 EXPORTS TOOL slop
 EXPORTS ENV SHELL /bin/slop
@@ -12,9 +12,9 @@ EXPORTS TOOL foreground
 EXPORTS TOOL help
 EXPORTS TOOL man
 EXPORTS TOOL pwd
-EXPORTS TOOL cd
 EXPORTS TOOL cat
 EXPORTS TOOL echo
+EXPORTS TOOL printf
 EXPORTS TOOL touch
 EXPORTS TOOL clear
 EXPORTS TOOL ls
@@ -26,10 +26,10 @@ EXPORTS TOOL mv
 EXPORTS TOOL cp
 EXPORTS TOOL mkdir
 EXPORTS TOOL rm
+EXPORTS TOOL sleep
 EXPORTS TOOL tar
 FILE /usr/share/man/cat1/[.1
 FILE /usr/share/man/cat1/cat.1
-FILE /usr/share/man/cat1/cd.1
 FILE /usr/share/man/cat1/clear.1
 FILE /usr/share/man/cat1/cp.1
 FILE /usr/share/man/cat1/echo.1
@@ -40,8 +40,10 @@ FILE /usr/share/man/cat1/ls.1
 FILE /usr/share/man/cat1/man.1
 FILE /usr/share/man/cat1/mkdir.1
 FILE /usr/share/man/cat1/mv.1
+FILE /usr/share/man/cat1/printf.1
 FILE /usr/share/man/cat1/pwd.1
 FILE /usr/share/man/cat1/rm.1
+FILE /usr/share/man/cat1/sleep.1
 FILE /usr/share/man/cat1/slop.1
 FILE /usr/share/man/cat1/stat.1
 FILE /usr/share/man/cat1/tar.1

package/Dollyfile-curl

@@ -3,7 +3,7 @@ PACKAGE curl
 REQUIRES HOST runtime@0
 REQUIRES HOST http@0
 
-FROM /v0.1.4/Dollyfile-system-build 7997c05ba08220831088b2aa713c86dbf0ded0229bbfa84f411476f00269d9fc
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
 
 REQUIRES HEADER libc
 REQUIRES HEADER http
@@ -13,9 +13,9 @@ REQUIRES TOOL   make
 REQUIRES TOOL   rm
 REQUIRES TOOL   tar
 
-SOURCE /v0.1.4/dist/static/default/curl-headers.tar 346a0298fcbdafbad7d0c0259a2d7b8539ca46c39222797c01dcac213564bf30 /tmp/curl-headers.tar
-SOURCE /v0.1.4/dist/static/default/libcurl-fetch.c  bdf44cc786ba51355b4fe4b9e9621341a0d71e88710ba3ab653153bdf00aa4e0 /usr/src/dolly/libcurl-fetch.c
-SOURCE /v0.1.4/dist/static/default/commands/curl.c  1cb956eba05199235940ec4a5420558b3c68177405d25ba3cc20d5fc160cfbe3 /usr/src/dolly/commands/curl.c
+SOURCE /v0.1.5/dist/static/default/curl-headers.tar 346a0298fcbdafbad7d0c0259a2d7b8539ca46c39222797c01dcac213564bf30 /tmp/curl-headers.tar
+SOURCE /v0.1.5/dist/static/default/libcurl-fetch.c  bdf44cc786ba51355b4fe4b9e9621341a0d71e88710ba3ab653153bdf00aa4e0 /usr/src/dolly/libcurl-fetch.c
+SOURCE /v0.1.5/dist/static/default/commands/curl.c  27025bd6aa514801c5592bd616a3e62e9ebe436c5d1092eafc31fd0c43f50bed /usr/src/dolly/commands/curl.c
 SLOP tar \
   -xf /tmp/curl-headers.tar \
   -C /

package/Dollyfile-display

@@ -3,14 +3,14 @@ PACKAGE display
 REQUIRES HOST runtime@0
 REQUIRES HOST display@0
 
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/lib/libdisplay.so /usr/lib/libdisplay.so
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/share/fonts/IosevkaTerm-SemiBold.ttf /usr/share/fonts/IosevkaTerm-SemiBold.ttf
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/share/licenses/ghostty /usr/share/licenses/ghostty
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/share/licenses/uucode /usr/share/licenses/uucode
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/share/fonts/DroidSansFallback.ttf /usr/share/fonts/DroidSansFallback.ttf
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/share/fonts/NotoEmoji-Regular.ttf /usr/share/fonts/NotoEmoji-Regular.ttf
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/share/licenses/droid-fonts /usr/share/licenses/droid-fonts
-COPY /v0.1.4/Dollyfile-ghostty-build f38a8d00f83771f683325881db2823730beb943ce0a0eb470e1cdef802d25206 /usr/share/licenses/noto-emoji /usr/share/licenses/noto-emoji
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/lib/libdisplay.so /usr/lib/libdisplay.so
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/share/fonts/IosevkaTerm-SemiBold.ttf /usr/share/fonts/IosevkaTerm-SemiBold.ttf
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/share/licenses/ghostty /usr/share/licenses/ghostty
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/share/licenses/uucode /usr/share/licenses/uucode
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/share/fonts/DroidSansFallback.ttf /usr/share/fonts/DroidSansFallback.ttf
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/share/fonts/NotoEmoji-Regular.ttf /usr/share/fonts/NotoEmoji-Regular.ttf
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/share/licenses/droid-fonts /usr/share/licenses/droid-fonts
+COPY /v0.1.5/Dollyfile-ghostty-build 18cb9b323955f362b932cece8b8d6f340193a998c02e569e1ed901be29c5f253 /usr/share/licenses/noto-emoji /usr/share/licenses/noto-emoji
 # The terminal as termcap describes it, for programs that link a termcap
 # library (less, Emacs): TERM is xterm-256color.
 FILE /etc/termcap

package/Dollyfile-dollyfile

@@ -0,0 +1,11 @@
+DOLLY 7
+PACKAGE dollyfile
+REQUIRES HOST runtime@0
+REQUIRES HOST http@0
+
+# The recipe engine alone. An image that installs it can be built FROM: the
+# build runs the base's own /bin/dollyfile (docs/dollyfile.md).
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
+
+EXPORTS TOOL dollyfile
+FILE /usr/share/man/cat1/dollyfile.1

package/Dollyfile-ghostty-build

@@ -5,7 +5,7 @@ REQUIRES HOST display@0
 REQUIRES HOST input@0
 REQUIRES HOST http@0
 
-FROM /v0.1.4/Dollyfile-zig-build 6c16bde5b02b9b125bc8f020c7fc225d9dd226e8e0609a1e826b2c826109d4ef
+FROM /v0.1.5/Dollyfile-zig-build 7b61cdcb025aaafa3ce7b17930a4fc697451850bae49e3c5bb75ba6cc1bff33a
 
 REQUIRES HEADER libc
 REQUIRES HEADER display
@@ -17,17 +17,17 @@ REQUIRES TOOL   rm
 REQUIRES TOOL   tar
 REQUIRES TOOL   zig
 
-SOURCE /v0.1.4/dist/static/default/ghostty.tar              3add3703b5d426311460df7b0474595549b9791af2855082d01ab26571232ba6 /tmp/ghostty.tar
-SOURCE /v0.1.4/dist/static/default/uucode.tar               27d4103c73b68b20c21adaee05c4cd2c01fc418e083f5961148e1f872951453e /tmp/uucode.tar
-SOURCE /v0.1.4/dist/static/default/ghostty/display.c        8c4ad6cc67a72e13724aa823c58a3ac0c20908ae5e2490d5f7e30cac9276145e /usr/src/dolly/ghostty/display.c
-SOURCE /v0.1.4/dist/static/default/stb_truetype.h           ecd30b05e0dd4fea3a13c26810dd9e1992dc379049482c393d5a19e6b5090aab /tmp/ghostty/stb_truetype.h
-SOURCE /v0.1.4/dist/static/default/stb_image.h              594c2fe35d49488b4382dbfaec8f98366defca819d916ac95becf3e75f4200b3 /tmp/ghostty/stb_image.h
-SOURCE /v0.1.4/dist/static/default/IosevkaTerm-SemiBold.ttf 754545a4f6250efdd3d2cc916bb344c59f0c59830405307dfd44d183f919a654 /usr/share/fonts/IosevkaTerm-SemiBold.ttf
+SOURCE /v0.1.5/dist/static/default/ghostty.tar              a5a438df0dd2248918a6527212f9e6500081326accdd20949771e30c17a2f1ec /tmp/ghostty.tar
+SOURCE /v0.1.5/dist/static/default/uucode.tar               be9d52ab9c0f49deb5fd8baa54b4b14f490f8e29e200d044e908d7adad54e3d0 /tmp/uucode.tar
+SOURCE /v0.1.5/dist/static/default/ghostty/display.c        df8b904790e996316c3ee9a748a654da17e40527f9604a37d9c99be2504e46a9 /usr/src/dolly/ghostty/display.c
+SOURCE /v0.1.5/dist/static/default/stb_truetype.h           ecd30b05e0dd4fea3a13c26810dd9e1992dc379049482c393d5a19e6b5090aab /tmp/ghostty/stb_truetype.h
+SOURCE /v0.1.5/dist/static/default/stb_image.h              594c2fe35d49488b4382dbfaec8f98366defca819d916ac95becf3e75f4200b3 /tmp/ghostty/stb_image.h
+SOURCE /v0.1.5/dist/static/default/IosevkaTerm-SemiBold.ttf cb3fd282d86c0e7cc2829f848df5a58973db98c8369a20427a9b3d06727e5aaa /usr/share/fonts/IosevkaTerm-SemiBold.ttf
 # What IosevkaTerm has no glyph for: Chinese, Japanese and Korean, then emoji.
-SOURCE /v0.1.4/dist/static/default/DroidSansFallback.ttf    56d3edfb377a8bc3c4b77f4476405c770173c0e31221ad7c77d0a8e1f3039a3e /usr/share/fonts/DroidSansFallback.ttf
-SOURCE /v0.1.4/dist/static/default/droid-fonts-NOTICE       38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a /usr/share/licenses/droid-fonts/NOTICE
-SOURCE /v0.1.4/dist/static/default/NotoEmoji-Regular.ttf    cd07743a4c93d8da929afdd28c1d368f11da478a1093146a13610081c2a58440 /usr/share/fonts/NotoEmoji-Regular.ttf
-SOURCE /v0.1.4/dist/static/default/noto-emoji-OFL.txt       fb755fa3280d1d215a20df2e64fe6a0f75f8208439b11671978214aae60d2997 /usr/share/licenses/noto-emoji/OFL.txt
+SOURCE /v0.1.5/dist/static/default/DroidSansFallback.ttf    56d3edfb377a8bc3c4b77f4476405c770173c0e31221ad7c77d0a8e1f3039a3e /usr/share/fonts/DroidSansFallback.ttf
+SOURCE /v0.1.5/dist/static/default/droid-fonts-NOTICE       38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a /usr/share/licenses/droid-fonts/NOTICE
+SOURCE /v0.1.5/dist/static/default/NotoEmoji-Regular.ttf    cd07743a4c93d8da929afdd28c1d368f11da478a1093146a13610081c2a58440 /usr/share/fonts/NotoEmoji-Regular.ttf
+SOURCE /v0.1.5/dist/static/default/noto-emoji-OFL.txt       fb755fa3280d1d215a20df2e64fe6a0f75f8208439b11671978214aae60d2997 /usr/share/licenses/noto-emoji/OFL.txt
 SLOP tar \
   -xf /tmp/ghostty.tar \
   -C /
@@ -35,14 +35,50 @@ SLOP tar \
   -xf /tmp/uucode.tar \
   -C /
 
+# The Unicode tables' generators run as programs of this Zig: Zig's page
+# allocator on WebAssembly grows the memory itself, behind libc's sbrk, so
+# their root gives them libc's.
+FILE /tmp/ghostty/generator.zig
+    const std = @import("std");
+    pub const os = struct {
+        pub const heap = struct {
+            pub const page_allocator = std.heap.c_allocator;
+        };
+    };
+    pub const main = @import("generate").main;
+
 # Zig emits Ghostty VT and compiler_rt as C; cc compiles them. zig.h passes
 # usize as uint64_t *, and @returnAddress would import an Emscripten helper.
+# The Unicode tables are generated first, as Ghostty's build does
+# (src/build/UnicodeTables.zig, uucode's build.zig): uucode's generator reads
+# the UCD and writes its tables, over which Ghostty's two print theirs.
 FILE /tmp/ghostty/Makefile
     .RECIPEPREFIX := >
     ZIGFLAGS := -OReleaseSmall -target wasm64-emscripten -mcpu=generic+atomics -fsingle-threaded -ofmt=c
     CFLAGS := -O2 -std=c99 -fno-strict-aliasing -Wno-incompatible-pointer-types -I /usr/lib/zig
+    UUCODE_CONFIG := --dep storage.zig -Mconfig.zig=/usr/src/uucode/src/config.zig \
+      --dep config.zig -Mstorage.zig=/usr/src/uucode/src/storage.zig \
+      --dep config.zig --dep storage.zig -Mbuild_config=/usr/src/ghostty/src/build/uucode_config.zig
+    GENERATORS := /tmp/ghostty/uucode-generate /tmp/ghostty/props-generate /tmp/ghostty/symbols-generate
     all: /usr/lib/libghostty-vt.a /usr/lib/libdisplay.so
-    /tmp/ghostty/ghostty-vt.c:
+    /tmp/ghostty/uucode-generate.c:
+    >zig build-exe $(ZIGFLAGS) -lc --name uucode-generate --dep generate -Mroot=/tmp/ghostty/generator.zig \
+    >  --dep config.zig --dep storage.zig --dep build_config -Mgenerate=/usr/src/uucode/src/generate.zig \
+    >  $(UUCODE_CONFIG) -femit-bin=$@
+    /tmp/ghostty/props-generate.c /tmp/ghostty/symbols-generate.c: /tmp/ghostty/uucode-tables.zig
+    >zig build-exe $(ZIGFLAGS) -lc --name $(basename $(@F)) --dep generate -Mroot=/tmp/ghostty/generator.zig \
+    >  --dep uucode -Mgenerate=/usr/src/ghostty/src/unicode/$(subst -generate.c,_uucode.zig,$(@F)) \
+    >  --dep types.zig --dep config.zig --dep tables -Muucode=/usr/src/uucode/src/root.zig \
+    >  -Mtypes.zig=/usr/src/uucode/src/types.zig \
+    >  --dep types.zig $(UUCODE_CONFIG) \
+    >  --dep config.zig --dep storage.zig --dep build_config -Mtables=/tmp/ghostty/uucode-tables.zig -femit-bin=$@
+    $(GENERATORS): %: %.c /tmp/ghostty/compiler_rt.o
+    >cc $(CFLAGS) '-D__builtin_return_address(level)=0' -o $@ $^
+    /tmp/ghostty/uucode-tables.zig: /tmp/ghostty/uucode-generate
+    >cd /usr/src/uucode && $< $@
+    /tmp/ghostty/unicode-props.zig /tmp/ghostty/unicode-symbols.zig: /tmp/ghostty/unicode-%.zig: /tmp/ghostty/%-generate
+    >$< > $@
+    /tmp/ghostty/ghostty-vt.c: /tmp/ghostty/uucode-tables.zig /tmp/ghostty/unicode-props.zig /tmp/ghostty/unicode-symbols.zig
     >zig build-obj \
     >  $(ZIGFLAGS) \
     >  -lc \
@@ -56,8 +92,8 @@ FILE /tmp/ghostty/Makefile
     >  -Mroot=/usr/src/ghostty/src/lib_vt.zig \
     >  -Mbuild_options=/usr/src/ghostty/generated/build-options.zig \
     >  -Mterminal_options=/usr/src/ghostty/generated/terminal-options.zig \
-    >  -Municode_tables=/usr/src/ghostty/generated/unicode-props.zig \
-    >  -Msymbols_tables=/usr/src/ghostty/generated/unicode-symbols.zig \
+    >  -Municode_tables=/tmp/ghostty/unicode-props.zig \
+    >  -Msymbols_tables=/tmp/ghostty/unicode-symbols.zig \
     >  -ODebug \
     >  --dep types.zig \
     >  --dep config.zig \
@@ -73,7 +109,7 @@ FILE /tmp/ghostty/Makefile
     >  --dep config.zig \
     >  --dep storage.zig \
     >  --dep build_config \
-    >  -Mtables=/usr/src/ghostty/generated/uucode-tables.zig \
+    >  -Mtables=/tmp/ghostty/uucode-tables.zig \
     >  -ODebug \
     >  --dep config.zig \
     >  -Mstorage.zig=/usr/src/uucode/src/storage.zig \
@@ -124,6 +160,7 @@ FILE /usr/share/licenses/droid-fonts/NOTICE
 FILE /usr/share/licenses/noto-emoji/OFL.txt
 FILE /usr/share/licenses/ghostty/LICENSE
 FILE /usr/share/licenses/uucode/LICENSE.md
+FILE /usr/share/licenses/uucode/LICENSE_unicode
 FILE /usr/share/licenses/wuffs/LICENSE-APACHE
 FILE /usr/share/licenses/wuffs/LICENSE-MIT
 FILE /usr/share/licenses/translate-c/LICENSE

package/Dollyfile-git

@@ -8,9 +8,9 @@ REQUIRES HOST threads@0
 # links zlib and its helpers libcurl too; both serve the build and are not
 # installed with it. Git runs its asyncs, a side band's reader among them, as
 # threads; without threads it would fork them.
-FROM /v0.1.4/Dollyfile-system-build 7997c05ba08220831088b2aa713c86dbf0ded0229bbfa84f411476f00269d9fc
-USE /v0.1.4/Dollyfile-zlib 7f3254e8d51bc7edd2fa47b19f3b1e2e43c747476ab93c57654639e4119abde7
-USE /v0.1.4/Dollyfile-curl 173c3c37eeac846ba8caa316c656cb75e5facea793eb9434337550ddaf3d32d1
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
+USE /v0.1.5/Dollyfile-zlib 0b706df4c643faf419bd9089995b97d13ff7237493d9bb9727f8d3df91cbe033
+USE /v0.1.5/Dollyfile-curl f31998555b9cca60e8ad5d7e6b5d8476aa119ecefbdc186f04461edad59f9e7d
 REQUIRES HEADER libc
 REQUIRES HEADER runtime
 REQUIRES HEADER curl
@@ -24,7 +24,7 @@ REQUIRES TOOL   mkdir
 REQUIRES TOOL   rm
 REQUIRES TOOL   tar
 
-SOURCE /v0.1.4/dist/static/default/git.tar 80a61ce947350bfd0c425ec5624c30379d99c9b443ad2588c6c361f8e0fee5d2 /tmp/git.tar
+SOURCE /v0.1.5/dist/static/default/git.tar 5c190c2a9301f54afab080b85341a8cd683bee1995b2d911e0bdea93f5eb845a /tmp/git.tar
 SLOP tar \
   -xf /tmp/git.tar \
   -C /
@@ -41,13 +41,12 @@ FILE /tmp/git/Makefile
     .RECIPEPREFIX := >
     SOURCES := $(file </usr/src/git/dolly-sources.txt)
     OBJECTS := $(addprefix /tmp/git/objects/,$(SOURCES:.c=.o))
-    # Keep the bootstrap build unoptimized: Git has hundreds of translation
-    # units and this layer is optimized for deterministic browser cold-build
-    # latency rather than execution throughput.
+    # NO_REGEX takes Git's regex, with GAWK and NO_MBSUPPORT as its Makefile
+    # sets them: the sysroot's regex.h has no REG_STARTEND.
     # Git ends with status 128 when its pager cannot start, so the default one
     # is a command for Slop: less when it is installed, cat otherwise.
     CPPFLAGS := \
-      -O0 \
+      -O2 \
       -std=gnu99 \
       -Wno-ignored-attributes \
       -D_DEFAULT_SOURCE \
@@ -64,14 +63,7 @@ FILE /tmp/git/Makefile
       -DNO_REGEX \
       -DGAWK \
       -DNO_MBSUPPORT \
-      -DNO_MEMMEM \
-      -DNO_PREAD \
-      -DNO_SETENV \
-      -DNO_STRCASESTR \
       -DNO_STRLCPY \
-      -DNO_STRTOUMAX \
-      -Dprintf=iprintf \
-      -Dfprintf=fiprintf \
       -DSHA1_BLK \
       -DSHA256_BLK \
       -DHAVE_ALLOCA_H \
@@ -96,7 +88,7 @@ FILE /tmp/git/Makefile
       -I /usr/src/git/compat/regex \
       -I /usr/src/git \
       -include dolly/runtime.h
-    all: /usr/bin/git /usr/libexec/dolly/git-remote-http /usr/libexec/dolly/git-remote-https
+    all: /usr/bin/git /usr/libexec/dolly/git-remote-http
     /tmp/git/objects/%.o: /usr/src/git/%.c
     >mkdir -p $(dir $@)
     >cc \
@@ -126,17 +118,6 @@ FILE /tmp/git/Makefile
     >  -lcurl \
     >  -lz \
     >  -o $@
-    /usr/libexec/dolly/git-remote-https: /usr/libexec/dolly/git-remote-http
-    >cc \
-    >  $(CPPFLAGS) \
-    >  /usr/src/git/common-main.c \
-    >  /usr/src/git/remote-curl.c \
-    >  /usr/src/git/http.c \
-    >  /usr/src/git/http-walker.c \
-    >  -lgit \
-    >  -lcurl \
-    >  -lz \
-    >  -o $@
 SLOP CWD /usr/src/git make \
   -f /tmp/git/Makefile
 
@@ -145,7 +126,8 @@ EXPORTS TOOL git
 SLOP git \
   --version
 # The builtins a local transport runs by their dashed names (git clone PATH
-# runs git-upload-pack on its other side), as upstream installs them.
+# runs git-upload-pack on its other side), as upstream installs them, and
+# the HTTPS helper, which upstream links to the HTTP one.
 FILE /usr/libexec/dolly/git-upload-pack
     #!/bin/slop
     exec git upload-pack "$@"
@@ -155,6 +137,9 @@ FILE /usr/libexec/dolly/git-receive-pack
 FILE /usr/libexec/dolly/git-upload-archive
     #!/bin/slop
     exec git upload-archive "$@"
+FILE /usr/libexec/dolly/git-remote-https
+    #!/bin/slop
+    exec /usr/libexec/dolly/git-remote-http "$@"
 SLOP git init -q /tmp/git-check/origin && git -C /tmp/git-check/origin commit -q --allow-empty -m one && \
   git clone -q /tmp/git-check/origin /tmp/git-check/clone && test "$(git -C /tmp/git-check/clone log --format=%s)" = one && \
   git -C /tmp/git-check/clone commit -q --allow-empty -m two && git -C /tmp/git-check/clone push -q origin HEAD:pushed && \
@@ -162,7 +147,6 @@ SLOP git init -q /tmp/git-check/origin && git -C /tmp/git-check/origin commit -q
 SLOP git --help > /usr/share/man/cat1/git.1
 
 FILE /usr/libexec/dolly/git-remote-http
-FILE /usr/libexec/dolly/git-remote-https
 FOLDER /usr/share/git-core/templates
 FILE /usr/share/licenses/git/COPYING
 # git links libcurl statically and carries its licence.
@@ -171,9 +155,9 @@ FILE /usr/share/man/cat1/git.1
 
 # Dolly's diff and patch: git diff --no-index and git apply, for programs and
 # build systems that run them.
-SOURCE /v0.1.4/dist/static/default/commands/run-program.h e73415ba149e8dcb9944313c36d8d2319202d699c810e02a26d5a94caa8f3a9f /tmp/git-tools/run-program.h
-SOURCE /v0.1.4/dist/static/default/commands/diff.c e1e71b3947fac230f221715577fbbfbd6ba3cf82c6c3cd027905f10ace8cf11e /tmp/git-tools/diff.c
-SOURCE /v0.1.4/dist/static/default/commands/patch.c 01a81c0b50df26223772e568bdc951db73d0be59b71251a1b023234c10a1b63e /tmp/git-tools/patch.c
+SOURCE /v0.1.5/dist/static/default/commands/run-program.h e73415ba149e8dcb9944313c36d8d2319202d699c810e02a26d5a94caa8f3a9f /tmp/git-tools/run-program.h
+SOURCE /v0.1.5/dist/static/default/commands/diff.c cda06a2a94c9d7c5f1ccab54f847011e35379f7cc452b7d4a0d7046ae61b7de9 /tmp/git-tools/diff.c
+SOURCE /v0.1.5/dist/static/default/commands/patch.c bd5ec1cb0224099738b9f12f9b30896c134989dbebd7ecdb652e255c2ad29236 /tmp/git-tools/patch.c
 SLOP cc -O2 /tmp/git-tools/diff.c -o /bin/diff
 SLOP cc -O2 /tmp/git-tools/patch.c -o /bin/patch
 EXPORTS TOOL diff

package/Dollyfile-gzip

@@ -2,8 +2,8 @@ DOLLY 7
 PACKAGE gzip
 REQUIRES HOST runtime@0
 
-FROM /v0.1.4/Dollyfile-system-build 7997c05ba08220831088b2aa713c86dbf0ded0229bbfa84f411476f00269d9fc
-USE /v0.1.4/Dollyfile-zlib 7f3254e8d51bc7edd2fa47b19f3b1e2e43c747476ab93c57654639e4119abde7
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
+USE /v0.1.5/Dollyfile-zlib 0b706df4c643faf419bd9089995b97d13ff7237493d9bb9727f8d3df91cbe033
 
 REQUIRES HEADER libc
 REQUIRES HEADER zlib
@@ -11,7 +11,7 @@ REQUIRES LIB z
 REQUIRES TOOL cc
 REQUIRES TOOL rm
 
-SOURCE /v0.1.4/dist/static/default/commands/gzip.c 54b1517e8151c007dfc768a9af73cfbc5e4a5a6a6d5dd6b1d773c02283d054d6 /tmp/gzip.c
+SOURCE /v0.1.5/dist/static/default/commands/gzip.c 265a07fe3b66241718ed0f97fb9d72bee27da29109a55e1640f5f1d5be29a626 /tmp/gzip.c
 SLOP cc /tmp/gzip.c -lz -o /bin/gzip
 SLOP rm /tmp/gzip.c
 EXPORTS TOOL gzip

package/Dollyfile-html

@@ -0,0 +1,78 @@
+DOLLY 7
+PACKAGE html
+REQUIRES HOST runtime@0
+REQUIRES HOST html@0
+
+# The html@0 module's header and client, and the html command, which shows
+# the user an HTML page or form in a popup of the page and prints the fields
+# of the form they submit. cc links every client archive in
+# /usr/lib/dolly/process; a program records html@0 when it calls the client.
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
+REQUIRES HEADER libc
+REQUIRES TOOL ar
+REQUIRES TOOL cc
+REQUIRES TOOL rm
+
+SOURCE /v0.1.5/host/html/html.h b5d3905d3cb6d70cb4b019f9f5c6375cb92ce241608ccaf02fc13278ebb08261 /usr/include/dolly/html.h
+SOURCE /v0.1.5/host/html/html-abi.h ba5cbfcad4170d47d079b4221005994a051152ebf7db8cc011e18cdd6aff512b /usr/include/dolly/html-abi.h
+SOURCE /v0.1.5/host/html/client.c 4c907d8a84cad64fc4e6433b057f4ac9a413e2454f20c7579129dc34c9afc202 /tmp/html/client.c
+SLOP cc -O1 -c /tmp/html/client.c -o /tmp/html/client.o
+SLOP ar rcs /usr/lib/dolly/process/libdolly-html.a /tmp/html/client.o
+
+EXPORTS HEADER html     /usr/include/dolly/html.h
+EXPORTS HEADER html-abi /usr/include/dolly/html-abi.h
+EXPORTS LIB    dolly-html /usr/lib/dolly/process/libdolly-html.a
+
+FILE /tmp/html/html.c
+    #include <dolly/html.h>
+    #include <errno.h>
+    #include <stdio.h>
+    #include <string.h>
+    
+    static const char usage[] =
+        "usage: html [FILE]\n"
+        "Shows FILE, or standard input, an HTML document of at most 1 MiB, in a popup\n"
+        "of the page: its text, headings, lists, tables and forms, in the page's style.\n"
+        "When the user submits a form, prints its fields on one line as a browser posts\n"
+        "them (application/x-www-form-urlencoded) and exits 0; exits 1 when the user\n"
+        "closes the popup, 2 on an error.\n";
+    static char document[DOLLY_HTML_DOCUMENT_MAX + 1];
+    static char fields[DOLLY_HTML_FIELDS_MAX];
+    
+    int main(int argc, char **argv) {
+      if (argc == 2 && strcmp(argv[1], "--help") == 0) {
+        fputs(usage, stdout);
+        return 0;
+      }
+      if (argc > 2) {
+        fputs(usage, stderr);
+        return 2;
+      }
+      FILE *input = argc == 2 ? fopen(argv[1], "rb") : stdin;
+      if (input == NULL) {
+        fprintf(stderr, "html: %s: %s\n", argv[1], strerror(errno));
+        return 2;
+      }
+      const size_t size = fread(document, 1, sizeof(document), input);
+      if (ferror(input)) {
+        fprintf(stderr, "html: %s\n", strerror(errno));
+        return 2;
+      }
+      if (size == 0 || size > DOLLY_HTML_DOCUMENT_MAX) {
+        fprintf(stderr, "html: the document is %s\n", size == 0 ? "empty" : "over 1 MiB");
+        return 2;
+      }
+      const int result = dolly_html_show(document, size, fields, sizeof(fields));
+      if (result == -ECANCELED) return 1;
+      if (result < 0) {
+        fprintf(stderr, "html: %s\n", strerror(-result));
+        return 2;
+      }
+      printf("%.*s\n", result, fields);
+      return 0;
+    }
+SLOP cc -O1 /tmp/html/html.c -o /usr/bin/html
+EXPORTS TOOL html
+SLOP html --help > /usr/share/man/cat1/html.1
+FILE /usr/share/man/cat1/html.1
+SLOP rm -rf /tmp/html

package/Dollyfile-mandoc

@@ -8,8 +8,8 @@ REQUIRES HOST runtime@0
 # man, apropos and makewhatis the same program can be are not installed: man
 # is the core's, and prints a page of text. A package that ships upstream's
 # pages uses this one to format them with text-page when it is built.
-FROM /v0.1.4/Dollyfile-system-tools 7f6c86fcc73e544e7007646eba2718bbc4d43b7f0516d9558e2dc500b1a05a80
-USE /v0.1.4/Dollyfile-zlib 7f3254e8d51bc7edd2fa47b19f3b1e2e43c747476ab93c57654639e4119abde7
+FROM /v0.1.5/Dollyfile-system-tools 39e8ad7c80d06b7a0c420bbeaae2e6b2423e7e633d38640e82d72a73c20e232a
+USE /v0.1.5/Dollyfile-zlib 0b706df4c643faf419bd9089995b97d13ff7237493d9bb9727f8d3df91cbe033
 
 REQUIRES HEADER libc
 REQUIRES HEADER zlib
@@ -26,7 +26,7 @@ REQUIRES TOOL   rm
 REQUIRES TOOL   tar
 REQUIRES TOOL   test
 
-SOURCE /v0.1.4/dist/static/default/mandoc-1.14.6.tar.gz 8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c /tmp/mandoc.tar.gz
+SOURCE /v0.1.5/dist/static/default/mandoc-1.14.6.tar.gz 8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c /tmp/mandoc.tar.gz
 SLOP gzip -dc /tmp/mandoc.tar.gz | tar -xf - -C /tmp
 
 # Not found here: fts, getprogname, recallocarray, strtonum, ohash, BSD's

package/Dollyfile-nena

@@ -5,13 +5,13 @@ REQUIRES HOST nena@0
 
 # nena lists the host modules of a session and enables or disables them. It
 # works where the image declares nena@0, as default does.
-FROM /v0.1.4/Dollyfile-system-build 7997c05ba08220831088b2aa713c86dbf0ded0229bbfa84f411476f00269d9fc
+FROM /v0.1.5/Dollyfile-system-build cf9cf053fb5debc080062e6e44c1b139175739f6158fa8a825b0255ba2063aee
 
 REQUIRES HEADER libc
 REQUIRES TOOL cc
 REQUIRES TOOL rm
 
-SOURCE /v0.1.4/dist/static/default/commands/nena.c b036175a8ca396de4647a663fb3d81172177b799562355088b01e32904616f37 /tmp/nena.c
+SOURCE /v0.1.5/dist/static/default/commands/nena.c b036175a8ca396de4647a663fb3d81172177b799562355088b01e32904616f37 /tmp/nena.c
 SLOP cc -O2 /tmp/nena.c -o /bin/nena
 SLOP rm /tmp/nena.c
 EXPORTS TOOL nena

package/Dollyfile-posix

@@ -6,8 +6,8 @@ REQUIRES HOST runtime@0
 # that builds them: sbase, awk, Dolly's find, xargs and the like, and sh.
 # Upstream's pages, of mdoc and man macros, are kept as the text mandoc
 # formats, which man prints as it is.
-FROM /v0.1.4/Dollyfile-system-tools 7f6c86fcc73e544e7007646eba2718bbc4d43b7f0516d9558e2dc500b1a05a80
-USE /v0.1.4/Dollyfile-mandoc 67a89ded0a009e1457626e18cc37ec6dd3d260f4eecbc462e970c83f708da631
+FROM /v0.1.5/Dollyfile-system-tools 39e8ad7c80d06b7a0c420bbeaae2e6b2423e7e633d38640e82d72a73c20e232a
+USE /v0.1.5/Dollyfile-mandoc f175a02b3df6d4fc836307aee318cd3bae8ab4d6afebe64a472bb0197af49144
 
 REQUIRES TOOL text-page
 SLOP text-page /usr/share/man/man1/*.1
@@ -36,13 +36,11 @@ EXPORTS TOOL od
 EXPORTS TOOL paste
 EXPORTS TOOL pathchk
 EXPORTS TOOL printenv
-EXPORTS TOOL printf
 EXPORTS TOOL readlink
 EXPORTS TOOL rmdir
 EXPORTS TOOL sed
 EXPORTS TOOL seq
 EXPORTS TOOL sha256sum
-EXPORTS TOOL sleep
 EXPORTS TOOL sort
 EXPORTS TOOL split
 EXPORTS TOOL strings
@@ -103,7 +101,6 @@ FILE /usr/share/man/cat1/rmdir.1
 FILE /usr/share/man/cat1/sed.1
 FILE /usr/share/man/cat1/seq.1
 FILE /usr/share/man/cat1/sha256sum.1
-FILE /usr/share/man/cat1/sleep.1
 FILE /usr/share/man/cat1/sort.1
 FILE /usr/share/man/cat1/split.1
 FILE /usr/share/man/cat1/strings.1