From 35a03c0f867233a4f2219fc034cdf179958d3a05 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 25 Mar 2014 08:51:42 -0400 Subject: [PATCH] Adjusted changelog/news, do not ignore test failures, install more examples --- debian/NEWS | 20 ++++++++++++++++---- debian/changelog | 3 +++ debian/rules | 18 ++++++++++-------- debian/source/jail.d_defaults-debian.conf | 2 ++ 4 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 debian/source/jail.d_defaults-debian.conf diff --git a/debian/NEWS b/debian/NEWS index e9c08e94..3d436fc6 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,9 +1,21 @@ -fail2ban (0.9.0+git37-gdeb5924-1) experimental; urgency=low +fail2ban (0.9.0+git48-gabcab00-1) experimental; urgency=low - From this version on log paths are defined in distro specific files. - for Debian this is in /etc/fail2ban/paths-debian.conf + [ Yaroslav Halchenko ] + * This version went through big refactoring which allowed to gain new + features such as multiline matching (see upstream's changelog for more + information). + * Although .local files are still supported, customizations are advised + to be provided under corresponding .d/ directories. E.g. see + /etc/fail2ban/jail.d/defaults-debian.conf which is where now sshd + jail is enabled by default to match previous behavior of Fail2Ban in + Debian. - -- Daniel Schaal Sun, 16 Mar 2014 16:51:06 +0100 + [ Daniel Schaal ] + * All jails definitions were rewritten to become more concise and uniform. + From this version on log paths are defined in distro specific files, + for Debian this is in /etc/fail2ban/paths-debian.conf. + + -- Yaroslav Halchenko Tue, 25 Mar 2014 08:38:31 -0400 fail2ban (0.8.11-1) unstable; urgency=low diff --git a/debian/changelog b/debian/changelog index 44ee53b5..c8fcd099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ fail2ban (0.9.0+git48-gabcab00-1) experimental; urgency=medium [ Yaroslav Halchenko ] * Post 0.9 release snapshot. + * debian/rules + - do not ignore tests failures + - nagios and cacti examples get installed -- Yaroslav Halchenko Tue, 25 Mar 2014 00:43:46 -0400 diff --git a/debian/rules b/debian/rules index 5dc6f587..0d898ca0 100755 --- a/debian/rules +++ b/debian/rules @@ -20,28 +20,30 @@ override_dh_clean: override_dh_install: rm -f $(DESTDIR)/usr/share/doc/fail2ban/README.Solaris - # Remove explicitely created /var/run/fail2ban - # just to please lintian since init file will - # take care about it anyways + :# Remove explicitely created /var/run/fail2ban + :# just to please lintian since init file will + :# take care about it anyways rm -rf $(DESTDIR)/var/run/ - # Install bash completion + :# 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 install -d $(DESTDIR)/lib/systemd/system install -d $(DESTDIR)/usr/lib/tmpfiles.d install -m 644 files/fail2ban.service $(DESTDIR)/lib/systemd/system install -m 644 files/fail2ban-tmpfiles.conf $(DESTDIR)/usr/lib/tmpfiles.d - + install -d $(DESTDIR)/lib/systemd/system + :# Install default jail enabler + install -m 644 debian/source/jail.d_defaults-debian.conf $(DESTDIR)/etc/fail2ban/jail.d/defaults-debian.conf dh_install override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - ./fail2ban-testcases-all || : + ./fail2ban-testcases-all endif override_dh_installexamples: - dh_installexamples config/jail.conf files/ipmasq-* + dh_installexamples files/ipmasq-* files/nagios files/cacti override_dh_installinit: dh_installinit -- defaults 99 diff --git a/debian/source/jail.d_defaults-debian.conf b/debian/source/jail.d_defaults-debian.conf new file mode 100644 index 00000000..9eb356c8 --- /dev/null +++ b/debian/source/jail.d_defaults-debian.conf @@ -0,0 +1,2 @@ +[sshd] +enabled = true