qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkgs/openssh: add patch to fix build

Browse Source
This commit is contained in:
Aaron Bieber 2024-10-15 07:53:43 -06:00
parent 3e1fc39812
commit 172ad43568
No known key found for this signature in database
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -379,7 +379,7 @@
inherit (spkgs) matrix-synapse;
xin = upkgs.callPackage ./bins/xin { inherit upkgs; };
openssh = upkgs.callPackage ./pkgs/openssh.nix { inherit upkgs; };
openssh = upkgs.pkgsMusl.callPackage ./pkgs/openssh.nix { inherit upkgs; };
});
templates = {

1
pkgs/openssh.nix
View File

@ -33,6 +33,7 @@ stdenv.mkDerivation {
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./openssh/dont_create_privsep_path.patch
./openssh/fix-164ea4380564a2a83713eacf71908e3946e5e4e4.diff
];
postPatch =

12
pkgs/openssh/fix-164ea4380564a2a83713eacf71908e3946e5e4e4.diff Normal file
View File

@ -0,0 +1,12 @@
diff --git a/sshd-auth.c b/sshd-auth.c
index 53658cf11..b071c59b1 100644
--- a/sshd-auth.c
+++ b/sshd-auth.c
@@ -464,7 +464,6 @@ main(int ac, char **av)
__progname = ssh_get_progname(av[0]);
/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
- saved_argc = ac;
saved_argv = xcalloc(ac + 1, sizeof(*saved_argv));
for (i = 0; (int)i < ac; i++)
saved_argv[i] = xstrdup(av[i]);