Skip to content

Commit 303bef8

Browse files
a-cratea-crate
authored
Merge pull request #44563 from a-crate/usrmerge-usrsbin-3
Usrmerge usrsbin 3
2 parents 92723cc + fde1f64 commit 303bef8

File tree

8 files changed

+216
-45
lines changed

8 files changed

+216
-45
lines changed

‎openldap.yaml

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package:
22
name: openldap
33
version: 2.6.9
4-
epoch: 0
4+
epoch: 40
55
description: LDAP Server
66
copyright:
77
- license: OLDAP-2.8
8+
dependencies:
9+
runtime:
10+
- merged-usrsbin
11+
- wolfi-baselayout
812

913
var-transforms:
1014
- from: ${{package.version}}
@@ -48,6 +52,7 @@ pipeline:
4852
--build=${{host.triplet.gnu}} \
4953
--target=${{host.triplet.gnu}} \
5054
--prefix=/usr \
55+
--sbindir=/usr/bin \
5156
--libexecdir=/usr/lib \
5257
--sysconfdir=/etc \
5358
--mandir=/usr/share/man \
@@ -141,10 +146,10 @@ pipeline:
141146
rmdir var/lib/openldap/run
142147
143148
# Fix tools symlinks to slapd.
144-
find usr/sbin/ -type l -exec ln -sf slapd {} \;
149+
find usr/bin/ -type l -exec ln -sf slapd {} \;
145150
146-
# Move executables from lib to sbin.
147-
mv usr/lib/slapd usr/lib/lloadd usr/sbin/
151+
# Move executables from lib to bin.
152+
mv usr/lib/slapd usr/lib/lloadd usr/bin/
148153
149154
# Move *.default configs to docs.
150155
mkdir -p usr/share/doc/${{package.name}}
@@ -216,12 +221,14 @@ subpackages:
216221
- uses: split/dev
217222
dependencies:
218223
runtime:
219-
- libldap
220224
- cyrus-sasl-dev
221225
- libevent-dev
226+
- libldap
222227
- libsodium-dev
223-
- util-linux-dev
228+
- merged-usrsbin
224229
- openldap-hin
230+
- util-linux-dev
231+
- wolfi-baselayout
225232
description: openldap dev
226233
test:
227234
pipeline:
@@ -236,6 +243,10 @@ subpackages:
236243
test:
237244
pipeline:
238245
- uses: test/docs
246+
dependencies:
247+
runtime:
248+
- merged-usrsbin
249+
- wolfi-baselayout
239250

240251
- name: libldap
241252
description: OpenLDAP libraries
@@ -249,6 +260,10 @@ subpackages:
249260
chmod 755 ${{targets.subpkgdir}}/usr/lib/*.so*
250261
251262
mv ${{targets.destdir}}/etc/openldap/ldap.conf ${{targets.subpkgdir}}/etc/openldap
263+
dependencies:
264+
runtime:
265+
- merged-usrsbin
266+
- wolfi-baselayout
252267
test:
253268
pipeline:
254269
- uses: test/tw/ldd-check
@@ -257,25 +272,35 @@ subpackages:
257272
pipeline:
258273
- runs: |
259274
mkdir -p ${{targets.subpkgdir}}/etc/openldap
260-
mkdir -p ${{targets.subpkgdir}}/usr/sbin
275+
mkdir -p ${{targets.subpkgdir}}/usr/bin
261276
mkdir -p ${{targets.subpkgdir}}/var/lib/openldap
262277
263278
mv ${{targets.destdir}}/etc/openldap/lloadd.conf ${{targets.subpkgdir}}/etc/openldap
264-
mv ${{targets.destdir}}/usr/sbin/lloadd ${{targets.subpkgdir}}/usr/sbin
279+
mv ${{targets.destdir}}/usr/bin/lloadd ${{targets.subpkgdir}}/usr/bin
265280
mv ${{targets.destdir}}/var/lib/openldap/openldap-lloadd ${{targets.subpkgdir}}/var/lib/openldap
266281
description: Standalone LDAP Load Balancer Daemon
282+
dependencies:
283+
runtime:
284+
- merged-usrsbin
285+
- wolfi-baselayout
267286

268287
- name: openldap-clients
269288
pipeline:
270289
- runs: |
271-
mkdir -p ${{targets.subpkgdir}}/usr
272-
mv ${{targets.destdir}}/usr/bin ${{targets.subpkgdir}}/usr/
290+
mkdir -p ${{targets.subpkgdir}}/usr/bin
291+
for i in ldapadd ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapvc ldapwhoami; do
292+
mv "${{targets.destdir}}"/usr/bin/$i "${{targets.subpkgdir}}"/usr/bin/
293+
done
273294
description: LDAP client utilities
274295
test:
275296
pipeline:
276297
- runs: |
277298
ldapurl version
278299
ldapurl help
300+
dependencies:
301+
runtime:
302+
- merged-usrsbin
303+
- wolfi-baselayout
279304

280305
- name: openldap-passwd-argon2
281306
pipeline:
@@ -284,7 +309,9 @@ subpackages:
284309
mv ${{targets.destdir}}/usr/lib/openldap/argon2.* ${{targets.subpkgdir}}/usr/lib/openldap/
285310
dependencies:
286311
runtime:
312+
- merged-usrsbin
287313
- openldap
314+
- wolfi-baselayout
288315
description: Argon2 OpenLDAP support
289316
test:
290317
pipeline:
@@ -293,7 +320,9 @@ subpackages:
293320
- name: openldap-passwd-pbkdf2
294321
dependencies:
295322
runtime:
323+
- merged-usrsbin
296324
- openldap
325+
- wolfi-baselayout
297326
pipeline:
298327
- runs: |
299328
mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
@@ -306,7 +335,9 @@ subpackages:
306335
- name: openldap-passwd-sha2
307336
dependencies:
308337
runtime:
338+
- merged-usrsbin
309339
- openldap
340+
- wolfi-baselayout
310341
pipeline:
311342
- runs: |
312343
mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
@@ -323,6 +354,10 @@ subpackages:
323354
mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
324355
mv ${{targets.destdir}}/usr/lib/openldap/${{range.value}}* ${{targets.subpkgdir}}/usr/lib/openldap/
325356
description: OpenLDAP ${{range.key}} backend
357+
dependencies:
358+
runtime:
359+
- merged-usrsbin
360+
- wolfi-baselayout
326361
test:
327362
pipeline:
328363
- uses: test/tw/ldd-check
@@ -334,13 +369,18 @@ subpackages:
334369
mkdir -p ${{targets.subpkgdir}}/usr/lib/openldap
335370
mv ${{targets.destdir}}/usr/lib/openldap/${{range.value}}* ${{targets.subpkgdir}}/usr/lib/openldap/
336371
description: OpenLDAP ${{range.key}} overlay
372+
dependencies:
373+
runtime:
374+
- merged-usrsbin
375+
- wolfi-baselayout
337376
test:
338377
pipeline:
339378
- uses: test/tw/ldd-check
340379

341380
- name: openldap-backend-all
342381
dependencies:
343382
runtime:
383+
- merged-usrsbin
344384
- openldap-back-asyncmeta
345385
- openldap-back-dnssrv
346386
- openldap-back-ldap
@@ -352,13 +392,15 @@ subpackages:
352392
- openldap-back-relay
353393
- openldap-back-sock
354394
- openldap-back-sql
395+
- wolfi-baselayout
355396
pipeline:
356397
- runs: mkdir -p ${{targets.subpkgdir}}
357398
description: Virtual package that installs all OpenLDAP backends
358399

359400
- name: openldap-overlay-all
360401
dependencies:
361402
runtime:
403+
- merged-usrsbin
362404
- openldap-overlay-accesslog
363405
- openldap-overlay-auditlog
364406
- openldap-overlay-autoca
@@ -385,6 +427,7 @@ subpackages:
385427
- openldap-overlay-translucent
386428
- openldap-overlay-unique
387429
- openldap-overlay-valsort
430+
- wolfi-baselayout
388431
pipeline:
389432
- runs: mkdir -p ${{targets.subpkgdir}}
390433
description: Virtual package that installs all OpenLDAP backends
@@ -394,6 +437,10 @@ subpackages:
394437
- runs: mkdir -p ${{targets.subpkgdir}}/usr/include
395438
- runs: install -m755 include/*.hin "${{targets.subpkgdir}}"/usr/include/
396439
description: openldap hin files
440+
dependencies:
441+
runtime:
442+
- merged-usrsbin
443+
- wolfi-baselayout
397444

398445
update:
399446
enabled: true

‎openssh.yaml

Lines changed: 66 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package:
22
name: openssh
33
version: "9.9_p2"
4-
epoch: 3
4+
epoch: 40
55
description: "the OpenBSD SSH implementation"
66
copyright:
77
- license: ISC
88
dependencies:
99
runtime:
10+
- merged-usrsbin
1011
- openssh-client
1112
- openssh-server
1213
- openssh-sftp-server
14+
- wolfi-baselayout
1315

1416
environment:
1517
contents:
@@ -42,6 +44,7 @@ pipeline:
4244
--host=${{host.triplet.gnu}} \
4345
--target=${{host.triplet.gnu}} \
4446
--prefix=/usr \
47+
--sbindir=/usr/bin \
4548
--datadir=/usr/share \
4649
--sysconfdir=/etc/ssh \
4750
--libexecdir=/usr/lib/ssh \
@@ -74,48 +77,100 @@ subpackages:
7477
test:
7578
pipeline:
7679
- uses: test/docs
80+
dependencies:
81+
runtime:
82+
- merged-usrsbin
83+
- wolfi-baselayout
7784

7885
- name: "openssh-keygen"
7986
description: "OpenSSH key generator"
8087
pipeline:
8188
- runs: |
8289
mkdir -p "${{targets.subpkgdir}}"/usr/bin
8390
mv "${{targets.destdir}}"/usr/bin/ssh-keygen "${{targets.subpkgdir}}"/usr/bin/
91+
dependencies:
92+
runtime:
93+
- merged-usrsbin
94+
- wolfi-baselayout
8495

8596
- name: "openssh-keyscan"
8697
description: "OpenSSH key scanner"
8798
pipeline:
8899
- runs: |
89100
mkdir -p "${{targets.subpkgdir}}"/usr/bin
90101
mv "${{targets.destdir}}"/usr/bin/ssh-keyscan "${{targets.subpkgdir}}"/usr/bin/
102+
dependencies:
103+
runtime:
104+
- merged-usrsbin
105+
- wolfi-baselayout
91106

92107
- name: "openssh-keysign"
93108
description: "OpenSSH key signing tool"
94109
pipeline:
95110
- runs: |
96111
mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
97112
mv "${{targets.destdir}}"/usr/lib/ssh/ssh-keysign "${{targets.subpkgdir}}"/usr/lib/ssh/
113+
dependencies:
114+
runtime:
115+
- merged-usrsbin
116+
- wolfi-baselayout
98117

99118
- name: "openssh-sftp-server"
100119
description: "OpenSSH SFTP server"
101120
pipeline:
102121
- runs: |
103122
mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
104123
mv "${{targets.destdir}}"/usr/lib/ssh/sftp-server "${{targets.subpkgdir}}"/usr/lib/ssh/
124+
dependencies:
125+
runtime:
126+
- merged-usrsbin
127+
- wolfi-baselayout
105128

106129
- name: "openssh-pkcs11-helper"
107130
description: "PKCS11 helper for OpenSSH"
108131
pipeline:
109132
- runs: |
110133
mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
111134
mv "${{targets.destdir}}"/usr/lib/ssh/ssh-pkcs11-helper "${{targets.subpkgdir}}"/usr/lib/ssh/
135+
dependencies:
136+
runtime:
137+
- merged-usrsbin
138+
- wolfi-baselayout
112139

113140
- name: "openssh-sk-helper"
114141
description: "Security key helper for OpenSSH"
115142
pipeline:
116143
- runs: |
117144
mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
118145
mv "${{targets.destdir}}"/usr/lib/ssh/ssh-sk-helper "${{targets.subpkgdir}}"/usr/lib/ssh/
146+
dependencies:
147+
runtime:
148+
- merged-usrsbin
149+
- wolfi-baselayout
150+
151+
- name: "openssh-server"
152+
description: "OpenSSH server"
153+
pipeline:
154+
- runs: |
155+
mkdir -p "${{targets.subpkgdir}}"/usr/bin
156+
mv "${{targets.destdir}}"/usr/bin/sshd "${{targets.subpkgdir}}"/usr/bin/
157+
mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
158+
mv "${{targets.destdir}}"/usr/lib/ssh/sshd-session "${{targets.subpkgdir}}"/usr/lib/ssh/
159+
dependencies:
160+
runtime:
161+
- merged-usrsbin
162+
- openssh-keygen
163+
- openssh-server-config
164+
- wolfi-baselayout
165+
scriptlets:
166+
post-install: |
167+
#!/bin/sh
168+
ssh-keygen -A -q -N ""
169+
test:
170+
pipeline:
171+
- runs: |
172+
ssh-keygen -A -q -N "" # This is unfortunate, but scriplets don't run in test environments, so force this here
173+
/usr/bin/sshd
119174
120175
- name: "openssh-client"
121176
description: "OpenSSH client"
@@ -140,28 +195,10 @@ subpackages:
140195
trap "rm -f $conf" EXIT
141196
echo "Tag YouAreIt" > "$conf"
142197
ssh -G _ | grep -i '^Tag YouAreIt$'
143-
144-
- name: "openssh-server"
145-
description: "OpenSSH server"
146-
pipeline:
147-
- runs: |
148-
mkdir -p "${{targets.subpkgdir}}"/usr/sbin
149-
mv "${{targets.destdir}}"/usr/sbin/sshd "${{targets.subpkgdir}}"/usr/sbin/
150-
mkdir -p "${{targets.subpkgdir}}"/usr/lib/ssh
151-
mv "${{targets.destdir}}"/usr/lib/ssh/sshd-session "${{targets.subpkgdir}}"/usr/lib/ssh/
152198
dependencies:
153199
runtime:
154-
- openssh-keygen
155-
- openssh-server-config
156-
scriptlets:
157-
post-install: |
158-
#!/bin/sh
159-
ssh-keygen -A -q -N ""
160-
test:
161-
pipeline:
162-
- runs: |
163-
ssh-keygen -A -q -N "" # This is unfortunate, but scriplets don't run in test environments, so force this here
164-
/usr/sbin/sshd
200+
- merged-usrsbin
201+
- wolfi-baselayout
165202

166203
- name: "openssh-service"
167204
description: "System OpenSSH server unit"
@@ -173,8 +210,10 @@ subpackages:
173210
echo "enable sshd.service" > "${{targets.subpkgdir}}/usr/lib/systemd/system-preset/80-sshd.preset"
174211
dependencies:
175212
runtime:
176-
- systemd
213+
- merged-usrsbin
177214
- openssh-server
215+
- systemd
216+
- wolfi-baselayout
178217

179218
- name: "openssh-server-config"
180219
description: "OpenSSH server configuration"
@@ -196,6 +235,10 @@ subpackages:
196235
echo "Banner /does-not-exist" > "$conf"
197236
ssh-keygen -A -q -N ""
198237
sshd -T | grep -i 'Banner /does-not-exist'
238+
dependencies:
239+
runtime:
240+
- merged-usrsbin
241+
- wolfi-baselayout
199242

200243
- name: "openssh-pam-config"
201244
description: "OpenSSH server pam configuration"
@@ -228,4 +271,4 @@ test:
228271
pipeline:
229272
- runs: |
230273
ssh-keygen -A -q -N "" # This is unfortunate, but scriplets don't run in test environments, so force this here
231-
/usr/sbin/sshd
274+
/usr/bin/sshd

0 commit comments

Comments
 (0)