mirror of https://github.com/fail2ban/fail2ban
preliminary patch for backports to wheezy etc (systemd support "disabled")
also removing obsolete patch for lucid -- will just not build for it any longerpull/856/head debian/0.9.1-1
Yaroslav Halchenko
parent
4e543da4ba
commit
408bed5464
|
|
@ -1,46 +0,0 @@
|
|||
From: Yaroslav Halchenko <debian@onerussian.com>
|
||||
Date: Thu, 6 Dec 2012 12:50:12 -0500
|
||||
Subject: [PATCH] Patch for elderly Debian/Ubuntu (e.g. 10.04) releases without dh_python2
|
||||
|
||||
Use again pycentral etc
|
||||
|
||||
crafted post 0.8.8-1 release when a user complained about inability to upgrade
|
||||
|
||||
---
|
||||
debian/control | 2 ++
|
||||
debian/rules | 12 +++++-------
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -3,6 +3,8 @@ Section: net
|
||||
Priority: optional
|
||||
Maintainer: Yaroslav Halchenko <debian@onerussian.com>
|
||||
Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.5.4-1~), python-pyinotify
|
||||
+Build-Depends-Indep: python-central (>= 0.5.6)
|
||||
+XS-Python-Version: current, >= 2.4
|
||||
Homepage: http://www.fail2ban.org
|
||||
Vcs-Git: git://github.com/fail2ban/fail2ban.git
|
||||
Vcs-Browser: http://github.com/fail2ban/fail2ban
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -72,14 +72,12 @@ binary-indep: install
|
||||
dh_installdocs
|
||||
dh_installexamples config/jail.conf files/ipmasq-*
|
||||
dh_installlogrotate
|
||||
- dh_python2 /usr/share/fail2ban
|
||||
+ dh_pycentral
|
||||
dh_installinit -- defaults 99
|
||||
-
|
||||
- # perform swap of order of calls to init and pycentral (or even
|
||||
- # bleedingly new dh_python2) in prerm to close #422655 --
|
||||
- # python-cleanup section is cut and placed at the end of the file
|
||||
- # since .init script would trigger their compilation again
|
||||
- sed -i -e '/^#.*ed by dh_python2/,/# End auto/{H;d};$$G' \
|
||||
+ # perform swap of order of calls to init and pycentral in prerm
|
||||
+ # to close #422655 -- pycentral section is cut and placed at
|
||||
+ # the end of the file
|
||||
+ sed -i -e '/^#.*ed by dh_pycentral/,/# End auto/{H;d};$$G' \
|
||||
debian/fail2ban.prerm.debhelper
|
||||
|
||||
dh_installman man/*.[15]
|
||||
|
|
@ -0,0 +1 @@
|
|||
neurodebian_use_python2
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -2,7 +2,7 @@ Source: fail2ban
|
||||
Section: net
|
||||
Priority: optional
|
||||
Maintainer: Yaroslav Halchenko <debian@onerussian.com>
|
||||
-Build-Depends: debhelper (>= 9), python3, python3-pyinotify, dh-systemd
|
||||
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-pyinotify, dh-python
|
||||
Homepage: http://www.fail2ban.org
|
||||
Vcs-Git: git://github.com/fail2ban/fail2ban.git
|
||||
Vcs-Browser: http://github.com/fail2ban/fail2ban
|
||||
@@ -12,8 +12,8 @@ Standards-Version: 3.9.6
|
||||
Package: fail2ban
|
||||
Architecture: all
|
||||
Depends: ${python3:Depends}, ${misc:Depends}, lsb-base (>=2.0-7)
|
||||
-Recommends: iptables, whois, python3-pyinotify
|
||||
-Suggests: mailx, system-log-daemon, python3-systemd
|
||||
+Recommends: iptables, whois, python-pyinotify
|
||||
+Suggests: mailx, system-log-daemon, python-systemd
|
||||
Description: ban hosts that cause multiple authentication errors
|
||||
Fail2ban monitors log files (e.g. /var/log/auth.log,
|
||||
/var/log/apache/access.log) and temporarily or persistently bans
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -9,13 +9,13 @@
|
||||
# Uncomment this to turn on verbose mode.
|
||||
#export DH_VERBOSE=1
|
||||
|
||||
-export PYBUILD_DISABLE_python2=1
|
||||
+export PYBUILD_DISABLE_python3=1
|
||||
|
||||
%:
|
||||
- dh $@ --with python3,systemd --buildsystem pybuild
|
||||
+ dh $@ --with python2 --buildsystem pybuild
|
||||
|
||||
DESTDIR=$(CURDIR)/debian/fail2ban
|
||||
-PYVERSION=$(shell py3versions -dv)
|
||||
+PYVERSION=$(shell pyversions -dv)
|
||||
|
||||
override_dh_clean:
|
||||
rm -rf fail2ban.egg-info
|
||||
@@ -30,7 +30,8 @@ override_dh_install:
|
||||
: # Install bash completion
|
||||
install -d $(DESTDIR)/etc/bash_completion.d
|
||||
install -m 644 files/bash-completion $(DESTDIR)/etc/bash_completion.d/fail2ban
|
||||
- : # Install systemd files
|
||||
+ : # Install systemd files, even in backport version just in case even though
|
||||
+ : # other systemd preparation activities are not carried out
|
||||
install -d $(DESTDIR)/lib/systemd/system
|
||||
install -d $(DESTDIR)/usr/lib/tmpfiles.d
|
||||
install -m 644 files/fail2ban.service $(DESTDIR)/lib/systemd/system
|
||||
|
|
@ -0,0 +1 @@
|
|||
neurodebian_use_python2
|
||||
|
|
@ -0,0 +1 @@
|
|||
neurodebian_use_python2
|
||||
|
|
@ -0,0 +1 @@
|
|||
neurodebian_use_python2
|
||||
|
|
@ -0,0 +1 @@
|
|||
neurodebian_use_python2
|
||||
Loading…
Reference in New Issue