summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xcontrib/solaris/build-pkg22
-rw-r--r--contrib/solaris/postinstall.in40
-rw-r--r--contrib/solaris/prototype9
4 files changed, 68 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3833f3036..5148f2613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 - markus@cvs.openbsd.org 2001/05/11 14:59:56 3 - markus@cvs.openbsd.org 2001/05/11 14:59:56
4 [clientloop.c misc.c misc.h] 4 [clientloop.c misc.c misc.h]
5 add unset_nonblock for stdout/err flushing in client_loop(). 5 add unset_nonblock for stdout/err flushing in client_loop().
6 - (bal) Patch to partial sync up contrib/solaris/ packaging software.
7 Patch by pete <ninjaz@webexpress.com>
6 8
720010511 920010511
8 - OpenBSD CVS Sync 10 - OpenBSD CVS Sync
@@ -5400,4 +5402,4 @@
5400 - Wrote replacements for strlcpy and mkdtemp 5402 - Wrote replacements for strlcpy and mkdtemp
5401 - Released 1.0pre1 5403 - Released 1.0pre1
5402 5404
5403$Id: ChangeLog,v 1.1217 2001/05/12 00:08:37 mouring Exp $ 5405$Id: ChangeLog,v 1.1218 2001/05/12 16:50:50 mouring Exp $
diff --git a/contrib/solaris/build-pkg b/contrib/solaris/build-pkg
index 76529ed48..fe92d9dda 100755
--- a/contrib/solaris/build-pkg
+++ b/contrib/solaris/build-pkg
@@ -145,21 +145,28 @@ mkdir -p ${BUILDDIR}/man/man1
145mkdir -p ${BUILDDIR}/man/man8 145mkdir -p ${BUILDDIR}/man/man8
146mkdir -p ${BUILDDIR}/etc 146mkdir -p ${BUILDDIR}/etc
147mkdir -p ${BUILDDIR}/bin 147mkdir -p ${BUILDDIR}/bin
148mkdir -p ${BUILDDIR}/libexec
148mkdir -p ${BUILDDIR}/sbin 149mkdir -p ${BUILDDIR}/sbin
149 150
150echo "Populating build directories..." 151echo "Populating build directories..."
151cp -p ../../../sshd sbin 152cp -p ../../../sshd sbin
152cp -p ../../../ssh-keygen bin 153cp -p ../../../ssh-keygen bin
154cp -p ../../../ssh-keyscan bin
153cp -p ../../../ssh bin 155cp -p ../../../ssh bin
154cp -p ../../../ssh-add bin 156cp -p ../../../ssh-add bin
155cp -p ../../../ssh-agent bin 157cp -p ../../../ssh-agent bin
156cp -p ../../../scp bin 158cp -p ../../../scp bin
157cp -p ../../../scp.1 man/man1/scp.1 159cp -p ../../../scp.1.out man/man1/scp.1
158cp -p ../../../ssh-add.1 man/man1/ssh-add.1 160cp -p ../../../sftp bin
159cp -p ../../../ssh-agent.1 man/man1/ssh-agent.1 161cp -p ../../../sftp.1.out man/man1/sftp.1
160cp -p ../../../ssh-keygen.1 man/man1/ssh-keygen.1 162cp -p ../../../sftp-server libexec/sftp-server
161cp -p ../../../ssh.1 man/man1/ssh.1 163cp -p ../../../sftp-server.8.out man/man8/sftp-server.8
162cp -p ../../../sshd.8 man/man8/sshd.8 164cp -p ../../../ssh-add.1.out man/man1/ssh-add.1
165cp -p ../../../ssh-agent.1.out man/man1/ssh-agent.1
166cp -p ../../../ssh-keygen.1.out man/man1/ssh-keygen.1
167cp -p ../../../ssh-keyscan.1.out man/man1/ssh-keyscan.1
168cp -p ../../../ssh.1.out man/man1/ssh.1
169cp -p ../../../sshd.8.out man/man8/sshd.8
163cp -p ../../../sshd_config.out etc/sshd_config.default 170cp -p ../../../sshd_config.out etc/sshd_config.default
164cp -p ../../../ssh_config.out etc/ssh_config.default 171cp -p ../../../ssh_config.out etc/ssh_config.default
165cp -p ../../../ssh_prng_cmds etc/ssh_prng_cmds.default 172cp -p ../../../ssh_prng_cmds etc/ssh_prng_cmds.default
@@ -182,8 +189,11 @@ ${STRIP} bin/ssh
182${STRIP} bin/ssh-add 189${STRIP} bin/ssh-add
183${STRIP} bin/ssh-agent 190${STRIP} bin/ssh-agent
184${STRIP} bin/ssh-keygen 191${STRIP} bin/ssh-keygen
192${STRIP} bin/ssh-keyscan
185${STRIP} sbin/sshd 193${STRIP} sbin/sshd
186${STRIP} bin/scp 194${STRIP} bin/scp
195${STRIP} bin/sftp
196${STRIP} libexec/sftp-server
187 197
188echo "" 198echo ""
189echo "Building Package" 199echo "Building Package"
diff --git a/contrib/solaris/postinstall.in b/contrib/solaris/postinstall.in
index 6f2c9b303..3ce3bf13d 100644
--- a/contrib/solaris/postinstall.in
+++ b/contrib/solaris/postinstall.in
@@ -89,6 +89,26 @@ if [ ! "${UPDATE}" = "1" ]; then
89 else 89 else
90 echo "Using existing DSA public/private host key pair for SSH-2." 90 echo "Using existing DSA public/private host key pair for SSH-2."
91 fi 91 fi
92 if [ ! -f "${CONFDIR}/ssh_host_rsa_key" ]; then
93 echo "Creating new RSA public/private host key pair for SSH-2."
94 $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key
95 $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key.pub
96 ### If there is *anything* there then leave it, otherwise look
97 ### in some reasonable alternate locations before giving up.
98 ### It's worth spending some extra time looking for the old one
99 ### to avoid a bunch of "host identification has changed" warnings.
100 ### Note that some old keys from the commercial SSH2 might not
101 ### be compatible, but we don't test for that.
102 if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key" ]; then
103 mv ${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key ${CONFDIR}
104 elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key" ]; then
105 mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key ${CONFDIR}
106 else
107 ${DESTBIN}/ssh-keygen -t rsa -f ${CONFDIR}/ssh_host_rsa_key -N ''
108 fi
109 else
110 echo "Using existing RSA public/private host key pair for SSH-2."
111 fi
92else 112else
93 echo "Performing an \"update\" installation of OpenSSH." 113 echo "Performing an \"update\" installation of OpenSSH."
94 ### Okay, this part *is* an update install...so we need to ensure 114 ### Okay, this part *is* an update install...so we need to ensure
@@ -178,6 +198,26 @@ else
178 else 198 else
179 echo "Using existing DSA public/private host key pair for SSH-2." 199 echo "Using existing DSA public/private host key pair for SSH-2."
180 fi 200 fi
201 if [ ! -f "${CONFDIR}/ssh_host_rsa_key" ]; then
202 echo "Creating new RSA public/private host key pair for SSH-2."
203 $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key
204 $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key.pub
205 ### If there is *anything* there then leave it, otherwise look
206 ### in some reasonable alternate locations before giving up.
207 ### It's worth spending some extra time looking for the old one
208 ### to avoid a bunch of "host identification has changed" warnings.
209 ### Note that some old keys from the commercial SSH2 might not
210 ### be compatible, but we don't test for that.
211 if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key" ]; then
212 mv ${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key ${CONFDIR}
213 elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key" ]; then
214 mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key ${CONFDIR}
215 else
216 ${DESTBIN}/ssh-keygen -d -f ${CONFDIR}/ssh_host_rsa_key -N ''
217 fi
218 else
219 echo "Using existing RSA public/private host key pair for SSH-2."
220 fi
181fi 221fi
182 222
183if [ ! -d %%PIDDIR%% ]; then 223if [ ! -d %%PIDDIR%% ]; then
diff --git a/contrib/solaris/prototype b/contrib/solaris/prototype
index 422b4aa77..3c93f2c1a 100644
--- a/contrib/solaris/prototype
+++ b/contrib/solaris/prototype
@@ -5,11 +5,15 @@ i preremove
5d none man 0755 root sys 5d none man 0755 root sys
6d none man/man1 0755 root sys 6d none man/man1 0755 root sys
7f none man/man1/scp.1 0644 root sys 7f none man/man1/scp.1 0644 root sys
8f none man/man1/sftp.1 0644 root sys
8f none man/man1/ssh-add.1 0644 root sys 9f none man/man1/ssh-add.1 0644 root sys
9f none man/man1/ssh-agent.1 0644 root sys 10f none man/man1/ssh-agent.1 0644 root sys
10f none man/man1/ssh-keygen.1 0644 root sys 11f none man/man1/ssh-keygen.1 0644 root sys
12f none man/man1/ssh-keyscan.1 0644 root sys
11f none man/man1/ssh.1 0644 root sys 13f none man/man1/ssh.1 0644 root sys
14s none man/man1/slogin.1=ssh.1
12d none man/man8 0755 root sys 15d none man/man8 0755 root sys
16f none man/man8/sftp-server.8 0644 root sys
13f none man/man8/sshd.8 0644 root sys 17f none man/man8/sshd.8 0644 root sys
14d none etc 0755 root sys 18d none etc 0755 root sys
15f none etc/sshd_config.default 0644 root sys 19f none etc/sshd_config.default 0644 root sys
@@ -20,8 +24,13 @@ f none etc/sshd-initscript 0755 root sys
20d none bin 0755 root sys 24d none bin 0755 root sys
21f none bin/ssh-keygen 0755 root sys 25f none bin/ssh-keygen 0755 root sys
22f none bin/ssh 0755 root sys 26f none bin/ssh 0755 root sys
27s none bin/slogin=ssh 0755 root sys
23f none bin/ssh-add 0755 root sys 28f none bin/ssh-add 0755 root sys
24f none bin/ssh-agent 0755 root sys 29f none bin/ssh-agent 0755 root sys
30f none bin/ssh-keyscan 0755 root sys
25f none bin/scp 0755 root sys 31f none bin/scp 0755 root sys
32f none bin/sftp 0755 root sys
33d none libexec 0755 root sys
34f none libexec/sftp-server 0755 root sys
26d none sbin 0755 root sys 35d none sbin 0755 root sys
27f none sbin/sshd 0755 root sys 36f none sbin/sshd 0755 root sys