drop all Upstart hacks

Release: 4

diff --git a/syslog-ng.init b/syslog-ng.init
index 5dd26392ecd3c7190b813f6ba1aec7f183e3b2b3..073a96f227c06aa9dc8aca1ff619a619f0b8cedb 100755 (executable)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -60,11 +60,9 @@ start() {
        fi
 
        msg_starting "syslog-ng"
-       emit starting JOB=syslog-ng SERVICE_syslog=y
        daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024 $OPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
-       emit --no-wait started JOB=syslog-ng SERVICE_syslog=y
 }
 
 stop() {
@@ -74,9 +72,7 @@ stop() {
        fi
 
        msg_stopping "syslog-ng"
-       emit stopping JOB=syslog-ng SERVICE_syslog=y
        killproc syslog-ng
-       emit --no-wait stopped JOB=syslog-ng SERVICE_syslog=y
        rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
 }
 
@@ -106,10 +102,7 @@ reload() {
 }
 
 flush_logs() {
-       if use_upstart && [ -f /etc/init/syslog-ng.conf ]; then
-               checkconfig
-               /sbin/initctl reload syslog-ng
-       elif [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
+       if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
                checkconfig
                msg_reloading "syslog-ng"
                /bin/systemctl reload syslog-ng.service
@@ -126,8 +119,6 @@ flush_logs() {
        fi
 }
 
-upstart_controlled --except checkconfig configtest flush-logs
-
 RETVAL=0
 # See how we were called.
 case "$1" in

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 68d4a6e6709be0eb863276336fd4ff9ab9dda7ad..315d04d6c6e6422c95281f597ff1d2a284862f01 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -30,7 +30,7 @@ Summary(pl.UTF-8):    Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
 Version:       3.5.6
-Release:       3
+Release:       4
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 Source0:       http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/%{version}/source/%{name}_%{version}.tar.gz
@@ -41,7 +41,6 @@ Source3:      %{name}.logrotate
 Source4:       http://www.balabit.com/support/documentation/syslog-ng-ose-3.5-guides/en/syslog-ng-ose-v3.5-guide-admin/pdf/%{name}-ose-v3.5-guide-admin.pdf
 # Source4-md5: 4c3c7f679e430373375752534e61abee
 Source5:       %{name}-simple.conf
-Source6:       %{name}.upstart
 Patch0:                %{name}-datadir.patch
 Patch1:                cap_syslog-vserver-workaround.patch
 Patch2:                %{name}-nolibs.patch
@@ -149,22 +148,6 @@ melhorias, como, por exemplo, a habilidade de filtrar mensagens de log
 por seu conteúdo (usando expressões regulares) e não apenas pelo par
 facility/prioridade como o syslog original.
 
-%package upstart
-Summary:       Upstart job description for syslog-ng
-Summary(pl.UTF-8):     Opis zadania Upstart dla demona syslog-ng
-Group:         Daemons
-Requires:      %{name} = %{version}-%{release}
-Requires:      upstart >= 0.6
-Conflicts:     avahi-upstart < 0.6.30-2
-Conflicts:     openssh-server-upstart < 2:5.8p2-2
-Conflicts:     postgresql-upstart < 9.0.4-2
-
-%description upstart
-Upstart job description for syslog-ng.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla demona syslog-ng.
-
 %package module-afmongodb
 Summary:       MongoDB destination support module for syslog-ng
 Summary(pl.UTF-8):     Moduł sysloga-ng do obsługi zapisu logów w bazie MongoDB
@@ -366,7 +349,7 @@ export LD_LIBRARY_PATH PYTHONPATH
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d,init} \
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} \
        $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
        $RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
 
@@ -386,10 +369,6 @@ touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/syslog-ng/*.la
 
-%if "%{pld_release}" == "th"
-%{__sed} -e 's|@@SBINDIR@@|%{_sbindir}|g' %{SOURCE6} > $RPM_BUILD_ROOT/etc/init/%{name}.conf
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -442,16 +421,6 @@ rm -f %{_var}/lib/%{name}/syslog-ng.persist
 %service -q syslog-ng restart
 exit 0
 
-%post upstart
-%upstart_post %{name}
-
-%postun upstart
-%upstart_postun %{name}
-
-%triggerun upstart -- syslog-ng-upstart < 3.2.4-3
-#  use SERVICE_syslog=y in upstart job environment instead of SERVICE=syslog
-%{__sed} -i -e 's,SERVICE=syslog,SERVICE_syslog=y,' /etc/init/*.conf || :
-
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
@@ -529,12 +498,6 @@ exit 0
 %attr(640,root,root) %ghost /var/log/user
 %attr(640,root,root) %ghost /var/log/xferlog
 
-%if "%{pld_release}" == "th"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
-%endif
-
 %if %{with mongodb}
 %files module-afmongodb
 %defattr(644,root,root,755)

diff --git a/syslog-ng.upstart b/syslog-ng.upstart
deleted file mode 100644 (file)
index ed5edf3..0000000
--- a/syslog-ng.upstart
+++ /dev/null
@@ -1,15 +0,0 @@
-
-start on pld.sysinit-done
-stop on pld.shutdown-started
-
-env SERVICE_syslog=y
-export SERVICE_syslog
-
-respawn
-
-console output
-
-exec @@SBINDIR@@/syslog-ng --process-mode=background -f /etc/syslog-ng/syslog-ng.conf
-expect fork
-
-# vi: ft=upstart