Ticket #42333: openssh-6.5p1.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                openssh
-version             6.4p1
+version             6.5p1
 revision            1
 
 categories          net
@@ -29 +29 @@
 homepage            http://www.openbsd.org/openssh/
 
 checksums           ${distfiles} \
-                    rmd160  d0e757c90350351bb92ebd4fa9f045586fb54f97 \
-                    sha256  5530f616513b14aea3662c4c373bafd6a97a269938674c006377e381f68975d2
+                    rmd160  241e51ad8108656e2ebb4c1b7550012336b25472 \
+                    sha256  a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027
 
 master_sites        openbsd:OpenSSH/portable \
                     http://mirror.mcs.anl.gov/openssh/portable/ \
@@ -63 +63 @@
                     --with-zlib=${prefix} \
                     --without-kerberos5 \
                     --with-libedit \
+                    --with-pie \
                     --without-xauth
 
 use_parallel_build  yes
@@ -76 +77 @@
 post-destroot {
     destroot.keepdirs ${destroot}${prefix}/var/run ${destroot}${prefix}/var/empty
     reinplace "s|#Port 22|Port 2222|g" ${destroot}${prefix}/etc/ssh/sshd_config
+    reinplace "s|UsePrivilegeSeparation sandbox|UsePrivilegeSeparation yes|g" ${destroot}${prefix}/etc/ssh/sshd_config
     xinstall -m 755 ${worksrcpath}/contrib/ssh-copy-id ${destroot}${prefix}/bin
     xinstall -m 644 ${worksrcpath}/contrib/ssh-copy-id.1 ${destroot}${prefix}/share/man/man1
     file rename "${destroot}${prefix}/etc/ssh/sshd_config" "${destroot}${prefix}/etc/ssh/sshd_config.example"
@@ -103 +105 @@
     # http://www.psc.edu/index.php/hpn-ssh
     # http://www.freshports.org/security/openssh-portable/ is usually quick in
     # updating the HPN patch for new versions, take a look there, too.
-    patch_sites-append      sourceforge:hpnssh
-    set hpn_patchfile       ${name}-6.3p1-hpnssh14v2.diff.gz
+    patch_sites-append      http://mirror.shatow.net/freebsd/openssh/
+    set hpn_patchfile       ${name}-6.5p1-hpnssh14v2.diff.gz
     patchfiles-append       ${hpn_patchfile}
     checksums-append        ${hpn_patchfile} \
-                            rmd160  8af79c3f63609da96d04b8e162f2b53cf7543be9 \
-                            sha256  23ae9307b58629ccf76a8ed5d9cf7215a45d6b7533d6b17eef17279fb9c48dca
+                            rmd160  5a7203fffee510b2ae6737af074fec2834bae122 \
+                            sha256  be6915130f2b1aad00235e02d55b67114dbb517b13d04d52a8abac9343166efd
 }
 
 variant gsskex conflicts hpn requires kerberos5 description "Add OpenSSH GSSAPI key exchange patch" {
@@ -173 +175 @@
             ${prefix}/bin/ssh-keygen -t rsa -f \\
             ${prefix}/etc/ssh/ssh_host_rsa_key -N \"\" -C `hostname`
         fi
+        if \[ ! -f ${prefix}/etc/ssh/ssh_host_ecdsa_key \]; then
+            ${prefix}/bin/ssh-keygen -t ecdsa -f \\
+            ${prefix}/etc/ssh/ssh_host_ecdsa_key -N \"\" -C `hostname`
+        fi
+        if \[ ! -f ${prefix}/etc/ssh/ssh_ed25519_rsa_key \]; then
+            ${prefix}/bin/ssh-keygen -t ed25519 -f \\
+            ${prefix}/etc/ssh/ssh_host_ed25519_key -N \"\" -C `hostname`
+        fi
         ${prefix}/sbin/sshd
     fi"
 startupitem.stop    \