diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-28 18:00:45 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-28 18:00:45 +0000 |
| commit | fbebf3817cfd44809136bf50f5503f59e51d0daa (patch) | |
| tree | 811383fecf0181c1bd8eb3b1f2d4fde43785bd4e /security | |
| parent | 208ccffbfe31d41f0b08ab8c0261b13a71aaad64 (diff) | |
| download | pkgsrc-fbebf3817cfd44809136bf50f5503f59e51d0daa.tar.gz | |
Only allow an in-tree update to occur if OpenSSL>=0.9.5a is in the base
distribution. This prevents surprises like "hey, why is /usr/sbin/sshd
broken" if a pkgsrc openssl is pkg_delete'd. Idea by itojun.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 10 | ||||
| -rw-r--r-- | security/openssh/Makefile.intree | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index fe8ab660ea5..87c099b1ced 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2002/06/28 17:10:16 jlam Exp $ +# $NetBSD: Makefile,v 1.83 2002/06/28 18:00:45 jlam Exp $ DISTNAME= openssh-3.4p1 PKGNAME= openssh-3.4.0.1 @@ -48,10 +48,6 @@ RCD_SCRIPTS_EGDIR= etc/rc.d PLIST_SUBST+= MANDIR=${MANDIR} PLIST_SUBST+= RCD_SCRIPTS_EGDIR=${RCD_SCRIPTS_EGDIR} -.if defined(UPDATE_INTREE_OPENSSH) -. include "Makefile.intree" -.endif - USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -122,6 +118,10 @@ FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR} MESSAGE_SUBST+= EGDIR=${EGDIR} INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL +.if defined(UPDATE_INTREE_OPENSSH) +. include "Makefile.intree" +.endif + post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd diff --git a/security/openssh/Makefile.intree b/security/openssh/Makefile.intree index aa809631c81..0e1fc4f0645 100644 --- a/security/openssh/Makefile.intree +++ b/security/openssh/Makefile.intree @@ -1,7 +1,15 @@ -# $NetBSD: Makefile.intree,v 1.1 2002/06/28 17:10:17 jlam Exp $ +# $NetBSD: Makefile.intree,v 1.2 2002/06/28 18:00:45 jlam Exp $ .include "../../mk/bsd.prefs.mk" +# Require an in-tree OpenSSL that is at least 0.9.5a. +# +USE_OPENSSL_VERSION:= ${OPENSSL_VERSION_095A} +.include "../../security/openssl/buildlink.mk" +.if ${_NEED_OPENSSL} == "YES" +IGNORE= "OpenSSL>=0.9.5a in the base distribution is required." +.endif + _UPDATE_INTREE_OPENSSH?= NO .if ${OPSYS} == "NetBSD" . for PATTERN in 1.5 1.5.* |