diff options
| author | wiz <wiz> | 2000-12-08 08:52:35 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2000-12-08 08:52:35 +0000 |
| commit | 935344d0a9d5c78ce2443f22342f714ac0a73a3b (patch) | |
| tree | 65bada5e9ce8157ea74a8498727c8dfe9571f9d7 /security | |
| parent | db8c460120f8645de5ae1147d01d0362fce9fa1c (diff) | |
| download | pkgsrc-935344d0a9d5c78ce2443f22342f714ac0a73a3b.tar.gz | |
Move code from REQ file to INSTALL.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 6 | ||||
| -rw-r--r-- | security/openssh/pkg/INSTALL | 16 | ||||
| -rw-r--r-- | security/openssh/pkg/REQ | 29 |
3 files changed, 19 insertions, 32 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index af2b4cdb9b4..cd41c5900eb 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2000/11/09 09:18:23 itojun Exp $ +# $NetBSD: Makefile,v 1.32 2000/12/08 08:52:35 wiz Exp $ # DISTNAME= openssh-2.3.0p1 @@ -90,9 +90,11 @@ post-build: < $${FILE} > ${WRKDIR}/`basename $${FILE}`; \ done +pre-install: + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL + post-install: ${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd - PKG_PREFIX=${PREFIX} ${SH} ${REQ_FILE} ${PKGNAME} INSTALL PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/security/openssh/pkg/INSTALL b/security/openssh/pkg/INSTALL index 8517160ab65..3586cf3d142 100644 --- a/security/openssh/pkg/INSTALL +++ b/security/openssh/pkg/INSTALL @@ -1,12 +1,26 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2000/07/22 08:22:59 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2000/12/08 08:52:36 wiz 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 + then + cat << EOF +=========================================================================== +You need a working /dev/urandom for ${PKGNAME} to work. + +Please make sure you have a kernel compiled from a config file +containing the line: + + pseudo-device rnd +=========================================================================== +EOF + exit 1 + fi ;; POST-INSTALL) SSH_CONF_DIR=@SSH_CONF_DIR@ diff --git a/security/openssh/pkg/REQ b/security/openssh/pkg/REQ deleted file mode 100644 index 91205d56cd6..00000000000 --- a/security/openssh/pkg/REQ +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# $NetBSD: REQ,v 1.2 2000/07/25 07:29:44 jlam Exp $ -# - -PKG=$1 -STAGE=$2 - -if [ "$STAGE" != "INSTALL" ]; -then - exit 0 -fi - -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 ${PKG} to work. - -Please make sure you have a kernel compiled from a config file -containing the line: - - pseudo-device rnd -=========================================================================== -EOF - exit 1 -fi - -exit 0 |