diff options
| author | mnag <mnag@FreeBSD.org> | 2006-10-08 05:06:55 +0800 |
|---|---|---|
| committer | mnag <mnag@FreeBSD.org> | 2006-10-08 05:06:55 +0800 |
| commit | 66e5c9929ad58f451c86039a2d95c987bb33723f (patch) | |
| tree | 9cd7c13b4e2fd46fb4e6c71e7733a3189eab6184 /security/openssh-portable/Makefile | |
| parent | 7e7e822f6747b2b407cf91aaa764b20ee0d548e6 (diff) | |
| download | freebsd-ports-gnome-66e5c9929ad58f451c86039a2d95c987bb33723f.tar.gz freebsd-ports-gnome-66e5c9929ad58f451c86039a2d95c987bb33723f.tar.zst freebsd-ports-gnome-66e5c9929ad58f451c86039a2d95c987bb33723f.zip | |
- Add OPTION to enable Kerberos/GSSAPI patch [1]
- Add OPTION to enable LPK patch (ldap stored public key) [2]
PR: 86384 [1], 103399 [2]
Submitted by: Garrett Wollman <wollman___khavrinen.csail.mit.edu> [1], Dmitriy Kirhlarov <dkirhlarov___oilspace.com> [2]
Diffstat (limited to 'security/openssh-portable/Makefile')
| -rw-r--r-- | security/openssh-portable/Makefile | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 868cbe37dcd5..d56a58976246 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -53,17 +53,19 @@ PORTABLE_SUFFIX= -portable SUDO?= # empty MAKE_ENV+= SUDO="${SUDO}" -OPTIONS= PAM "Enable pam(3) support" on \ - TCP_WRAPPERS "Enable tcp_wrappers support" on \ - LIBEDIT "Enable readline support to sftp(1)" on \ - KERBEROS "Enable kerberos (autodetection)" on \ - SUID_SSH "Enable suid SSH (Recommended off)" off \ - GSSAPI "Enable GSSAPI support" off \ - OPENSSH_CHROOT "Enable CHROOT support" off \ - OPENSC "Enable OpenSC smartcard support" off \ - OPENSCPINPATCH "Enable OpenSC PIN patch" off \ - HPN "Enable HPN-SSH patch" off \ - OVERWRITE_BASE "OpenSSH overwrite base" off +OPTIONS= PAM "Enable pam(3) support" on \ + TCP_WRAPPERS "Enable tcp_wrappers support" on \ + LIBEDIT "Enable readline support to sftp(1)" on \ + KERBEROS "Enable kerberos (autodetection)" on \ + SUID_SSH "Enable suid SSH (Recommended off)" off \ + GSSAPI "Enable GSSAPI support (req: KERBEROS)" off \ + KERB_GSSAPI "Enable Kerberos/GSSAPI patch (req: GSSAPI)" off \ + OPENSSH_CHROOT "Enable CHROOT support" off \ + OPENSC "Enable OpenSC smartcard support" off \ + OPENSCPINPATCH "Enable OpenSC PIN patch" off \ + HPN "Enable HPN-SSH patch" off \ + LPK "Enable LDAP Public Key (LPK) patch" off \ + OVERWRITE_BASE "OpenSSH overwrite base" off .include <bsd.port.pre.mk> @@ -97,6 +99,11 @@ CONFIGURE_ARGS+= --disable-suid-ssh .if !defined(WITHOUT_KERBEROS) .if defined(KRB5_HOME) && exists(${KRB5_HOME}) || defined(WITH_GSSAPI) +.if defined(WITH_KERB_GSSAPI) +PATCH_DIST_STRIP= -p0 +PATCH_SITES+= http://www.sxw.org.uk/computing/patches/ +PATCHFILES+= openssh-4.4p1-gsskex-20061002.patch +.endif PORTABLE_SUFFIX= # empty GSSAPI_SUFFIX= -gssapi CONFLICTS+= openssh-portable-*-[0-9]* @@ -133,12 +140,25 @@ CONFIGURE_ARGS+= --with-opensc=${LOCALBASE} EXTRA_PATCHES+= ${FILESDIR}/scardpin.patch .endif +.if defined(WITH_HPN) && defined(WITH_LPK) +BROKEN= HPN and LPK patches are incompatible +.endif + .if defined(WITH_HPN) PATCH_DIST_STRIP= -p1 PATCH_SITES+= http://www.psc.edu/networking/projects/hpn-ssh/ PATCHFILES+= openssh-4.4p1-hpn.diff.gz .endif +.if defined(WITH_LPK) +PATCH_DIST_STRIP= -p0 +EXTRA_PATCHES+= ${FILESDIR}/openssh-lpk.patch +USE_OPENLDAP= yes +CPPFLAGS+= "-I${LOCALBASE}/include -DWITH_LDAP_PUBKEY" +CONFIGURE_ARGS+= --with-libs='-lldap' --with-ldflags='-L/usr/local/lib' \ + --with-cppflags='-I/usr/local/include -DWITH_LDAP_PUBKEY' +.endif + .if defined(WITH_OVERWRITE_BASE) WITH_OPENSSL_BASE= yes BASE_SUFFIX= -overwrite-base |