commit 5d66b3813f685f277828f5e50af9aed70323e07f
Author: Jan Rękorajski <[email protected]>
Date: Mon Jan 6 20:02:20 2014 +0100
- install python module into private dir to avoid pollution
fail2ban.spec | 12 ++++++++----
private-scriptdir.patch | 33 +++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 4 deletions(-)
---
diff --git a/fail2ban.spec b/fail2ban.spec
index 7927cbd..dddd702 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -2,13 +2,14 @@ Summary: Ban IPs that make too many password failures
Summary(pl.UTF-8): Blokowanie IP powodujących zbyt dużo prób logowań z
błędnym hasłem
Name: fail2ban
Version: 0.8.11
-Release: 2.3
+Release: 2.4
License: GPL
Group: Daemons
Source0:
http://download.sourceforge.net/fail2ban/%{name}-%{version}.tar.gz
# Source0-md5: 2182a21c7efd885f373ffc941d11914d
Source1: %{name}.init
Patch0: ipv6.patch
+Patch1: private-scriptdir.patch
URL: http://fail2ban.sourceforge.net/
BuildRequires: python-devel
BuildRequires: python-modules
@@ -38,8 +39,12 @@ z sshd czy plikami logów serwera WWW Apache.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
rm setup.cfg
+# we don't want very generic named dirs directly in py_sitescriptdir
+sed -i -e 's|@@SCRIPTDIR@@|"%{py_sitescriptdir}/%{name}"|'
fail2ban-{client,regex,server}
+
%build
%{__python} setup.py build
@@ -49,10 +54,9 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d \
$RPM_BUILD_ROOT%{_mandir}/man1 \
$RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}}
-PYTHONPATH=$RPM_BUILD_ROOT%{py_sitescriptdir}; export PYTHONPATH
-
%{__python} setup.py install \
--optimize=2 \
+ --install-lib=%{py_sitescriptdir}/%{name} \
--root=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/fail2ban
@@ -102,7 +106,7 @@ fi
%dir %{_sysconfdir}/fail2ban/jail.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fail2ban/*.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fail2ban/*/*.conf
-%{py_sitescriptdir}/*
+%{py_sitescriptdir}/%{name}
%{_mandir}/man1/fail2ban-client.1*
%{_mandir}/man1/fail2ban-regex.1*
%{_mandir}/man1/fail2ban-server.1*
diff --git a/private-scriptdir.patch b/private-scriptdir.patch
new file mode 100644
index 0000000..4667876
--- /dev/null
+++ b/private-scriptdir.patch
@@ -0,0 +1,33 @@
+--- fail2ban-0.8.11/fail2ban-client~ 2013-11-12 22:06:54.000000000 +0100
++++ fail2ban-0.8.11/fail2ban-client 2014-01-06 19:55:02.041427898 +0100
+@@ -30,7 +30,7 @@
+ try:
+ from common.version import version
+ except ImportError, e:
+- sys.path.insert(1, "/usr/share/fail2ban")
++ sys.path.insert(1, @@SCRIPTDIR@@)
+ from common.version import version
+
+ # Now we can import the rest of modules
+--- fail2ban-0.8.11/fail2ban-regex~ 2013-11-12 22:06:54.000000000 +0100
++++ fail2ban-0.8.11/fail2ban-regex 2014-01-06 19:55:23.041427746 +0100
+@@ -36,7 +36,7 @@
+ try:
+ from common.version import version
+ except ImportError, e:
+- sys.path.insert(1, "/usr/share/fail2ban")
++ sys.path.insert(1, @@SCRIPTDIR@@)
+ from common.version import version
+
+ from optparse import OptionParser, Option
+--- fail2ban-0.8.11/fail2ban-server~ 2013-11-12 22:06:54.000000000 +0100
++++ fail2ban-0.8.11/fail2ban-server 2014-01-06 19:55:39.534760960 +0100
+@@ -29,7 +29,7 @@
+ try:
+ from common.version import version
+ except ImportError, e:
+- sys.path.insert(1, "/usr/share/fail2ban")
++ sys.path.insert(1, @@SCRIPTDIR@@)
+ from common.version import version
+
+ from server.server import Server
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fail2ban.git/commitdiff/47c24e99b565dd110b23ae0681d14a78b86c19b6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
