summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openssh.spec18
-rw-r--r--ssh.h4
2 files changed, 20 insertions, 2 deletions
diff --git a/openssh.spec b/openssh.spec
index 817c0534e..240a007bd 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -64,6 +64,16 @@ install -m644 openssh-agent.1 $RPM_BUILD_ROOT/usr/man/man1
64install -m644 openssh-add.1 $RPM_BUILD_ROOT/usr/man/man1 64install -m644 openssh-add.1 $RPM_BUILD_ROOT/usr/man/man1
65install -m644 openssh-keygen.1 $RPM_BUILD_ROOT/usr/man/man1 65install -m644 openssh-keygen.1 $RPM_BUILD_ROOT/usr/man/man1
66 66
67# Install compatibility symlinks
68cd $RPM_BUILD_ROOT/usr/sbin
69ln -s opensshd sshd
70cd $RPM_BUILD_ROOT/usr/bin
71ln -s openssh ssh
72ln -s openscp scp
73ln -s openssh-agent ssh-agent
74ln -s openssh-add ssh-add
75ln -s openssh-keygen ssh-keygen
76
67%clean 77%clean
68rm -rf $RPM_BUILD_ROOT 78rm -rf $RPM_BUILD_ROOT
69 79
@@ -95,6 +105,14 @@ fi
95%attr(0755,root,root) /usr/bin/openssh-add 105%attr(0755,root,root) /usr/bin/openssh-add
96%attr(0755,root,root) /usr/bin/openscp 106%attr(0755,root,root) /usr/bin/openscp
97 107
108# Symlinks
109%attr(0755,root,root) /usr/sbin/sshd
110%attr(0755,root,root) /usr/bin/ssh
111%attr(0755,root,root) /usr/bin/ssh-agent
112%attr(0755,root,root) /usr/bin/ssh-keygen
113%attr(0755,root,root) /usr/bin/ssh-add
114%attr(0755,root,root) /usr/bin/scp
115
98%attr(0755,root,root) /usr/man/man8/opensshd.8 116%attr(0755,root,root) /usr/man/man8/opensshd.8
99%attr(0755,root,root) /usr/man/man1/openssh.1 117%attr(0755,root,root) /usr/man/man1/openssh.1
100%attr(0755,root,root) /usr/man/man1/openssh-agent.1 118%attr(0755,root,root) /usr/man/man1/openssh-agent.1
diff --git a/ssh.h b/ssh.h
index 133c084b6..247e45cc8 100644
--- a/ssh.h
+++ b/ssh.h
@@ -13,7 +13,7 @@ Generic header file for ssh.
13 13
14*/ 14*/
15 15
16/* RCSID("$Id: ssh.h,v 1.2 1999/10/28 03:25:17 damien Exp $"); */ 16/* RCSID("$Id: ssh.h,v 1.3 1999/10/28 04:34:49 damien Exp $"); */
17 17
18#ifndef SSH_H 18#ifndef SSH_H
19#define SSH_H 19#define SSH_H
@@ -89,7 +89,7 @@ only by root, whereas ssh_config should be world-readable. */
89 89
90/* The process id of the daemon listening for connections is saved 90/* The process id of the daemon listening for connections is saved
91 here to make it easier to kill the correct daemon when necessary. */ 91 here to make it easier to kill the correct daemon when necessary. */
92#define SSH_DAEMON_PID_FILE PIDDIR "/sshd.pid" 92#define SSH_DAEMON_PID_FILE PIDDIR "/opensshd.pid"
93 93
94/* The directory in user\'s home directory in which the files reside. 94/* The directory in user\'s home directory in which the files reside.
95 The directory should be world-readable (though not all files are). */ 95 The directory should be world-readable (though not all files are). */