Merge pull request #22102 from dustinkirkland/openssh

sshd won't start without a /var/empty directory

openssh.yaml

@@ -1,7 +1,7 @@
 package:
   name: openssh
   version: 9.7_p1
-  epoch: 1
+  epoch: 2
   description: "the OpenBSD SSH implementation"
   copyright:
     - license: ISC
@@ -127,6 +127,10 @@ subpackages:
       runtime:
         - openssh-keygen
         - openssh-server-config
+    scriptlets:
+      post-install: |
+        #!/bin/sh
+        ssh-keygen -A -q -N ""
 
   - name: "openssh-server-config"
     description: "OpenSSH server configuration"
@@ -140,3 +144,13 @@ update:
   enabled: true
   release-monitor:
     identifier: 2565
+
+test:
+  environment:
+    contents:
+      packages:
+        - openssh-server
+  pipeline:
+    - runs: |
+        ssh-keygen -A -q -N ""    # This is unfortunate, but scriplets don't run in test environments, so force this here
+        /usr/sbin/sshd

wolfi-baselayout.yaml

@@ -1,7 +1,7 @@
 package:
   name: wolfi-baselayout
   version: 20230201
-  epoch: 11
+  epoch: 12
   description: "baselayout data for Wolfi"
   copyright:
     - license: MIT
@@ -59,5 +59,8 @@ pipeline:
 
       chmod 0700 "${{targets.destdir}}"/root
 
+      mkdir -p "${{targets.destdir}}"/var/empty
+      chmod 755 "${{targets.destdir}}"/var/empty
+
 update:
   enabled: false