summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/redhat/openssh.spec3
-rwxr-xr-xcontrib/solaris/build-pkg1
-rw-r--r--contrib/solaris/postinstall.in5
-rw-r--r--contrib/solaris/prototype1
-rw-r--r--contrib/suse/openssh.spec1
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 @@
1# Version of OpenSSH 1# Version of OpenSSH
2%define oversion 2.3.0p1 2%define oversion 2.3.0p2
3 3
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 1.0.3 5%define aversion 1.0.3
@@ -212,6 +212,7 @@ fi
212%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* 212%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
213%attr(0644,root,root) %{_mandir}/man1/scp.1* 213%attr(0644,root,root) %{_mandir}/man1/scp.1*
214%attr(0755,root,root) %dir %{_sysconfdir}/ssh 214%attr(0755,root,root) %dir %{_sysconfdir}/ssh
215%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/primes
215%attr(0755,root,root) %dir %{_libexecdir}/openssh 216%attr(0755,root,root) %dir %{_libexecdir}/openssh
216 217
217%files clients 218%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
163cp -p ../../../sshd_config.out etc/sshd_config.default 163cp -p ../../../sshd_config.out etc/sshd_config.default
164cp -p ../../../ssh_config.out etc/ssh_config.default 164cp -p ../../../ssh_config.out etc/ssh_config.default
165cp -p ../../../ssh_prng_cmds etc/ssh_prng_cmds.default 165cp -p ../../../ssh_prng_cmds etc/ssh_prng_cmds.default
166cp -p ../../../primes etc/primes.default
166 167
167# One of the annoying things about the Solaris packaging process is that 168# One of the annoying things about the Solaris packaging process is that
168# there's no simple way to prototype on the fly--so make sure you edit 169# 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
46 instbackup ${CONFDIR} ssh_prng_cmds 46 instbackup ${CONFDIR} ssh_prng_cmds
47 instbackup ${CONFDIR} ssh_config 47 instbackup ${CONFDIR} ssh_config
48 instbackup ${CONFDIR} sshd_config 48 instbackup ${CONFDIR} sshd_config
49 instbackup ${CONFDIR} primes
49 50
50 ### If no existing sshd_config and host key, then create 51 ### If no existing sshd_config and host key, then create
51 if [ ! -f "${CONFDIR}/ssh_host_key" ]; then 52 if [ ! -f "${CONFDIR}/ssh_host_key" ]; then
@@ -126,6 +127,10 @@ else
126 instbackup ${CONFDIR} sshd_config 127 instbackup ${CONFDIR} sshd_config
127 NEWCONF=1 128 NEWCONF=1
128 fi 129 fi
130 if [ ! -r "${CONFDIR}/primes" ]; then
131 instbackup ${CONFDIR} primes
132 NEWCONF=1
133 fi
129 if [ $NEWCONF -eq 0 ]; then 134 if [ $NEWCONF -eq 0 ]; then
130 echo "Your existing SSH configuration files have not been altered." 135 echo "Your existing SSH configuration files have not been altered."
131 else 136 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
15f none etc/sshd_config.default 0644 root sys 15f none etc/sshd_config.default 0644 root sys
16f none etc/ssh_config.default 0644 root sys 16f none etc/ssh_config.default 0644 root sys
17f none etc/ssh_prng_cmds.default 0644 root sys 17f none etc/ssh_prng_cmds.default 0644 root sys
18f none etc/primes.default 0644 root sys
18f none etc/sshd-initscript 0755 root sys 19f none etc/sshd-initscript 0755 root sys
19d none bin 0755 root sys 20d none bin 0755 root sys
20f none bin/ssh-keygen 0755 root sys 21f 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
166%attr(0755,root,root) %dir /etc/ssh 166%attr(0755,root,root) %dir /etc/ssh
167%attr(0644,root,root) %config /etc/ssh/ssh_config 167%attr(0644,root,root) %config /etc/ssh/ssh_config
168%attr(0600,root,root) %config /etc/ssh/sshd_config 168%attr(0600,root,root) %config /etc/ssh/sshd_config
169%attr(0600,root,root) %config /etc/ssh/primes
169%attr(0644,root,root) %config /etc/pam.d/sshd 170%attr(0644,root,root) %config /etc/pam.d/sshd
170%attr(0755,root,root) %config /sbin/init.d/sshd 171%attr(0755,root,root) %config /sbin/init.d/sshd
171%attr(0755,root,root) /usr/bin/ssh-keygen 172%attr(0755,root,root) /usr/bin/ssh-keygen