Date: Wed, 30 May 2012 23:38:19 -0400 From: Jason Hellenthal <jhellenthal@dataix.net> To: Michael Scheidell <scheidell@freebsd.org> Cc: freebsd-ports@freebsd.org Subject: Re: security/openssh-portable HPN 404 Message-ID: <20120531033818.GA25330@DataIX.net> In-Reply-To: <4FC6CCED.7050800@FreeBSD.org> References: <20120530120031.E651010656FA@hub.freebsd.org> <000901cd3ebd$60b4b8d0$221e2a70$@quicknet.nl> <4FC6C880.4040502@shatow.net> <4FC6CCED.7050800@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--rS8CxjVDS/+yyDmU Content-Type: multipart/mixed; boundary="1yeeQ81UyVL57Vl7" Content-Disposition: inline --1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable You guys may want to try these out... This updates to openssh-portable-5.9p1_2,1 See the attached config file for the options I tested with. If you want something else and it does not work feel free to email me directly and I will see what I can do. I don't have time to put this up publicly yet but will soon. On Wed, May 30, 2012 at 09:44:13PM -0400, Michael Scheidell wrote: >=20 >=20 > On 5/30/12 9:25 PM, Bryan Drewery wrote: > > cd /usr/ports/security/openssh-portable > > fetchhttp://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports%2F168306&getpat= ch=3D1 > > patch< patch-openssh-hpn-mirror.txt > > > actually, the & in the command line mucks things up. >=20 > this should work: > cd /usr/ports/security/openssh-portable > fetch -o -=20 > 'http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports%2F168306&getpatch=3D1= ' =20 > | patch >=20 > (-o is output file.. unless you want a strange file hanging around, -=20 > means stdout, | patch just pipes standard out to in and to patch. >=20 > --=20 > Michael Scheidell, CTO > >*| * SECNAP Network Security Corporation > d: +1.561.948.2259 > w: http://people.freebsd.org/~scheidell > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" --=20 - (2^(N-1)) --1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="openssh-portable-5.9p1_2,1.config" ===> 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 --1yeeQ81UyVL57Vl7 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="openssh-portable-5.9p1_2,1.diff" Content-Transfer-Encoding: quoted-printable diff -urN security/openssh-portable-5.8p2/Makefile security/openssh-portabl= e/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 @@ # =20 PORTNAME=3D openssh -DISTVERSION=3D 5.8p2 -PORTREVISION=3D 2 -PORTEPOCH=3D 1 +DISTVERSION=3D 5.9p1 +PORTREVISION=3D 2 +PORTEPOCH=3D 1 CATEGORIES=3D security ipv6 MASTER_SITES=3D ${MASTER_SITE_OPENBSD} MASTER_SITE_SUBDIR=3D OpenSSH/portable @@ -42,7 +42,6 @@ OPTIONS=3D 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+=3D --with-libedit .endif =20 -.if !defined(WITH_SUID_SSH) -CONFIGURE_ARGS+=3D --disable-suid-ssh -.endif - .if defined(WITH_BSM) CONFIGURE_ARGS+=3D --with-audit=3Dbsm .endif @@ -119,7 +114,7 @@ =20 .if defined(WITH_HPN) PATCH_SITES+=3D http://www.psc.edu/networking/projects/hpn-ssh/ -PATCHFILES+=3D ${PORTNAME}-5.8p1-hpn13v11.diff.gz +PATCHFILES+=3D ${PORTNAME}-5.9p1-hpn13v12.diff.gz PATCH_DIST_STRIP=3D .endif =20 @@ -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_PO= RT_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_PO= RT_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-portabl= e/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) =3D 5c35ec7c966ce05cc4497ac59c0b54a556e55ae7= 368165cc8c4129694654f314 -SIZE (openssh-5.8p2.tar.gz) =3D 1115475 -SHA256 (openssh-5.8p1-hpn13v11.diff.gz) =3D 62b500d29d8889ce76c8b596eb6573= 1d8ac3469d89d9c6eb29fec2a845159df7 -SIZE (openssh-5.8p1-hpn13v11.diff.gz) =3D 22993 -SHA256 (openssh-5.8p1+x509-7.0.diff.gz) =3D 3b578cbf69f25e630e8da52b6586a3= 6c62c0c7ce026f95acda91c023dc47c85b -SIZE (openssh-5.8p1+x509-7.0.diff.gz) =3D 184277 -SHA256 (openssh-5.7p1-gsskex-all-20110125.patch) =3D bfdc72c3d7d5d4f9f8a78= b649988dff8fad780cfa72bad4a69eb94c54de9a359 -SIZE (openssh-5.7p1-gsskex-all-20110125.patch) =3D 91889 +SHA256 (openssh-5.9p1.tar.gz) =3D 8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3= 310cc32eba84c939b07777d5 +SIZE (openssh-5.9p1.tar.gz) =3D 1110014 +SHA256 (openssh-5.9p1-hpn13v12.diff.gz) =3D 74499c3487a53eaaeaad79d89d8260= c23f9a416173d7c256d1f3131677213040 +SIZE (openssh-5.9p1-hpn13v12.diff.gz) =3D 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:1= 8:56.000000000 -0400 +++ security/openssh-portable/files/patch-Makefile.in 1969-12-31 19:00:00.0= 00000000 -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 -=20 --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) i= nstall-files install-sysconf - install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS= ) install-files -=20 --1yeeQ81UyVL57Vl7-- --rS8CxjVDS/+yyDmU Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJPxuepAAoJEBSh2Dr1DU7WwPQH/2binEFWvo2LHLOI3kw3Btpp 4eH3vxWNZYZy6iUfk2mFSh6zRjnl1GOLvKWGvFUcHaBobjgxkgj3Deoz9cPlmPbt SEE/WOx5mF13ZI8ZmBqToAsgin6K0wQZGPVL0+lIJuJ/FHWeOmB8+KEL+W7H4W+q chx3rQ1oOHy+gVnCzCRgfqoDJwQC+DeO5VlKv6+viz+uQpD3CmVUIcjmTyUKsiAs lW18qP3M0XCP5p2VHOVa6zNsS5ZpCj2iEQTmZolCWlxTlGTaGbry6LLTQke8LqMD 6GVYEup0/TziqFcqgbUIdTE1gwnAbbRkkfTpY8S0FYG2+lMWTpS7tObgKqBbQDw= =oHOS -----END PGP SIGNATURE----- --rS8CxjVDS/+yyDmU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120531033818.GA25330>