On Sun, Jun 24, 2012 at 01:46:20PM -0400, Robert Simmons wrote: > On Sun, Jun 24, 2012 at 1:17 PM, J. Hellenthal <jhellent...@dataix.net> wrote: > > > > As stated in the subject > > > > if [ -f /usr/local/etc/ssh/ssh_host_ecdsa_key ]; then > > echo "You already have a Elliptic Curve DSA host key" \ > > "in /usr/local/etc/ssh/ssh_host_ecdsa_key" > > echo "Skipping protocol version 2 Elliptic Curve DSA Key Generation" > > else > > /usr/local/bin/ssh-keygen -t dsa \ > > -f /usr/local/etc/ssh/ssh_host_ecdsa_key -N '' > > fi > > > > > > Specifically "/usr/local/bin/ssh-keygen -t dsa" needs to be changed to > > "-t ecdsa" to be correct. Otherwise we are just reimplementing a DSA key > > in a different file. > > Good eye. I'm in the process of updating that port to 6.0p1. There > are quite a lot of local patches that are part of the port. At the > moment I'm muddling through what they do and whether they can be > removed or not. I didn't even notice this problem. > > I've attached a pair of patches that correct this problem. Open a PR > about this, and you can attach these patches to it. I'm not the > maintainer nor do I have commit privileges, but if you open a PR, I'm > sure someone will make the change.
Yeah I have been there too. The current port 5.8 I updated to 5.9. Some of the patches do not work but the diff I have is attached for the functions I use out of it. Also attached is my config for that port. But when I made it I did not have GSSAPI turned on. That does work but just have not adjusted it. -- - (2^(N-1))
===> The following configuration options are available for openssh-portable-5.9.p1_2,1: BSM=on: "Enable OpenBSM Auditing" FILECONTROL=off: "Enable file control patch (broken)" HPN=on: "Enable HPN-SSH patch" KERBEROS=off: "Enable kerberos (autodetection)" KERB_GSSAPI=off: "Enable Kerberos/GSSAPI patch (req: GSSAPI)" LIBEDIT=on: "Enable readline support to sftp(1)" LPK=off: "Enable LDAP Public Key (LPK) patch" OPENSSH_CHROOT=on: "Enable CHROOT support" OVERWRITE_BASE=off: "OpenSSH overwrite base" PAM=on: "Enable pam(3) support" TCP_WRAPPERS=on: "Enable tcp_wrappers support" X509=off: "Enable x509 certificate patch" ===> Use 'make config' to modify these settings
diff -urN security/openssh-portable-5.8p2/Makefile security/openssh-portable/Makefile --- security/openssh-portable-5.8p2/Makefile 2012-05-01 05:56:31.000000000 -0400 +++ security/openssh-portable/Makefile 2012-05-30 20:01:26.493449509 -0400 @@ -6,9 +6,9 @@ # PORTNAME= openssh -DISTVERSION= 5.8p2 -PORTREVISION= 2 -PORTEPOCH= 1 +DISTVERSION= 5.9p1 +PORTREVISION= 2 +PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} MASTER_SITE_SUBDIR= OpenSSH/portable @@ -42,7 +42,6 @@ OPTIONS= PAM "Enable pam(3) support" on \ TCP_WRAPPERS "Enable tcp_wrappers support" on \ LIBEDIT "Enable readline support to sftp(1)" on \ - SUID_SSH "Enable suid SSH (Recommended off)" off \ BSM "Enable OpenBSM Auditing" off \ KERBEROS "Enable kerberos (autodetection)" off \ KERB_GSSAPI "Enable Kerberos/GSSAPI patch (req: GSSAPI)" off \ @@ -87,10 +86,6 @@ CONFIGURE_ARGS+= --with-libedit .endif -.if !defined(WITH_SUID_SSH) -CONFIGURE_ARGS+= --disable-suid-ssh -.endif - .if defined(WITH_BSM) CONFIGURE_ARGS+= --with-audit=bsm .endif @@ -119,7 +114,7 @@ .if defined(WITH_HPN) PATCH_SITES+= http://www.psc.edu/networking/projects/hpn-ssh/ -PATCHFILES+= ${PORTNAME}-5.8p1-hpn13v11.diff.gz +PATCHFILES+= ${PORTNAME}-5.9p1-hpn13v12.diff.gz PATCH_DIST_STRIP= .endif @@ -194,11 +189,9 @@ -e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8 @${REINPLACE_CMD} -E -e 's|SSH_VERSION|TMP_SSH_VERSION|' \ -e 's|.*SSH_RELEASE.*||' ${WRKSRC}/version.h - @${ECHO_CMD} '#define FREEBSD_PORT_VERSION " FreeBSD-${PKGNAME}"' >> \ - ${WRKSRC}/version.h - @${ECHO_CMD} '#define SSH_VERSION TMP_SSH_VERSION SSH_PORTABLE FREEBSD_PORT_VERSION' >> \ + @${ECHO_CMD} '#define SSH_VERSION TMP_SSH_VERSION SSH_PORTABLE' >> \ ${WRKSRC}/version.h - @${ECHO_CMD} '#define SSH_RELEASE TMP_SSH_VERSION SSH_PORTABLE FREEBSD_PORT_VERSION' >> \ + @${ECHO_CMD} '#define SSH_RELEASE TMP_SSH_VERSION SSH_PORTABLE' >> \ ${WRKSRC}/version.h .if defined(WITH_HPN) @${REINPLACE_CMD} -e 's|TMP_SSH_VERSION SSH_PORTABLE|TMP_SSH_VERSION SSH_PORTABLE SSH_HPN|' \ diff -urN security/openssh-portable-5.8p2/distinfo security/openssh-portable/distinfo --- security/openssh-portable-5.8p2/distinfo 2011-10-21 12:18:56.000000000 -0400 +++ security/openssh-portable/distinfo 2012-05-30 19:07:47.129970365 -0400 @@ -1,8 +1,4 @@ -SHA256 (openssh-5.8p2.tar.gz) = 5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314 -SIZE (openssh-5.8p2.tar.gz) = 1115475 -SHA256 (openssh-5.8p1-hpn13v11.diff.gz) = 62b500d29d8889ce76c8b596eb65731d8ac3469d89d9c6eb29fec2a845159df7 -SIZE (openssh-5.8p1-hpn13v11.diff.gz) = 22993 -SHA256 (openssh-5.8p1+x509-7.0.diff.gz) = 3b578cbf69f25e630e8da52b6586a36c62c0c7ce026f95acda91c023dc47c85b -SIZE (openssh-5.8p1+x509-7.0.diff.gz) = 184277 -SHA256 (openssh-5.7p1-gsskex-all-20110125.patch) = bfdc72c3d7d5d4f9f8a78b649988dff8fad780cfa72bad4a69eb94c54de9a359 -SIZE (openssh-5.7p1-gsskex-all-20110125.patch) = 91889 +SHA256 (openssh-5.9p1.tar.gz) = 8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5 +SIZE (openssh-5.9p1.tar.gz) = 1110014 +SHA256 (openssh-5.9p1-hpn13v12.diff.gz) = 74499c3487a53eaaeaad79d89d8260c23f9a416173d7c256d1f3131677213040 +SIZE (openssh-5.9p1-hpn13v12.diff.gz) = 20186 diff -urN security/openssh-portable-5.8p2/files/patch-Makefile.in security/openssh-portable/files/patch-Makefile.in --- security/openssh-portable-5.8p2/files/patch-Makefile.in 2011-10-21 12:18:56.000000000 -0400 +++ security/openssh-portable/files/patch-Makefile.in 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2010-05-12 00:51:39.000000000 -0600 -+++ Makefile.in 2010-09-14 16:14:12.000000000 -0600 -@@ -238,7 +238,7 @@ - $(AUTORECONF) - -rm -rf autom4te.cache - --install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config -+install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf - install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf - install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files -
pgpxHiycDVRDH.pgp
Description: PGP signature