diff options
| author | taca <taca@pkgsrc.org> | 2011-05-17 03:26:52 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2011-05-17 03:26:52 +0000 |
| commit | 5d2a3ee538a9f04cf81b568d412bd67a8a6cd36f (patch) | |
| tree | c8b80eeca38b14a07b54749f63936d66471b5b11 /security | |
| parent | 77fffb0cb7c23090c3e3584dfdcfbcf5ccce8615 (diff) | |
| download | pkgsrc-5d2a3ee538a9f04cf81b568d412bd67a8a6cd36f.tar.gz | |
Don't always try to create ecdsa key which depends on OpenSSL's version.
Bump PKGREVISION.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 18 | ||||
| -rw-r--r-- | security/openssh/files/sshd.sh | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index ccb9510b2ba..3b368b2641f 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.201 2011/05/16 05:06:48 taca Exp $ +# $NetBSD: Makefile,v 1.202 2011/05/17 03:26:52 taca Exp $ DISTNAME= openssh-5.8p2 PKGNAME= openssh-5.8.2 -PKGREVISION= 1 +PKGREVISION= 2 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ @@ -162,6 +162,7 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor OWN_DIRS= ${OPENSSH_CHROOT} RCD_SCRIPTS= sshd +RCD_SCRIPT_SRC.sshd= ${WRKDIR}/sshd.sh PLIST_SRC+= ${.CURDIR}/PLIST FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} @@ -176,6 +177,19 @@ SUBST_MESSAGE.patch= More patch a file. .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" +# +# type of key "ecdsa" isn't always supported depends on OpenSSL. +# +post-configure: + if ${EGREP} -q '^\#define[ ]+OPENSSL_HAS_ECC' \ + ${WRKSRC}/config.h; then \ + ${SED} -e '/HAVE_ECDSA/s/.*//' \ + ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd.sh; \ + else \ + ${SED} -e '/HAVE_ECDSA_START/,/HAVE_ECDSA_STOP/d' \ + ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd.sh; \ + fi + post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} cd ${WRKSRC}; for file in ${CONFS}; do \ diff --git a/security/openssh/files/sshd.sh b/security/openssh/files/sshd.sh index dae0fd1455f..26bc4f65ee1 100644 --- a/security/openssh/files/sshd.sh +++ b/security/openssh/files/sshd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: sshd.sh,v 1.12 2011/05/16 05:06:49 taca Exp $ +# $NetBSD: sshd.sh,v 1.13 2011/05/17 03:26:52 taca Exp $ # # PROVIDE: sshd # REQUIRE: DAEMON LOGIN @@ -42,13 +42,14 @@ sshd_keygen() else ${keygen_command} -t rsa -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -N '' fi - +/* HAVE_ECDSA_START */ if [ -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key ]; then @ECHO@ "You already have a ECDSA host key in @PKG_SYSCONFDIR@/ssh_host_ecdsa_key" @ECHO@ "Skipping protocol version 2 ECDSA Key Generation" else ${keygen_command} -t ecdsa -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -N '' fi +/* HAVE_ECDSA_STOP */ ) } |