diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-05 13:48:37 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-05 13:48:37 +1000 |
commit | f22019bdbfb986daf24428a9d37f9fe9bb3ff7ad (patch) | |
tree | e23aa2864fccb6f4097d962aa14f9d78ca02a929 /buildpkg.sh.in | |
parent | 68790fedef210e03e36534b111e2f27b858170b4 (diff) |
- (djm) [Makefile.in WARNING.RNG aclocal.m4 buildpkg.sh.in configure.ac]
[entropy.c ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c]
[ssh-keysign.c ssh-pkcs11-helper.c ssh-rand-helper.8 ssh-rand-helper.c]
[ssh.c ssh_prng_cmds.in sshd.c contrib/aix/buildbff.sh]
[regress/README.regress] Remove ssh-rand-helper and all its
tentacles. PRNGd seeding has been rolled into entropy.c directly.
Thanks to tim@ for testing on affected platforms.
Diffstat (limited to 'buildpkg.sh.in')
-rw-r--r-- | buildpkg.sh.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/buildpkg.sh.in b/buildpkg.sh.in index 22c66fbd4..4de9d42e4 100644 --- a/buildpkg.sh.in +++ b/buildpkg.sh.in | |||
@@ -229,8 +229,6 @@ perl -p -i -e "s/#PrintMotd yes/PrintMotd no/" \ | |||
229 | # We don't want to overwrite config files on multiple installs | 229 | # We don't want to overwrite config files on multiple installs |
230 | mv $FAKE_ROOT${sysconfdir}/ssh_config $FAKE_ROOT${sysconfdir}/ssh_config.default | 230 | mv $FAKE_ROOT${sysconfdir}/ssh_config $FAKE_ROOT${sysconfdir}/ssh_config.default |
231 | mv $FAKE_ROOT${sysconfdir}/sshd_config $FAKE_ROOT${sysconfdir}/sshd_config.default | 231 | mv $FAKE_ROOT${sysconfdir}/sshd_config $FAKE_ROOT${sysconfdir}/sshd_config.default |
232 | [ -f $FAKE_ROOT${sysconfdir}/ssh_prng_cmds ] && \ | ||
233 | mv $FAKE_ROOT${sysconfdir}/ssh_prng_cmds $FAKE_ROOT${sysconfdir}/ssh_prng_cmds.default | ||
234 | 232 | ||
235 | # local tweeks here | 233 | # local tweeks here |
236 | [ -s "${POST_MAKE_INSTALL_FIXES}" ] && . ${POST_MAKE_INSTALL_FIXES} | 234 | [ -s "${POST_MAKE_INSTALL_FIXES}" ] && . ${POST_MAKE_INSTALL_FIXES} |
@@ -317,11 +315,6 @@ cat > postinstall << _EOF | |||
317 | [ -f \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config ] || \\ | 315 | [ -f \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config ] || \\ |
318 | cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config.default \\ | 316 | cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config.default \\ |
319 | \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config | 317 | \${PKG_INSTALL_ROOT}${sysconfdir}/sshd_config |
320 | [ -f \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds.default ] && { | ||
321 | [ -f \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds ] || \\ | ||
322 | cp -p \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds.default \\ | ||
323 | \${PKG_INSTALL_ROOT}${sysconfdir}/ssh_prng_cmds | ||
324 | } | ||
325 | 318 | ||
326 | # make rc?.d dirs only if we are doing a test install | 319 | # make rc?.d dirs only if we are doing a test install |
327 | [ -n "${TEST_DIR}" ] && [ $DO_SMF -ne 1 ] && { | 320 | [ -n "${TEST_DIR}" ] && [ $DO_SMF -ne 1 ] && { |