Print this page 
First stab at the full Joyent wad (still needs work!!!)
Split Close
Expand all
Collapse all
          --- old/build/openssh/patches/0004-Reorganise-man-pages-into-Illumos-numbering-adjust-t.patch
          +++ new/build/openssh/patches/0006-Reorganise-man-pages-into-Illumos-numbering-adjust-t.patch
   1      -From 0b784f8f36fc30f8722e784777fe012062beb0d3 Mon Sep 17 00:00:00 2001
        1 +From 310f67442b9faf22eb3a30a614202cdd04f99119 Mon Sep 17 00:00:00 2001
   2    2  From: oracle <solaris@oracle.com>
   3    3  Date: Mon, 3 Aug 2015 14:34:55 -0700
   4      -Subject: [PATCH 04/30] Reorganise man pages into Illumos numbering, adjust
        4 +Subject: [PATCH 06/36] Reorganise man pages into Illumos numbering, adjust
   5    5   text
   6    6  
   7    7  ---
   8    8   Makefile.in          |   22 +-
   9    9   moduli.4             |  127 ++++
  10   10   moduli.5             |  127 ----
  11   11   sftp-server.1m       |  170 +++++
  12   12   sftp-server.8        |  170 -----
       13 + ssh-keygen.1         |    6 +-
  13   14   ssh-keysign.1m       |   93 +++
  14   15   ssh-keysign.8        |   93 ---
  15   16   ssh-pkcs11-helper.1m |   43 ++
  16   17   ssh-pkcs11-helper.8  |   43 --
  17   18   ssh_config.4         | 1726 +++++++++++++++++++++++++++++++++++++++++++++++++
  18   19   ssh_config.5         | 1726 -------------------------------------------------
  19   20   sshd.1m              |  971 ++++++++++++++++++++++++++++
  20   21   sshd.8               |  971 ----------------------------
  21   22   sshd_config.4        | 1736 ++++++++++++++++++++++++++++++++++++++++++++++++++
  22   23   sshd_config.5        | 1736 --------------------------------------------------
  23      - 15 files changed, 4877 insertions(+), 4877 deletions(-)
       24 + 16 files changed, 4879 insertions(+), 4881 deletions(-)
  24   25   create mode 100644 moduli.4
  25   26   delete mode 100644 moduli.5
  26   27   create mode 100644 sftp-server.1m
  27   28   delete mode 100644 sftp-server.8
  28   29   create mode 100644 ssh-keysign.1m
  29   30   delete mode 100644 ssh-keysign.8
  30   31   create mode 100644 ssh-pkcs11-helper.1m
  31   32   delete mode 100644 ssh-pkcs11-helper.8
  32   33   create mode 100644 ssh_config.4
  33   34   delete mode 100644 ssh_config.5
  34   35   create mode 100644 sshd.1m
  35   36   delete mode 100644 sshd.8
  36   37   create mode 100644 sshd_config.4
  37   38   delete mode 100644 sshd_config.5
  38   39  
  39   40  diff --git a/Makefile.in b/Makefile.in
  40      -index 8e52bca..0dd46b1 100644
       41 +index bc4660f..9f953e1 100644
  41   42  --- a/Makefile.in
  42   43  +++ b/Makefile.in
  43      -@@ -112,8 +112,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
       44 +@@ -113,8 +113,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
  44   45          sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
  45      -        sandbox-seccomp-filter.o sandbox-capsicum.o
       46 +        sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-solaris.o
  46   47   
  47   48  -MANPAGES       = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out
  48   49  -MANPAGES_IN    = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
  49   50  +MANPAGES       = moduli.4.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.1m.out sftp-server.1m.out sftp.1.out ssh-keysign.1m.out ssh-pkcs11-helper.1m.out sshd_config.4.out ssh_config.4.out
  50   51  +MANPAGES_IN    = moduli.4 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.1m sftp-server.1m sftp.1 ssh-keysign.1m ssh-pkcs11-helper.1m sshd_config.4 ssh_config.4
  51   52   MANTYPE                = @MANTYPE@
  52   53   
  53   54   CONFIGFILES=sshd_config.out ssh_config.out moduli.out
  54      -@@ -307,8 +307,8 @@ install-files:
       55 +@@ -308,8 +308,8 @@ install-files:
  55   56          $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
  56   57          $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
  57   58          $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
  58   59  -       $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
  59   60  -       $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
  60   61  +       $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)4
  61   62  +       $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1m
  62   63          $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
  63   64          (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
  64   65          $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
  65      -@@ -328,14 +328,14 @@ install-files:
       66 +@@ -329,14 +329,14 @@ install-files:
  66   67          $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
  67   68          $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
  68   69          $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
  69   70  -       $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
  70   71  -       $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
  71   72  -       $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
  72   73  -       $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
  73   74  +       $(INSTALL) -m 644 moduli.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/moduli.4
  74   75  +       $(INSTALL) -m 644 sshd_config.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/sshd_config.4
  75   76  +       $(INSTALL) -m 644 ssh_config.4.out $(DESTDIR)$(mandir)/$(mansubdir)4/ssh_config.4
↓ open down ↓ 619 lines elided ↑ open up ↑ 
 695  696  -.%N draft-ietf-secsh-filexfer-02.txt
 696  697  -.%D October 2001
 697  698  -.%O work in progress material
 698  699  -.Re
 699  700  -.Sh HISTORY
 700  701  -.Nm
 701  702  -first appeared in
 702  703  -.Ox 2.8 .
 703  704  -.Sh AUTHORS
 704  705  -.An Markus Friedl Aq Mt markus@openbsd.org
      706 +diff --git a/ssh-keygen.1 b/ssh-keygen.1
      707 +index ed17a08..9616030 100644
      708 +--- a/ssh-keygen.1
      709 ++++ b/ssh-keygen.1
      710 +@@ -174,9 +174,7 @@ key in
      711 + .Pa ~/.ssh/id_ed25519
      712 + or
      713 + .Pa ~/.ssh/id_rsa .
      714 +-Additionally, the system administrator may use this to generate host keys,
      715 +-as seen in
      716 +-.Pa /etc/rc .
      717 ++Additionally, the system administrator may use this to generate host keys.
      718 + .Pp
      719 + Normally this program generates the key and asks for a file in which
      720 + to store the private key.
      721 +@@ -224,7 +222,7 @@ for which host keys
      722 + do not exist, generate the host keys with the default key file path,
      723 + an empty passphrase, default bits for the key type, and default comment.
      724 + This is used by
      725 +-.Pa /etc/rc
      726 ++.Pa /lib/svc/method/sshd
      727 + to generate new host keys.
      728 + .It Fl a Ar rounds
      729 + When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
 705  730  diff --git a/ssh-keysign.1m b/ssh-keysign.1m
 706  731  new file mode 100644
 707  732  index 0000000..60c96ad
 708  733  --- /dev/null
 709  734  +++ b/ssh-keysign.1m
 710  735  @@ -0,0 +1,93 @@
 711  736  +.\" $OpenBSD: ssh-keysign.8,v 1.14 2013/12/07 11:58:46 naddy Exp $
 712  737  +.\"
 713  738  +.\" Copyright (c) 2002 Markus Friedl.  All rights reserved.
 714  739  +.\"
↓ open down ↓ 3742 lines elided ↑ open up ↑ 
4457 4482  -OpenSSH is a derivative of the original and free
4458 4483  -ssh 1.2.12 release by Tatu Ylonen.
4459 4484  -Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
4460 4485  -Theo de Raadt and Dug Song
4461 4486  -removed many bugs, re-added newer features and
4462 4487  -created OpenSSH.
4463 4488  -Markus Friedl contributed the support for SSH
4464 4489  -protocol versions 1.5 and 2.0.
4465 4490  diff --git a/sshd.1m b/sshd.1m
4466 4491  new file mode 100644
4467      -index 0000000..967a753
     4492 +index 0000000..ada4f25
4468 4493  --- /dev/null
4469 4494  +++ b/sshd.1m
4470 4495  @@ -0,0 +1,971 @@
4471 4496  +.\"
4472 4497  +.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4473 4498  +.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4474 4499  +.\"                    All rights reserved
4475 4500  +.\"
4476 4501  +.\" As far as I am concerned, the code I have written for this software
4477 4502  +.\" can be used freely for any purpose.  Any derived versions of this
↓ open down ↓ 51 lines elided ↑ open up ↑ 
4529 4554  +.Sh DESCRIPTION
4530 4555  +.Nm
4531 4556  +(OpenSSH Daemon) is the daemon program for
4532 4557  +.Xr ssh 1 .
4533 4558  +Together these programs replace rlogin and rsh,
4534 4559  +and provide secure encrypted communications between two untrusted hosts
4535 4560  +over an insecure network.
4536 4561  +.Pp
4537 4562  +.Nm
4538 4563  +listens for connections from clients.
4539      -+It is normally started at boot from
4540      -+.Pa /etc/rc .
     4564 ++It is normally started at boot by
     4565 ++.Xr smf 5 .
4541 4566  +It forks a new
4542 4567  +daemon for each incoming connection.
4543 4568  +The forked daemons handle
4544 4569  +key exchange, encryption, authentication, command execution,
4545 4570  +and data exchange.
4546 4571  +.Pp
4547 4572  +.Nm
4548 4573  +can be configured using command-line options or a configuration file
4549 4574  +(by default
4550 4575  +.Xr sshd_config 4 ) ;
↓ open down ↓ 5343 lines elided ↑ open up ↑ 
9894 9919  -ssh 1.2.12 release by Tatu Ylonen.
9895 9920  -Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
9896 9921  -Theo de Raadt and Dug Song
9897 9922  -removed many bugs, re-added newer features and
9898 9923  -created OpenSSH.
9899 9924  -Markus Friedl contributed the support for SSH
9900 9925  -protocol versions 1.5 and 2.0.
9901 9926  -Niels Provos and Markus Friedl contributed support
9902 9927  -for privilege separation.
9903 9928  -- 
9904      -2.3.2 (Apple Git-55)
     9929 +2.5.4 (Apple Git-61)
9905 9930  
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX