b86c905ff1
Some changes different from patches provided in that PR are: - patch-aj, patch-aq, and patch-as not changed (they appeared to be identical to previous patches) - DragonFly support also added to configure script (patch-aa) because compilation failed due to missing crypt - and install-sysconf target removed from the installation target in Makefile.in (patch-ah). Just let the pkgsrc framework install this since it now will allow it to be removed correctly on deinstall. - use "pam" instead of "PAM" as option name in the post-install target. This removes patch-ai. This also now uses openssh-4.2p1-hpn11.diff patch. I didn't test with kerberos and hpn-patch options. I did test with PAM on Linux. (The PR reported that kerberos and hpn-patch options were tested for compiling.) I tested on NetBSD 2.0.2, Linux, and DragonFly. This includes two security fixes and several bug fixes and many improvemens. The changes are listed at http://www.mindrot.org/pipermail/openssh-unix-announce/2005-September/000083.html http://www.mindrot.org/pipermail/openssh-unix-announce/2005-May/000079.html TODO: get some of these patches committed upstream.
33 lines
926 B
Makefile
33 lines
926 B
Makefile
# $NetBSD: options.mk,v 1.6 2005/09/21 18:07:09 reed Exp $
|
|
|
|
.include "../../mk/bsd.prefs.mk"
|
|
|
|
PKG_OPTIONS_VAR= PKG_OPTIONS.openssh
|
|
PKG_SUPPORTED_OPTIONS= kerberos hpn-patch
|
|
|
|
.if !empty(OPSYS:MLinux)
|
|
PKG_SUPPORTED_OPTIONS+= pam
|
|
.endif
|
|
|
|
.include "../../mk/bsd.options.mk"
|
|
|
|
.if !empty(PKG_OPTIONS:Mkerberos)
|
|
. include "../../mk/krb5.buildlink3.mk"
|
|
CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE}
|
|
.endif
|
|
|
|
.if !empty(PKG_OPTIONS:Mhpn-patch)
|
|
PATCHFILES= openssh-4.2p1-hpn11.diff
|
|
PATCH_SITES= http://www.psc.edu/networking/projects/hpn-ssh/
|
|
PATCH_DIST_STRIP= -p1
|
|
.endif
|
|
|
|
.if !empty(PKG_OPTIONS:Mpam)
|
|
# XXX: PAM authentication causes memory faults, and haven't tracked down
|
|
# XXX: why yet. For the moment, disable PAM authentication for non-Linux.
|
|
.include "../../mk/pam.buildlink3.mk"
|
|
CONFIGURE_ARGS+= --with-pam
|
|
PLIST_SRC+= ${.CURDIR}/PLIST.pam
|
|
MESSAGE_SRC+= ${.CURDIR}/MESSAGE.pam
|
|
MESSAGE_SUBST+= EGDIR=${EGDIR}
|
|
.endif
|