Ticket #2779: openssh.diff

Portfile

@@ -2 +2 @@
 
 PortSystem      1.0
 name            openssh
-version         3.8.1p1
-revision        1
-revision        0
+version         4.0
 categories      net 
 maintainers     yeled@opendarwin.org
 description     OpenSSH secure login server
@@ -20 +18 @@
           methods. 
 homepage        http://www.openssh.com/
 platforms       darwin
-checksums       md5 1dbfd40ae683f822ae917eebf171ca42
+distname                ${distname}p1
+checksums       md5 7b36f28fc16e1b7f4ba3c1dca191ac92
 master_sites    openbsd:OpenSSH/portable \
                 ftp://carroll.cac.psu.edu/pub/OpenBSD/OpenSSH/portable/
-depends_lib     lib:libssl.0.9.7:openssl lib:libz.1.1.4:zlib
+depends_lib     lib:XXX:openssl lib:XXX:zlib
 
 # Specified -fno-builtin because GCC 3.3 has log() as a builtin
 # (from math.h) while OpenSSH has its own log() function
@@ -32 +31 @@
 configure.args --with-ssl-dir=${prefix} --sysconfdir=${prefix}/etc/ssh \
   --with-privsep-path=${prefix}/var/empty --with-md5-passwords \
   --with-pid-dir=${prefix}/var/run --with-tcp-wrappers \
-  --with-pam --disable-suid-ssh --with-random=/dev/urandom
+  --with-pam --disable-suid-ssh --with-random=/dev/urandom \
+  --mandir=${prefix}/share/man
 
 destroot.target install-nokeys
 
 post-destroot {
-  xinstall -o root -m 755 -d ${destroot}${prefix}/etc/rc.d
   destroot.keepdirs ${destroot}${prefix}/var/run ${destroot}${prefix}/var/empty
-  xinstall -o root -m 755 -c ${portpath}/files/openssh.sh ${destroot}${prefix}/etc/rc.d
-  reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/rc.d/openssh.sh
+  reinplace "s|#Port 22|Port 2222|g" ${destroot}${prefix}/etc/ssh/sshd_config
 }
 
 # For X11 Forwarding
@@ -53 +51 @@
 }
 
 variant darwin {
-  depends_run  path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
   # ln -s /usr/include/pam to work/include/security because 'security' was 
   # renamed to 'pam' in OS X.
-  pre-configure { system "mkdir ${workpath}/include"
-    system "ln -s /usr/include/pam ${workpath}/include/security" }
-  post-install {
-  ui_msg "===============================================================================\n"
-  ui_msg "Setup instructions:\n\t
-    Make sure SSHSERVER=-NO- is set in /etc/hostconfig or untick\n\t'Remote Sharing' option in System Preferences > Sharing.\n\tOPTIONAL: Copy your /etc/ssh_host* files to ${prefix}/etc/ssh/\n\tRun: `sudo killall sshd && sudo ${prefix}/etc/rc.d/openssh.sh`\n"
-ui_msg "===============================================================================\n"
+  pre-configure {
+    file mkdir ${workpath}/include
+    system "ln -s /usr/include/pam ${workpath}/include/security"
   }
 }
 
+startupitem.create      yes
+startupitem.name        OpenSSH
+startupitem.start \
+        "if \[ -x ${prefix}/sbin/sshd ]; then
+                if \[ ! -f ${prefix}/etc/ssh/ssh_host_key \]; then
+                        ${prefix}/bin/ssh-keygen -t rsa1 -f \\
+                        ${prefix}/etc/ssh/ssh_host_key -N \"\" -C `hostname`
+                fi
+                if \[ ! -f ${prefix}/etc/ssh/ssh_host_dsa_key \]; then
+                        ${prefix}/bin/ssh-keygen -t dsa -f \\
+                        ${prefix}/etc/ssh/ssh_host_dsa_key -N \"\" -C `hostname`
+                fi
+                if \[ ! -f ${prefix}/etc/ssh/ssh_host_rsa_key \]; then
+                        ${prefix}/bin/ssh-keygen -t rsa -f \\
+                        ${prefix}/etc/ssh/ssh_host_rsa_key -N \"\" -C `hostname`
+                fi
+                ${prefix}/sbin/sshd
+                fi"
+startupitem.stop \
+        "if \[ -r ${prefix}/var/run/sshd.pid \]; then
+                kill `cat ${prefix}/var/run/sshd.pid` && rm ${prefix}/var/run/sshd.pid
+                fi"
+startupitem.restart     "StopService; StartService"