Merge branch 'staging' (release 2024.08.1)

digests.txt

@@ -52,12 +52,13 @@ f745fee8efc807a1493d2c9bd617b1345f10a4dab02cc528fe930647846682ea iputils
 0297a099ae95eed13d48bce2d4d624544857680095b6201e9919e1d5da45a6cd jq
 63db8d16b2549bb68498ab60f700bc12d9fec725db38440678aefc4f83353537 json-c
 2b7016af8f507d31d222b30e8c42e26bec7178963edf4a029ea50563b87914f6 k9s
-1ace822e40987f94a442c76505fbbe7446da5481e57c7e57d5b51d5b8362d65a keyfork
+bd6167d2a4a6c3b1c3f9c0accbb1fe0d5854f64997bd1d9d8d822cdf628f8baf keyfork
 facd6c6d1eacf6a0d180f9b231fc45527ecd1693db97cecff282e1b5cbe989d5 ksops-dry-run
 70fa7f6e5918ddb66732d4ef42e979dd6db38ad92875f5ad8ff1a6d04450fa3d kubeconform
 f647075cb0330b8cfc3d35ac097d9155e130ea5d1dd16c99e927c7a3b4da47ed kubectl
 a99a74f2e37770ea3cb6fe8a4ebe8e731800ab3ea1ed3813b9f374592adf85f2 kustomize
 57655bd5bed28075a8ab96e1e50d9a6f88a0321893dcda0f53b4b483a5188f7a kustomize-sops
+742ac429b484bf2b441f9ad72d1c67b44795343c0b5ab646ca5a4bcb8a27f592 libarchive
 1267bb842bcb6e8bff56e2b72599357605a5e141f76629f7e96187ae85a07197 libassuan
 bc8dc2d91963008d3bdb462251269bce239a17b8966818023ec950301f8d744a libcap
 23c734a9376d588c2ac112c61d84309c511281fbc62e0fcdbb04e97ef4d2f99d libffi
@@ -94,6 +95,7 @@ a7078cbde902f0c891910a54bee2b4f073d456f1e10f8a051000d05b616eb7b2 nettle
 7899c399f2924c5ba0dfbce9ce6f8391e27ecd0564f0341fb85f83ba293e1ebe npth
 088dbc336e34f16f7a8e323f114918468a7e4b13b190c43593ca7b0dffea54b4 openpgp-card-tools
 8da704d0078d445d3af0338764b9f3a87ba4841744c396c8eddef15466366553 opensc
+79e8a8b5994cec32e486ffb59c76ae3f6b3081ac9c578da4bf633383e6b45e66 openssh
 9bd55ed05263a538e6a23c0262edc356c998a24674f3b8ad008a4b117a4cdf3b openssl
 fd9b0600f7f73f87d9d678b8b8a7119e0f9b9314c9959bd0d180c31736cb97d6 pcsc-lite
 d83997bda2b9500c8a4567df827a90d65efa842f9a2bb361b6f394589cf167d5 pcsc-tools

packages/keyfork/Containerfile

@@ -1,6 +1,6 @@
 FROM scratch AS base
-ENV VERSION=0.2.2
-ENV SRC_HASH=4a70a6ae1c2fcb6448552950ab67536b9d1abcb5d6e41dedd28db24e3979271f
+ENV VERSION=0.2.3
+ENV SRC_HASH=0beafb5ee6c7cab77295c40b25f58d709187ef11d849e0646281b57d2a6b5523
 ENV SRC_FILE=keyfork-v${VERSION}.tar.gz
 ENV SRC_SITE=https://git.distrust.co/public/keyfork/archive/${SRC_FILE}
 

packages/libarchive/Containerfile

@@ -0,0 +1,33 @@
+FROM scratch as base
+ARG ARCH=x86_64
+ENV VERSION=3.7.4
+ENV SRC_HASH=f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735
+ENV SRC_FILE=libarchive-${VERSION}.tar.xz
+ENV SRC_SITE=https://libarchive.org/downloads/${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 . /
+RUN tar -xf ${SRC_FILE}
+WORKDIR libarchive-${VERSION}
+RUN --network=none <<-EOF
+	set -ex
+	./configure \
+		--build=${ARCH}-linux-musl \
+		--host=${ARCH}-linux-musl \
+		--prefix=/usr \
+        --without-xml2
+	make -j "$(nproc)"
+EOF
+
+FROM build as install
+RUN --network=none make DESTDIR="/rootfs" install
+
+FROM stagex/filesystem as package
+COPY --from=install /rootfs/. /

packages/openssh/Containerfile

@@ -0,0 +1,64 @@
+FROM scratch as base
+ENV VERSION=9.8p1
+ENV SRC_HASH=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3
+ENV SRC_FILE=openssh-${VERSION}.tar.gz
+ENV SRC_SITE=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${SRC_FILE}
+
+FROM base as fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch as build
+COPY --from=stagex/busybox . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/binutils . /
+COPY --from=stagex/make . /
+COPY --from=stagex/bison . /
+COPY --from=stagex/libtool . /
+COPY --from=stagex/zlib . /
+COPY --from=stagex/libzstd . /
+COPY --from=stagex/flex . /
+COPY --from=stagex/openssl . /
+COPY --from=stagex/perl . /
+COPY --from=stagex/autoconf . /
+COPY --from=stagex/automake . /
+COPY --from=stagex/pkgconf . /
+COPY --from=stagex/gettext . /
+COPY --from=stagex/m4 . /
+COPY --from=stagex/argp-standalone . /
+COPY --from=stagex/musl . /
+COPY --from=stagex/musl-fts . /
+COPY --from=stagex/musl-obstack . /
+COPY --from=stagex/linux-headers . /
+RUN tar -xf ${SRC_FILE}
+WORKDIR openssh-${VERSION}
+ADD *.patch .
+RUN --network=none <<-EOF
+    set -eux
+    autoreconf -vif
+    ./configure \
+        --build="x86_64-linux-musl" \
+        --host="x86_64-linux-musl" \
+        --prefix=/usr \
+        --sysconfdir=/etc/ssh \
+        --libexecdir=/usr/lib/ssh \
+        --mandir=/usr/share/man \
+        --with-cflags="$(pkg-config --cflags --static utmps)" \
+        --with-libs="$(pkg-config --libs --static utmps)" \
+        --with-privsep-path=/var/empty \
+        --with-pid-dir=/run \
+        --with-mantype=doc \
+        --with-xauth=/usr/bin/xauth \
+        --with-default-path='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' \
+        --disable-utmp \
+        --disable-wtmp \
+        --disable-lastlog \
+        --disable-strip \
+        --with-ssl-engine
+    make -j "$(nproc)"
+EOF
+
+FROM build as install
+RUN --network=none make DESTDIR=/rootfs install
+
+FROM stagex/filesystem as package
+COPY --from=install /rootfs/. /

signatures/stagex/git@sha256=d177bde1f1ca0f20f74502af4da17b89628683f21116573ada69f38b46d367a6/signature-3

@@ -0,0 +1,5 @@
+£
›ÀËÌÀÅØç R±ø÷û"ÆÓ’Ò¶¿ˆ®VJ.Ê,ÉLNÌQ²ªVÊLIÍ+É,©±Sò“³S‹t‹RÓR‹Ró’S•¬”ŠKÓS+ôÓ3K”ju”2s<32><$•¹‰y™i©Å%º)™é@
+¨>ÅÐÜ<)%Õ0Í09Ñ ÍÈ ÍÜÄÔÀ(1Í$%ÑÐ<ÉÂÒÌÈÂÌÂ8ÍÈÐÐÐÌÔÜ81%ÑÌ2ÍØ"ÉÄ,ÅØÌ<ÑdKIe
Èê‚ô…äü¼’Ä̼Ô"°Õ
+Å™éy‰%¥E© uù%™ùy oä•æäÔÆv2³00r1ÈŠ)²t4Y•¾YU‘Íÿ¹[¬L ÿ3pq
+ÀDªŸ0t5‰ÿIþÄsèöÑ©KX£–ÄÞ_w¼BqÆ.·ÍÝתNo:"ð¾šwÉzö÷ÑÌ»6‹x´º¸ó&yr-TLX¿ÅtµÈ<C2B5>ýl5S̳ÖM©ü(÷‡7Í]tïÖ€5ïg‰¾Y¿ËzÖ.éßf°º•òXˆe¹m,rÌ‹™ë¾cŽ§Íò/—₹™×Çëo÷“yµ7éæ
	¥»þBßæ.ÐhfZ8ëÑ!…ìEI²Üûxz}±×E%Ýà<C39D>‚ûÞÕ°¿ÿÂb¹íEA¸vÑÁ¦}†Bsç\’R¾ ]4çóÅÃB9öšË<[¤ü.¹è/h1úÂ8¿<38>%'ã$ÓŠÍËO®l/κ¨é’ÌÆܪÝqw¿úDÓ·[®gÅØûýÉØÈgû½4ööWÍ:?~‰s†
sy¿›,RÌvQ<76>¼¹…S¶¢XÖ%óÛÍõÔÎUýi-.ú¹2~<7E>FÖti%×U=êGOñ=~Î#Çñ»ÑÛg5×DÖŽ»»•Q”‘wë{—Ë.ó?>ýh/xÑfšä…™âëE»òŸ/cÝPÉè^æ_°ÓÃÝKëÍÿ;©{Dïøn:½òÍ´R¿Óû_©[2·qÿBÿúÀ+óWU±ÞSg_í½…}š,¯Ê<1D>à‹×÷LŒ~sݽ—5¡í¥›UÙó¥Ž7ÝoÚè3øü
YóãCÚ]û%êÕ.
+áê»uY*ý)hXô<´"tzîe‹³'5*Jô

src/packages.mk

@@ -300,7 +300,8 @@ out/curl/index.json: \
 	out/gcc/index.json \
 	out/make/index.json \
 	out/musl/index.json \
-	out/openssl/index.json
+	out/openssl/index.json \
+	out/perl/index.json
 	$(call build,curl)
 
 .PHONY: diffutils
@@ -861,6 +862,18 @@ out/kustomize-sops/index.json: \
 	out/go/index.json
 	$(call build,kustomize-sops)
 
+.PHONY: libarchive
+libarchive: out/libarchive/index.json
+out/libarchive/index.json: \
+	packages/libarchive/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,libarchive)
+
 .PHONY: libassuan
 libassuan: out/libassuan/index.json
 out/libassuan/index.json: \
@@ -1444,6 +1457,33 @@ out/opensc/index.json: \
 	out/zlib/index.json
 	$(call build,opensc)
 
+.PHONY: openssh
+openssh: out/openssh/index.json
+out/openssh/index.json: \
+	packages/openssh/Containerfile \
+	out/argp-standalone/index.json \
+	out/autoconf/index.json \
+	out/automake/index.json \
+	out/binutils/index.json \
+	out/bison/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/flex/index.json \
+	out/gcc/index.json \
+	out/gettext/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/musl-fts/index.json \
+	out/musl-obstack/index.json \
+	out/perl/index.json \
+	out/pkgconf/index.json \
+	out/zlib/index.json
+	$(call build,openssh)
+
 .PHONY: openssl
 openssl: out/openssl/index.json
 out/openssl/index.json: \