Date: Thu, 3 Oct 2013 22:38:57 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329246 - head/security/openssh-portable Message-ID: <201310032238.r93Mcv2W074878@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Oct 3 22:38:57 2013 New Revision: 329246 URL: http://svnweb.freebsd.org/changeset/ports/329246 Log: - Fix KERB_GSSAPI incorrectly using a predictable cache file. This was due to a mistake in r319062 when porting the patch from 5.8 to 6.2 There is no active upstream for this patch. For reference here are the changes made in the patch: --- - 2013-10-03 11:07:21.262913573 -0500 +++ /tmp/zdiff.XXXXXXXXXX.STScEeSI 2013-10-03 11:07:21.000000000 -0500 @@ -183,7 +183,7 @@ if (ret < 0 || (size_t)ret >= sizeof(ccname)) return ENOMEM; -+#ifdef USE_CCAPI ++#ifndef USE_CCAPI old_umask = umask(0177); tmpfd = mkstemp(ccname + strlen("FILE:")); oerrno = errno; PR: ports/180419 Reported by: Garrett Wollman <wollman@khavrinen.csail.mit.edu> Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/distinfo Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Thu Oct 3 22:35:12 2013 (r329245) +++ head/security/openssh-portable/Makefile Thu Oct 3 22:38:57 2013 (r329246) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.2p2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -134,7 +134,7 @@ CONFIGURE_LIBS+= -lgssapi_krb5 # Adapated from 5.7 patch at http://www.sxw.org.uk/computing/patches/ . if ${PORT_OPTIONS:MKERB_GSSAPI} -PATCHFILES+= openssh-6.2p2-gsskex-all-20110125.patch.gz +PATCHFILES+= openssh-6.2p2-gsskex-all-20110125-2.patch.gz PATCH_DIST_STRIP= . endif . if ${OPENSSLBASE} == "/usr" Modified: head/security/openssh-portable/distinfo ============================================================================== --- head/security/openssh-portable/distinfo Thu Oct 3 22:35:12 2013 (r329245) +++ head/security/openssh-portable/distinfo Thu Oct 3 22:38:57 2013 (r329246) @@ -6,8 +6,8 @@ SHA256 (openssh-6.2p1-CTR-threaded-v14.d SIZE (openssh-6.2p1-CTR-threaded-v14.diff.gz) = 4908 SHA256 (openssh-6.2p1+x509-7.4.1.diff.gz) = cdfa0ac38184062de7e0af36eeda7713095fbcffffb598d785047f6f47e48eae SIZE (openssh-6.2p1+x509-7.4.1.diff.gz) = 215496 -SHA256 (openssh-6.2p2-gsskex-all-20110125.patch.gz) = 1c54be66bfedb90b4909f0dda11dde09b10db6dca5a1c565c4c3efaed2036b2d -SIZE (openssh-6.2p2-gsskex-all-20110125.patch.gz) = 24309 +SHA256 (openssh-6.2p2-gsskex-all-20110125-2.patch.gz) = 597634f1a9e624b928f0ae647ec2ffba641f94a3ecad1161bce8fb2512c476b8 +SIZE (openssh-6.2p2-gsskex-all-20110125-2.patch.gz) = 24205 SHA256 (openssh-lpk-6.2p1.patch.gz) = 96c7a5435f3fd7d83875ee06c4a3c83ee6172c7d9de31b9ffdeb18118f285a24 SIZE (openssh-lpk-6.2p1.patch.gz) = 17881 SHA256 (openssh-sctp-2163.patch.gz) = 86ac3a59119c9c26193334d8ba7c3be9f143209080e4f8a2a00577c24c0c9e03
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310032238.r93Mcv2W074878>