summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xcontrib/aix/buildbff.sh11
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c18430a9..6964dcffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120090307
2 - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it
3 exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS
4 has a /dev/random).
5
120090306 620090306
2 - (djm) OpenBSD CVS Sync 7 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2009/03/05 07:18:19 8 - djm@cvs.openbsd.org 2009/03/05 07:18:19
diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh
index 97a7cbbba..6648e8e65 100755
--- a/contrib/aix/buildbff.sh
+++ b/contrib/aix/buildbff.sh
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# buildbff.sh: Create AIX SMIT-installable OpenSSH packages 3# buildbff.sh: Create AIX SMIT-installable OpenSSH packages
4# $Id: buildbff.sh,v 1.10 2006/09/10 03:24:19 dtucker Exp $ 4# $Id: buildbff.sh,v 1.11 2009/03/06 23:22:10 dtucker Exp $
5# 5#
6# Author: Darren Tucker (dtucker at zip dot com dot au) 6# Author: Darren Tucker (dtucker at zip dot com dot au)
7# This file is placed in the public domain and comes with absolutely 7# This file is placed in the public domain and comes with absolutely
@@ -151,11 +151,18 @@ fi
151 151
152 152
153# Rename config files; postinstall script will copy them if necessary 153# Rename config files; postinstall script will copy them if necessary
154for cfgfile in ssh_config sshd_config ssh_prng_cmds 154for cfgfile in ssh_config sshd_config
155do 155do
156 mv $FAKE_ROOT/$sysconfdir/$cfgfile $FAKE_ROOT/$sysconfdir/$cfgfile.default 156 mv $FAKE_ROOT/$sysconfdir/$cfgfile $FAKE_ROOT/$sysconfdir/$cfgfile.default
157done 157done
158 158
159# AIX 5.3 and newer have /dev/random and don't create ssh_prng_cmds
160if [ -f $FAKE_ROOT/$sysconfdir/ssh_prng_cmds ]
161then
162 mv FAKE_ROOT/$sysconfdir/ssh_prng_cmds \
163 $FAKE_ROOT/$sysconfdir/ssh_prng_cmds.default
164fi
165
159# 166#
160# Generate lpp control files. 167# Generate lpp control files.
161# working dir is $FAKE_ROOT but files are generated in dir above 168# working dir is $FAKE_ROOT but files are generated in dir above