summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-10-28 14:34:49 +1000
committerDamien Miller <djm@mindrot.org>1999-10-28 14:34:49 +1000
commit29d685212f4792c084052f07006f57a50cc6f2c8 (patch)
treee8ffecbebaa67724188c8de9f0bdad6031101780
parent92986dd9ba78476e4ce6cb282a049a67280602a5 (diff)
Rename PID fileV_1_2_PRE4
Add symlinks back to ssh in RPM spec file
-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 817c0534..240a007b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -64,6 +64,16 @@ install -m644 openssh-agent.1 $RPM_BUILD_ROOT/usr/man/man1
install -m644 openssh-add.1 $RPM_BUILD_ROOT/usr/man/man1
install -m644 openssh-keygen.1 $RPM_BUILD_ROOT/usr/man/man1
+# Install compatibility symlinks
+cd $RPM_BUILD_ROOT/usr/sbin
+ln -s opensshd sshd
+cd $RPM_BUILD_ROOT/usr/bin
+ln -s openssh ssh
+ln -s openscp scp
+ln -s openssh-agent ssh-agent
+ln -s openssh-add ssh-add
+ln -s openssh-keygen ssh-keygen
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -95,6 +105,14 @@ fi
%attr(0755,root,root) /usr/bin/openssh-add
%attr(0755,root,root) /usr/bin/openscp
+# Symlinks
+%attr(0755,root,root) /usr/sbin/sshd
+%attr(0755,root,root) /usr/bin/ssh
+%attr(0755,root,root) /usr/bin/ssh-agent
+%attr(0755,root,root) /usr/bin/ssh-keygen
+%attr(0755,root,root) /usr/bin/ssh-add
+%attr(0755,root,root) /usr/bin/scp
+
%attr(0755,root,root) /usr/man/man8/opensshd.8
%attr(0755,root,root) /usr/man/man1/openssh.1
%attr(0755,root,root) /usr/man/man1/openssh-agent.1
diff --git a/ssh.h b/ssh.h
index 133c084b..247e45cc 100644
--- a/ssh.h
+++ b/ssh.h
@@ -13,7 +13,7 @@ Generic header file for ssh.
*/
-/* RCSID("$Id: ssh.h,v 1.2 1999/10/28 03:25:17 damien Exp $"); */
+/* RCSID("$Id: ssh.h,v 1.3 1999/10/28 04:34:49 damien Exp $"); */
#ifndef SSH_H
#define SSH_H
@@ -89,7 +89,7 @@ only by root, whereas ssh_config should be world-readable. */
/* The process id of the daemon listening for connections is saved
here to make it easier to kill the correct daemon when necessary. */
-#define SSH_DAEMON_PID_FILE PIDDIR "/sshd.pid"
+#define SSH_DAEMON_PID_FILE PIDDIR "/opensshd.pid"
/* The directory in user\'s home directory in which the files reside.
The directory should be world-readable (though not all files are). */