646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Marie Ramlow <me@nycode.dev>
|
|
Date: Sun, 24 Nov 2024 20:04:35 +0100
|
|
Subject: [PATCH] meson: Don't link ssh dropins
|
|
|
|
---
|
|
meson.build | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index b5aaecd669..91b23f2d72 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir')
|
|
if sshconfdir == ''
|
|
sshconfdir = sysconfdir / 'ssh/ssh_config.d'
|
|
endif
|
|
-conf.set10('LINK_SSH_PROXY_DROPIN', sshconfdir != 'no' and not sshconfdir.startswith('/usr/'))
|
|
+conf.set10('LINK_SSH_PROXY_DROPIN', 0)
|
|
|
|
sshdconfdir = get_option('sshdconfdir')
|
|
if sshdconfdir == ''
|
|
sshdconfdir = sysconfdir / 'ssh/sshd_config.d'
|
|
endif
|
|
-conf.set10('LINK_SSHD_USERDB_DROPIN', sshdconfdir != 'no' and not sshdconfdir.startswith('/usr/'))
|
|
+conf.set10('LINK_SSHD_USERDB_DROPIN', 0)
|
|
|
|
sshdprivsepdir = get_option('sshdprivsepdir')
|
|
conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/'))
|