Patch to update contrib/solaris package builder [new patch]
ninjaz at webexpress.com
ninjaz at webexpress.com
Tue May 8 12:48:44 EST 2001
Ben,
Sorry for overbilling the original patch. I didn't realize I'd missed the
other parts.
I don't see anything to do with slogin, though:
# pwd
/local/src/openssh-2.9p1
# find . -name '*slogin*'
#
This patch has the following changes:
build-pkg:
Added mkdir of libexec/
cp ssh-keyscan, sftp-server.8 and sftp-keyscan.1
Add ssh-keyscan, sftp and sftp-server to the strip list
prototype:
Added libexec directory entry
Added file entries for sftp-keyscan, sftp-server.8, and sftp-keyscan.1
-pete
On Mon, 7 May 2001 mouring at etoh.eviladmin.org wrote:
>
> There is a lot more missing then that. <frown> This has been a topic as
> of lately. I was hoping to see a complete patch that brought it up fully.
>
> ssh-keyscan is missing, slogin is missing.. sftp-server.8 is missing.. to
> name a few.
>
> - Ben
>
> On Mon, 7 May 2001 ninjaz at webexpress.com wrote:
>
> > I've attached a patch for contrib/solaris package builder to bring it up
> > to date with OpenSSH 2.9p1.
> >
> > The changes are:
> >
> > build-pkg -
> > add libexec/ directory creation (to house sftp-server)
> > cp sftp-server to libexec/
> > cp sftp.1 to man/man1
> > cp sftp to bin/
> >
> > postinstall.in -
> > add RSA key generation and installation/update
> >
> > prototype -
> > add sftp, sftp.1 and sftp-server
> >
> > Btw, 2.9p1 is looking quite nice here. :) I was having some problems with
> > connections being dropped while logged onto some legacy SSH2 servers with
> > 2.5.2p2. That is no longer happening with 2.9p1.
> >
> > -pete
> >
>
>
-------------- next part --------------
diff -u solaris.virgin/build-pkg solaris/build-pkg
--- solaris.virgin/build-pkg Fri Nov 10 14:36:39 2000
+++ solaris/build-pkg Mon May 7 19:22:02 2001
@@ -145,19 +145,26 @@
mkdir -p ${BUILDDIR}/man/man8
mkdir -p ${BUILDDIR}/etc
mkdir -p ${BUILDDIR}/bin
+mkdir -p ${BUILDDIR}/libexec
mkdir -p ${BUILDDIR}/sbin
echo "Populating build directories..."
cp -p ../../../sshd sbin
cp -p ../../../ssh-keygen bin
+cp -p ../../../ssh-keyscan bin
cp -p ../../../ssh bin
cp -p ../../../ssh-add bin
cp -p ../../../ssh-agent bin
cp -p ../../../scp bin
cp -p ../../../scp.1 man/man1/scp.1
+cp -p ../../../sftp bin
+cp -p ../../../sftp.1 man/man1/sftp.1
+cp -p ../../../sftp-server libexec/sftp-server
+cp -p ../../../sftp-server.8 man/man8
cp -p ../../../ssh-add.1 man/man1/ssh-add.1
cp -p ../../../ssh-agent.1 man/man1/ssh-agent.1
cp -p ../../../ssh-keygen.1 man/man1/ssh-keygen.1
+cp -p ../../../ssh-keyscan.1 man/man1/ssh-keyscan.1
cp -p ../../../ssh.1 man/man1/ssh.1
cp -p ../../../sshd.8 man/man8/sshd.8
cp -p ../../../sshd_config.out etc/sshd_config.default
@@ -182,8 +189,11 @@
${STRIP} bin/ssh-add
${STRIP} bin/ssh-agent
${STRIP} bin/ssh-keygen
+${STRIP} bin/ssh-keyscan
${STRIP} sbin/sshd
${STRIP} bin/scp
+${STRIP} bin/sftp
+${STRIP} libexec/sftp-server
echo ""
echo "Building Package"
diff -u solaris.virgin/postinstall.in solaris/postinstall.in
--- solaris.virgin/postinstall.in Mon Apr 23 17:03:58 2001
+++ solaris/postinstall.in Mon May 7 17:51:35 2001
@@ -89,6 +89,26 @@
else
echo "Using existing DSA public/private host key pair for SSH-2."
fi
+ if [ ! -f "${CONFDIR}/ssh_host_rsa_key" ]; then
+ echo "Creating new RSA public/private host key pair for SSH-2."
+ $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key
+ $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key.pub
+ ### If there is *anything* there then leave it, otherwise look
+ ### in some reasonable alternate locations before giving up.
+ ### It's worth spending some extra time looking for the old one
+ ### to avoid a bunch of "host identification has changed" warnings.
+ ### Note that some old keys from the commercial SSH2 might not
+ ### be compatible, but we don't test for that.
+ if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key" ]; then
+ mv ${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key ${CONFDIR}
+ elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key" ]; then
+ mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key ${CONFDIR}
+ else
+ ${DESTBIN}/ssh-keygen -t rsa -f ${CONFDIR}/ssh_host_rsa_key -N ''
+ fi
+ else
+ echo "Using existing RSA public/private host key pair for SSH-2."
+ fi
else
echo "Performing an \"update\" installation of OpenSSH."
### Okay, this part *is* an update install...so we need to ensure
@@ -177,6 +197,26 @@
fi
else
echo "Using existing DSA public/private host key pair for SSH-2."
+ fi
+ if [ ! -f "${CONFDIR}/ssh_host_rsa_key" ]; then
+ echo "Creating new RSA public/private host key pair for SSH-2."
+ $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key
+ $INSTALLF $PKGINST ${CONFDIR}/ssh_host_rsa_key.pub
+ ### If there is *anything* there then leave it, otherwise look
+ ### in some reasonable alternate locations before giving up.
+ ### It's worth spending some extra time looking for the old one
+ ### to avoid a bunch of "host identification has changed" warnings.
+ ### Note that some old keys from the commercial SSH2 might not
+ ### be compatible, but we don't test for that.
+ if [ -f "${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key" ]; then
+ mv ${PKG_INSTALL_ROOT}/etc/ssh_host_rsa_key ${CONFDIR}
+ elif [ -f "${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key" ]; then
+ mv ${PKG_INSTALL_ROOT}/usr/local/etc/ssh_host_rsa_key ${CONFDIR}
+ else
+ ${DESTBIN}/ssh-keygen -d -f ${CONFDIR}/ssh_host_rsa_key -N ''
+ fi
+ else
+ echo "Using existing RSA public/private host key pair for SSH-2."
fi
fi
diff -u solaris.virgin/prototype solaris/prototype
--- solaris.virgin/prototype Fri Nov 10 14:36:39 2000
+++ solaris/prototype Mon May 7 19:41:51 2001
@@ -5,11 +5,14 @@
d none man 0755 root sys
d none man/man1 0755 root sys
f none man/man1/scp.1 0644 root sys
+f none man/man1/sftp.1 0644 root sys
f none man/man1/ssh-add.1 0644 root sys
f none man/man1/ssh-agent.1 0644 root sys
f none man/man1/ssh-keygen.1 0644 root sys
+f none man/man1/ssh-keyscan.1 0644 root sys
f none man/man1/ssh.1 0644 root sys
d none man/man8 0755 root sys
+f none man/man8/sftp-server.8 0644 root sys
f none man/man8/sshd.8 0644 root sys
d none etc 0755 root sys
f none etc/sshd_config.default 0644 root sys
@@ -22,6 +25,10 @@
f none bin/ssh 0755 root sys
f none bin/ssh-add 0755 root sys
f none bin/ssh-agent 0755 root sys
+f none bin/ssh-keyscan 0755 root sys
f none bin/scp 0755 root sys
+f none bin/sftp 0755 root sys
+d none libexec 0755 root sys
+f none libexec/sftp-server 0755 root sys
d none sbin 0755 root sys
f none sbin/sshd 0755 root sys
More information about the openssh-unix-dev
mailing list