drop all Upstart hacks

Release: 4

diff --git a/openssh.spec b/openssh.spec
index 57246dd26c3b850fbe39f09efd297fdd3142e9a6..a19d70c04daa529b12d605bc35959f8a968becaf 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):    OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       6.8p1
-Release:       3
+Release:       4
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -48,7 +48,6 @@ Source4:      %{name}.sysconfig
 Source5:       ssh-agent.sh
 Source6:       ssh-agent.conf
 Source7:       %{name}-lpk.schema
-Source8:       %{name}d.upstart
 Source9:       sshd.service
 Source10:      sshd-keygen
 Source11:      sshd.socket
@@ -437,20 +436,6 @@ among the servers in the network.
 Backend LDAP dla OpenSSH to metoda rozprowadzania autoryzowanych
 tokenów między serwerami w sieci.
 
-%package server-upstart
-Summary:       Upstart job description for OpenSSH server
-Summary(pl.UTF-8):     Opis zadania Upstart dla serwera OpenSSH
-Group:         Daemons
-Requires:      %{name}-server = %{epoch}:%{version}-%{release}
-Requires:      upstart >= 0.6
-Conflicts:     syslog-ng < 3.2.4-1
-
-%description server-upstart
-Upstart job description for OpenSSH.
-
-%description server-upstart -l pl.UTF-8
-Opis zadania Upstart dla OpenSSH.
-
 %package gnome-askpass
 Summary:       OpenSSH GNOME passphrase dialog
 Summary(de.UTF-8):     OpenSSH GNOME Passwort-Dialog
@@ -609,7 +594,7 @@ cd contrib
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{init,pam.d,rc.d/init.d,sysconfig,security,env.d}} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{pam.d,rc.d/init.d,sysconfig,security,env.d}} \
        $RPM_BUILD_ROOT{%{_libexecdir}/ssh,%{schemadir},%{systemdunitdir}}
 install -d $RPM_BUILD_ROOT/etc/{profile.d,X11/xinit/xinitrc.d}
 
@@ -625,7 +610,6 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/profile.d
 ln -sf /etc/profile.d/ssh-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/ssh-agent.sh
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{schemadir}
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/sshd.conf
 
 cp -p %{SOURCE9} %{SOURCE11} %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_libexecdir}/sshd-keygen
@@ -748,12 +732,6 @@ if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
 EOF
 fi
 
-%post server-upstart
-%upstart_post sshd
-
-%postun server-upstart
-%upstart_postun sshd
-
 %post -n openldap-schema-openssh-lpk
 %openldap_schema_register %{schemadir}/openssh-lpk.schema
 %service -q ldap restart
@@ -858,9 +836,3 @@ fi
 %defattr(644,root,root,755)
 %{schemadir}/openssh-lpk.schema
 %endif
-
-%if "%{pld_release}" != "ti"
-%files server-upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/sshd.conf
-%endif

diff --git a/opensshd.init b/opensshd.init
index d9a805e82107d0695e8693970f2f416d4288f9c7..9e76029f7a1991928e53fe30d4233f912e4791a7 100755 (executable)
--- a/opensshd.init
+++ b/opensshd.init
@@ -11,8 +11,6 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-upstart_controlled --except init configtest
-
 # Get network config
 . /etc/sysconfig/network
 

diff --git a/opensshd.upstart b/opensshd.upstart
deleted file mode 100644 (file)
index 7836e17..0000000
--- a/opensshd.upstart
+++ /dev/null
@@ -1,36 +0,0 @@
-
-start on pld.network-started and started SERVICE_syslog=y and started random
-stop on pld.shutdown-started
-
-respawn
-respawn limit 10 5
-console output
-oom never
-
-pre-start script
-       test -x /usr/sbin/sshd || { stop; exit 0; }
-       test -c /dev/null || { stop; exit 0; }
-
-       if [ ! -s /etc/ssh/ssh_host_key \
-               -o ! -s /etc/ssh/ssh_host_rsa_key \
-               -o ! -s /etc/ssh/ssh_host_dsa_key \
-               -o ! -s /etc/ssh/ssh_host_ecdsa_key \
-       ]; then
-               # call gen keys if any of the files above is missing or empty
-               /etc/rc.d/init.d/sshd ssh_gen_keys
-       fi
-end script
-
-script
-       . /etc/rc.d/init.d/functions
-       . /etc/sysconfig/network
-
-       if is_yes "$IPV4_NETWORKING" && is_no "$IPV6_NETWORKING"; then
-               OPTIONS="$OPTIONS -4"
-       fi
-       if is_yes "$IPV6_NETWORKING" && is_no "$IPV4_NETWORKING"; then
-               OPTIONS="$OPTIONS -6"
-       fi
-
-       exec /usr/sbin/sshd -D $OPTIONS
-end script