From b43bf1b783b6907543ca872687236634d915f861 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Aug 15 2013 19:25:42 +0000 Subject: Ship empty /etc/fail2ban/jail.d directory --- diff --git a/fail2ban-jail.d.patch b/fail2ban-jail.d.patch new file mode 100644 index 0000000..9ccb6bb --- /dev/null +++ b/fail2ban-jail.d.patch @@ -0,0 +1,14 @@ +diff --git a/setup.py b/setup.py +index b61ecce..27ad17b 100755 +--- a/setup.py ++++ b/setup.py +@@ -66,6 +66,9 @@ setup( + ('/etc/fail2ban/action.d', + glob("config/action.d/*.conf") + ), ++ ('/etc/fail2ban/jail.d', ++ '' ++ ), + ('/var/run/fail2ban', + '' + ), diff --git a/fail2ban.spec b/fail2ban.spec index 1bbdbc4..fe2b67d 100644 --- a/fail2ban.spec +++ b/fail2ban.spec @@ -11,6 +11,8 @@ Source1: fail2ban-logrotate Patch0: fail2ban-0.8.3-init.patch # Fix logfile paths in jail.conf Patch1: fail2ban-logfiles.patch +# Install jail.d +Patch2: fail2ban-jail.d.patch Patch6: fail2ban-log2syslog.patch Patch8: fail2ban-notmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -47,6 +49,7 @@ and shorewall respectively. %setup -q -n %{name}-%{version}-d529151 %patch0 -p1 -b .init %patch1 -p1 -b .logfiles +%patch2 -p1 -b .jail.d %patch6 -p1 -b .log2syslog %patch8 -p1 -b .notmp @@ -119,10 +122,11 @@ fi %{_initddir}/fail2ban %endif %{_mandir}/man1/fail2ban*.1* -%{_mandir}/man5/*.1* +%{_mandir}/man5/*.5* %dir %{_sysconfdir}/fail2ban %dir %{_sysconfdir}/fail2ban/action.d %dir %{_sysconfdir}/fail2ban/filter.d +%dir %{_sysconfdir}/fail2ban/jail.d %config(noreplace) %{_sysconfdir}/fail2ban/fail2ban.conf %config(noreplace) %{_sysconfdir}/fail2ban/jail.conf %config(noreplace) %{_sysconfdir}/fail2ban/action.d/*.conf @@ -135,6 +139,7 @@ fi %changelog * Fri Aug 9 2013 Orion Poplawski - 0.9-0.2.gitd529151 - Ship jail.conf(5) man page +- Ship empty /etc/fail2ban/jail.d directory * Thu Aug 8 2013 Orion Poplawski - 0.9-0.1.gitd529151 - Update to 0.9 git branch