From 606f880e0fd1a31f5beb3b37ece0c12317a9ed61 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 16 Sep 2000 15:39:56 +1100 Subject: - (djm) Shadow expiry check fix from Pavel Troller - (djm) Re-enable int64_t types - we need them for sftp - (djm) Use libexecdir from configure , rather than libexecdir/ssh - (djm) Update Redhat SPEC file accordingly - (djm) Add Kevin Steves HP/UX contrib files - (djm) Add Charles Levert getpgrp patch - (djm) Fix password auth on HP/UX 10.20. Patch from Dirk De Wachter - (djm) Fixprogs and entropy list fixes from Larry Jones - (djm) Fix for SuSE spec file from Takashi YOSHIDA --- contrib/hpux/README | 19 ++++++++++ contrib/hpux/sshd | 5 +++ contrib/hpux/sshd.rc | 90 +++++++++++++++++++++++++++++++++++++++++++++ contrib/redhat/openssh.spec | 20 +++++----- contrib/suse/openssh.spec | 21 ++++++----- 5 files changed, 135 insertions(+), 20 deletions(-) create mode 100644 contrib/hpux/README create mode 100644 contrib/hpux/sshd create mode 100755 contrib/hpux/sshd.rc (limited to 'contrib') diff --git a/contrib/hpux/README b/contrib/hpux/README new file mode 100644 index 000000000..edddfc018 --- /dev/null +++ b/contrib/hpux/README @@ -0,0 +1,19 @@ +README for OpenSSH HP-UX contrib files +Kevin Steves + +sshd: configuration file for sshd.rc +sshd.rc: SSH startup script + +To install: + +o Verify paths in sshd.rc match your local installation + (WHAT_PATH and WHAT_PID) +o Customize sshd if needed (SSHD_ARGS) +o Install: + + # cp sshd /etc/rc.config.d + # chmod 444 /etc/rc.config.d/sshd + # cp sshd.rc /sbin/init.d + # chmod 555 /sbin/init.d/sshd.rc + # ln -s /sbin/init.d/sshd.rc /sbin/rc1.d/K100sshd + # ln -s /sbin/init.d/sshd.rc /sbin/rc2.d/S900sshd diff --git a/contrib/hpux/sshd b/contrib/hpux/sshd new file mode 100644 index 000000000..8eb5e92a3 --- /dev/null +++ b/contrib/hpux/sshd @@ -0,0 +1,5 @@ +# SSHD_START: Set to 1 to start SSH daemon +# SSHD_ARGS: Command line arguments to pass to sshd +# +SSHD_START=1 +SSHD_ARGS= diff --git a/contrib/hpux/sshd.rc b/contrib/hpux/sshd.rc new file mode 100755 index 000000000..f9a10999b --- /dev/null +++ b/contrib/hpux/sshd.rc @@ -0,0 +1,90 @@ +#!/sbin/sh + +# +# sshd.rc: SSH daemon start-up and shutdown script +# + +# Allowed exit values: +# 0 = success; causes "OK" to show up in checklist. +# 1 = failure; causes "FAIL" to show up in checklist. +# 2 = skip; causes "N/A" to show up in the checklist. +# Use this value if execution of this script is overridden +# by the use of a control variable, or if this script is not +# appropriate to execute for some other reason. +# 3 = reboot; causes the system to be rebooted after execution. + +# Input and output: +# stdin is redirected from /dev/null +# +# stdout and stderr are redirected to the /etc/rc.log file +# during checklist mode, or to the console in raw mode. + +PATH=/usr/sbin:/usr/bin:/sbin +export PATH + +WHAT='OpenSSH' +WHAT_PATH=/opt/openssh/sbin/sshd +WHAT_PID=/var/run/sshd.pid +WHAT_CONFIG=/etc/rc.config.d/sshd + +# NOTE: If your script executes in run state 0 or state 1, then /usr might +# not be available. Do not attempt to access commands or files in +# /usr unless your script executes in run state 2 or greater. Other +# file systems typically not mounted until run state 2 include /var +# and /opt. + +rval=0 + +# Check the exit value of a command run by this script. If non-zero, the +# exit code is echoed to the log file and the return value of this script +# is set to indicate failure. + +set_return() { + x=$? + if [ $x -ne 0 ]; then + echo "EXIT CODE: $x" + rval=1 # script FAILed + fi +} + +case $1 in +'start_msg') + echo "Starting $WHAT" + ;; + +'stop_msg') + echo "Stopping $WHAT" + ;; + +'start') + if [ -f $WHAT_CONFIG ] ; then + . $WHAT_CONFIG + else + echo "ERROR: $WHAT_CONFIG defaults file MISSING" + fi + + if [ "$SSHD_START" -eq 1 -a -x "$WHAT_PATH" ]; then + $WHAT_PATH $SSHD_ARGS && echo "$WHAT started" + set_return + else + rval=2 + fi + ;; + +'stop') + if kill `cat $WHAT_PID`; then + echo "$WHAT stopped" + else + rval=1 + echo "Unable to stop $WHAT" + fi + set_return + ;; + +*) + echo "usage: $0 {start|stop|start_msg|stop_msg}" + rval=1 + ;; +esac + +exit $rval diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 810af1500..37316d21e 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -167,8 +167,8 @@ This package contains the GNOME passphrase dialog. %build -%configure --sysconfdir=/etc/ssh --with-tcp-wrappers \ - --with-rsh=/usr/bin/rsh +%configure --sysconfdir=/etc/ssh --libexecdir=/usr/libexec/openssh \ + --with-tcp-wrappers --with-rsh=/usr/bin/rsh make @@ -193,17 +193,17 @@ make install DESTDIR=$RPM_BUILD_ROOT/ install -d $RPM_BUILD_ROOT/etc/pam.d/ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d -install -d $RPM_BUILD_ROOT/usr/libexec/ssh +install -d $RPM_BUILD_ROOT/usr/libexec/openssh install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd %if ! %{no_x11_askpass} -install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass -ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass +install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/x11-ssh-askpass +ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/ssh-askpass %endif %if ! %{no_gnome_askpass} -install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass +install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass %endif %clean @@ -230,7 +230,7 @@ fi %attr(0644,root,root) /usr/man/man1/ssh-keygen.1* %attr(0644,root,root) /usr/man/man1/scp.1* %attr(0755,root,root) %dir /etc/ssh -%attr(0755,root,root) %dir /usr/libexec/ssh +%attr(0755,root,root) %dir /usr/libexec/openssh %files clients %defattr(-,root,root) @@ -258,12 +258,12 @@ fi %doc x11-ssh-askpass-%{aversion}/README %doc x11-ssh-askpass-%{aversion}/ChangeLog %doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad -%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass -%attr(0755,root,root) /usr/libexec/ssh/x11-ssh-askpass +%attr(0755,root,root) /usr/libexec/openssh/ssh-askpass +%attr(0755,root,root) /usr/libexec/openssh/x11-ssh-askpass %endif %if ! %{no_gnome_askpass} %files askpass-gnome %defattr(-,root,root) -%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass +%attr(0755,root,root) /usr/libexec/openssh/gnome-ssh-askpass %endif diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 5c2e56e62..324d88aea 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -150,8 +150,9 @@ This package contains the GNOME passphrase dialog. %build CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=/usr --sysconfdir=/etc/ssh --with-gnome-askpass \ - --with-tcp-wrappers --with-ipv4-default +./configure --prefix=/usr --sysconfdir=/etc/ssh \ + --libexecdir=/usr/libexec/ssh --with-gnome-askpass \ + --with-tcp-wrappers --with-ipv4-default make cd contrib @@ -167,12 +168,12 @@ install -d $RPM_BUILD_ROOT/etc/ssh/ install -d $RPM_BUILD_ROOT/etc/pam.d/ install -d $RPM_BUILD_ROOT/sbin/init.d/ install -d $RPM_BUILD_ROOT/var/adm/fillup-templates -install -d $RPM_BUILD_ROOT/usr/libexec/ssh -install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd +install -d $RPM_BUILD_ROOT/usr/libexec/openssh +install -m644 contrib/sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd -install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass -ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass +install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass +ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/ssh-askpass install -m744 contrib/suse/rc.config.sshd \ $RPM_BUILD_ROOT/var/adm/fillup-templates @@ -230,7 +231,7 @@ fi %attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1* %attr(0644,root,root) %doc /usr/man/man1/scp.1* %attr(0755,root,root) %dir /etc/ssh -%attr(0755,root,root) %dir /usr/libexec/ssh +%attr(0755,root,root) %dir /usr/libexec/openssh %files clients %defattr(-,root,root) @@ -247,7 +248,7 @@ fi %files server %defattr(-,root,root) %attr(0755,root,root) /usr/sbin/sshd -%attr(0755,root,root) /usr/libexec/ssh/sftp-server +%attr(0755,root,root) /usr/libexec/openssh/sftp-server %attr(0644,root,root) %doc /usr/man/man8/sshd.8* %attr(0644,root,root) %doc /usr/man/man8/sftp-server.8* %attr(0600,root,root) %config /etc/ssh/sshd_config @@ -258,6 +259,6 @@ fi %files askpass %defattr(-,root,root) -%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass -%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass +%attr(0755,root,root) /usr/libexec/openssh/ssh-askpass +%attr(0755,root,root) /usr/libexec/openssh/gnome-ssh-askpass -- cgit v1.2.3