Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at devShellTools-shell 32 lines 1.1 kB view raw
1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2From: Marie Ramlow <me@nycode.dev> 3Date: Sun, 24 Nov 2024 20:04:35 +0100 4Subject: [PATCH] meson: Don't link ssh dropins 5 6--- 7 meson.build | 4 ++-- 8 1 file changed, 2 insertions(+), 2 deletions(-) 9 10diff --git a/meson.build b/meson.build 11index d392610625..c17d0a1feb 100644 12--- a/meson.build 13+++ b/meson.build 14@@ -211,13 +211,13 @@ sshconfdir = get_option('sshconfdir') 15 if sshconfdir == '' 16 sshconfdir = sysconfdir / 'ssh/ssh_config.d' 17 endif 18-conf.set10('LINK_SSH_PROXY_DROPIN', sshconfdir != 'no' and not sshconfdir.startswith('/usr/')) 19+conf.set10('LINK_SSH_PROXY_DROPIN', 0) 20 21 sshdconfdir = get_option('sshdconfdir') 22 if sshdconfdir == '' 23 sshdconfdir = sysconfdir / 'ssh/sshd_config.d' 24 endif 25-conf.set10('LINK_SSHD_USERDB_DROPIN', sshdconfdir != 'no' and not sshdconfdir.startswith('/usr/')) 26+conf.set10('LINK_SSHD_USERDB_DROPIN', 0) 27 28 sshdprivsepdir = get_option('sshdprivsepdir') 29 conf.set10('CREATE_SSHDPRIVSEPDIR', sshdprivsepdir != 'no' and not sshdprivsepdir.startswith('/usr/')) 30-- 312.47.0 32