From 186d6405314eafef3d53407a43a50d7d421800e9 Mon Sep 17 00:00:00 2001
From: Stewart Adam <s.adam@diffingo.com>
Date: Oct 16 2016 02:56:45 +0000
Subject: - Update to upstream release 5.19.0, fixes #1325633

- Remove sysvinit conversion to systemd, fixes #1094916
- Remove logging to /var/log/monit.log in favor of logging to journald

---

diff --git a/.gitignore b/.gitignore
index 35c404c..d5f2c83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-monit-5.1.1.tar.gz
-/monit-5.2.3.tar.gz
-/monit-5.2.5.tar.gz
-/monit-5.3.1.tar.gz
-/monit-5.6.tar.gz
-/monit-5.14.tar.gz
+/monit-5.19.0.tar.gz
diff --git a/monit-logging-conf b/monit-logging-conf
deleted file mode 100644
index 8e4d21a..0000000
--- a/monit-logging-conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# log to monit.log
-set logfile /var/log/monit.log
-
diff --git a/monit.logrotate b/monit.logrotate
deleted file mode 100644
index e9c62b2..0000000
--- a/monit.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/monit.log {
-    missingok
-    notifempty
-    size 100k
-    create 0644 root root
-    postrotate
-        /bin/systemctl reload monit.service > /dev/null 2>&1 || :
-    endscript
-}
diff --git a/monit.spec b/monit.spec
index 48a8408..90b60d5 100644
--- a/monit.spec
+++ b/monit.spec
@@ -1,15 +1,13 @@
 Name:           monit
-Version:        5.14
-Release:        2%{?dist}
+Version:        5.19.0
+Release:        1%{?dist}
 Summary:        Manages and monitors processes, files, directories and devices
 
 Group:          Applications/Internet
 License:        AGPLv3
 URL:            http://mmonit.com/monit/
 Source0:        http://mmonit.com/monit/dist/%{name}-%{version}.tar.gz
-Source2:        monit.logrotate
-Source3:        monit.service
-Source4:        monit-logging-conf
+Source1:        monit.service
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: flex
@@ -18,11 +16,8 @@ BuildRequires: pam-devel
 BuildRequires: byacc
 BuildRequires: systemd
 
-Requires(post): systemd-sysv
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
+%{?systemd_requires}
+BuildRequires: systemd
 
 %description
 monit is a utility for managing and monitoring, processes, files, directories
@@ -44,18 +39,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
 install -p -D -m0600 monitrc $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
 install -p -D -m0755 monit $RPM_BUILD_ROOT%{_bindir}/monit
 
-# Log file & logrotate config
-install -p -D -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/monit
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
-install -m0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/monit.log
-
 # systemd service file
 mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
-install -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_unitdir}/monit.service
+install -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_unitdir}/monit.service
 
 # Let's include some good defaults
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/monit.d
-install -p -D -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/monit.d/logging
 
 %{__sed} -i 's/# set daemon  120.*/set daemon 60  # check services at 1-minute intervals/' \
     $RPM_BUILD_ROOT%{_sysconfdir}/monitrc
@@ -80,19 +69,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %systemd_postun_with_restart monit.service
 
-%triggerun -- monit < 5.3.1-1
-/usr/bin/systemd-sysv-convert --save monit > /dev/null 2>&1 || :
-/bin/systemctl --no-reload enable monit.service > /dev/null 2>&1 || :
-/sbin/chkconfig --del monit > /dev/null 2>&1 || :
-/bin/systemctl try-restart monit.server > /dev/null 2>&1 || :
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %config(noreplace) %{_sysconfdir}/monitrc
-%config(noreplace) %{_sysconfdir}/monit.d/logging
-%config(noreplace) %{_sysconfdir}/logrotate.d/monit
-%config %ghost %{_localstatedir}/log/monit.log
 %{_unitdir}/monit.service
 %{_sysconfdir}/monit.d/
 %{_bindir}/%{name}
@@ -100,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 15 2016 Stewart Adam <s.adam@diffingo.com> - 5.19.0-1
+- Update to upstream release 5.19.0, fixes #1325633
+- Remove sysvinit conversion to systemd, fixes #1094916
+- Remove logging to /var/log/monit.log in favor of logging to journald
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 39f7f68..e1c0ded 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-19dfc1ce8512e832134d06eedd96ba50  monit-5.6.tar.gz
-1b3ae1eb08a0914402a8764e5689c1c5  monit-5.14.tar.gz
+51ee50dd71e1bb9fe9a128bc88456b77  monit-5.19.0.tar.gz