summaryrefslogtreecommitdiff
path: root/contrib/solaris
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-11-11 08:36:38 +1100
committerDamien Miller <djm@mindrot.org>2000-11-11 08:36:38 +1100
commit0986b55a601066b1dc896c4508a55e905ea8d0ea (patch)
treed26d7627bdf3d667bbe92772be8d70925770c763 /contrib/solaris
parentdcca981e88978f84e404ef718e0e997b518403f0 (diff)
downloadopenssh-git-0986b55a601066b1dc896c4508a55e905ea8d0ea.tar.gz
- (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and
packaging files
Diffstat (limited to 'contrib/solaris')
-rwxr-xr-xcontrib/solaris/build-pkg1
-rw-r--r--contrib/solaris/postinstall.in5
-rw-r--r--contrib/solaris/prototype1
3 files changed, 7 insertions, 0 deletions
diff --git a/contrib/solaris/build-pkg b/contrib/solaris/build-pkg
index 5f2e3add..76529ed4 100755
--- a/contrib/solaris/build-pkg
+++ b/contrib/solaris/build-pkg
@@ -163,6 +163,7 @@ cp -p ../../../sshd.8 man/man8/sshd.8
cp -p ../../../sshd_config.out etc/sshd_config.default
cp -p ../../../ssh_config.out etc/ssh_config.default
cp -p ../../../ssh_prng_cmds etc/ssh_prng_cmds.default
+cp -p ../../../primes etc/primes.default
# One of the annoying things about the Solaris packaging process is that
# there's no simple way to prototype on the fly--so make sure you edit
diff --git a/contrib/solaris/postinstall.in b/contrib/solaris/postinstall.in
index 58d773f8..834b5b20 100644
--- a/contrib/solaris/postinstall.in
+++ b/contrib/solaris/postinstall.in
@@ -46,6 +46,7 @@ if [ ! "${UPDATE}" = "1" ]; then
instbackup ${CONFDIR} ssh_prng_cmds
instbackup ${CONFDIR} ssh_config
instbackup ${CONFDIR} sshd_config
+ instbackup ${CONFDIR} primes
### If no existing sshd_config and host key, then create
if [ ! -f "${CONFDIR}/ssh_host_key" ]; then
@@ -126,6 +127,10 @@ else
instbackup ${CONFDIR} sshd_config
NEWCONF=1
fi
+ if [ ! -r "${CONFDIR}/primes" ]; then
+ instbackup ${CONFDIR} primes
+ NEWCONF=1
+ fi
if [ $NEWCONF -eq 0 ]; then
echo "Your existing SSH configuration files have not been altered."
else
diff --git a/contrib/solaris/prototype b/contrib/solaris/prototype
index 02c4823d..422b4aa7 100644
--- a/contrib/solaris/prototype
+++ b/contrib/solaris/prototype
@@ -15,6 +15,7 @@ d none etc 0755 root sys
f none etc/sshd_config.default 0644 root sys
f none etc/ssh_config.default 0644 root sys
f none etc/ssh_prng_cmds.default 0644 root sys
+f none etc/primes.default 0644 root sys
f none etc/sshd-initscript 0755 root sys
d none bin 0755 root sys
f none bin/ssh-keygen 0755 root sys