diff options
| author | tron <tron> | 2001-01-10 15:10:59 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-01-10 15:10:59 +0000 |
| commit | af818be659cd497eedab587eeeddd6f35103b83a (patch) | |
| tree | 89dac1aabc2c568cc8c6d463f2c4e96867919c64 | |
| parent | 8094cb45edce656a7318339c622715de6c8e7cf8 (diff) | |
| download | pkgsrc-af818be659cd497eedab587eeeddd6f35103b83a.tar.gz | |
Don't check for "/dev/urandom" under Solaris.
| -rw-r--r-- | security/openssh/Makefile | 6 | ||||
| -rw-r--r-- | security/openssh/pkg/INSTALL | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index cd41c5900eb..5358bf4cdb8 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2000/12/08 08:52:35 wiz Exp $ -# +# $NetBSD: Makefile,v 1.33 2001/01/10 15:10:59 tron Exp $ DISTNAME= openssh-2.3.0p1 CATEGORIES= security @@ -55,7 +54,7 @@ MESSAGE_FILE= ${WRKDIR}/MESSAGE ONLY_FOR_PLATFORM= NetBSD-*-arm32 NetBSD-*-i386 \ NetBSD-*-m68k NetBSD-*-mips NetBSD-*-mipseb \ NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-powerpc \ - NetBSD-*-sparc NetBSD-*-vax + NetBSD-*-sparc NetBSD-*-vax SunOS-*-* .include "../../mk/bsd.prefs.mk" @@ -87,6 +86,7 @@ post-build: do \ ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \ -e 's#@PREFIX@#${PREFIX}#g' \ + -e 's#@OPSYS@#${OPSYS}#g' \ < $${FILE} > ${WRKDIR}/`basename $${FILE}`; \ done diff --git a/security/openssh/pkg/INSTALL b/security/openssh/pkg/INSTALL index 3586cf3d142..00cc2b9b35d 100644 --- a/security/openssh/pkg/INSTALL +++ b/security/openssh/pkg/INSTALL @@ -1,15 +1,17 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2000/12/08 08:52:36 wiz Exp $ +# $NetBSD: INSTALL,v 1.3 2001/01/10 15:11:00 tron Exp $ PKGNAME=$1 STAGE=$2 case ${STAGE} in PRE-INSTALL) - if ! dd if=/dev/urandom of=/dev/null bs=1 count=1 2>/dev/null >/dev/null + if [ "@OPSYS@" != "SunOS" ] then - cat << EOF + if ! dd if=/dev/urandom of=/dev/null bs=1 count=1 2>/dev/null >/dev/null + then + cat << EOF =========================================================================== You need a working /dev/urandom for ${PKGNAME} to work. @@ -19,7 +21,8 @@ containing the line: pseudo-device rnd =========================================================================== EOF - exit 1 + exit 1 + fi fi ;; POST-INSTALL) |