Module Name:	pkgsrc
Committed By:	reed
Date:		Wed Sep 21 18:07:09 UTC 2005

Modified Files:
	pkgsrc/security/openssh: Makefile distinfo options.mk
	pkgsrc/security/openssh/patches: patch-aa patch-ab patch-ac patch-ad
	    patch-ae patch-af patch-ag patch-ah patch-ak patch-al patch-am
	    patch-an patch-ao patch-ap patch-ar patch-at patch-au patch-av
Removed Files:
	pkgsrc/security/openssh/patches: patch-ai

Log Message:
Update openssh to 4.2p1. This is from PR #31331. Thank you, Jason.

Some changes different from patches provided in that PR are:

- patch-aj, patch-aq, and patch-as not changed (they appeared to
  be identical to previous patches)

- DragonFly support also added to configure script (patch-aa)
  because compilation failed due to missing crypt

- and install-sysconf target removed from the installation target
  in Makefile.in (patch-ah). Just let the pkgsrc framework install
  this since it now will allow it to be removed correctly on
  deinstall.

- use "pam" instead of "PAM" as option name in the post-install
  target.

This removes patch-ai.

This also now uses openssh-4.2p1-hpn11.diff patch.

I didn't test with kerberos and hpn-patch options. I did test with
PAM on Linux. (The PR reported that kerberos and hpn-patch options
were tested for compiling.) I tested on NetBSD 2.0.2, Linux,
and DragonFly.

This includes two security fixes and several bug fixes and many
improvemens.  The changes are listed at
http://www.mindrot.org/pipermail/openssh-unix-announce/2005-September/000083.html
http://www.mindrot.org/pipermail/openssh-unix-announce/2005-May/000079.html

TODO: get some of these patches committed upstream.


To generate a diff of this commit:
cvs rdiff -r1.156 -r1.157 pkgsrc/security/openssh/Makefile
cvs rdiff -r1.40 -r1.41 pkgsrc/security/openssh/distinfo
cvs rdiff -r1.5 -r1.6 pkgsrc/security/openssh/options.mk
cvs rdiff -r1.37 -r1.38 pkgsrc/security/openssh/patches/patch-aa
cvs rdiff -r1.20 -r1.21 pkgsrc/security/openssh/patches/patch-ab
cvs rdiff -r1.12 -r1.13 pkgsrc/security/openssh/patches/patch-ac
cvs rdiff -r1.10 -r1.11 pkgsrc/security/openssh/patches/patch-ad
cvs rdiff -r1.9 -r1.10 pkgsrc/security/openssh/patches/patch-ae
cvs rdiff -r1.7 -r1.8 pkgsrc/security/openssh/patches/patch-af
cvs rdiff -r1.6 -r1.7 pkgsrc/security/openssh/patches/patch-ag \
    pkgsrc/security/openssh/patches/patch-ak \
    pkgsrc/security/openssh/patches/patch-ao
cvs rdiff -r1.21 -r1.22 pkgsrc/security/openssh/patches/patch-ah
cvs rdiff -r1.7 -r0 pkgsrc/security/openssh/patches/patch-ai
cvs rdiff -r1.5 -r1.6 pkgsrc/security/openssh/patches/patch-al \
    pkgsrc/security/openssh/patches/patch-an \
    pkgsrc/security/openssh/patches/patch-ap
cvs rdiff -r1.4 -r1.5 pkgsrc/security/openssh/patches/patch-am \
    pkgsrc/security/openssh/patches/patch-ar
cvs rdiff -r1.1 -r1.2 pkgsrc/security/openssh/patches/patch-at \
    pkgsrc/security/openssh/patches/patch-au \
    pkgsrc/security/openssh/patches/patch-av

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.