Bump epoch and add dependency on merged-usrsbin

Signed-off-by: Amelia Crate <[email protected]>

Author: a-crate

openldap.yaml

@@ -1,10 +1,14 @@
 package:
   name: openldap
   version: 2.6.9
-  epoch: 0
+  epoch: 40
   description: LDAP Server
   copyright:
     - license: OLDAP-2.8
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 var-transforms:
   - from: ${{package.version}}
@@ -217,12 +221,14 @@ subpackages:
       - uses: split/dev
     dependencies:
       runtime:
-        - libldap
         - cyrus-sasl-dev
         - libevent-dev
+        - libldap
         - libsodium-dev
-        - util-linux-dev
+        - merged-usrsbin
         - openldap-hin
+        - util-linux-dev
+        - wolfi-baselayout
     description: openldap dev
     test:
       pipeline:
@@ -236,6 +242,10 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: libldap
     description: OpenLDAP libraries
@@ -254,6 +264,10 @@ subpackages:
         - uses: test/ldd-check
           with:
             packages: libldap
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: openldap-lloadd
     pipeline:
@@ -266,6 +280,10 @@ subpackages:
           mv ${{targets.destdir}}/usr/bin/lloadd ${{targets.subpkgdir}}/usr/bin
           mv ${{targets.destdir}}/var/lib/openldap/openldap-lloadd ${{targets.subpkgdir}}/var/lib/openldap
     description: Standalone LDAP Load Balancer Daemon
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: openldap-clients
     pipeline:
@@ -280,6 +298,10 @@ subpackages:
         - runs: |
             ldapurl version
             ldapurl help
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: openldap-passwd-argon2
     pipeline:
@@ -288,13 +310,17 @@ subpackages:
           mv ${{targets.destdir}}/usr/lib/openldap/argon2.* ${{targets.subpkgdir}}/usr/lib/openldap/
     dependencies:
       runtime:
+        - merged-usrsbin
         - openldap
+        - wolfi-baselayout
     description: Argon2 OpenLDAP support
 
   - name: openldap-passwd-pbkdf2
     dependencies:
       runtime:
+        - merged-usrsbin
         - openldap
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
@@ -304,7 +330,9 @@ subpackages:
   - name: openldap-passwd-sha2
     dependencies:
       runtime:
+        - merged-usrsbin
         - openldap
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
@@ -318,6 +346,10 @@ subpackages:
           mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
           mv ${{targets.destdir}}/usr/lib/openldap/${{range.value}}* ${{targets.subpkgdir}}/usr/lib/openldap/
     description: OpenLDAP ${{range.key}} backend
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - range: overlays
     name: openldap-overlay-${{range.key}}
@@ -326,10 +358,15 @@ subpackages:
           mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
           mv ${{targets.destdir}}/usr/lib/openldap/${{range.value}}* ${{targets.subpkgdir}}/usr/lib/openldap/
     description: OpenLDAP ${{range.key}} overlay
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: openldap-backend-all
     dependencies:
       runtime:
+        - merged-usrsbin
         - openldap-back-asyncmeta
         - openldap-back-dnssrv
         - openldap-back-ldap
@@ -341,13 +378,15 @@ subpackages:
         - openldap-back-relay
         - openldap-back-sock
         - openldap-back-sql
+        - wolfi-baselayout
     pipeline:
       - runs: mkdir -p ${{targets.subpkgdir}}
     description: Virtual package that installs all OpenLDAP backends
 
   - name: openldap-overlay-all
     dependencies:
       runtime:
+        - merged-usrsbin
         - openldap-overlay-accesslog
         - openldap-overlay-auditlog
         - openldap-overlay-autoca
@@ -374,6 +413,7 @@ subpackages:
         - openldap-overlay-translucent
         - openldap-overlay-unique
         - openldap-overlay-valsort
+        - wolfi-baselayout
     pipeline:
       - runs: mkdir -p ${{targets.subpkgdir}}
     description: Virtual package that installs all OpenLDAP backends
@@ -383,6 +423,10 @@ subpackages:
       - runs: mkdir -p ${{targets.subpkgdir}}/usr/include
       - runs: install -m755 include/*.hin "${{targets.subpkgdir}}"/usr/include/
     description: openldap hin files
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
 update:
   enabled: true

openssh.yaml

@@ -1,15 +1,17 @@
 package:
   name: openssh
   version: "9.9_p2"
-  epoch: 3
+  epoch: 40
   description: "the OpenBSD SSH implementation"
   copyright:
     - license: ISC
   dependencies:
     runtime:
+      - merged-usrsbin
       - openssh-client
       - openssh-server
       - openssh-sftp-server
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -75,48 +77,76 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-keygen"
     description: "OpenSSH key generator"
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/bin
           mv "${{targets.destdir}}"/usr/bin/ssh-keygen "${{targets.subpkgdir}}"/usr/bin/
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-keyscan"
     description: "OpenSSH key scanner"
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/bin
           mv "${{targets.destdir}}"/usr/bin/ssh-keyscan "${{targets.subpkgdir}}"/usr/bin/
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-keysign"
     description: "OpenSSH key signing tool"
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
           mv "${{targets.destdir}}"/usr/lib/ssh/ssh-keysign "${{targets.subpkgdir}}"/usr/lib/ssh/
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-sftp-server"
     description: "OpenSSH SFTP server"
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
           mv "${{targets.destdir}}"/usr/lib/ssh/sftp-server "${{targets.subpkgdir}}"/usr/lib/ssh/
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-pkcs11-helper"
     description: "PKCS11 helper for OpenSSH"
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
           mv "${{targets.destdir}}"/usr/lib/ssh/ssh-pkcs11-helper "${{targets.subpkgdir}}"/usr/lib/ssh/
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-sk-helper"
     description: "Security key helper for OpenSSH"
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
           mv "${{targets.destdir}}"/usr/lib/ssh/ssh-sk-helper "${{targets.subpkgdir}}"/usr/lib/ssh/
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-server"
     description: "OpenSSH server"
@@ -128,8 +158,10 @@ subpackages:
           mv "${{targets.destdir}}"/usr/lib/ssh/sshd-session "${{targets.subpkgdir}}"/usr/lib/ssh/
     dependencies:
       runtime:
+        - merged-usrsbin
         - openssh-keygen
         - openssh-server-config
+        - wolfi-baselayout
     scriptlets:
       post-install: |
         #!/bin/sh
@@ -163,6 +195,10 @@ subpackages:
             trap "rm -f $conf" EXIT
             echo "Tag YouAreIt" > "$conf"
             ssh -G _ | grep -i '^Tag YouAreIt$'
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-service"
     description: "System OpenSSH server unit"
@@ -174,8 +210,10 @@ subpackages:
           echo "enable sshd.service" > "${{targets.subpkgdir}}/usr/lib/systemd/system-preset/80-sshd.preset"
     dependencies:
       runtime:
-        - systemd
+        - merged-usrsbin
         - openssh-server
+        - systemd
+        - wolfi-baselayout
 
   - name: "openssh-server-config"
     description: "OpenSSH server configuration"
@@ -197,6 +235,10 @@ subpackages:
             echo "Banner /does-not-exist" > "$conf"
             ssh-keygen -A -q -N ""
             sshd -T | grep -i 'Banner /does-not-exist'
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "openssh-pam-config"
     description: "OpenSSH server pam configuration"

openvpn.yaml

@@ -1,7 +1,7 @@
 package:
   name: openvpn
   version: "2.6.13"
-  epoch: 0
+  epoch: 40
   description: Robust, and highly configurable VPN (Virtual Private Network)
   copyright:
     - license: GPL-2.0-or-later
@@ -13,7 +13,9 @@ package:
       - liblz4-1
       - libnl3
       - lzo
+      - merged-usrsbin
       - openssl
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -83,15 +85,21 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: openvpn-dev
     description: openvpn dev
     pipeline:
       - uses: split/dev
     dependencies:
       runtime:
-        - openvpn
+        - merged-usrsbin
         - openssl-dev
+        - openvpn
+        - wolfi-baselayout
 
   - name: openvpn-openrc
     description: openvpn openrc init
@@ -103,7 +111,9 @@ subpackages:
           install -Dm644 vendor/openvpn.confd "${{targets.subpkgdir}}"/etc/conf.d/
     dependencies:
       runtime:
+        - merged-usrsbin
         - openssl-dev
+        - wolfi-baselayout
 
   - name: openvpn-auth-pam
     description: openvpn dev
@@ -114,8 +124,10 @@ subpackages:
     dependencies:
       runtime:
         - glibc
-        - linux-pam
         - iproute2
+        - linux-pam
+        - merged-usrsbin
+        - wolfi-baselayout
     test:
       pipeline:
         - uses: test/tw/ldd-check
@@ -128,8 +140,10 @@ subpackages:
           install -Dm644 vendor/openvpn.supervisord.conf "${{targets.subpkgdir}}"/etc/supervisor.d/openvpn.conf
     dependencies:
       runtime:
+        - merged-usrsbin
         - openvpn-doc
         - supervisor
+        - wolfi-baselayout
 
 update:
   enabled: true