Merge branch 'debian-release/experimental' of https://github.com/schaal/fail2ban into debian-releases/experimental

* 'debian-release/experimental' of https://github.com/schaal/fail2ban:
  Switch debian packaging to use python3
debian-releases/experimental
Yaroslav Halchenko 2014-10-12 10:26:48 -04:00
commit eb6cc726ff
2 changed files with 9 additions and 6 deletions

8
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: fail2ban
Section: net Section: net
Priority: optional Priority: optional
Maintainer: Yaroslav Halchenko <debian@onerussian.com> Maintainer: Yaroslav Halchenko <debian@onerussian.com>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-pyinotify, dh-systemd Build-Depends: debhelper (>= 9), python3, python3-pyinotify, dh-systemd
Homepage: http://www.fail2ban.org Homepage: http://www.fail2ban.org
Vcs-Git: git://github.com/fail2ban/fail2ban.git Vcs-Git: git://github.com/fail2ban/fail2ban.git
Vcs-Browser: http://github.com/fail2ban/fail2ban Vcs-Browser: http://github.com/fail2ban/fail2ban
@ -11,9 +11,9 @@ Standards-Version: 3.9.4
Package: fail2ban Package: fail2ban
Architecture: all Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, lsb-base (>=2.0-7) Depends: ${python3:Depends}, ${misc:Depends}, lsb-base (>=2.0-7)
Recommends: iptables, whois, python-pyinotify Recommends: iptables, whois, python3-pyinotify
Suggests: python-gamin, mailx, system-log-daemon, python-systemd Suggests: mailx, system-log-daemon, python3-systemd
Description: ban hosts that cause multiple authentication errors Description: ban hosts that cause multiple authentication errors
Fail2ban monitors log files (e.g. /var/log/auth.log, Fail2ban monitors log files (e.g. /var/log/auth.log,
/var/log/apache/access.log) and temporarily or persistently bans /var/log/apache/access.log) and temporarily or persistently bans

7
debian/rules vendored
View File

@ -9,10 +9,13 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
export PYBUILD_DISABLE_python2=1
%: %:
dh $@ --with python2,systemd dh $@ --with python3,systemd --buildsystem pybuild
DESTDIR=$(CURDIR)/debian/fail2ban DESTDIR=$(CURDIR)/debian/fail2ban
PYVERSION=$(shell py3versions -dv)
override_dh_clean: override_dh_clean:
rm -rf fail2ban.egg-info rm -rf fail2ban.egg-info
@ -39,7 +42,7 @@ override_dh_install:
override_dh_auto_test: override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
./fail2ban-testcases-all --no-network cd build && FAIL2BAN_CONFIG_DIR="$(CURDIR)/config" PYTHONPATH="$(CURDIR)/.pybuild/pythonX.Y_$(PYVERSION)/build/" scripts-*/fail2ban-testcases --no-network
endif endif
override_dh_installexamples: override_dh_installexamples: