- (djm) Added /etc/primes for kex DH group neg, fixup Makefile.in and

   packaging files

5 files changed, 10 insertions, 1 deletions

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 9590e2a5c..dcc8834c7 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,5 +1,5 @@
 # Version of OpenSSH
-%define oversion 2.3.0p1
+%define oversion 2.3.0p2
 
 # Version of ssh-askpass
 %define aversion 1.0.3
@@ -212,6 +212,7 @@ fi
 %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
 %attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/primes
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
 
 %files clients
diff --git a/contrib/solaris/build-pkg b/contrib/solaris/build-pkg
index 5f2e3addd..76529ed48 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 58d773f87..834b5b204 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 02c4823de..422b4aa77 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
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 04420706d..826b87349 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -166,6 +166,7 @@ fi
 %attr(0755,root,root) %dir /etc/ssh
 %attr(0644,root,root) %config /etc/ssh/ssh_config
 %attr(0600,root,root) %config /etc/ssh/sshd_config
+%attr(0600,root,root) %config /etc/ssh/primes
 %attr(0644,root,root) %config /etc/pam.d/sshd
 %attr(0755,root,root) %config /sbin/init.d/sshd
 %attr(0755,root,root) /usr/bin/ssh-keygen