From 037fc22517361d3a9973cb8dc09040c378c2d913 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Thu, 9 Jul 2026 10:18:21 +0300
Subject: packages: harden NetBSD dtail pipeline (review findings)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Makefile: .SHELLFLAGS := -ec — with .ONESHELL a failing intermediate
  recipe line (remote pkg_create, scp, PV upload) previously did not
  stop the recipe and make exited 0; also remove stale /tmp package
  artifacts at target start so a failed build can never silently
  re-upload an old tgz, guard against an empty extracted version, and
  quote the tr operand
- dtail-netbsd.json.tpl + rc.d: move the SSH host key from volatile
  /var/run/dserver/cache to persistent /var/db/dserver/ssh_host_key so
  it survives reboots (clients re-accept the key once after upgrade)
- pkg-dtail-netbsd.sh: reject a missing version argument; write the
  pkg_summary via a temp file so a pkg_info failure cannot publish a
  truncated pkg_summary.gz; document that the dserver user/group is a
  deliberate manual install step
- key-cache template: comment now states the daily cron entry is added
  manually at install time (documented in the pkgrepo skill)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 packages/scripts/pkg-dtail-netbsd.sh | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'packages/scripts')

diff --git a/packages/scripts/pkg-dtail-netbsd.sh b/packages/scripts/pkg-dtail-netbsd.sh
index f3bc9d6..cbddd24 100644
--- a/packages/scripts/pkg-dtail-netbsd.sh
+++ b/packages/scripts/pkg-dtail-netbsd.sh
@@ -8,6 +8,10 @@
 # NetBSD repo ever holds more than dtail, regenerate the summary across all
 # .tgz files in the repo directory instead.
 #
+# The package deliberately ships no install script for the dserver user/group:
+# creating them is a documented one-time install step (see the pkgrepo skill's
+# dtail-package.md), matching how the FreeBSD package handles it.
+#
 # Arguments:
 #   $1 — version (NetBSD-safe, no dashes — e.g. 4.3.2ng)
 
@@ -18,6 +22,10 @@ PATH=/usr/sbin:/usr/bin:/bin:$PATH
 export PATH
 
 VERSION="$1"
+if [ -z "$VERSION" ]; then
+    echo "Error: version argument missing (would build dtail-.tgz)" >&2
+    exit 1
+fi
 NAME="dtail"
 COMMENT="Distributed log tail and grep tool"
 DESC="DTail is a distributed DevOps tool for tailing, grepping, catting, and
@@ -89,7 +97,12 @@ pkg_create \
     -p "$WORKDIR/stage" \
     "$WORKDIR/out/${NAME}-${VERSION}.tgz"
 
-# Repo metadata for pkgin (pkg_add itself doesn't need it)
-( cd "$WORKDIR/out" && pkg_info -X ./*.tgz | gzip -9 > pkg_summary.gz )
+# Repo metadata for pkgin (pkg_add itself doesn't need it). Write the summary
+# to a temp file first: piping pkg_info straight into gzip would mask a
+# pkg_info failure (set -e without pipefail) and publish a truncated summary.
+( cd "$WORKDIR/out" && \
+    pkg_info -X ./*.tgz > pkg_summary.tmp && \
+    gzip -9 < pkg_summary.tmp > pkg_summary.gz && \
+    rm pkg_summary.tmp )
 
 echo "NetBSD package ${NAME}-${VERSION} built in $WORKDIR/out/"
-- 
cgit v1.2.3