changelog and dropping absorbed patch

pull/1858/head
Yaroslav Halchenko 2017-05-10 22:11:27 -04:00
parent 96323b1da0
commit 1561d5fb14
3 changed files with 7 additions and 25 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
fail2ban (0.9.7-1) experimental; urgency=medium
* Fresh upstream release, primarily bugfix but includes some enhancements
to regexes and new filters
-- Yaroslav Halchenko <debian@onerussian.com> Wed, 10 May 2017 21:40:16 -0400
fail2ban (0.9.6-2) unstable; urgency=medium
* debian/patches/changeset_a639f0b083c213bde4ff3dcfbbb9fbcab0dd55f8.diff

View File

@ -1,24 +0,0 @@
From: Paul Brook <paul@nowt.org>
Subject: BF: specify explicit time offset not a time zone name to avoid needing tzdata during testing
Origin: Debian
Bug-Debian: https://bugs.debian.org/855920
Forwarded: https://github.com/fail2ban/fail2ban/pull/1754
Applied-Upstream: yes
Last-Update: 2017-04-17
--- a/fail2ban/tests/utils.py
+++ b/fail2ban/tests/utils.py
@@ -95,7 +95,10 @@ def setUpMyTime():
# Set the time to a fixed, known value
# Sun Aug 14 12:00:00 CEST 2005
# yoh: we need to adjust TZ to match the one used by Cyril so all the timestamps match
- os.environ['TZ'] = 'Europe/Zurich'
+ # This offset corresponds to Europe/Zurich timezone. Specifying it
+ # explicitly allows to avoid requiring tzdata package to be installed during
+ # testing. See https://bugs.debian.org/855920 for more information
+ os.environ['TZ'] = 'CET-01CEST-02,M3.5.0,M10.5.0'
time.tzset()
MyTime.setTime(1124013600)

View File

@ -1,3 +1,2 @@
changeset_a639f0b083c213bde4ff3dcfbbb9fbcab0dd55f8.diff
deb_init_paths
deb_manpages_reportbug