From 2bbb9d0c998db77cf5403f50bf1e105e3719fa2f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 30 Oct 1999 09:46:20 +1000 Subject: Updated COPYING file with usage of RC4 Renamed sshd.init to sshd.init.redhat --- COPYING.Ylonen | 2 +- openssh.spec | 6 ++++-- sshd.init | 49 ------------------------------------------------- sshd.init.redhat | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 52 deletions(-) delete mode 100755 sshd.init create mode 100755 sshd.init.redhat diff --git a/COPYING.Ylonen b/COPYING.Ylonen index 5e681edd2..ad17df17a 100644 --- a/COPYING.Ylonen +++ b/COPYING.Ylonen @@ -24,7 +24,7 @@ restrictive); see below for details. [ The make-ssh-known-hosts script is no longer included. ] [ TSS has been removed. ] [ MD5 is now external. ] -[ RC4 support has been removed. ] +[ RC4 support has been removed (RC4 is used internally for arc4random). ] [ Blowfish is now external. ] The 32-bit CRC implementation in crc32.c is due to Gary S. Brown. diff --git a/openssh.spec b/openssh.spec index fe6c137b8..c70c3d052 100644 --- a/openssh.spec +++ b/openssh.spec @@ -1,6 +1,6 @@ Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh -Version: 1.2pre6 +Version: 1.2pre7 Release: 1 Packager: Damien Miller Source0: openssh-%{version}-linux.tar.gz @@ -20,6 +20,8 @@ up to date in terms of security and features, as well as removing all patented algorithms to seperate libraries (OpenSSL). %changelog +* Sat Oct 30 1999 Damien Miller +- Renamed init script * Fri Oct 29 1999 Damien Miller - Back to old binary names * Thu Oct 28 1999 Damien Miller @@ -48,7 +50,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/man/man1 mkdir -p $RPM_BUILD_ROOT/usr/man/man8 install -m644 sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd -install -m755 sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd +install -m755 sshd.init.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config diff --git a/sshd.init b/sshd.init deleted file mode 100755 index 40cc92b86..000000000 --- a/sshd.init +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# Init file for OpenSSH server daemon -# -# chkconfig: 2345 55 25 -# description: OpenSSH server daemon -# -# processname: sshd -# config: /etc/ssh/ssh_host_key -# config: /etc/ssh/ssh_host_key.pub -# config: /etc/ssh/ssh_random_seed -# config: /etc/ssh/sshd_config -# pidfile: /var/run/sshd.pid - -# source function library -. /etc/rc.d/init.d/functions - -RETVAL=0 - -case "$1" in - start) - echo -n "Starting sshd: " - daemon /usr/sbin/sshd - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd - echo - ;; - stop) - echo -n "Shutting down sshd: " - killproc sshd - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd - echo - ;; - restart) - $0 stop - $0 start - RETVAL=$? - ;; - status) - status sshd - RETVAL=$? - ;; - *) - echo "Usage: sshd {start|stop|restart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/sshd.init.redhat b/sshd.init.redhat new file mode 100755 index 000000000..40cc92b86 --- /dev/null +++ b/sshd.init.redhat @@ -0,0 +1,49 @@ +#!/bin/bash + +# Init file for OpenSSH server daemon +# +# chkconfig: 2345 55 25 +# description: OpenSSH server daemon +# +# processname: sshd +# config: /etc/ssh/ssh_host_key +# config: /etc/ssh/ssh_host_key.pub +# config: /etc/ssh/ssh_random_seed +# config: /etc/ssh/sshd_config +# pidfile: /var/run/sshd.pid + +# source function library +. /etc/rc.d/init.d/functions + +RETVAL=0 + +case "$1" in + start) + echo -n "Starting sshd: " + daemon /usr/sbin/sshd + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd + echo + ;; + stop) + echo -n "Shutting down sshd: " + killproc sshd + RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd + echo + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + status) + status sshd + RETVAL=$? + ;; + *) + echo "Usage: sshd {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL -- cgit v1.2.3