···

       
45
       
45
       
 
       
      ./locale_archive.patch

     

       
46
       
46
       
 
       
      ./fix-host-key-algorithms-plus.patch

     

       
47
       
47
       
 
       
      ./CVE-2015-8325.patch

     

       
48
       
48
       
+
       


     

       
49
       
49
       
+
       
      # See discussion in https://github.com/NixOS/nixpkgs/pull/16966

     

       
50
       
50
       
+
       
      ./dont_create_privsep_path.patch

     

       
48
       
51
       
 
       
    ]

     

       
49
       
52
       
 
       
    ++ optional withGssapiPatches gssapiSrc;

     

       
50
       
53
       
 
       


     
···

       
65
       
68
       
 
       
    ++ optional withKerberos "--with-kerberos5=${kerberos}"

     

       
66
       
69
       
 
       
    ++ optional stdenv.isDarwin "--disable-libutil"

     

       
67
       
70
       
 
       
    ++ optional (!linkOpenssl) "--without-openssl";

     

       
68
       
68
       
-
       


     

       
69
       
69
       
-
       
  preConfigure = ''

     

       
70
       
70
       
-
       
    configureFlagsArray+=("--with-privsep-path=$out/empty")

     

       
71
       
71
       
-
       
    mkdir -p $out/empty

     

       
72
       
72
       
-
       
  '';

     

       
73
       
71
       
 
       


     

       
74
       
72
       
 
       
  enableParallelBuilding = true;

     

       
75
       
73
       
 
       


     

···

       
1
       
1
       
+
       
diff -ur openssh-7.2p2_orig/Makefile.in openssh-7.2p2/Makefile.in

     

       
2
       
2
       
+
       
--- openssh-7.2p2_orig/Makefile.in	2016-03-09 19:04:48.000000000 +0100

     

       
3
       
3
       
+
       
+++ openssh-7.2p2/Makefile.in	2016-07-16 09:56:05.643903293 +0200

     

       
4
       
4
       
+
       
@@ -301,7 +301,6 @@

     

       
5
       
5
       
+
       
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5

     

       
6
       
6
       
+
       
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8

     

       
7
       
7
       
+
       
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)

     

       
8
       
8
       
+
       
-	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))

     

       
9
       
9
       
+
       
 	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)

     

       
10
       
10
       
+
       
 	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)

     

       
11
       
11
       
+
       
 	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)