Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=157ed39b65804fd2ace52a503163af30d20b91c3
commit 157ed39b65804fd2ace52a503163af30d20b91c3 Author: kikadf <[email protected]> Date: Sat Jul 19 08:50:51 2014 +0200 fail2ban-0.8.13-1arcturus1-x86_64 * Version bump * Fix CVE-2013-7176, CVE-2013-7177 diff --git a/source/network-extra/fail2ban/FrugalBuild b/source/network-extra/fail2ban/FrugalBuild index 2a3ebc5..d28a559 100644 --- a/source/network-extra/fail2ban/FrugalBuild +++ b/source/network-extra/fail2ban/FrugalBuild @@ -2,27 +2,24 @@ # Maintainer: bouleetbil <[email protected]> pkgname=fail2ban -pkgver=0.8.4 -pkgrel=3 +pkgver=0.8.13 +pkgrel=1arcturus1 pkgdesc="Bans IP that make too many password failures" depends=('iptables' 'whois') groups=('network-extra') archs=('i686' 'x86_64') -_F_sourceforge_subdir="fail2ban-stable/" -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge -source=($source fail2ban-0.8.4-cve2009-5023.patch fail2ban-0.8.4-sshd-breakin.patch \ - fail2ban-0.8.4-hashlib.patch fail2ban.service) -sha1sums=('0816a9f8d54013dc9b395284caff3c54f44377d8' \ - '73cc35b8cc823e0a1d5f84aa1791be329cc38e2d' \ - 'c9780ec64a8e59cee3c74be2863b3816ff6b16e8' \ - '2385a85135b9040239901d381fb2cec564f7463b' \ +_F_github_tag="yes" +_F_archive_grepv="9" +Finclude github +source=($source fail2ban.service) +sha1sums=('0e464c89c9b5df31274a9d970457ea7443c9d0df' \ '51975cc4be12704eedffccdb7853c3e815988174') backup=(etc/fail2ban/{fail2ban,jail}.conf) _F_systemd_units=(fail2ban=) Finclude systemd build() { + Funpack_github Fbuild # systemd tmpfiles Frm var/run diff --git a/source/network-extra/fail2ban/fail2ban-0.8.4-cve2009-5023.patch b/source/network-extra/fail2ban/fail2ban-0.8.4-cve2009-5023.patch deleted file mode 100644 index d1b69a4..0000000 --- a/source/network-extra/fail2ban/fail2ban-0.8.4-cve2009-5023.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: config/action.d/mail-buffered.conf -=================================================================== ---- config/action.d/mail-buffered.conf (revision 766) -+++ config/action.d/mail-buffered.conf (revision 767) -@@ -81,7 +81,7 @@ - - # Default temporary file - # --tmpfile = /tmp/fail2ban-mail.txt -+tmpfile = /var/run/fail2ban/tmp-mail.txt - - # Destination/Addressee of the mail - # -Index: config/action.d/sendmail-buffered.conf -=================================================================== ---- config/action.d/sendmail-buffered.conf (revision 766) -+++ config/action.d/sendmail-buffered.conf (revision 767) -@@ -101,5 +101,5 @@ - - # Default temporary file - # --tmpfile = /tmp/fail2ban-mail.txt -+tmpfile = /var/run/fail2ban/tmp-mail.txt - -Index: config/action.d/dshield.conf -=================================================================== ---- config/action.d/dshield.conf (revision 766) -+++ config/action.d/dshield.conf (revision 767) -@@ -206,5 +206,5 @@ - # Notes.: Base name of temporary files used for buffering - # Values: [ STRING ] Default: /tmp/fail2ban-dshield - # --tmpfile = /tmp/fail2ban-dshield -+tmpfile = /var/run/fail2ban/tmp-dshield - -Index: config/action.d/mynetwatchman.conf -=================================================================== ---- config/action.d/mynetwatchman.conf (revision 766) -+++ config/action.d/mynetwatchman.conf (revision 767) -@@ -141,4 +141,4 @@ - # Notes.: Base name of temporary files - # Values: [ STRING ] Default: /tmp/fail2ban-mynetwatchman - # --tmpfile = /tmp/fail2ban-mynetwatchman -+tmpfile = /var/run/fail2ban/tmp-mynetwatchman diff --git a/source/network-extra/fail2ban/fail2ban-0.8.4-hashlib.patch b/source/network-extra/fail2ban/fail2ban-0.8.4-hashlib.patch deleted file mode 100644 index 4ab90b8..0000000 --- a/source/network-extra/fail2ban/fail2ban-0.8.4-hashlib.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: fail2ban-0.8.4/server/filter.py -=================================================================== ---- fail2ban-0.8.4.orig/server/filter.py -+++ fail2ban-0.8.4/server/filter.py -@@ -439,7 +439,7 @@ class FileFilter(Filter): - # In order to detect log rotation, the hash (MD5) of the first line of the file - # is computed and compared to the previous hash of this line. - --import md5 -+import hashlib - - class FileContainer: - -@@ -454,7 +454,7 @@ class FileContainer: - try: - firstLine = handler.readline() - # Computes the MD5 of the first line. -- self.__hash = md5.new(firstLine).digest() -+ self.__hash = hashlib.md5(firstLine).digest() - # Start at the beginning of file if tail mode is off. - if tail: - handler.seek(0, 2) -@@ -471,7 +471,7 @@ class FileContainer: - self.__handler = open(self.__filename) - firstLine = self.__handler.readline() - # Computes the MD5 of the first line. -- myHash = md5.new(firstLine).digest() -+ myHash = hashlib.md5(firstLine).digest() - stats = os.fstat(self.__handler.fileno()) - # Compare hash and inode - if self.__hash != myHash or self.__ino != stats.st_ino: diff --git a/source/network-extra/fail2ban/fail2ban-0.8.4-sshd-breakin.patch b/source/network-extra/fail2ban/fail2ban-0.8.4-sshd-breakin.patch deleted file mode 100644 index dcfc43f..0000000 --- a/source/network-extra/fail2ban/fail2ban-0.8.4-sshd-breakin.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: fail2ban-0.8.4/config/filter.d/sshd.conf -=================================================================== ---- fail2ban-0.8.4.orig/config/filter.d/sshd.conf -+++ fail2ban-0.8.4/config/filter.d/sshd.conf -@@ -31,8 +31,8 @@ failregex = ^%(__prefix_line)s(?:error: - ^%(__prefix_line)sUser \S+ from <HOST> not allowed because not listed in AllowUsers$ - ^%(__prefix_line)sauthentication failure; logname=\S* uid=\S* euid=\S* tty=\S* ruser=\S* rhost=<HOST>(?:\s+user=.*)?\s*$ - ^%(__prefix_line)srefused connect from \S+ \(<HOST>\)\s*$ -- ^%(__prefix_line)sAddress <HOST> .* POSSIBLE BREAK-IN ATTEMPT!*\s*$ -- ^%(__prefix_line)sUser \S+ from <HOST> not allowed because none of user's groups are listed in AllowGroups$ -+ ^%(__prefix_line)sreverse mapping checking getaddrinfo for .* \[<HOST>\] .* POSSIBLE BREAK-IN ATTEMPT\!\s* -+ ^%(__prefix_line)sUser \S+ from <HOST> not allowed because none of user's groups are listed in AllowGroups$ - - # Option: ignoreregex - # Notes.: regex to ignore. If this regex matches, the line is ignored. _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
