sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update and re-add KERB_GSSAPI gsskex patch.

Browse source 
I did very minor porting of the upstream patch to make
  it apply.
  Note that this currently does not build with base heimdal, but
  does build with port MIT or port HEIMDAL.
- Bump PORTREVISION in case someone built the update, expecting
  this option to work and now have a broken ssh.

PR:		ports/178885
Reported by:	Garrett Wollman <wollman@csail.mit.edu>
This commit is contained in:
Bryan Drewery 2013-05-25 16:44:00 +00:00
parent e31d9d96e6
commit ef47aef18c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=319062
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
security/openssh-portable/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= openssh PORTNAME= openssh
DISTVERSION= 6.2p2 DISTVERSION= 6.2p2
PORTREVISION= 1 PORTREVISION= 2
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= security ipv6 CATEGORIES= security ipv6
MASTER_SITES= ${MASTER_SITE_OPENBSD} MASTER_SITES= ${MASTER_SITE_OPENBSD}
@ -40,13 +40,14 @@ SUDO?= # empty
MAKE_ENV+= SUDO="${SUDO}" MAKE_ENV+= SUDO="${SUDO}"
OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \ OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \
HPN LPK X509 \ HPN LPK X509 KERB_GSSAPI \
OVERWRITE_BASE SCTP AES_THREADED OVERWRITE_BASE SCTP AES_THREADED
OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS HPN OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS HPN
OPTIONS_RADIO= KERBEROS OPTIONS_RADIO= KERBEROS
OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE
TCP_WRAPPERS_DESC= Enable tcp_wrappers support TCP_WRAPPERS_DESC= Enable tcp_wrappers support
BSM_DESC= Enable OpenBSM Auditing BSM_DESC= Enable OpenBSM Auditing
KERB_GSSAPI_DESC= Enable Kerberos/GSSAPI patch (req: GSSAPI)
HPN_DESC= Enable HPN-SSH patch HPN_DESC= Enable HPN-SSH patch
LPK_DESC= Enable LDAP Public Key (LPK) [OBSOLETE] LPK_DESC= Enable LDAP Public Key (LPK) [OBSOLETE]
X509_DESC= Enable x509 certificate patch X509_DESC= Enable x509 certificate patch
@ -86,6 +87,15 @@ BROKEN= X509 patch and SCTP patch do not apply cleanly together
. if ${PORT_OPTIONS:MLPK} . if ${PORT_OPTIONS:MLPK}
BROKEN= X509 patch and LPK patch do not apply cleanly together BROKEN= X509 patch and LPK patch do not apply cleanly together
. endif . endif
. if ${PORT_OPTIONS:MKERB_GSSAPI}
BROKEN= X509 patch incompatible with KERB_GSSAPI patch
. endif
.endif
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && ${PORT_OPTIONS:MKERB_GSSAPI}
BROKEN= KERB_GSSAPI Requires either MIT or HEMIDAL, does not build with base Heimdal currently
.endif .endif
.if defined(OPENSSH_OVERWRITE_BASE) .if defined(OPENSSH_OVERWRITE_BASE)
@ -121,6 +131,12 @@ IGNORE= You have selected HEIMDAL_BASE but do not have heimdal installed in bas
CONFIGURE_LIBS+= -lgssapi_krb5 CONFIGURE_LIBS+= -lgssapi_krb5
. endif . endif
. endif . endif
# 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
PATCH_DIST_STRIP=
.endif
.if ${OPENSSLBASE} == "/usr" .if ${OPENSSLBASE} == "/usr"
CONFIGURE_ARGS+= --without-rpath CONFIGURE_ARGS+= --without-rpath
LDFLAGS= # empty LDFLAGS= # empty

2
security/openssh-portable/distinfo
View file

@ -6,6 +6,8 @@ SHA256 (openssh-6.2p1-CTR-threaded-v14.diff.gz) = 4d2fefd8a415c76d761ffe3a8fda7d
SIZE (openssh-6.2p1-CTR-threaded-v14.diff.gz) = 4908 SIZE (openssh-6.2p1-CTR-threaded-v14.diff.gz) = 4908
SHA256 (openssh-6.2p1+x509-7.4.1.diff.gz) = cdfa0ac38184062de7e0af36eeda7713095fbcffffb598d785047f6f47e48eae SHA256 (openssh-6.2p1+x509-7.4.1.diff.gz) = cdfa0ac38184062de7e0af36eeda7713095fbcffffb598d785047f6f47e48eae
SIZE (openssh-6.2p1+x509-7.4.1.diff.gz) = 215496 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-lpk-6.2p1.patch.gz) = 96c7a5435f3fd7d83875ee06c4a3c83ee6172c7d9de31b9ffdeb18118f285a24 SHA256 (openssh-lpk-6.2p1.patch.gz) = 96c7a5435f3fd7d83875ee06c4a3c83ee6172c7d9de31b9ffdeb18118f285a24
SIZE (openssh-lpk-6.2p1.patch.gz) = 17881 SIZE (openssh-lpk-6.2p1.patch.gz) = 17881
SHA256 (openssh-sctp-2163.patch.gz) = 86ac3a59119c9c26193334d8ba7c3be9f143209080e4f8a2a00577c24c0c9e03 SHA256 (openssh-sctp-2163.patch.gz) = 86ac3a59119c9c26193334d8ba7c3be9f143209080e4f8a2a00577c24c0c9e03