rpm/fail2ban
SHA256
1
0
Fork 0
forked from pool/fail2ban
Code Pull Requests Activity

Accepting request 1090960 from home:lrupp:branches:security

Browse Source 
- use nagios-rpm-macros to define the libexecdir for SUSE distributions
  correctly (defaut here is /usr/lib/nagios/plugins)
- move conditional for %%pre scripts, to avoid any dependency or other 
  stuff getting in the way on old distributions

OBS-URL: https://build.opensuse.org/request/show/1090960
OBS-URL: https://build.opensuse.org/package/show/security/fail2ban?expand=0&rev=116
This commit is contained in:
Wolfgang Frisch 2023-06-06 07:57:14 +00:00 committed by Git OBS Bridge
parent ed52f92140
commit 0615f554fb
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jun 5 16:36:47 UTC 2023 - Lars Vogdt <lars@linux-schulserver.de>
- use nagios-rpm-macros to define the libexecdir for SUSE distributions
correctly (defaut here is /usr/lib/nagios/plugins)
- move conditional for %%pre scripts, to avoid any dependency or other
stuff getting in the way on old distributions
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 4 21:07:21 UTC 2022 - Dirk Müller <dmueller@suse.com> Sun Dec 4 21:07:21 UTC 2022 - Dirk Müller <dmueller@suse.com>

14
fail2ban.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fail2ban # spec file for package fail2ban
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -103,9 +103,13 @@ reason, i.e. SFW will always run first because it does a table flush.
%endif %endif
%package -n monitoring-plugins-%{name} %package -n monitoring-plugins-%{name}
%define nagios_plugindir %{_libexecdir}/nagios/plugins
Summary: Check fail2ban server and how many IPs are currently banned Summary: Check fail2ban server and how many IPs are currently banned
Group: System/Monitoring Group: System/Monitoring
%if 0%{?suse_version}
BuildRequires: nagios-rpm-macros
%else
%define nagios_plugindir %{_libexecdir}/nagios/plugins
%endif
Provides: nagios-plugins-%{name} = %{version} Provides: nagios-plugins-%{name} = %{version}
Obsoletes: nagios-plugins-%{name} < %{version} Obsoletes: nagios-plugins-%{name} < %{version}
@ -231,8 +235,8 @@ export LANG=en_US.UTF-8
./fail2ban-testcases-all --no-network || true ./fail2ban-testcases-all --no-network || true
%endif %endif
%pre
%if 0%{?suse_version} >= 1230 %if 0%{?suse_version} >= 1230
%pre
%service_add_pre %{name}.service %service_add_pre %{name}.service
%endif %endif
@ -333,7 +337,11 @@ export LANG=en_US.UTF-8
%files -n monitoring-plugins-%{name} %files -n monitoring-plugins-%{name}
%license COPYING %license COPYING
%doc files/nagios/README %doc files/nagios/README
%if 0%{?suse_version}
%dir %{nagios_libdir}
%else
%dir %{_libexecdir}/nagios %dir %{_libexecdir}/nagios
%endif
%dir %{nagios_plugindir} %dir %{nagios_plugindir}
%{nagios_plugindir}/check_%{name} %{nagios_plugindir}/check_%{name}