fix: remove packages that aren't compiling and clean up

packages/abuild/Containerfile

@@ -1,37 +0,0 @@
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=3.12.0
-ENV SRC_HASH=5783e04ededa21ffa3f600551a7e2ca6db1c8e1a962a868311f5e5e4560908ce
-ENV SRC_FILE=abuild-${VERSION}.tar.gz
-ENV SRC_SITE=https://gitlab.alpinelinux.org/alpine/abuild/-/archive/${VERSION}/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/meson . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/make . /
-COPY --from=stagex/lzip . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/zlib . /
-COPY --from=stagex/elfutils . /
-COPY --from=stagex/scdoc . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR abuild-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-	make VERSION="${VERSION}-r5"
-EOF
-
-FROM build as install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /
-

packages/acl/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.3.2
 ENV SRC_HASH=5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c
 ENV SRC_FILE=acl-${VERSION}.tar.gz
 ENV SRC_SITE=https://download.savannah.nongnu.org/releases/acl/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -25,12 +25,12 @@ RUN --network=none <<-EOF
 	    --prefix=/usr \
 		--libdir=/usr/lib \
 		--libexecdir=/usr/libexec
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/apache2/Containerfile

@@ -1,78 +0,0 @@
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=2.4.59
-ENV SRC_HASH=ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323
-ENV SRC_FILE=httpd-${VERSION}.tar.bz2
-ENV SRC_SITE=https://dlcdn.apache.org/httpd/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/expat . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/make . /
-COPY --from=stagex/autoconf . /
-COPY --from=stagex/automake . /
-COPY --from=stagex/brotli . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/zlib . /
-COPY --from=stagex/libxml2 . /
-COPY --from=stagex/pcre2 . /
-COPY --from=stagex/lua . /
-
-RUN tar -xf ${SRC_FILE}
-WORKDIR httpd-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-    ./configure \
-	    --prefix=/usr \
-		--enable-so \
-		--enable-suexec \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-logfile=/var/log/apache2/suexec.log \
-		--with-suexec-bin=/usr/sbin/suexec \
-		--with-suexec-uidmin=99 \
-		--with-suexec-gidmin=99 \
-		--with-apr=/usr/bin/apr-1-config \
-		--with-apr-util=/usr/bin/apu-1-config \
-		--with-pcre=/usr \
-		--enable-mods-shared=all \
-		--enable-mpms-shared=all \
-		--with-mpm=prefork \
-		--enable-ssl \
-		--with-ssl \
-		--enable-proxy \
-		--enable-cache \
-		--enable-disk-cache \
-		--enable-mem-cache \
-		--enable-file-cache \
-		--enable-ldap \
-		--enable-authnz-ldap \
-		--enable-cgid \
-		--enable-cgi \
-		--enable-authn-anon \
-		--enable-authn-alias \
-		--disable-imagemap \
-		--enable-proxy-connect \
-		--enable-proxy-http \
-		--enable-proxy-ftp \
-		--enable-deflate \
-		--enable-dbd \
-		--enable-exception-hook \
-		--enable-dav \
-		--enable-dav-fs \
-		--enable-dav-lock
-	make
-EOF
-
-FROM build as install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /

packages/apr-util/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.6.3
 ENV SRC_HASH=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 ENV SRC_FILE=apr-util-${VERSION}.tar.bz2
 ENV SRC_SITE=https://www.apache.org/dist/apr/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -20,11 +20,16 @@ COPY --from=stagex/openldap . /
 COPY --from=stagex/sqlite3 . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/postgresql . /
+COPY --from=stagex/apr . /
+COPY --from=stagex/libtool . /
+COPY --from=stagex/util-linux . /
 
 RUN tar -xf ${SRC_FILE}
 WORKDIR apr-util-${VERSION}
+COPY *.patch .
 RUN --network=none <<-EOF
 	set -eux
+	patch -p1 < musl-fix-testsuite.patch
     ./configure \
 	    --prefix=/usr \
 		--with-apr=/usr \
@@ -37,12 +42,12 @@ RUN --network=none <<-EOF
 		--without-sqlite2 \
 		--with-dbm=ndbm \
 		--with-ndbm
-    make
+    make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/apr-util/musl-fix-testsuite.patch

@@ -0,0 +1,19 @@
+diff --git a/test/testxlate.c b/test/testxlate.c
+index 6981eff..de00fa4 100644
+--- a/test/testxlate.c
++++ b/test/testxlate.c
+@@ -116,8 +116,12 @@ static void test_transformation(abts_case *tc, void *data)
+     }
+
+     /* 4. Transformation using charset aliases */
+-    one_test(tc, "UTF-8", "UTF-7", test_utf8, test_utf7, p);
+-    one_test(tc, "UTF-7", "UTF-8", test_utf7, test_utf8, p);
++    if (is_transform_supported(tc, "UTF-8", "UTF-7", p)) {
++        one_test(tc, "UTF-8", "UTF-7", test_utf8, test_utf7, p);
++    }
++    if (is_transform_supported(tc, "UTF-7", "UTF-8", p)) {
++        one_test(tc, "UTF-7", "UTF-8", test_utf7, test_utf8, p);
++    }
+ }
+
+ #endif /* APR_HAS_XLATE */

packages/argon2/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=20190702
 ENV SRC_HASH=daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c
 ENV SRC_FILE=${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
@@ -17,7 +18,7 @@ RUN tar -xf $SRC_FILE
 WORKDIR phc-winner-argon2-${VERSION}
 RUN --network=none <<-EOF
 	set -eux
-	make -j $(nproc) OPTTARGET=none ARGON2_VERSION=${VERSION}
+	make -j "$(nproc)" OPTTARGET=none ARGON2_VERSION=${VERSION}
 EOF
 
 FROM build as install

packages/aspell/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=0.60.8.1
 ENV SRC_HASH=d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b
 ENV SRC_FILE=aspell-${VERSION}.tar.gz
 ENV SRC_SITE=https://ftp.gnu.org/gnu/aspell/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/busybox . /
 COPY --from=stagex/perl . /
 COPY --from=stagex/binutils . /
@@ -27,12 +27,12 @@ RUN --network=none <<-EOF
 		--sysconfdir=/etc \
 		--enable-dict-dir=/usr/share/aspell \
 		--enable-pkgdatadir=/usr/share/aspell
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN --network=none make DESTDIR="/rootfs" install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/attr/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.5.2
 ENV SRC_HASH=39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87
 ENV SRC_FILE=attr-${VERSION}.tar.gz
 ENV SRC_SITE=https://download.savannah.nongnu.org/releases/attr/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -32,12 +32,12 @@ RUN --network=none <<-EOF
 		--docdir=/usr/share/doc/attr \
 		--datadir=/usr/share \
 		--disable-nls
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/brotli/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.1.0
 ENV SRC_HASH=e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/google/brotli/archive/refs/tags/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -34,9 +34,9 @@ RUN --network=none <<-EOF
 	cmake --build build
 EOF
 
-FROM build as install
+FROM build AS install
 RUN DESTDIR=/rootfs cmake --install build
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/dbus-glib/Containerfile

@@ -1,44 +0,0 @@
-
-FROM scratch AS base
-ARG ARCH=x86_64
-ENV VERSION=0.112
-ENV SRC_HASH=7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a
-ENV SRC_FILE=dbus-glib-${VERSION}.tar.gz
-ENV SRC_SITE=https://dbus.freedesktop.org/releases/dbus-glib/${SRC_FILE}
-
-FROM base AS fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch AS build
-COPY --from=stagex/glib . /
-COPY --from=stagex/gettext . /
-COPY --from=stagex/expat . /
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/dbus . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/make . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR dbus-glib-${VERSION}
-RUN ls -la .
-RUN --network=none <<-EOF
-	set -eux \
-    CFLAGS="-flto=auto" \
-	./configure \
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--enable-bash-completion=no
-	make -j "$(nproc)"
-EOF
-
-FROM build AS install
-RUN DESTDIR=/rootfs cmake --install build
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem AS package
-COPY --from=install /rootfs/. /

packages/dbus/Containerfile

@@ -1,49 +0,0 @@
-FROM scratch AS base
-ARG ARCH=x86_64
-ENV VERSION=1.14.10
-ENV SRC_HASH=ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f
-ENV SRC_FILE=dbus-${VERSION}.tar.xz
-ENV SRC_SITE=https://dbus.freedesktop.org/releases/dbus/${SRC_FILE}
-
-FROM base AS fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch AS build
-COPY --from=stagex/glib . /
-COPY --from=stagex/gettext . /
-COPY --from=stagex/expat . /
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/meson . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/libsm . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/m4 . /
-COPY --from=stagex/xmlto . /
-COPY --from=stagex/make . /
-COPY --from=stagex/automake . /
-COPY --from=stagex/autoconf . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR dbus-${VERSION}
-RUN ls -la .
-RUN --network=none <<-EOF
-	set -eux
-    ./autogen.sh
-	./configure \
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-	    --prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--with-system-pid-file=/run/dbus/dbus.pid \
-		--enable-checks \
-		--disable-asserts
-	make -j "$(nproc)"
-EOF
-
-FROM build AS install
-RUN DESTDIR=/rootfs cmake --install build
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem AS package
-COPY --from=install /rootfs/. /

packages/enchant2/Containerfile

@@ -1,51 +0,0 @@
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=2.6.9
-ENV SRC_HASH=d9a5a10dc9b38a43b3a0fa22c76ed6ebb7e09eb535aff62954afcdbd40efff6b
-ENV SRC_FILE=enchant-${VERSION}.tar.gz
-ENV SRC_SITE=https://github.com/AbiWord/enchant/releases/download/v${VERSION}/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/perl . /
-COPY --from=stagex/file . /
-COPY --from=stagex/bash . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/make . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/linux-headers . /
-COPY --from=stagex/glib . /
-COPY --from=stagex/groff . /
-COPY --from=stagex/hunspell . /
-COPY --from=stagex/pcre2 . /
-COPY --from=stagex/gettext . /
-COPY --from=stagex/aspell . /
-COPY --from=stagex/file . /
-COPY --from=stagex/nuspell . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR enchant-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-    ./configure \
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-		--prefix=/usr \
-		--disable-static \
-		--with-aspell \
-		--with-hunspell \
-		--with-nuspell
-	make
-EOF
-
-FROM build as install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /

packages/expat/Containerfile

@@ -1,14 +1,15 @@
 
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.6.2
 ENV SRC_HASH=d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3
 ENV SRC_FILE=expat-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/libexpat/libexpat/releases/download/R_2_6_2/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
@@ -27,9 +28,9 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/fmt/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=10.2.1
 ENV SRC_HASH=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
 ENV SRC_FILE=${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/fmtlib/fmt/archive/refs/tags/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -24,7 +24,7 @@ RUN tar -xf ${SRC_FILE}
 WORKDIR fmt-${VERSION}
 COPY *.patch .
 RUN --network=none <<-EOF
-	set -eux \
+	set -eux
 	patch -p1 fix-handling-of-static-separator.patch
 	# Build in-tree so the prebuilt docs get installed correctly.
 	# See https://github.com/fmtlib/fmt/issues/2837
@@ -37,9 +37,9 @@ RUN --network=none <<-EOF
 	cmake --build .
 EOF
 
-FROM build as install
+FROM build AS install
 RUN DESTDIR=/rootfs cmake --install .
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/gdbm/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.23
 ENV SRC_HASH=74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd
 ENV SRC_FILE=gdbm-${VERSION}.tar.gz
 ENV SRC_SITE=https://ftp.gnu.org/gnu/gdbm/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/bash . /
@@ -29,12 +29,12 @@ RUN --network=none <<-EOF
 		--disable-largefile \
 		--disable-dependency-tracking \
 		--enable-fast-install
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/glib/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.80.0
 ENV SRC_HASH=8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
 ENV SRC_FILE=glib-${VERSION}.tar.xz
 ENV SRC_SITE=https://download.gnome.org/sources/glib/2.80/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/python . /
 COPY --from=stagex/zlib . /
 COPY --from=stagex/bzip2 . /
@@ -41,7 +41,7 @@ RUN tar -xf ${SRC_FILE}
 WORKDIR glib-${VERSION}
 COPY *.patch .
 RUN --network=none <<-EOF
-	# set -eux \
+	set -eux
 	patch -p1 alwaysbash.patch
 	patch -p1 deprecated-no-warn.patch
 	patch -p1 fix-tests.patch
@@ -63,9 +63,9 @@ RUN --network=none <<-EOF
 	meson install --no-rebuild -C output
 EOF
 
-FROM build as install
+FROM build AS install
 RUN DESTDIR=/rootfs meson install --no-rebuild -C output
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/groff/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.23.0
 ENV SRC_HASH=6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13
 ENV SRC_FILE=groff-${VERSION}.tar.gz
 ENV SRC_SITE=https://ftp.gnu.org/gnu/groff/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/perl . /
 COPY --from=stagex/m4 . /
 COPY --from=stagex/busybox . /
@@ -29,9 +30,9 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/hunspell/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.7.2
 ENV SRC_HASH=11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8
 ENV SRC_FILE=hunspell-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/hunspell/hunspell/releases/download/v${VERSION}/${SRC_FILE}
-FROM base as fetch
+
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/bash . /
@@ -27,12 +28,12 @@ RUN --network=none <<-EOF
 		--with-readline \
 		--disable-static \
 		--without-included-gettext
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/krb5/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.21.2
 ENV SRC_HASH=9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491
 ENV SRC_FILE=krb5-${VERSION}.tar.gz
 ENV SRC_SITE=https://kerberos.org/dist/krb5/1.21/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/perl . /
 COPY --from=stagex/bash . /
 COPY --from=stagex/m4 . /
@@ -54,9 +55,9 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/libaio/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=0.3.113
 ENV SRC_HASH=716c7059703247344eb066b54ecbc3ca2134f0103307192e6c2b7dab5f9528ab
 ENV SRC_FILE=libaio-libaio-${VERSION}.tar.gz
 ENV SRC_SITE=https://pagure.io/libaio/archive/libaio-${VERSION}/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/bash . /
 COPY --from=stagex/gcc . /
@@ -21,17 +21,17 @@ RUN tar -xf ${SRC_FILE}
 WORKDIR libaio-libaio-${VERSION}
 COPY *.patch .
 RUN --network=none <<-EOF
-	set -eux \
+	set -eux
     patch -p1 libaio-cppflags.patch
     patch -p1 libaio-errno.patch
     patch -p1 test-poll.patch
     patch -p1 test.patch
-    make
+    make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/libedit/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=20230828-3.1
 ENV SRC_HASH=4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad
 ENV SRC_FILE=libedit-${VERSION}.tar.gz
 ENV SRC_SITE=https://www.thrysoee.dk/editline/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/perl . /
 COPY --from=stagex/ncurses . /
 COPY --from=stagex/gawk . /
@@ -33,11 +34,11 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /
 
 

packages/libevent/Containerfile

@@ -1,16 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.1.12
 ENV SRC_HASH=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 ENV SRC_FILE=libevent-${VERSION}-stable.tar.gz
 ENV SRC_SITE=https://github.com/libevent/libevent/releases/download/release-${VERSION}-stable/${SRC_FILE}
-          #  https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz
-          #  https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz
-          #  https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/bash . /
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
@@ -18,7 +16,6 @@ COPY --from=stagex/gcc . /
 COPY --from=stagex/binutils . /
 COPY --from=stagex/make . /
 COPY --from=stagex/openssl . /
-RUN ls -lah
 RUN tar -xf $SRC_FILE
 WORKDIR libevent-${VERSION}-stable
 RUN --network=none <<-EOF
@@ -31,11 +28,11 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /
 
 

packages/libiconv/Containerfile

@@ -1,15 +1,15 @@
 
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.17
-ENV SRC_HASH=8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a
+ENV SRC_HASH=8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313
 ENV SRC_FILE=libiconv-${VERSION}.tar.gz
 ENV SRC_SITE=https://ftp.gnu.org/gnu/libiconv/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/bash . /
@@ -26,12 +26,12 @@ RUN --network=none <<-EOF
 		--sysconfdir=/etc \
 		--enable-openssl \
 		--disable-openssl-runtime
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/libsm/Containerfile

@@ -1,44 +0,0 @@
-FROM scratch AS base
-ARG ARCH=x86_64
-ENV VERSION=1.2.4
-ENV SRC_HASH=fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84
-ENV SRC_FILE=libSM-${VERSION}.tar.xz
-ENV SRC_SITE=https://www.x.org/releases/individual/lib/${SRC_FILE}
-
-FROM base AS fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
-
-FROM fetch AS build
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/musl . /
-COPY --from=stagex/make . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/xmlto . /
-COPY --from=stagex/xorgproto . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR libSM-${VERSION}
-RUN --network=none <<-EOF
-	set -ex
-	./configure \
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--with-libuuid \
-		--enable-docs \
-		--with-xmlto \
-		--without-fop
-	make
-
-	make -j "$(nproc)"
-EOF
-
-FROM build AS install
-RUN --network=none <<-EOF
-    set -eu
-    make DESTDIR="/rootfs" install
-EOF
-
-FROM stagex/filesystem AS package
-COPY --from=install /rootfs/. /

packages/libsodium/Containerfile

@@ -22,8 +22,6 @@ RUN --network=none <<-EOF
 		--build=${ARCH}-linux-musl \
 		--host=${ARCH}-linux-musl \
 		--prefix=/usr
-	make
-
 	make -j "$(nproc)"
 EOF
 

packages/libverto/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=0.3.2
 ENV SRC_HASH=8d1756fd704f147549f606cd987050fb94b0b1ff621ea6aa4d6bf0b74450468a
 ENV SRC_FILE=libverto-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/latchset/libverto/releases/download/0.3.2/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/perl . /
 COPY --from=stagex/bash . /
 COPY --from=stagex/m4 . /
@@ -39,7 +40,6 @@ COPY --from=stagex/libedit . /
 COPY --from=stagex/python . /
 COPY --from=stagex/libevent . /
 COPY --from=stagex/pkgconf . /
-
 RUN tar -xf $SRC_FILE
 WORKDIR libverto-${VERSION}
 RUN --network=none <<-EOF
@@ -54,11 +54,10 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
-RUN ls -la .
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 RUN mv /rootfs/usr/lib/libverto-libevent.so.* /rootfs/usr/lib/
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/libx11/Containerfile

@@ -1,40 +0,0 @@
-
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=1.8.9
-ENV SRC_HASH=57ca5f07d263788ad661a86f4139412e8b699662e6b60c20f1f028c25a935e48
-ENV SRC_FILE=libX11-${VERSION}.tar.gz
-ENV SRC_SITE=https://www.x.org/releases/individual/lib/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/make . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/libxslt . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR libX11-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-    ./configure
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--disable-xf86bigfont
-	make
-EOF
-
-FROM build as install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /

packages/libxcb/Containerfile

@@ -1,42 +0,0 @@
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=1.16.1
-ENV SRC_HASH=ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f
-ENV SRC_FILE=libxcb-${VERSION}.tar.xz
-ENV SRC_SITE=https://xorg.freedesktop.org/archive/individual/lib/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/expat . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/bash . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/make . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/meson . /
-COPY --from=stagex/glib . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR libxcb-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-    export CFLAGS="-flto=auto"
-    ./configure
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-		--prefix=/usr \
-		--enable-xkb \
-		--enable-xinput \
-		--disable-xprint
-	make
-EOF
-
-FROM build as install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /

packages/linux-pam/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.6.1
 ENV SRC_HASH=f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e
 ENV SRC_FILE=Linux-PAM-${VERSION}.tar.xz
 ENV SRC_SITE=https://github.com/linux-pam/linux-pam/releases/download/v${VERSION}/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -45,13 +45,12 @@ RUN --network=none <<-EOF
 		--disable-examples \
 		--sbindir=/usr/sbin \
 		--enable-securedir=/usr/lib/security
-    make
+    make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
-RUN ls -la /rootfs
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/lmdb/Containerfile

@@ -23,7 +23,7 @@ RUN --network=none <<-EOF
 	set -eux \
 	patch -p1 lmdb-make.patch
     export CFLAGS="-O2 -fPIC"
-	make
+	make -j "$(nproc)"
 EOF
 
 FROM build AS install

packages/mariadb-connector-c/Containerfile

@@ -1,50 +0,0 @@
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=3.3.9
-ENV SRC_HASH=062b9ec5c26cbb236a78f0ba26981272053f59bdfc113040bab904a9da36d31f
-ENV SRC_FILE=v${VERSION}.tar.gz
-ENV SRC_SITE=https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/cmake . /
-COPY --from=stagex/samurai . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/libzstd . /
-COPY --from=stagex/zlib . /
-COPY --from=stagex/ninja . /
-COPY --from=stagex/linux-headers . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR mariadb-connector-c-${VERSION}
-COPY *.patch .
-RUN --network=none <<-EOF
-	set -eux
-	patch -p1 < incorrect-sys-poll.patch
-	patch -p1 < unused-parameter.patch
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_SHARED_LIBS=True \
-		-DINSTALL_LIBDIR=lib \
-		-DINSTALL_INCLUDEDIR=include/mysql \
-		\
-		-DMARIADB_PORT=3306 \
-		-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock \
-		-DWITH_EXTERNAL_ZLIB=YES \
-		-DWITH_MYSQLCOMPAT=ON \
-		-DWITH_SSL=OPENSSL
-	cmake --build build
-EOF
-
-FROM build as install
-RUN DESTDIR=/rootfs cmake --install build
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /

packages/mariadb-connector-c/incorrect-sys-poll.patch

@@ -1,11 +0,0 @@
---- a/plugins/pvio/pvio_socket.c
-+++ b/plugins/pvio/pvio_socket.c
-@@ -39,7 +39,7 @@
- #include <sys/un.h>
- #endif
- #ifdef HAVE_POLL
--#include <sys/poll.h>
-+#include <poll.h>
- #endif
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>

packages/mariadb-connector-c/unused-paramater.patch

@@ -1,25 +0,0 @@
-These functions are implemented in assembly for x86 and x86_64.
-On other architectures, they are no-ops, and so parameters are unused.
-
-Starting from version 3.3.7, mariadb-connector-c is compiled with "-Werror"
-turned on, so allow unused parameters here with GCC's Diagnostic Pragma:
-https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html
-
---- a/libmariadb/ma_context.c
-+++ b/libmariadb/ma_context.c
-@@ -692,6 +692,9 @@
- #endif  /* MY_CONTEXT_USE_WIN32_FIBERS */
-
- #ifdef MY_CONTEXT_DISABLE
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wunused-parameter"
-+
- int
- my_context_continue(struct my_context *c)
- {
-@@ -723,4 +726,5 @@
- {
- }
-
-+#pragma GCC diagnostic pop
- #endif

packages/mariadb/Containerfile

@@ -1,121 +0,0 @@
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=10.11.7
-ENV SRC_HASH=5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157
-ENV SRC_FILE=mariadb-${VERSION}.tar.gz
-ENV SRC_SITE=https://rsync.osuosl.org/pub/mariadb/mariadb-${VERSION}/source/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/make . /
-COPY --from=stagex/perl . /
-COPY --from=stagex/bison . /
-COPY --from=stagex/cmake . /
-COPY --from=stagex/libaio . /
-COPY --from=stagex/libarchive . /
-COPY --from=stagex/libevent . /
-COPY --from=stagex/libxml2 . /
-COPY --from=stagex/linux-headers . /
-COPY --from=stagex/linux-pam . /
-COPY --from=stagex/ncurses . /
-COPY --from=stagex/pcre2 . /
-COPY --from=stagex/samurai . /
-COPY --from=stagex/xz . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/readline . /
-COPY --from=stagex/fmt . /
-COPY --from=stagex/libzstd . /
-COPY --from=stagex/mariadb-connector-c . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR mariadb-${VERSION}
-COPY *.patch .
-RUN --network=none <<-EOF
-	set -eux
-	# patch -p1 < disable-failing-test.patch
-	# patch -p1 < gcc13.patch
-	# patch -p1 < have-stacktrace.patch
-	# patch -p1 < lfs64.patch
-	# patch -p1 < pcc-remove-glibc-dep.patch
-	cmake -B build -G Ninja -Wno-dev \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCOMPILATION_COMMENT="StageX" \
-		-DSYSCONFDIR=/etc \
-		-DSYSCONF2DIR=/etc/my.cnf.d \
-		-DMYSQL_DATADIR=/var/lib/mysql \
-		-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock \
-		-DDEFAULT_CHARSET=utf8mb4 \
-		-DDEFAULT_COLLATION=utf8mb4_general_ci \
-		-DENABLED_LOCAL_INFILE=ON \
-		-DINSTALL_INFODIR=share/info \
-		-DINSTALL_MANDIR=share/man \
-		-DINSTALL_PAMDIR=/lib/security \
-		-DINSTALL_PLUGINDIR=lib/mariadb/plugin \
-		-DINSTALL_SCRIPTDIR=bin \
-		-DINSTALL_INCLUDEDIR=include/mysql \
-		-DINSTALL_DOCREADMEDIR=share/doc/mariadb \
-		-DINSTALL_SUPPORTFILESDIR=share/mariadb \
-		-DINSTALL_MYSQLSHAREDIR=share/mariadb \
-		-DINSTALL_DOCDIR=share/doc/mariadb \
-		-DTMPDIR=/var/tmp \
-		-DCONNECT_WITH_MYSQL=ON \
-		-DCONNECT_WITH_LIBXML2=system \
-		-DCONNECT_WITH_ODBC=NO \
-		-DCONNECT_WITH_JDBC=NO \
-		-DPLUGIN_ARCHIVE=YES \
-		-DPLUGIN_ARIA=YES \
-		-DPLUGIN_BLACKHOLE=YES \
-		-DPLUGIN_CASSANDRA=NO \
-		-DPLUGIN_CSV=YES \
-		-DPLUGIN_MYISAM=YES \
-		-DPLUGIN_MROONGA=NO \
-		-DPLUGIN_OQGRAPH=NO \
-		-DPLUGIN_PARTITION=STATIC \
-		-DPLUGIN_ROCKSDB=NO \
-		-DPLUGIN_SPHINX=NO \
-		-DPLUGIN_TOKUDB=NO \
-		-DPLUGIN_AUTH_GSSAPI=NO \
-		-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \
-		-DPLUGIN_CRACKLIB_PASSWORD_CHECK=NO \
-		-DWITH_ASAN=OFF \
-		-DWITH_EMBEDDED_SERVER=ON \
-		-DWITH_EXTRA_CHARSETS=complex \
-		-DWITH_INNODB_BZIP2=OFF \
-		-DWITH_INNODB_LZ4=OFF \
-		-DWITH_INNODB_LZMA=ON \
-		-DWITH_INNODB_LZO=OFF \
-		-DWITH_INNODB_SNAPPY=OFF \
-		-DWITH_ROCKSDB_BZIP2=OFF \
-		-DWITH_ROCKSDB_JEMALLOC=OFF \
-		-DWITH_ROCKSDB_LZ4=OFF \
-		-DWITH_ROCKSDB_ZSTD=ON \
-		-DWITH_ROCKSDB_SNAPPY=OFF \
-		-DWITH_JEMALLOC=NO \
-		-DWITH_LIBARCHIVE=system \
-		-DWITH_LIBFMT=system \
-		-DWITH_LIBNUMA=NO \
-		-DWITH_LIBWRAP=OFF \
-		-DWITH_LIBWSEP=OFF \
-		-DWITH_MARIABACKUP=ON \
-		-DWITH_PCRE=system \
-		-DWITH_READLINE=ON \
-		-DWITH_SYSTEMD=no \
-		-DWITH_SSL=system \
-		-DWITH_VALGRIND=OFF \
-		-DWITH_ZLIB=system \
-		-DSKIP_TESTS=ON
-	cmake --build build
-EOF
-
-FROM build as install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /

packages/mariadb/disable-failing-test.patch

@@ -1,30 +0,0 @@
-diff --git a/storage/maria/unittest/CMakeLists.txt b/storage/maria/unittest/CMakeLists.txt
-index a2da150..fd04ef4 100644
---- a/storage/maria/unittest/CMakeLists.txt
-+++ b/storage/maria/unittest/CMakeLists.txt
-@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
-         ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c  sequence_storage.c)
- MY_ADD_TEST(ma_test_loghandler_readonly)
-
--SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
--ADD_EXECUTABLE(ma_test_loghandler_nologs-t
--        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
--MY_ADD_TEST(ma_test_loghandler_nologs)
-+#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t  PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
-+#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
-+#        ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
-+#MY_ADD_TEST(ma_test_loghandler_nologs)
-
- SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
- SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
---- a/unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
-+++ b/unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
-@@ -15,7 +15,7 @@
-
- MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
-              byte_order
--             queues stacktrace crc32 LINK_LIBRARIES mysys)
-+             queues crc32 LINK_LIBRARIES mysys)
- MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
- MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
- ADD_DEFINITIONS(${SSL_DEFINES})

packages/mariadb/gcc13.patch

@@ -1,40 +0,0 @@
---- a/storage/rocksdb/rocksdb/util/string_util.h
-+++ b/storage/rocksdb/rocksdb/util/string_util.h
-@@ -6,6 +6,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <sstream>
- #include <string>
- #include <unordered_map>
---- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-@@ -8,6 +8,7 @@
- #pragma once
- #ifndef ROCKSDB_LITE
-
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "rocksdb/status.h"
---- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
-+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
-@@ -5,6 +5,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
---- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-@@ -6,6 +6,7 @@
- #pragma once
-
- #include "rocksdb/rocksdb_namespace.h"
-+#include <cstdint>
-
- struct CompactionIterationStats {
-   // Compaction statistics

packages/mariadb/have-stacktrace.patch

@@ -1,21 +0,0 @@
-https://jira.mariadb.org/browse/MDEV-24131
-
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- a/unittest/mysys/stacktrace-t.c
-+++ b/unittest/mysys/stacktrace-t.c
-@@ -22,6 +22,14 @@
-
- char b_bss[10];
-
-+#ifndef HAVE_STACKTRACE
-+int  my_safe_print_str(const char* val, size_t max_len)
-+{
-+  printf("%*s\n", (int) max_len, val);
-+  return 0;
-+}
-+#endif
-+
- void test_my_safe_print_str()
- {
-   char b_stack[10];

packages/mariadb/lfs64.patch

@@ -1,936 +0,0 @@
-needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
---
-diff --git a/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h b/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h
-index 0a389db6..6e3c900f 100644
---- a/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h
-+++ b/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h
-@@ -129,7 +129,7 @@ class ObjectIDManager
-      * @param offset the offset to start reading at
-      * @param size the number of bytes to read into buf
-      */
--    void readData(uint8_t* buf, off64_t offset, int size) const;
-+    void readData(uint8_t* buf, off_t offset, int size) const;
-
-     /** @brief Reliably writes data to the bitmap file
-      *
-@@ -140,7 +140,7 @@ class ObjectIDManager
-      * @param offset the offset to start writing at
-      * @param size the number of bytes to write
-      */
--    void writeData(uint8_t* buf, off64_t offset, int size) const;
-+    void writeData(uint8_t* buf, off_t offset, int size) const;
-
-     /** @brief If there is no bitmap file yet, this is used to make one
-      *
-diff --git a/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read b/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read
-index d5368cfa..18754df4 100644
---- a/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read
-+++ b/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read
-@@ -115,7 +115,7 @@ void* thr_popper(void* arg) {
- #endif
-
- 		longSeekOffset=(uint64_t)offset * (uint64_t)fileBlockSize;
--		lseek64(fd, longSeekOffset, SEEK_SET);
-+		lseek(fd, longSeekOffset, SEEK_SET);
- 		totalRqst++;
- 		dlen = (fr->BlocksRequested() > extentSize ? extentSize : fr->BlocksRequested());
- 		sz=0;
-diff --git a/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp b/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp
-index e2e9b3a9..3bb30fd1 100644
---- a/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp
-+++ b/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp
-@@ -192,7 +192,7 @@ int SMComm::stat(const string& filename, struct stat* statbuf)
-   common_exit(command, response, err);
- }
-
--int SMComm::truncate(const string& filename, const off64_t length)
-+int SMComm::truncate(const string& filename, const off_t length)
- {
-   ByteStream* command = buffers.getByteStream();
-   ByteStream* response = buffers.getByteStream();
-diff --git a/storage/columnstore/columnstore/utils/cloudio/SMComm.h b/storage/columnstore/columnstore/utils/cloudio/SMComm.h
-index bb46304b..51edc0be 100644
---- a/storage/columnstore/columnstore/utils/cloudio/SMComm.h
-+++ b/storage/columnstore/columnstore/utils/cloudio/SMComm.h
-@@ -50,7 +50,7 @@ class SMComm : public boost::noncopyable
-
-   // added this one because it should be trivial to implement in SM, and prevents a large
-   // operation in SMDataFile.
--  int truncate(const std::string& filename, const off64_t length);
-+  int truncate(const std::string& filename, const off_t length);
-
-   int listDirectory(const std::string& path, std::list<std::string>* entries);
-
-diff --git a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp
-index 84eab1ac..0d827c16 100644
---- a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp
-+++ b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp
-@@ -38,7 +38,7 @@ SMDataFile::SMDataFile(const char* name, int _openmode, const struct stat& _stat
-   comm = SMComm::get();
- }
-
--ssize_t SMDataFile::pread(void* buf, off64_t offset, size_t count)
-+ssize_t SMDataFile::pread(void* buf, off_t offset, size_t count)
- {
-   return comm->pread(name(), buf, count, offset);
- }
-@@ -63,7 +63,7 @@ ssize_t SMDataFile::write(const void* buf, size_t count)
-   return ret;
- }
-
--int SMDataFile::seek(off64_t offset, int whence)
-+int SMDataFile::seek(off_t offset, int whence)
- {
-   switch (whence)
-   {
-@@ -83,18 +83,18 @@ int SMDataFile::seek(off64_t offset, int whence)
-   return 0;
- }
-
--int SMDataFile::truncate(off64_t length)
-+int SMDataFile::truncate(off_t length)
- {
-   return comm->truncate(name(), length);
- }
-
--int SMDataFile::fallocate(int mode, off64_t offset, off64_t length)
-+int SMDataFile::fallocate(int mode, off_t offset, off_t length)
- {
-   idbassert_s(mode == 0, "SMDataFile::fallocate() does not support mode != 0 right now.");
-   return comm->truncate(name(), offset + length);
- }
-
--off64_t SMDataFile::size()
-+off_t SMDataFile::size()
- {
-   struct stat _stat;
-   int err = comm->stat(name(), &_stat);
-@@ -104,7 +104,7 @@ off64_t SMDataFile::size()
-   return _stat.st_size;
- }
-
--off64_t SMDataFile::tell()
-+off_t SMDataFile::tell()
- {
-   return position;
- }
-diff --git a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h
-index 1d77edd6..6bd9b20f 100644
---- a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h
-+++ b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h
-@@ -30,14 +30,14 @@ class SMDataFile : public IDBDataFile
-  public:
-   virtual ~SMDataFile();
-
--  ssize_t pread(void* ptr, off64_t offset, size_t count);
-+  ssize_t pread(void* ptr, off_t offset, size_t count);
-   ssize_t read(void* ptr, size_t count);
-   ssize_t write(const void* ptr, size_t count);
--  int seek(off64_t offset, int whence);
--  int truncate(off64_t length);
--  int fallocate(int mode, off64_t offset, off64_t length);
--  off64_t size();
--  off64_t tell();
-+  int seek(off_t offset, int whence);
-+  int truncate(off_t length);
-+  int fallocate(int mode, off_t offset, off_t length);
-+  off_t size();
-+  off_t tell();
-   int flush();
-   time_t mtime();
-   int close();
-@@ -48,7 +48,7 @@ class SMDataFile : public IDBDataFile
-  private:
-   SMDataFile();
-   SMDataFile(const char* fname, int openmode, const struct stat&);
--  off64_t position;
-+  off_t position;
-   int openmode;
-   SMComm* comm;
-
-diff --git a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp
-index 96fe25d3..c15653ad 100644
---- a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp
-+++ b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp
-@@ -38,7 +38,7 @@ int SMFileSystem::mkdir(const char* path)
-   return 0;
- }
-
--off64_t SMFileSystem::size(const char* filename) const
-+off_t SMFileSystem::size(const char* filename) const
- {
-   struct stat _stat;
-
-@@ -50,7 +50,7 @@ off64_t SMFileSystem::size(const char* filename) const
-   return _stat.st_size;
- }
-
--off64_t SMFileSystem::compressedSize(const char* filename) const
-+off_t SMFileSystem::compressedSize(const char* filename) const
- {
-   // Yikes, punting on this one.
-   throw NotImplementedYet(__func__);
-diff --git a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h
-index 0e60f533..bace23fb 100644
---- a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h
-+++ b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h
-@@ -33,8 +33,8 @@ class SMFileSystem : public IDBFileSystem, boost::noncopyable
-
-   // why are some of these const and some not const in IDBFileSystem?
-   int mkdir(const char* pathname);
--  off64_t size(const char* path) const;
--  off64_t compressedSize(const char* path) const;
-+  off_t size(const char* path) const;
-+  off_t compressedSize(const char* path) const;
-   int remove(const char* pathname);
-   int rename(const char* oldpath, const char* newpath);
-   bool exists(const char* pathname) const;
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp
-index 6d7c5834..cb3f2510 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp
-@@ -67,7 +67,7 @@ BufferedFile::~BufferedFile()
-   delete[] m_buffer;
- }
-
--ssize_t BufferedFile::pread(void* ptr, off64_t offset, size_t count)
-+ssize_t BufferedFile::pread(void* ptr, off_t offset, size_t count)
- {
-   ssize_t ret = 0;
-   int savedErrno;
-@@ -122,7 +122,7 @@ ssize_t BufferedFile::read(void* ptr, size_t count)
- ssize_t BufferedFile::write(const void* ptr, size_t count)
- {
-   ssize_t ret = 0;
--  off64_t offset = tell();
-+  off_t offset = tell();
-   int savedErrno = 0;
-   size_t progress = 0;
-   uint8_t* ptr8 = (uint8_t*)ptr;
-@@ -150,7 +150,7 @@ ssize_t BufferedFile::write(const void* ptr, size_t count)
-   return progress;
- }
-
--int BufferedFile::seek(off64_t offset, int whence)
-+int BufferedFile::seek(off_t offset, int whence)
- {
-   int ret = 0;
-   int savedErrno;
-@@ -168,7 +168,7 @@ int BufferedFile::seek(off64_t offset, int whence)
-   return ret;
- }
-
--int BufferedFile::truncate(off64_t length)
-+int BufferedFile::truncate(off_t length)
- {
-   int ret = 0;
-   int savedErrno;
-@@ -187,14 +187,14 @@ int BufferedFile::truncate(off64_t length)
-   return ret;
- }
-
--off64_t BufferedFile::size()
-+off_t BufferedFile::size()
- {
- #ifdef _MSC_VER
-   return _filelengthi64(fileno(m_fp));  // Interestingly, implemented as fseek/ftell in the windows crt
- #else
-   // going to calculate size 2 ways - first, via seek
--  off64_t length = -1;
--  off64_t here;
-+  off_t length = -1;
-+  off_t here;
-
-   flockfile(m_fp);
-
-@@ -220,7 +220,7 @@ off64_t BufferedFile::size()
- #endif
- }
-
--off64_t BufferedFile::tell()
-+off_t BufferedFile::tell()
- {
- #ifdef _MSC_VER
-   return _ftelli64(m_fp);
-@@ -282,7 +282,7 @@ int BufferedFile::close()
-      @see
-     This one is used in shared/we_fileop.cpp to skip expensive file preallocation.
- */
--int BufferedFile::fallocate(int mode, off64_t offset, off64_t length)
-+int BufferedFile::fallocate(int mode, off_t offset, off_t length)
- {
-   int ret = 0;
-   int savedErrno = 0;
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h
-index 09646b44..ba688a10 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h
-@@ -40,16 +40,16 @@ class BufferedFile : public IDBDataFile, boost::noncopyable
-   BufferedFile(const char* fname, const char* mode, unsigned opts);
-   /* virtual */ ~BufferedFile();
-
--  /* virtual */ ssize_t pread(void* ptr, off64_t offset, size_t count);
-+  /* virtual */ ssize_t pread(void* ptr, off_t offset, size_t count);
-   /* virtual */ ssize_t read(void* ptr, size_t count);
-   /* virtual */ ssize_t write(const void* ptr, size_t count);
--  /* virtual */ int seek(off64_t offset, int whence);
--  /* virtual */ int truncate(off64_t length);
--  /* virtual */ off64_t size();
--  /* virtual */ off64_t tell();
-+  /* virtual */ int seek(off_t offset, int whence);
-+  /* virtual */ int truncate(off_t length);
-+  /* virtual */ off_t size();
-+  /* virtual */ off_t tell();
-   /* virtual */ int flush();
-   /* virtual */ time_t mtime();
--  /* virtual */ int fallocate(int mode, off64_t offset, off64_t length);
-+  /* virtual */ int fallocate(int mode, off_t offset, off_t length);
-
-  protected:
-   /* virtual */
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h
-index 1747189e..739e7717 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h
-@@ -124,7 +124,7 @@ class IDBDataFile
-    * or fseek followed by read for C-library FILE*.  Return value
-    * is the number of bytes read.
-    */
--  virtual ssize_t pread(void* ptr, off64_t offset, size_t count) = 0;
-+  virtual ssize_t pread(void* ptr, off_t offset, size_t count) = 0;
-
-   /**
-    * This is a read method similar to kernel style read or C library
-@@ -148,7 +148,7 @@ class IDBDataFile
-    * operation - ex. HDFS will not support it for files opened for writing
-    * Returns 0 on success, -1 on error
-    */
--  virtual int seek(off64_t offset, int whence) = 0;
-+  virtual int seek(off_t offset, int whence) = 0;
-
-   /**
-    * The truncate() method is equivalent to the ftruncate method.  Note
-@@ -156,7 +156,7 @@ class IDBDataFile
-    * or write or append do not, but HDFS files opened for modification do.
-    * Returns 0 on success, -1 on error.
-    */
--  virtual int truncate(off64_t length) = 0;
-+  virtual int truncate(off_t length) = 0;
-
-   /**
-    * The size() method returns the size of the file in a manner consistent
-@@ -166,14 +166,14 @@ class IDBDataFile
-    * external view of size may differ (ex. if writing buffered i/o before
-    * a flush/sync or if writing an open HDFS file).  Returns -1 on error.
-    */
--  virtual off64_t size() = 0;
-+  virtual off_t size() = 0;
-
-   /**
-    * The tell() call returns the current offset in the file.  This is
-    * similar to lseek with 0 offset in the standard library and ftell
-    * for buffered FILE *s.
-    */
--  virtual off64_t tell() = 0;
-+  virtual off_t tell() = 0;
-
-   /**
-    * The flush() method instructs the file to write any buffered contents
-@@ -194,7 +194,7 @@ class IDBDataFile
-    * only.
-    * Returns -1 on error.
-    */
--  virtual int fallocate(int mode, off64_t offset, off64_t length) = 0;
-+  virtual int fallocate(int mode, off_t offset, off_t length) = 0;
-
-   int colWidth()
-   {
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h
-index 4ca4a285..54e58540 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h
-@@ -82,14 +82,14 @@ class IDBFileSystem
-    * size() returns the size of the file specified by path.
-    * Returns the size on success, -1 on error
-    */
--  virtual off64_t size(const char* path) const = 0;
-+  virtual off_t size(const char* path) const = 0;
-
-   /**
-    * compressedSize() returns the decompressed size of the file
-    * speicified by path.
-    * Returns the size on success, -1 on error
-    */
--  virtual off64_t compressedSize(const char* path) const = 0;
-+  virtual off_t compressedSize(const char* path) const = 0;
-
-   /**
-    * exists() checks for the existence of a particular path.
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp
-index 37d4cb3c..8111d00c 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp
-@@ -117,14 +117,14 @@ void IDBLogger::logRW(const char* op, const std::string& fname, const IDBDataFil
-   writeLog(logmsg.str());
- }
-
--void IDBLogger::logSeek(const std::string& fname, const IDBDataFile* ptr, off64_t offset, int whence, int ret)
-+void IDBLogger::logSeek(const std::string& fname, const IDBDataFile* ptr, off_t offset, int whence, int ret)
- {
-   ostringstream logmsg;
-   logmsg << fname << "," << ptr << ",seek," << offset << "," << whence << "," << ret;
-   writeLog(logmsg.str());
- }
-
--void IDBLogger::logTruncate(const std::string& fname, const IDBDataFile* ptr, off64_t length, int ret)
-+void IDBLogger::logTruncate(const std::string& fname, const IDBDataFile* ptr, off_t length, int ret)
- {
-   ostringstream logmsg;
-   logmsg << fname << "," << ptr << ",truncate," << length << ",," << ret;
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h
-index b200c914..c4d6d0a5 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h
-@@ -36,8 +36,8 @@ class IDBLogger
-   static void logNoArg(const std::string& fname, const IDBDataFile* ptr, const char* op, int ret);
-   static void logRW(const char* op, const std::string& fname, const IDBDataFile* ptr, size_t offset,
-                     size_t count, size_t bytesRead);
--  static void logSeek(const std::string& fname, const IDBDataFile* ptr, off64_t offset, int whence, int ret);
--  static void logTruncate(const std::string& fname, const IDBDataFile* ptr, off64_t length, int ret);
-+  static void logSeek(const std::string& fname, const IDBDataFile* ptr, off_t offset, int whence, int ret);
-+  static void logTruncate(const std::string& fname, const IDBDataFile* ptr, off_t length, int ret);
-   static void logSize(const std::string& fname, const IDBDataFile* ptr, long long ret);
-
-   static void logFSop(IDBFileSystem::Types type, const char* op, const char* pathname,
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h
-index 117f1e8d..d53fbfa0 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h
-@@ -125,8 +125,8 @@ class IDBPolicy
-    * please see IDBFileSystem.h.
-    */
-   static int mkdir(const char* pathname);
--  static off64_t size(const char* path);
--  static off64_t compressedSize(const char* path);
-+  static off_t size(const char* path);
-+  static off_t compressedSize(const char* path);
-   static int remove(const char* pathname);
-   static int rename(const char* oldpath, const char* newpath);
-   static bool exists(const char* pathname);
-@@ -194,12 +194,12 @@ inline int IDBPolicy::mkdir(const char* pathname)
-   return IDBPolicy::getFs(pathname).mkdir(pathname);
- }
-
--inline off64_t IDBPolicy::size(const char* path)
-+inline off_t IDBPolicy::size(const char* path)
- {
-   return IDBPolicy::getFs(path).size(path);
- }
-
--inline off64_t IDBPolicy::compressedSize(const char* path)
-+inline off_t IDBPolicy::compressedSize(const char* path)
- {
-   return IDBPolicy::getFs(path).compressedSize(path);
- }
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp
-index bd3e1c4b..6c9d04a5 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp
-@@ -115,13 +115,13 @@ int PosixFileSystem::rename(const char* oldpath, const char* newpath)
-   return ret;
- }
-
--off64_t PosixFileSystem::size(const char* path) const
-+off_t PosixFileSystem::size(const char* path) const
- {
-   // should this use Boost??
-   struct stat statBuf;
-   int rc = ::stat(path, &statBuf);
-   int savedErrno = errno;
--  off64_t ret = ((rc == 0) ? statBuf.st_size : -1);
-+  off_t ret = ((rc == 0) ? statBuf.st_size : -1);
-
-   if (IDBLogger::isEnabled())
-     IDBLogger::logFSop(POSIX, "fs:size", path, this, ret);
-@@ -156,11 +156,11 @@ size_t readFillBuffer(idbdatafile::IDBDataFile* pFile, char* buffer, size_t byte
-   return totalBytesRead;
- }
-
--off64_t PosixFileSystem::compressedSize(const char* path) const
-+off_t PosixFileSystem::compressedSize(const char* path) const
- {
-   IDBDataFile* pFile = NULL;
-   size_t nBytes;
--  off64_t dataSize = 0;
-+  off_t dataSize = 0;
-
-   try
-   {
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h
-index c1f4e5ff..6e18ca45 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h
-@@ -29,8 +29,8 @@ class PosixFileSystem : public IDBFileSystem
-   ~PosixFileSystem();
-
-   int mkdir(const char* pathname) override;
--  off64_t size(const char* path) const override;
--  off64_t compressedSize(const char* path) const override;
-+  off_t size(const char* path) const override;
-+  off_t compressedSize(const char* path) const override;
-   int remove(const char* pathname) override;
-   int rename(const char* oldpath, const char* newpath) override;
-   bool exists(const char* pathname) const override;
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp b/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp
-index 07a7630b..97dcb97c 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp
-@@ -75,7 +75,7 @@ UnbufferedFile::~UnbufferedFile()
-   close();
- }
-
--ssize_t UnbufferedFile::pread(void* ptr, off64_t offset, size_t count)
-+ssize_t UnbufferedFile::pread(void* ptr, off_t offset, size_t count)
- {
-   ssize_t ret;
-   int savedErrno;
-@@ -161,7 +161,7 @@ ssize_t UnbufferedFile::write(const void* ptr, size_t count)
-   return ret;
- }
-
--int UnbufferedFile::seek(off64_t offset, int whence)
-+int UnbufferedFile::seek(off_t offset, int whence)
- {
-   int ret;
-   int savedErrno;
-@@ -182,7 +182,7 @@ int UnbufferedFile::seek(off64_t offset, int whence)
-   return ret;
- }
-
--int UnbufferedFile::truncate(off64_t length)
-+int UnbufferedFile::truncate(off_t length)
- {
-   int ret;
-   int savedErrno;
-@@ -207,15 +207,15 @@ int UnbufferedFile::truncate(off64_t length)
-   return ret;
- }
-
--off64_t UnbufferedFile::size()
-+off_t UnbufferedFile::size()
- {
--  off64_t ret = 0;
-+  off_t ret = 0;
-   int savedErrno;
-
- #ifdef _MSC_VER
-   DWORD hi = 0;
-   DWORD lo = GetFileSize(m_fd, &hi);
--  ret = off64_t(((uint64_t)hi) << 32) | lo;
-+  ret = off_t(((uint64_t)hi) << 32) | lo;
- #else
-   struct stat statBuf;
-   int rc = ::fstat(m_fd, &statBuf);
-@@ -230,9 +230,9 @@ off64_t UnbufferedFile::size()
-   return ret;
- }
-
--off64_t UnbufferedFile::tell()
-+off_t UnbufferedFile::tell()
- {
--  off64_t ret;
-+  off_t ret;
- #ifdef _MSC_VER
-   LARGE_INTEGER wRet;
-   LARGE_INTEGER dist;
-@@ -333,7 +333,7 @@ int UnbufferedFile::close()
-      @see
-     This one is used in shared/we_fileop.cpp to skip expensive file preallocation.
- */
--int UnbufferedFile::fallocate(int mode, off64_t offset, off64_t length)
-+int UnbufferedFile::fallocate(int mode, off_t offset, off_t length)
- {
-   int ret = 0;
-   int savedErrno = 0;
-diff --git a/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp b/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp
-index 42b46873..0cef9ebb 100644
---- a/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp
-+++ b/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp
-@@ -623,9 +623,9 @@ bool TestRunner::truncateTest(IDBDataFile::Types filetype)
-     blk_num = m_opts.numblocks;
-   }
-
--  off64_t fsize = m_file->size();
-+  off_t fsize = m_file->size();
-
--  if (fsize != (off64_t)(blk_num * BLK_SIZE))
-+  if (fsize != (off_t)(blk_num * BLK_SIZE))
-   {
-     ostringstream errstr;
-     errstr << "wrong file size after truncate, " << fsize << " != " << blk_num * BLK_SIZE;
-@@ -645,7 +645,7 @@ bool TestRunner::renameTest(IDBDataFile::Types type)
-   IDBFileSystem& fs = IDBFileSystem::getFs(type);
-
-   // get the size before we move for compare purposes.
--  off64_t fsize_orig = fs.size(m_fname.c_str());
-+  off_t fsize_orig = fs.size(m_fname.c_str());
-
-   // choose a path in a different directory that we know already exists
-   // and make it specific to our thread...
-@@ -666,7 +666,7 @@ bool TestRunner::renameTest(IDBDataFile::Types type)
-   }
-
-   // now check if oldpath exists using size method
--  off64_t fsize = fs.size(m_fname.c_str());
-+  off_t fsize = fs.size(m_fname.c_str());
-
-   if (fsize != -1)
-   {
-@@ -712,7 +712,7 @@ bool TestRunner::copyTest(IDBDataFile::Types type)
-   IDBFileSystem& fs = IDBFileSystem::getFs(type);
-
-   // get the size before we copy for compare purposes.
--  off64_t fsize_orig = fs.size(m_fname.c_str());
-+  off_t fsize_orig = fs.size(m_fname.c_str());
-
-   // choose a path in a different directory that we know already exists
-   // and make it specific to our thread...
-@@ -733,7 +733,7 @@ bool TestRunner::copyTest(IDBDataFile::Types type)
-   }
-
-   // now check if newpath exists using size method
--  off64_t fsize = fs.size(newpath.c_str());
-+  off_t fsize = fs.size(newpath.c_str());
-
-   if (fsize != fsize_orig)
-   {
-@@ -1023,9 +1023,9 @@ bool TestRunner::tellTest(IDBDataFile::Types filetype)
-     return false;
-   }
-
--  off64_t filepos = m_file->tell();
-+  off_t filepos = m_file->tell();
-
--  if (filepos != off64_t(BLK_SIZE))
-+  if (filepos != off_t(BLK_SIZE))
-   {
-     ostringstream errstr;
-     errstr << "tellTest: File position not at correct block, " << filepos << " != " << BLK_SIZE;
-diff --git a/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp b/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp
-index 9678501c..4bb33049 100644
---- a/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp
-+++ b/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp
-@@ -393,7 +393,7 @@ int ColumnBufferCompressed::compressAndFlush(bool bFinishingFile)
-   Stats::startParseEvent(WE_STATS_WRITE_COL);
- #endif
-
--  off64_t fileOffset = fFile->tell();
-+  off_t fileOffset = fFile->tell();
-   size_t nitems = fFile->write(compressedOutBuf, outputLen) / outputLen;
-
-   if (nitems != 1)
-diff --git a/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp b/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp
-index 3f89c28a..57f74352 100644
---- a/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp
-+++ b/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp
-@@ -955,7 +955,7 @@ int ColumnInfo::expandAbbrevExtent(bool bRetainFilePos)
- {
-   if (fLoadingAbbreviatedExtent)
-   {
--    off64_t oldOffset = 0;
-+    off_t oldOffset = 0;
-
-     if (bRetainFilePos)
-     {
-diff --git a/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp b/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp
-index 0a4f5e90..c7eb5fe6 100644
---- a/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp
-+++ b/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp
-@@ -318,7 +318,7 @@ int Dctnry::expandDctnryExtent()
- {
-   RETURN_ON_NULL(m_dFile, ERR_FILE_SEEK);
-
--  off64_t oldOffset = m_dFile->tell();
-+  off_t oldOffset = m_dFile->tell();
-
-   RETURN_ON_ERROR(setFileOffset(m_dFile, 0, SEEK_END));
-
-diff --git a/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp b/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp
-index 194b260e..4f9ce81b 100644
---- a/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp
-+++ b/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp
-@@ -93,9 +93,9 @@ size_t readFillBuffer(idbdatafile::IDBDataFile* pFile, char* buffer, size_t byte
-   return totalBytesRead;
- }
-
--static off64_t getCompressedDataSize(string& fileName)
-+static off_t getCompressedDataSize(string& fileName)
- {
--  off64_t dataSize = 0;
-+  off_t dataSize = 0;
-   IDBDataFile* pFile = 0;
-   size_t nBytes;
-   // Some IDBPolicy functions can throw exceptions, caller will catch it
-@@ -198,7 +198,7 @@ struct ColumnThread
-         char fileName[200];
-         (void)fileOp.getFileName(fOid, fileName, rootList[i], entries[0].partitionNum, entries[0].segmentNum);
-         string aFile(fileName);  // convert between char* and string
--        off64_t fileSize = 0;
-+        off_t fileSize = 0;
-
-         if (fReportRealUse && (fCompressionType > 0))
-         {
-diff --git a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp
-index b34535c7..474a44a8 100644
---- a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp
-+++ b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp
-@@ -1183,7 +1183,7 @@ int ChunkManager::openFile(CompFileData* fileData, const char* mode, int colWidt
- // (ex __LINE__); this is used for logging error messages.  Likewise, filename
- // is used for logging any error message.
- //------------------------------------------------------------------------------
--int ChunkManager::setFileOffset(IDBDataFile* pFile, const string& fileName, off64_t offset, int ln) const
-+int ChunkManager::setFileOffset(IDBDataFile* pFile, const string& fileName, off_t offset, int ln) const
- {
-   int rc = NO_ERROR;
-
-diff --git a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h
-index 30a9862f..bc22a451 100644
---- a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h
-+++ b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h
-@@ -309,7 +309,7 @@ class ChunkManager
-   int openFile(CompFileData* fileData, const char* mode, int colWidth, bool useTmpSuffix, int ln) const;
-
-   // @brief set offset in a compressed DB file from beginning.
--  int setFileOffset(IDBDataFile* pFile, const std::string& fileName, off64_t offset, int ln) const;
-+  int setFileOffset(IDBDataFile* pFile, const std::string& fileName, off_t offset, int ln) const;
-
-   // @brief read from a compressed DB file.
-   int readFile(IDBDataFile* pFile, const std::string& fileName, void* buf, size_t size, int ln) const;
-diff --git a/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp b/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp
-index 1db08a92..2c783325 100644
---- a/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp
-+++ b/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp
-@@ -1310,7 +1310,7 @@ int FileOp::fillCompColumnExtentEmptyChunks(OID oid, int colWidth, const uint8_t
-       getLogger()->logMsg(oss.str(), MSGLVL_INFO2);
-     }
-
--    off64_t endHdrsOffset = pFile->tell();
-+    off_t endHdrsOffset = pFile->tell();
-     rc = expandAbbrevColumnExtent(pFile, dbRoot, emptyVal, colWidth, colDataType);
-
-     if (rc != NO_ERROR)
-@@ -1374,7 +1374,7 @@ int FileOp::fillCompColumnExtentEmptyChunks(OID oid, int colWidth, const uint8_t
-               std::endl << std::endl;
- #endif
-
--  off64_t endOffset = 0;
-+  off_t endOffset = 0;
-
-   // Fill in or add necessary remaining empty chunks
-   if (numChunksToFill > 0)
-@@ -1416,7 +1416,7 @@ int FileOp::fillCompColumnExtentEmptyChunks(OID oid, int colWidth, const uint8_t
-
-       // Position file to write empty chunks; default to end of headers
-       // in case there are no chunks listed in the header
--      off64_t startOffset = pFile->tell();
-+      off_t startOffset = pFile->tell();
-
-       if (chunkPtrs.size() > 0)
-       {
-diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp
-index 3298a833..ec256a2a 100644
---- a/storage/connect/filamfix.cpp
-+++ b/storage/connect/filamfix.cpp
-@@ -695,7 +695,7 @@ bool BGXFAM::BigSeek(PGLOBAL g, HANDLE h, BIGINT pos, int org)
-     return true;
-     } // endif
- #else   // !_WIN32
--  if (lseek64(h, pos, org) < 0) {
-+  if (lseek(h, pos, org) < 0) {
-     snprintf(g->Message, sizeof(g->Message), "lseek64: %s", strerror(errno));
-     printf("%s\n", g->Message);
-     return true;
-@@ -1022,7 +1022,7 @@ int BGXFAM::Cardinality(PGLOBAL g)
-
- #else    // UNIX
-     if (Hfile == INVALID_HANDLE_VALUE) {
--      int h = open64(filename, O_RDONLY, 0);
-+      int h = open(filename, O_RDONLY, 0);
-
-       if (trace(1))
-         htrc(" h=%d\n", h);
-@@ -1041,13 +1041,13 @@ int BGXFAM::Cardinality(PGLOBAL g)
-         } // endif h
-
-       // Get the size of the file (can be greater than 4 GB)
--      fsize = lseek64(h, 0, SEEK_END);
-+      fsize = lseek(h, 0, SEEK_END);
-       close(h);
-     } else {
--      BIGINT curpos = lseek64(Hfile, 0, SEEK_CUR);
-+      BIGINT curpos = lseek(Hfile, 0, SEEK_CUR);
-
--      fsize = lseek64(Hfile, 0, SEEK_END);
--      lseek64(Hfile, curpos, SEEK_SET);
-+      fsize = lseek(Hfile, 0, SEEK_END);
-+      lseek(Hfile, curpos, SEEK_SET);
-     } // endif Hfile
-
-     if (fsize < 0) {
-@@ -1357,7 +1357,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc)
-         return RC_FX;
-         } // endif error
- #else   // !_WIN32
--      if (ftruncate64(Hfile, (BIGINT)(Tpos * Lrecl))) {
-+      if (ftruncate(Hfile, (BIGINT)(Tpos * Lrecl))) {
-         snprintf(g->Message, sizeof(g->Message), MSG(TRUNCATE_ERROR), strerror(errno));
-         return RC_FX;
-         } // endif
-@@ -1402,7 +1402,7 @@ bool BGXFAM::OpenTempFile(PGLOBAL g)
-     return true;
-     } // endif Tfile
- #else    // UNIX
--  Tfile = open64(tempname, O_WRONLY | O_TRUNC, S_IWRITE);
-+  Tfile = open(tempname, O_WRONLY | O_TRUNC, S_IWRITE);
-
-   if (Tfile == INVALID_HANDLE_VALUE) {
-     int rc = errno;
-@@ -1531,7 +1531,7 @@ void BGXFAM::Rewind(void)
- #if defined(_WIN32)  //OB
-   SetFilePointer(Hfile, 0, NULL, FILE_BEGIN);
- #else    // UNIX
--  lseek64(Hfile, 0, SEEK_SET);
-+  lseek(Hfile, 0, SEEK_SET);
- #endif   // UNIX
- #endif // 0
-   CurBlk = -1;
-diff --git a/storage/connect/filamvct.cpp b/storage/connect/filamvct.cpp
-index 184df646..f462060a 100644
---- a/storage/connect/filamvct.cpp
-+++ b/storage/connect/filamvct.cpp
-@@ -3084,7 +3084,7 @@ bool BGVFAM::BigSeek(PGLOBAL g, HANDLE h, BIGINT pos, bool b)
-     return true;
-     } // endif
- #else   // !_WIN32
--  if (lseek64(h, pos, (b) ? SEEK_END : SEEK_SET) < 0) {
-+  if (lseek(h, pos, (b) ? SEEK_END : SEEK_SET) < 0) {
-     snprintf(g->Message, sizeof(g->Message), MSG(ERROR_IN_LSK), errno);
-     return true;
-     } // endif
-@@ -3238,7 +3238,7 @@ int BGVFAM::GetBlockInfo(PGLOBAL g)
-
-   if (h == INVALID_HANDLE_VALUE || !len.QuadPart) {
- #else   // !_WIN32
--  h = open64(filename, O_RDONLY, 0);
-+  h = open(filename, O_RDONLY, 0);
-
-   if (h == INVALID_HANDLE_VALUE || !_filelength(h)) {
- #endif  // !_WIN32
-@@ -3314,7 +3314,7 @@ bool BGVFAM::SetBlockInfo(PGLOBAL g)
- #else   // !_WIN32
-     int oflag = (b) ?  O_RDWR : O_RDWR | O_TRUNC;
-
--    h = open64(filename, oflag, 0);
-+    h = open(filename, oflag, 0);
- #endif  // !_WIN32
-
-     if (h == INVALID_HANDLE_VALUE) {
-@@ -3409,7 +3409,7 @@ bool BGVFAM::MakeEmptyFile(PGLOBAL g, PCSZ fn)
-   int    h;
-   BIGINT pos;
-
--  h= open64(filename, O_CREAT | O_WRONLY, S_IREAD | S_IWRITE);
-+  h= open(filename, O_CREAT | O_WRONLY, S_IREAD | S_IWRITE);
-
-   if (h == -1)
-     return true;
-@@ -3420,7 +3420,7 @@ bool BGVFAM::MakeEmptyFile(PGLOBAL g, PCSZ fn)
-     htrc("MEF: pos=%lld n=%d maxblk=%d blksize=%d\n",
-                pos, n, MaxBlk, Blksize);
-
--  if (lseek64(h, pos, SEEK_SET) < 0)
-+  if (lseek(h, pos, SEEK_SET) < 0)
-     goto err;
-
-   // This actually fills the empty file
-@@ -3619,7 +3619,7 @@ bool BGVFAM::OpenTableFile(PGLOBAL g)
-       return true;
-     } // endswitch
-
--  Hfile = open64(filename, oflag, pmd); // Enable file size > 2G
-+  Hfile = open(filename, oflag, pmd); // Enable file size > 2G
-
-   if (Hfile == INVALID_HANDLE_VALUE) {
-     rc = errno;
-@@ -3933,7 +3933,7 @@ int BGVFAM::DeleteRecords(PGLOBAL g, int irc)
-           return RC_FX;
-           } // endif error
- #else   // !_WIN32
--        if (ftruncate64(Hfile, (BIGINT)(Tpos * Lrecl))) {
-+        if (ftruncate(Hfile, (BIGINT)(Tpos * Lrecl))) {
-           snprintf(g->Message, sizeof(g->Message), MSG(TRUNCATE_ERROR), strerror(errno));
-           return RC_FX;
-           } // endif
-@@ -3993,7 +3993,7 @@ bool BGVFAM::OpenTempFile(PGLOBAL g)
- #else    // UNIX
-   int oflag = (MaxBlk) ? O_WRONLY : O_WRONLY | O_TRUNC;
-
--  Tfile = open64(tempname, oflag, S_IWRITE);
-+  Tfile = open(tempname, oflag, S_IWRITE);
-
-   if (Tfile == INVALID_HANDLE_VALUE) {
-     int rc = errno;
-@@ -4250,7 +4250,7 @@ void BGVFAM::Rewind(void)
- #if defined(_WIN32)  //OB
-   SetFilePointer(Hfile, 0, NULL, FILE_BEGIN);
- #else    // UNIX
--  lseek64(Hfile, 0, SEEK_SET);
-+  lseek(Hfile, 0, SEEK_SET);
- #endif   // UNIX
- #endif // 0
-   } // end of Rewind
-diff --git a/storage/connect/xindex.cpp b/storage/connect/xindex.cpp
-index 4bcbbfd4..1144f89a 100644
---- a/storage/connect/xindex.cpp
-+++ b/storage/connect/xindex.cpp
-@@ -2652,7 +2652,7 @@ bool XHUGE::Open(PGLOBAL g, char *filename, int id, MODE mode)
-     /*******************************************************************/
-     /* Position the cursor at end of file so ftell returns file size.  */
-     /*******************************************************************/
--    if (!(NewOff.Val = (longlong)lseek64(Hfile, 0LL, SEEK_END))) {
-+    if (!(NewOff.Val = (longlong)lseek(Hfile, 0LL, SEEK_END))) {
-       snprintf(g->Message, sizeof(g->Message), MSG(FUNC_ERRNO), errno, "Seek");
-       return true;
-       } // endif
-@@ -2681,7 +2681,7 @@ bool XHUGE::Open(PGLOBAL g, char *filename, int id, MODE mode)
-       htrc("noff[%d]=%lld\n", id, noff[id].Val);
-
-     // Position the cursor at the offset of this index
--    if (lseek64(Hfile, noff[id].Val, SEEK_SET) < 0) {
-+    if (lseek(Hfile, noff[id].Val, SEEK_SET) < 0) {
-       snprintf(g->Message, sizeof(g->Message), "(XHUGE)lseek64: %s (%lld)", strerror(errno), noff[id].Val);
-       printf("%s\n", g->Message);
- //    snprintf(g->Message, sizeof(g->Message), MSG(FUNC_ERRNO), errno, "Hseek");
-@@ -2709,10 +2709,10 @@ bool XHUGE::Seek(PGLOBAL g, int low, int high, int origin)
-     } // endif
-
- #else // UNIX
--  off64_t pos = (off64_t)low
--              + (off64_t)high * ((off64_t)0x100 * (off64_t)0x1000000);
-+  off_t pos = (off_t)low
-+              + (off_t)high * ((off_t)0x100 * (off_t)0x1000000);
-
--  if (lseek64(Hfile, pos, origin) < 0) {
-+  if (lseek(Hfile, pos, origin) < 0) {
-     snprintf(g->Message, sizeof(g->Message), MSG(ERROR_IN_LSK), errno);
-
-     if (trace(1))
-@@ -2841,7 +2841,7 @@ void XHUGE::Close(char *fn, int id)
- #else   // !_WIN32
-   if (id >= 0 && fn) {
-     if (Hfile != INVALID_HANDLE_VALUE) {
--      if (lseek64(Hfile, id * sizeof(IOFF), SEEK_SET) >= 0) {
-+      if (lseek(Hfile, id * sizeof(IOFF), SEEK_SET) >= 0) {
-         ssize_t nbw = write(Hfile, &NewOff, sizeof(IOFF));
-
-         if (nbw != (signed)sizeof(IOFF))

packages/mariadb/pcc-remove-glibc-dep.patch

@@ -1,36 +0,0 @@
-diff --git a/include/my_cpu.h b/include/my_cpu.h
-index f2e26fca..94599b74 100644
---- a/include/my_cpu.h
-+++ b/include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
-   __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
--  __ppc_get_timebase();
-+  __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
-   /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");

packages/nasm/Containerfile

@@ -1,38 +0,0 @@
-FROM scratch AS base
-ARG ARCH=x86_64
-ENV VERSION=2.16.03
-ENV SRC_HASH=1412a1c760bbd05db026b6c0d1657affd6631cd0a63cddb6f73cc6d4aa616148
-ENV SRC_FILE=nasm-${VERSION}.tar.xz
-ENV SRC_SITE=https://www.nasm.us/pub/nasm/releasebuilds/${VERSION}/${SRC_FILE}
-
-FROM base AS fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
-
-FROM fetch AS build
-COPY --from=stagex/busybox . /
-COPY --from=stagex/perl . /
-COPY --from=stagex/cmake . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/musl . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/make . /
-COPY --from=stagex/bash . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR nasm-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-    CFLAGS="-O2 -flto=auto" \
-	./configure \
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-		--prefix=/usr
-	make -j "$(nproc)"
-EOF
-
-FROM build AS install
-RUN --network=none DESTDIR="/rootfs" cmake --install build
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem AS package
-COPY --from=install /rootfs/. /

packages/nuspell/Containerfile

@@ -19,6 +19,7 @@ COPY --from=stagex/musl . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/icu . /
 COPY --from=stagex/make . /
+COPY --from=stagex/m4 . /
 COPY --from=stagex/gcc . /
 RUN tar -xf v${VERSION}.tar.gz
 WORKDIR nuspell-${VERSION}

packages/oniguruma/Containerfile

@@ -1,44 +0,0 @@
-FROM scratch AS base
-ARG ARCH=x86_64
-ENV VERSION=6.9.9
-ENV SRC_HASH=001aa1202e78448f4c0bf1a48c76e556876b36f16d92ce3207eccfd61d99f2a0
-ENV SRC_FILE=v${VERSION}.tar.gz
-ENV SRC_SITE=https://github.com/kkos/oniguruma/archive/${SRC_FILE}
-
-FROM base AS fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
-
-FROM fetch AS build
-COPY --from=stagex/busybox . /
-COPY --from=stagex/autoconf . /
-COPY --from=stagex/libtool . /
-COPY --from=stagex/automake . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/musl . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/make . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR oniguruma-${VERSION}
-COPY *.patch .
-RUN --network=none <<-EOF
-	set -eux
-    autoreconf -vfi
-	./configure \
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-	    --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-posix-api
-	make
-EOF
-
-FROM build AS install
-RUN --network=none DESTDIR="/rootfs" cmake --install build
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem AS package
-COPY --from=install /rootfs/. /

packages/openldap/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.5.17
 ENV SRC_HASH=d706a34b348ae38a9e3e4eb0d2cd5afeb939f2b2db95e6ae3d410d6a75e90e3c
 ENV SRC_FILE=openldap-${VERSION}.tgz
 ENV SRC_SITE=https://www.openldap.org/software/download/OpenLDAP/openldap-release/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/perl . /
 COPY --from=stagex/bash . /
 COPY --from=stagex/m4 . /
@@ -27,6 +28,7 @@ COPY --from=stagex/argon2 . /
 COPY --from=stagex/groff . /
 RUN tar -xf $SRC_FILE
 WORKDIR openldap-${VERSION}
+ENV SOURCE_DATE_EPOCH=1
 RUN --network=none <<-EOF
 	set -eux
 	./configure \
@@ -48,9 +50,9 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/pcre2/Containerfile

@@ -1,13 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=10.43
 ENV SRC_HASH=f0048e26b02bdfaf43b8cec75030a9c2fe28552bf5caa693d3ccbf4d886fa930
 ENV SRC_FILE=pcre2-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/PCRE2Project/pcre2/archive/refs/tags/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/zlib . /
 COPY --from=stagex/gawk . /
 COPY --from=stagex/bzip2 . /
@@ -47,11 +48,11 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /
 
 

packages/perl-dbd-mysql/Containerfile

@@ -1,36 +0,0 @@
-FROM scratch as base
-ARG ARCH=x86_64
-ENV VERSION=4.052
-ENV SRC_HASH=a83f57af7817787de0ef56fb15fdfaf4f1c952c8f32ff907153b66d2da78ff5b
-ENV SRC_FILE=DBD-mysql-${VERSION}.tar.gz
-ENV SRC_SITE=https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/${SRC_FILE}
-
-FROM base as fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch as build
-COPY --from=stagex/musl . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/bash . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/perl . /
-COPY --from=stagex/zlib . /
-COPY --from=stagex/mariadb-connector-c . /
-COPY --from=stagex/perl-dbi . /
-COPY --from=stagex/make . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR DBD-mysql-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-    perl Makefile.PL
-	make
-EOF
-
-FROM build as install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem as package
-COPY --from=install /rootfs/. /

packages/perl-dbi/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.643
 ENV SRC_HASH=8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa
 ENV SRC_FILE=DBI-${VERSION}.tar.gz
 ENV SRC_SITE=https://cpan.metacpan.org/authors/id/T/TI/TIMB/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/bash . /
@@ -19,16 +19,17 @@ COPY --from=stagex/perl . /
 COPY --from=stagex/make . /
 RUN tar -xf ${SRC_FILE}
 WORKDIR DBI-${VERSION}
+ENV SOURCE_DATE_EPOCH=1
 RUN --network=none <<-EOF
 	set -eux
     perl Makefile.PL
 	PERL_MM_USE_DEFAULT="1 perl -I. Makefile.PL INSTALLDIRS=vendor"
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/perl-yaml-syck/Containerfile

@@ -18,6 +18,7 @@ COPY --from=stagex/make . /
 
 RUN tar -xf ${SRC_FILE}
 WORKDIR YAML-Syck-${VERSION}
+ENV SOURCE_DATE_EPOCH=1
 RUN --network=none <<-EOF
 	set -eux \
     export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')

packages/php/Containerfile

@@ -20,9 +20,9 @@ COPY --from=stagex/libzstd . /
 COPY --from=stagex/lld . /
 COPY --from=stagex/binutils . /
 COPY --from=stagex/llvm . /
+COPY --from=stagex/curl . /
 COPY --from=stagex/clang . /
 COPY --from=stagex/bison . /
-COPY --from=stagex/curl . /
 COPY --from=stagex/gdbm . /
 COPY --from=stagex/lmdb . /
 COPY --from=stagex/pkgconf . /
@@ -79,10 +79,9 @@ RUN --network=none <<-EOF
 		--with-config-file-scan-dir=/etc/php83/conf.d \
 		--disable-rpath \
 		--disable-short-tags \
-		--disable-all \
 		\
-		# --enable-bcmath=shared \
-		# --with-bz2=shared \
+		--enable-bcmath=shared \
+		--with-bz2=shared \
 		# --enable-calendar=shared \
 		# --enable-ctype=shared \
 		# --with-curl=shared \
@@ -143,7 +142,7 @@ RUN --network=none <<-EOF
 		# --enable-soap=shared \
 		# --with-sodium=shared \
 		# --enable-sockets=shared \
-		# --with-sqlite3=shared \
+		# with-sqlite3=shared \
 		# --enable-sysvmsg=shared \
 		# --enable-sysvsem=shared \
 		# --enable-sysvshm=shared \
@@ -155,7 +154,7 @@ RUN --network=none <<-EOF
 		# --enable-xmlwriter=shared \
 		# --with-xsl=shared \
 		# --with-zip=shared \
-		# --with-zlib \
+		--with-zlib \
 		# --enable-zend-test=shared \
 		"$@"
     make || { echo "Make failed"; cat config.log; }

packages/re2c/Containerfile

@@ -1,13 +1,13 @@
-FROM scratch as base
+FROM scratch AS base
 ENV VERSION=3.1
 ENV SRC_HASH=087c44de0400fb15caafde09fd72edc7381e688a35ef505ee65e0e3d2fac688b
 ENV SRC_FILE=${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/skvadrik/re2c/archive/refs/tags/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/autoconf . /
 COPY --from=stagex/automake . /
 COPY --from=stagex/binutils . /
@@ -26,12 +26,12 @@ RUN --network=none <<-EOF
     autoreconf -i -W all
 	./configure \
         --prefix=/usr
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/rhash/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.4.4
 ENV SRC_HASH=8e7d1a8ccac0143c8fe9b68ebac67d485df119ea17a613f4038cda52f84ef52a
 ENV SRC_FILE=v${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/rhash/RHash/archive/refs/tags/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/bash . /
@@ -25,12 +25,12 @@ RUN --network=none <<-EOF
 		--sysconfdir=/etc \
 		--enable-openssl \
 		--disable-openssl-runtime
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/samurai/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.2
 ENV SRC_HASH=3b8cf51548dfc49b7efe035e191ff5e1963ebc4fe8f6064a5eefc5343eaf78a5
 ENV SRC_FILE=samurai-${VERSION}.tar.gz
 ENV SRC_SITE=https://github.com/michaelforney/samurai/releases/download/${VERSION}/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -19,15 +19,15 @@ RUN tar -xf ${SRC_FILE}
 WORKDIR samurai-${VERSION}
 COPY *.patch .
 RUN --network=none <<-EOF
-	set -eux \
+	set -eux
 	patch -p1 CVE-2021-30218.patch
 	patch -p1 CVE-2021-30219.patch
-	make CFLAGS="-O2" CC=gcc
+	make CFLAGS="-O2" CC=gcc -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/scdoc/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.11.3
 ENV SRC_HASH=4c5c6136540384e5455b250f768e7ca11b03fdba1a8efc2341ee0f1111e57612
 ENV SRC_FILE=${VERSION}.tar.gz
 ENV SRC_SITE=https://git.sr.ht/~sircmpwn/scdoc/archive/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -18,13 +18,13 @@ RUN tar -xf ${SRC_FILE}
 WORKDIR scdoc-${VERSION}
 RUN --network=none <<-EOF
 	set -eux
-	make PREFIX="/usr"
+	make PREFIX="/usr" -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /
 

packages/skalibs/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.14.1.1
 ENV SRC_HASH=b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3
 ENV SRC_FILE=skalibs-${VERSION}.tar.gz
 ENV SRC_SITE=https://skarnet.org/software/skalibs/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -23,12 +23,12 @@ RUN --network=none <<-EOF
 		--enable-static \
         --prefix=/usr \
 		--libdir=/usr/lib
-    make
+    make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/unixodbc/Containerfile

@@ -1,14 +1,14 @@
-
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=2.3.12
 ENV SRC_HASH=f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec
 ENV SRC_FILE=unixODBC-${VERSION}.tar.gz
 ENV SRC_SITE=https://www.unixodbc.org/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-FROM fetch as build
+
+FROM fetch AS build
 COPY --from=stagex/perl . /
 COPY --from=stagex/bash . /
 COPY --from=stagex/m4 . /
@@ -38,9 +38,9 @@ RUN --network=none <<-EOF
 	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/util-macros/Containerfile

@@ -1,14 +1,14 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=1.20.0
 ENV SRC_HASH=0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db
 ENV SRC_FILE=util-macros-${VERSION}.tar.xz
 ENV SRC_SITE=https://www.x.org/releases/individual/util/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
-FROM fetch as build
+FROM fetch AS build
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/busybox . /
@@ -26,12 +26,12 @@ RUN --network=none <<-EOF
 		--build=${ARCH}-linux-musl \
 		--host=${ARCH}-linux-musl \
 		--prefix=/usr
-	make
+	make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/utmps/Containerfile

@@ -1,11 +1,11 @@
-FROM scratch as base
+FROM scratch AS base
 ARG ARCH=x86_64
 ENV VERSION=0.1.2.2
 ENV SRC_HASH=f7ffa3714c65973bb95fbcf1501c06fc0478d93a51cea1b373ec6811c2425f52
 ENV SRC_FILE=utmps-${VERSION}.tar.gz
 ENV SRC_SITE=https://skarnet.org/software/utmps/${SRC_FILE}
 
-FROM base as fetch
+FROM base AS fetch
 ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
 
 FROM fetch as build
@@ -28,12 +28,12 @@ RUN --network=none <<-EOF
 		--libexecdir=/lib/utmps \
 		--with-lib=/usr/lib \
 		--with-dynlib=/lib
-    make
+    make -j "$(nproc)"
 EOF
 
-FROM build as install
+FROM build AS install
 RUN make DESTDIR=/rootfs install
 RUN find /rootfs -exec touch -hcd "@0" "{}" +
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem AS package
 COPY --from=install /rootfs/. /

packages/vala/0001-posix-Define-_XOPEN_SOURCE-_GNU_SOURCE-for-signal-fu.patch

@@ -1,76 +0,0 @@
-From 1d79a03d86a2f10051e902b97a3bf08cf038d06a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 6 Aug 2024 12:53:55 +0200
-Subject: [PATCH] posix: Define _XOPEN_SOURCE/_GNU_SOURCE for signal funcs
-
-Fixes https://gitlab.gnome.org/GNOME/vala/-/issues/1558
----
- vapi/posix.vapi | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/vapi/posix.vapi b/vapi/posix.vapi
-index caa0f41f8..91e03ff5c 100644
---- a/vapi/posix.vapi
-+++ b/vapi/posix.vapi
-@@ -1590,35 +1590,35 @@ namespace Posix {
- 		short    si_addr_lsb;
- 	}
-
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int kill (pid_t pid, int signum);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int killpg (pid_t pgpr, int signum);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_GNU_SOURCE")]
- 	public int raise (int signum);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public void psignal (int signum, string message);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigemptyset (out sigset_t sigset);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigfillset (out sigset_t sigset);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigaddset (ref sigset_t sigset, int signo);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigdelset (ref sigset_t sigset, int __signo);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigismember (sigset_t sigset, int __signo);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigprocmask (int how, sigset_t sigset, out sigset_t oset);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigqueue (pid_t pid, int signum, sigval_t val);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigsuspend (sigset_t sigset);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigpending (sigset_t sigset);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigwait (sigset_t sigset, out int sig);
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_XOPEN_SOURCE")]
- 	public int sigaction (int signum, sigaction_t? act, out sigaction_t? oldact);
-
- 	[CCode (has_target = false, cheader_filename = "signal.h", feature_test_macro = "_GNU_SOURCE")]
-@@ -1636,7 +1636,7 @@ namespace Posix {
- 	[CCode (cheader_filename = "signal.h")]
- 	public sighandler_t SIG_IGN;
-
--	[CCode (cheader_filename = "signal.h")]
-+	[CCode (cheader_filename = "signal.h", feature_test_macro = "_GNU_SOURCE")]
- 	public sighandler_t signal (int signum, sighandler_t? handler);
-
- 	[CCode (cheader_filename = "stdio.h")]
---
-2.46.0

packages/vala/Containerfile

@@ -1,46 +0,0 @@
-FROM scratch AS base
-ARG ARCH=x86_64
-ENV VERSION=0.56.16
-ENV SRC_HASH=05487b5600f5d2f09e66a753cccd8f39c1bff9f148aea1b7774d505b9c8bca9b
-ENV SRC_FILE=vala-${VERSION}.tar.xz
-ENV SRC_SITE=https://download.gnome.org/sources/vala/0.56/${SRC_FILE}
-
-FROM base AS fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
-
-FROM fetch AS build
-COPY --from=stagex/busybox . /
-COPY --from=stagex/glib . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/bison . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/libunwind . /
-COPY --from=stagex/zlib . /
-COPY --from=stagex/flex . /
-COPY --from=stagex/perl . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/libtool . /
-COPY --from=stagex/musl . /
-COPY --from=stagex/openssl . /
-COPY --from=stagex/make . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR vala-${VERSION}
-COPY *.patch .
-RUN --network=none <<-EOF
-	set -eux
-    patch -p1 < 0001-posix-Define-_XOPEN_SOURCE-_GNU_SOURCE-for-signal-fu.patch
-    CFLAGS="-O2 -flto=auto" \
-	CXXFLAGS="$-O2 -flto=auto" \
-	./configure \
-		--build=${ARCH}-linux-musl \
-		--host=${ARCH}-linux-musl \
-		--prefix=/usr
-	make -j "$(nproc)"
-EOF
-
-FROM build AS install
-RUN --network=none DESTDIR="/rootfs" cmake --install build
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem AS package
-COPY --from=install /rootfs/. /

packages/xorgproto/Containerfile

@@ -1,45 +0,0 @@
-FROM scratch AS base
-ARG ARCH=x86_64
-ENV VERSION=2024.1
-ENV SRC_HASH=4f6b9b4faf91e5df8265b71843a91fc73dc895be6210c84117a996545df296ce
-ENV SRC_FILE=xorgproto-${VERSION}.tar.gz
-ENV SRC_SITE=https://xorg.freedesktop.org/archive/individual/proto/${SRC_FILE}
-
-FROM base AS fetch
-ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} ${SRC_FILE}
-
-FROM fetch AS build
-COPY --from=stagex/musl . /
-COPY --from=stagex/abuild . /
-COPY --from=stagex/ninja . /
-COPY --from=stagex/make . /
-COPY --from=stagex/gcc . /
-COPY --from=stagex/perl . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/util-macros . /
-COPY --from=stagex/bash . /
-COPY --from=stagex/busybox . /
-COPY --from=stagex/binutils . /
-COPY --from=stagex/pkgconf . /
-COPY --from=stagex/meson . /
-COPY --from=stagex/m4 . /
-COPY --from=stagex/autoconf . /
-COPY --from=stagex/automake . /
-COPY --from=stagex/zlib . /
-RUN tar -xf ${SRC_FILE}
-WORKDIR xorgproto-${VERSION}
-RUN --network=none <<-EOF
-	set -eux
-	abuild-meson \
-		--datadir=/usr/lib \
-		-Dlegacy=true \
-		. output
-	meson compile -C output
-EOF
-
-FROM build AS install
-RUN make DESTDIR=/rootfs install
-RUN find /rootfs -exec touch -hcd "@0" "{}" +
-
-FROM stagex/filesystem AS package
-COPY --from=install /rootfs/. /

src/packages.mk

@@ -1,3 +1,34 @@
+.PHONY: apr-util
+apr-util: out/apr-util/index.json
+out/apr-util/index.json: \
+	packages/apr-util/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/expat/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/gdbm/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openldap/index.json \
+	out/openssl/index.json \
+	out/postgresql/index.json \
+	out/sqlite3/index.json
+	$(call build,apr-util)
+
+.PHONY: libiconv
+libiconv: out/libiconv/index.json
+out/libiconv/index.json: \
+	packages/libiconv/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json
+	$(call build,libiconv)
 
 .PHONY: abseil-cpp
 abseil-cpp: out/abseil-cpp/index.json
@@ -15,6 +46,44 @@ out/abseil-cpp/index.json: \
 	out/zlib/index.json
 	$(call build,abseil-cpp)
 
+.PHONY: acl
+acl: out/acl/index.json
+out/acl/index.json: \
+	packages/acl/Containerfile \
+	out/attr/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json
+	$(call build,acl)
+
+.PHONY: apr
+apr: out/apr/index.json
+out/apr/index.json: \
+	packages/apr/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/util-linux/index.json
+	$(call build,apr)
+
+.PHONY: argon2
+argon2: out/argon2/index.json
+out/argon2/index.json: \
+	packages/argon2/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json
+	$(call build,argon2)
+
 .PHONY: argp-standalone
 argp-standalone: out/argp-standalone/index.json
 out/argp-standalone/index.json: \
@@ -31,6 +100,32 @@ out/argp-standalone/index.json: \
 	out/perl/index.json
 	$(call build,argp-standalone)
 
+.PHONY: aspell
+aspell: out/aspell/index.json
+out/aspell/index.json: \
+	packages/aspell/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json
+	$(call build,aspell)
+
+.PHONY: attr
+attr: out/attr/index.json
+out/attr/index.json: \
+	packages/attr/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json
+	$(call build,attr)
+
 .PHONY: autoconf
 autoconf: out/autoconf/index.json
 out/autoconf/index.json: \
@@ -167,6 +262,21 @@ out/bison/index.json: \
 	out/perl/index.json
 	$(call build,bison)
 
+.PHONY: brotli
+brotli: out/brotli/index.json
+out/brotli/index.json: \
+	packages/brotli/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json \
+	out/samurai/index.json
+	$(call build,brotli)
+
 .PHONY: buf
 buf: out/buf/index.json
 out/buf/index.json: \
@@ -239,12 +349,16 @@ out/clang/index.json: \
 	out/cmake/index.json \
 	out/filesystem/index.json \
 	out/gcc/index.json \
+	out/git/index.json \
+	out/libxml2/index.json \
+	out/linux-headers/index.json \
 	out/llvm/index.json \
 	out/musl/index.json \
 	out/ninja/index.json \
 	out/openssl/index.json \
 	out/py-setuptools/index.json \
 	out/python/index.json \
+	out/samurai/index.json \
 	out/zlib/index.json
 	$(call build,clang)
 
@@ -381,6 +495,29 @@ out/dosfstools/index.json: \
 	out/perl/index.json
 	$(call build,dosfstools)
 
+.PHONY: doxygen
+doxygen: out/doxygen/index.json
+out/doxygen/index.json: \
+	packages/doxygen/Containerfile \
+	out/binutils/index.json \
+	out/bison/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/coreutils/index.json \
+	out/filesystem/index.json \
+	out/flex/index.json \
+	out/gcc/index.json \
+	out/libxml2/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/python/index.json \
+	out/samurai/index.json
+	$(call build,doxygen)
+
 .PHONY: e2fsprogs
 e2fsprogs: out/e2fsprogs/index.json
 out/e2fsprogs/index.json: \
@@ -471,6 +608,18 @@ out/eudev/index.json: \
 	out/musl/index.json
 	$(call build,eudev)
 
+.PHONY: expat
+expat: out/expat/index.json
+out/expat/index.json: \
+	packages/expat/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json
+	$(call build,expat)
+
 .PHONY: file
 file: out/file/index.json
 out/file/index.json: \
@@ -538,6 +687,42 @@ out/flex/index.json: \
 	out/perl/index.json
 	$(call build,flex)
 
+.PHONY: fmt
+fmt: out/fmt/index.json
+out/fmt/index.json: \
+	packages/fmt/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/doxygen/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json \
+	out/postgresql/index.json \
+	out/python/index.json \
+	out/samurai/index.json
+	$(call build,fmt)
+
+.PHONY: freetds
+freetds: out/freetds/index.json
+out/freetds/index.json: \
+	packages/freetds/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/libtool/index.json \
+	out/linux-headers/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/readline/index.json \
+	out/unixodbc/index.json
+	$(call build,freetds)
+
 .PHONY: gawk
 gawk: out/gawk/index.json
 out/gawk/index.json: \
@@ -561,6 +746,20 @@ out/gcc/index.json: \
 	out/stage3/index.json
 	$(call build,gcc)
 
+.PHONY: gdbm
+gdbm: out/gdbm/index.json
+out/gdbm/index.json: \
+	packages/gdbm/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json
+	$(call build,gdbm)
+
 .PHONY: gen_initramfs
 gen_initramfs: out/gen_initramfs/index.json
 out/gen_initramfs/index.json: \
@@ -602,6 +801,39 @@ out/git/index.json: \
 	out/zlib/index.json
 	$(call build,git)
 
+.PHONY: glib
+glib: out/glib/index.json
+out/glib/index.json: \
+	packages/glib/Containerfile \
+	out/binutils/index.json \
+	out/bison/index.json \
+	out/busybox/index.json \
+	out/bzip2/index.json \
+	out/cmake/index.json \
+	out/expat/index.json \
+	out/filesystem/index.json \
+	out/flex/index.json \
+	out/gcc/index.json \
+	out/gettext/index.json \
+	out/libffi/index.json \
+	out/libxml2/index.json \
+	out/libxslt/index.json \
+	out/linux-headers/index.json \
+	out/make/index.json \
+	out/meson/index.json \
+	out/musl/index.json \
+	out/ncurses/index.json \
+	out/ninja/index.json \
+	out/pcre2/index.json \
+	out/pkgconf/index.json \
+	out/py-packaging/index.json \
+	out/python/index.json \
+	out/rhash/index.json \
+	out/util-linux/index.json \
+	out/xz/index.json \
+	out/zlib/index.json
+	$(call build,glib)
+
 .PHONY: gmp
 gmp: out/gmp/index.json
 out/gmp/index.json: \
@@ -683,6 +915,20 @@ out/grep/index.json: \
 	out/musl/index.json
 	$(call build,grep)
 
+.PHONY: groff
+groff: out/groff/index.json
+out/groff/index.json: \
+	packages/groff/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json
+	$(call build,groff)
+
 .PHONY: grpcurl
 grpcurl: out/grpcurl/index.json
 out/grpcurl/index.json: \
@@ -739,6 +985,20 @@ out/helm/index.json: \
 	out/go/index.json
 	$(call build,helm)
 
+.PHONY: hunspell
+hunspell: out/hunspell/index.json
+out/hunspell/index.json: \
+	packages/hunspell/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json
+	$(call build,hunspell)
+
 .PHONY: icu
 icu: out/icu/index.json
 out/icu/index.json: \
@@ -830,6 +1090,36 @@ out/keyfork/index.json: \
 	out/zlib/index.json
 	$(call build,keyfork)
 
+.PHONY: krb5
+krb5: out/krb5/index.json
+out/krb5/index.json: \
+	packages/krb5/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/bison/index.json \
+	out/busybox/index.json \
+	out/curl/index.json \
+	out/e2fsprogs/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/groff/index.json \
+	out/libevent/index.json \
+	out/libtool/index.json \
+	out/libverto/index.json \
+	out/linux-headers/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openldap/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/python/index.json \
+	out/util-linux/index.json
+	$(call build,krb5)
+
 .PHONY: ksops-dry-run
 ksops-dry-run: out/ksops-dry-run/index.json
 out/ksops-dry-run/index.json: \
@@ -880,6 +1170,20 @@ out/kustomize-sops/index.json: \
 	out/go/index.json
 	$(call build,kustomize-sops)
 
+.PHONY: libaio
+libaio: out/libaio/index.json
+out/libaio/index.json: \
+	packages/libaio/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/linux-headers/index.json \
+	out/make/index.json \
+	out/musl/index.json
+	$(call build,libaio)
+
 .PHONY: libarchive
 libarchive: out/libarchive/index.json
 out/libarchive/index.json: \
@@ -920,6 +1224,37 @@ out/libcap/index.json: \
 	out/perl/index.json
 	$(call build,libcap)
 
+.PHONY: libedit
+libedit: out/libedit/index.json
+out/libedit/index.json: \
+	packages/libedit/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gawk/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/ncurses/index.json \
+	out/perl/index.json
+	$(call build,libedit)
+
+.PHONY: libevent
+libevent: out/libevent/index.json
+out/libevent/index.json: \
+	packages/libevent/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json
+	$(call build,libevent)
+
 .PHONY: libffi
 libffi: out/libffi/index.json
 out/libffi/index.json: \
@@ -958,6 +1293,24 @@ out/libgpg-error/index.json: \
 	out/npth/index.json
 	$(call build,libgpg-error)
 
+.PHONY: libical
+libical: out/libical/index.json
+out/libical/index.json: \
+	packages/libical/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/icu/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/ninja/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/samurai/index.json
+	$(call build,libical)
+
 .PHONY: libksba
 libksba: out/libksba/index.json
 out/libksba/index.json: \
@@ -986,6 +1339,18 @@ out/libqrencode/index.json: \
 	out/musl/index.json
 	$(call build,libqrencode)
 
+.PHONY: libsodium
+libsodium: out/libsodium/index.json
+out/libsodium/index.json: \
+	packages/libsodium/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json
+	$(call build,libsodium)
+
 .PHONY: libtool
 libtool: out/libtool/index.json
 out/libtool/index.json: \
@@ -1027,6 +1392,35 @@ out/libusb/index.json: \
 	out/musl/index.json
 	$(call build,libusb)
 
+.PHONY: libverto
+libverto: out/libverto/index.json
+out/libverto/index.json: \
+	packages/libverto/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/curl/index.json \
+	out/e2fsprogs/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/groff/index.json \
+	out/libedit/index.json \
+	out/libevent/index.json \
+	out/libtool/index.json \
+	out/linux-headers/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openldap/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/python/index.json \
+	out/util-linux/index.json
+	$(call build,libverto)
+
 .PHONY: libxml2
 libxml2: out/libxml2/index.json
 out/libxml2/index.json: \
@@ -1185,6 +1579,29 @@ out/linux-nitro/index.json: \
 	out/zlib/index.json
 	$(call build,linux-nitro)
 
+.PHONY: linux-pam
+linux-pam: out/linux-pam/index.json
+out/linux-pam/index.json: \
+	packages/linux-pam/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/binutils/index.json \
+	out/bison/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/filesystem/index.json \
+	out/flex/index.json \
+	out/gcc/index.json \
+	out/gettext/index.json \
+	out/libtool/index.json \
+	out/linux-headers/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/utmps/index.json
+	$(call build,linux-pam)
+
 .PHONY: lld
 lld: out/lld/index.json
 out/lld/index.json: \
@@ -1255,6 +1672,20 @@ out/llvm16/index.json: \
 	out/zlib/index.json
 	$(call build,llvm16)
 
+.PHONY: lmdb
+lmdb: out/lmdb/index.json
+out/lmdb/index.json: \
+	packages/lmdb/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json
+	$(call build,lmdb)
+
 .PHONY: lua
 lua: out/lua/index.json
 out/lua/index.json: \
@@ -1476,7 +1907,48 @@ out/ocismack/index.json: \
 	out/openssl/index.json \
 	out/rust/index.json \
 	out/zlib/index.json
-	$(call build,ocismack)
+
+.PHONY: nuspell
+nuspell: out/nuspell/index.json
+out/nuspell/index.json: \
+	packages/nuspell/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/cmake/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/icu/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/ninja/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/samurai/index.json
+	$(call build,nuspell)
+
+.PHONY: openldap
+openldap: out/openldap/index.json
+out/openldap/index.json: \
+	packages/openldap/Containerfile \
+	out/argon2/index.json \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/groff/index.json \
+	out/libedit/index.json \
+	out/libevent/index.json \
+	out/libtool/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json \
+	out/perl/index.json \
+	out/unixodbc/index.json
+	$(call build,openldap)
 
 .PHONY: openpgp-card-tools
 openpgp-card-tools: out/openpgp-card-tools/index.json
@@ -1569,6 +2041,31 @@ out/openssl/index.json: \
 	out/perl/index.json
 	$(call build,openssl)
 
+.PHONY: pcre2
+pcre2: out/pcre2/index.json
+out/pcre2/index.json: \
+	packages/pcre2/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/bzip2/index.json \
+	out/filesystem/index.json \
+	out/gawk/index.json \
+	out/gcc/index.json \
+	out/libedit/index.json \
+	out/libtool/index.json \
+	out/libzstd/index.json \
+	out/linux-headers/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/ncurses/index.json \
+	out/perl/index.json \
+	out/readline/index.json \
+	out/zlib/index.json
+	$(call build,pcre2)
+
 .PHONY: pcsc-lite
 pcsc-lite: out/pcsc-lite/index.json
 out/pcsc-lite/index.json: \
@@ -1615,6 +2112,21 @@ out/perl/index.json: \
 	out/musl/index.json
 	$(call build,perl)
 
+.PHONY: perl-dbi
+perl-dbi: out/perl-dbi/index.json
+out/perl-dbi/index.json: \
+	packages/perl-dbi/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json
+	$(call build,perl-dbi)
+
 .PHONY: perl-module-build
 perl-module-build: out/perl-module-build/index.json
 out/perl-module-build/index.json: \
@@ -1639,6 +2151,63 @@ out/perl-pod-parser/index.json: \
 	out/perl/index.json
 	$(call build,perl-pod-parser)
 
+.PHONY: perl-yaml-syck
+perl-yaml-syck: out/perl-yaml-syck/index.json
+out/perl-yaml-syck/index.json: \
+	packages/perl-yaml-syck/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json
+	$(call build,perl-yaml-syck)
+
+.PHONY: php
+php: out/php/index.json
+out/php/index.json: \
+	packages/php/Containerfile \
+	out/acl/index.json \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/bash/index.json \
+	out/bc/index.json \
+	out/binutils/index.json \
+	out/bison/index.json \
+	out/busybox/index.json \
+	out/bzip2/index.json \
+	out/clang/index.json \
+	out/curl/index.json \
+	out/expat/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/gdbm/index.json \
+	out/gettext/index.json \
+	out/gmp/index.json \
+	out/icu/index.json \
+	out/libedit/index.json \
+	out/libunwind/index.json \
+	out/libxml2/index.json \
+	out/libzstd/index.json \
+	out/linux-headers/index.json \
+	out/lld/index.json \
+	out/llvm/index.json \
+	out/lmdb/index.json \
+	out/lzip/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json \
+	out/pcre2/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/python/index.json \
+	out/re2c/index.json \
+	out/sqlite3/index.json \
+	out/zlib/index.json
+	$(call build,php)
+
 .PHONY: pkgconf
 pkgconf: out/pkgconf/index.json
 out/pkgconf/index.json: \
@@ -2232,6 +2801,24 @@ out/python/index.json: \
 	out/zlib/index.json
 	$(call build,python)
 
+.PHONY: re2c
+re2c: out/re2c/index.json
+out/re2c/index.json: \
+	packages/re2c/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/libtool/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json \
+	out/python/index.json
+	$(call build,re2c)
+
 .PHONY: readline
 readline: out/readline/index.json
 out/readline/index.json: \
@@ -2261,6 +2848,20 @@ out/redis/index.json: \
 	out/pkgconf/index.json
 	$(call build,redis)
 
+.PHONY: rhash
+rhash: out/rhash/index.json
+out/rhash/index.json: \
+	packages/rhash/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/openssl/index.json
+	$(call build,rhash)
+
 .PHONY: rust
 rust: out/rust/index.json
 out/rust/index.json: \
@@ -2284,6 +2885,31 @@ out/rust/index.json: \
 	out/zlib/index.json
 	$(call build,rust)
 
+.PHONY: samurai
+samurai: out/samurai/index.json
+out/samurai/index.json: \
+	packages/samurai/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/pkgconf/index.json
+	$(call build,samurai)
+
+.PHONY: scdoc
+scdoc: out/scdoc/index.json
+out/scdoc/index.json: \
+	packages/scdoc/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json
+	$(call build,scdoc)
+
 .PHONY: sed
 sed: out/sed/index.json
 out/sed/index.json: \
@@ -2296,6 +2922,18 @@ out/sed/index.json: \
 	out/musl/index.json
 	$(call build,sed)
 
+.PHONY: skalibs
+skalibs: out/skalibs/index.json
+out/skalibs/index.json: \
+	packages/skalibs/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json
+	$(call build,skalibs)
+
 .PHONY: sops
 sops: out/sops/index.json
 out/sops/index.json: \
@@ -2509,6 +3147,25 @@ out/tpm2-tss/index.json: \
 	out/util-linux/index.json
 	$(call build,tpm2-tss)
 
+.PHONY: unixodbc
+unixodbc: out/unixodbc/index.json
+out/unixodbc/index.json: \
+	packages/unixodbc/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/libtool/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json \
+	out/postgresql/index.json
+	$(call build,unixodbc)
+
 .PHONY: util-linux
 util-linux: out/util-linux/index.json
 out/util-linux/index.json: \
@@ -2530,6 +3187,83 @@ out/util-linux/index.json: \
 	out/pkgconf/index.json
 	$(call build,util-linux)
 
+.PHONY: util-macros
+util-macros: out/util-macros/index.json
+out/util-macros/index.json: \
+	packages/util-macros/Containerfile \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gawk/index.json \
+	out/gcc/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/pkgconf/index.json
+	$(call build,util-macros)
+
+.PHONY: utmps
+utmps: out/utmps/index.json
+out/utmps/index.json: \
+	packages/utmps/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/skalibs/index.json
+	$(call build,utmps)
+
+.PHONY: xmlto
+xmlto: out/xmlto/index.json
+out/xmlto/index.json: \
+	packages/xmlto/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/docbook-xsl/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/gettext/index.json \
+	out/glib/index.json \
+	out/libtool/index.json \
+	out/libxml2/index.json \
+	out/libxslt/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/musl/index.json \
+	out/perl/index.json \
+	out/perl-pod-parser/index.json \
+	out/perl-yaml-syck/index.json \
+	out/zlib/index.json
+	$(call build,xmlto)
+
+.PHONY: xorgproto
+xorgproto: out/xorgproto/index.json
+out/xorgproto/index.json: \
+	packages/xorgproto/Containerfile \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/bash/index.json \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/m4/index.json \
+	out/make/index.json \
+	out/meson/index.json \
+	out/musl/index.json \
+	out/ninja/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/util-macros/index.json \
+	out/zlib/index.json
+	$(call build,xorgproto)
+
 .PHONY: xorriso
 xorriso: out/xorriso/index.json
 out/xorriso/index.json: \