New upstream version 1.0.18

1 files changed, 29 insertions, 115 deletions

diff --git a/foolsm.spec b/foolsm.spec
index 2836998..70a2f89 100644
--- a/foolsm.spec
+++ b/foolsm.spec
@@ -1,40 +1,19 @@
 #define devel 1
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-%bcond_without systemd	# enabled
-%else
-%bcond_with systemd	# disabled
-%endif
 
 Summary: The Foobar Link Status Monitor
 Name: foolsm
-Version: 1.0.14
+Version: 1.0.18
 Release: 1%{?dist}
 License: GPLv2
-URL: http://lsm.foobar.fi/
-Source0: %{name}-%{version}.tar.gz
-%if %{with systemd}
-Requires(post):   systemd-units
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
-BuildRequires:    systemd
-%else
-Requires(post): chkconfig
-Requires(postun): /sbin/service
-Requires(preun): /sbin/service
-Requires(preun): chkconfig
-%endif
-Requires: mailx
+URL: https://lsm.foobar.fi/
+Source0: https://lsm.foobar.fi/download/%{name}-%{version}.tar.gz
 %if 0%{?devel}
 BuildRequires: ElectricFence
 %endif
-%if 0%{?rhel} && 0%{?rhel} <= 5
-Group: System Environment/Daemons
-%global _sharedstatedir /var/lib
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%endif
-Obsoletes: lsm < 1.0.7-1
-Conflicts: lsm < 1.0.7-1
-Provides: lsm = %{version}-%{release}
+BuildRequires:    systemd
+%{?systemd_requires}
+Requires: mailx
+Requires: hostname
 
 %description
 Foolsm is the Foobar Link Status Monitor.
@@ -56,119 +35,35 @@ EFENCE="-lefence"
 make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=${EFENCE} %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}%{_sysconfdir}/foolsm
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_libexecdir}/foolsm
 mkdir -p %{buildroot}%{_sharedstatedir}/foolsm
+mkdir -p %{buildroot}%{_datadir}/munin/plugins/
 
 install -m0755 foolsm %{buildroot}%{_sbindir}
 install -m0644 foolsm.conf %{buildroot}%{_sysconfdir}/foolsm
 install -m0755 default_script group_script shorewall_script shorewall6_script \
     %{buildroot}%{_libexecdir}/foolsm/
+install -m0755 foolsm_ %{buildroot}%{_datadir}/munin/plugins/
 
-%if %{with systemd}
 mkdir -p %{buildroot}%{_unitdir}
 install -m0644 foolsm.service %{buildroot}%{_unitdir}/
-%else
-mkdir -p %{buildroot}%{_initrddir}
-install -m0755 foolsm.init %{buildroot}%{_initrddir}/foolsm
-%endif
-
-%clean
-rm -rf %{buildroot}
-
-%triggerun -- lsm < 1.0.7-1
-%if %{with systemd}
-systemctl --quiet is-enabled lsm.service && \
-    touch %{_localstatedir}/lock/subsys/lsm.enabled || :
-systemctl --quiet is-active lsm.service && \
-    touch %{_localstatedir}/lock/subsys/lsm.started || :
-%else
-/sbin/chkconfig lsm >/dev/null 2>&1 && \
-    touch %{_localstatedir}/lock/subsys/lsm.enabled || :
-/sbin/service lsm status >/dev/null 2>&1 && \
-    touch %{_localstatedir}/lock/subsys/lsm.started || :
-%endif
-for config in %{_sysconfdir}/lsm/lsm.conf \
-    %{_sysconfdir}/lsm/local*.conf \
-    %{_sysconfdir}/lsm/*_script
-do
-    [ -f ${config} ] && \
-	cp -p ${config} %{_sysconfdir}/foolsm/
-done
-if [ -f %{_sysconfdir}/foolsm/lsm.conf ]; then
-    mv -f %{_sysconfdir}/foolsm/foolsm.conf \
-	%{_sysconfdir}/foolsm/foolsm.conf.rpmnew
-    echo "warning: %{_sysconfdir}/foolsm/foolsm.conf created as %{_sysconfdir}/foolsm/foolsm.conf.rpmnew"
-    mv -f %{_sysconfdir}/foolsm/lsm.conf %{_sysconfdir}/foolsm/foolsm.conf
-fi
-for config in %{_sysconfdir}/foolsm/*.conf; do
-    sed --in-place=.rpmsave \
-	-e 's@/etc/lsm/@/etc/foolsm/@g' \
-	-e 's@%{_datadir}/lsm/@%{_libexecdir}/foolsm/@g' \
-	-e 's@%{_libexecdir}/lsm/@%{_libexecdir}/foolsm/@g' \
-	${config} >/dev/null 2>&1 || :
-done
-
-%triggerpostun -- lsm < 1.0.7-1
-%if %{with systemd}
-if [ -f %{_localstatedir}/lock/subsys/lsm.enabled ]; then
-    systemctl enable foolsm.service >/dev/null 2>&1 || :
-    rm -f %{_localstatedir}/lock/subsys/lsm.enabled
-fi
-if [ -f %{_localstatedir}/lock/subsys/lsm.started ]; then
-    systemctl start foolsm.service >/dev/null 2>&1 || :
-    rm -f %{_localstatedir}/lock/subsys/lsm.started
-fi
-%else
-/sbin/chkconfig --add foolsm
-if [ -f %{_localstatedir}/lock/subsys/lsm.enabled ]; then
-    /sbin/chkconfig foolsm on
-    rm -f %{_localstatedir}/lock/subsys/lsm.enabled
-fi
-if [ -f %{_localstatedir}/lock/subsys/lsm.started ]; then
-    /sbin/service foolsm restart >/dev/null 2>&1
-    rm -f %{_localstatedir}/lock/subsys/lsm.started
-fi
-%endif
 
 %post
-%if %{with systemd}
 %systemd_post foolsm.service
-%else
-/sbin/chkconfig --add foolsm
-%endif
 
 %preun
-%if %{with systemd}
 %systemd_preun foolsm.service
-%else
-if [ $1 -eq 0 ]; then
-    /sbin/service foolsm stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del foolsm
-fi
-%endif
 
 %postun
-%if %{with systemd}
 %systemd_postun_with_restart foolsm.service
-%else
-if [ $1 -ge 1 ]; then
-    /sbin/service foolsm condrestart >/dev/null 2>&1 || :
-fi
-%endif
 
 
 %files
-%defattr(-,root,root,-)
 %doc README foolsm.conf.sample default_script.sample rsyslog-foolsm.conf.sample
-%if %{with systemd}
+%license LICENSE
 %{_unitdir}/foolsm.service
-%else
-%{_initrddir}/foolsm
-%endif
 %dir %{_libexecdir}/foolsm
 %{_libexecdir}/foolsm/default_script
 %{_libexecdir}/foolsm/group_script
@@ -178,8 +73,27 @@ fi
 %config(noreplace) %{_sysconfdir}/foolsm/foolsm.conf
 %{_sbindir}/foolsm
 %dir %{_sharedstatedir}/foolsm
+%dir %{_datadir}/munin
+%dir %{_datadir}/munin/plugins
+%{_datadir}/munin/plugins/foolsm_
 
 %changelog
+* Mon Jul 19 2021 Mika Ilmaranta <ilmis@nullnet.fi> - 1.0.18-1
+- fixed compile time warnings with el8 compiler
+
+* Mon Jul 19 2021 Tuomo Soini <tis@foobar.fi> - 1.0.17-1
+- Drop legacy stuff from spec
+
+* Mon Jul 19 2021 Tuomo Soini <tis@foobar.fi> - 1.0.16-1
+- Add hostname to default_script and group_script
+- Change date format in emails to be more readable
+- Add Requirement for hostname package
+- Cleanup spec file
+- Add LICENSE file
+
+* Wed Mar 31 2021 Mika Ilmaranta <ilmis@nullnet.fi> - 1.0.15-1
+- foolsm_ munin plugin added
+
 * Mon May  4 2020 Mika Ilmaranta <ilmis@nullnet.fi> - 1.0.14-1
 - log recvfrom errors only on debug level >= 9
 - foolsm.conf: debug level 100 doesn't control detaching from controlling