Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d2a8c16191df8ddea8e4cce62677c31b92f1f36c
commit d2a8c16191df8ddea8e4cce62677c31b92f1f36c Author: kikadf <[email protected]> Date: Mon Dec 15 09:30:41 2014 +0100 denyhosts-2.6-6-x86_64 * Fix CVE-2013-6890 diff --git a/source/network-extra/denyhosts/CVE-2013-6890.patch b/source/network-extra/denyhosts/CVE-2013-6890.patch new file mode 100644 index 0000000..496f3f1 --- /dev/null +++ b/source/network-extra/denyhosts/CVE-2013-6890.patch @@ -0,0 +1,44 @@ +diff -up DenyHosts-2.6/DenyHosts/regex.py.CVE-2013-6890 DenyHosts-2.6/DenyHosts/regex.py +--- DenyHosts-2.6/DenyHosts/regex.py.CVE-2013-6890 2014-01-06 16:39:32.505865176 -0600 ++++ DenyHosts-2.6/DenyHosts/regex.py 2014-01-06 22:05:52.675094771 -0600 +@@ -6,23 +6,22 @@ import re + + #DATE_FORMAT_REGEX = re.compile(r"""(?P<month>[A-z]{3,3})\s*(?P<day>\d+)""") + +-SSHD_FORMAT_REGEX = re.compile(r""".* (sshd.*:|\[sshd\]) (?P<message>.*)""") ++SSHD_FORMAT_REGEX = re.compile(r""".*? (sshd.*?:|\[sshd\]) (?P<message>.*)""") + #SSHD_FORMAT_REGEX = re.compile(r""".* sshd.*: (?P<message>.*)""") + +-FAILED_ENTRY_REGEX = re.compile(r"""Failed (?P<method>.*) for (?P<invalid>invalid user |illegal user )?(?P<user>.*?) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") ++FAILED_ENTRY_REGEX = re.compile(r"""Failed (?P<method>\S*) for (?P<invalid>invalid user |illegal user )?(?P<user>.*) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") + +-FAILED_ENTRY_REGEX2 = re.compile(r"""(?P<invalid>(Illegal|Invalid)) user (?P<user>.*?) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") ++FAILED_ENTRY_REGEX2 = re.compile(r"""(?P<invalid>(Illegal|Invalid)) user (?P<user>.*) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") + +-FAILED_ENTRY_REGEX3 = re.compile(r"""Authentication failure for (?P<user>.*) .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") ++FAILED_ENTRY_REGEX3 = None + +-FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P<user>.*) .*from (?P<host>.*)""") ++FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P<user>.*) from (::ffff:)?(?P<host>\S+)$""") + +-FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) .*from (?P<host>.*) not allowed because none of user's groups are listed in AllowGroups""") ++FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P<user>.*) from (::ffff:)?(?P<host>\S+) not allowed because none of user's groups are listed in AllowGroups$""") + +-FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") +- +-FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) not allowed because not listed in AllowUsers""") ++FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") + ++FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P<user>.*) from (::ffff:)?(?P<host>\S+) not allowed because not listed in AllowUsers$""") + + # these are reserved for future versions + FAILED_ENTRY_REGEX8 = None +@@ -42,7 +41,7 @@ for i in FAILED_ENTRY_REGEX_RANGE: + FAILED_ENTRY_REGEX_MAP[i] = rx + + +-SUCCESSFUL_ENTRY_REGEX = re.compile(r"""Accepted (?P<method>.*) for (?P<user>.*?) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") ++SUCCESSFUL_ENTRY_REGEX = re.compile(r"""Accepted (?P<method>\S+) for (?P<user>.*?) from (::ffff:)?(?P<host>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$""") + + TIME_SPEC_REGEX = re.compile(r"""(?P<units>\d*)\s*(?P<period>[smhdwy])?""") + diff --git a/source/network-extra/denyhosts/FrugalBuild b/source/network-extra/denyhosts/FrugalBuild index 83b6231..4ae5174 100644 --- a/source/network-extra/denyhosts/FrugalBuild +++ b/source/network-extra/denyhosts/FrugalBuild @@ -2,19 +2,33 @@ # Maintainer: crazy <[email protected]> # Contributor: BMH1980 <[email protected]> +options+=('asneeded') + pkgname=denyhosts pkgver=2.6 -pkgrel=5 +pkgrel=6 pkgdesc="DenyHosts is a utility to help sys admins thwart ssh hackers" -license="GPL2" +_F_sourceforge_name="DenyHosts" Finclude sourceforge -source=(${source/denyhosts-/DenyHosts-} http://$pkgname.sf.net/faq.html $pkgname.service $pkgname.cfg) +source=($source http://$pkgname.sf.net/faq.html $pkgname.service $pkgname.cfg) groups=('network-extra') archs=('i686' 'x86_64') depends=('python>=2.7') backup=('etc/denyhosts.cfg') _F_systemd_units=($pkgname=) Finclude systemd +options+=('noversrc') +sha1sums=('02143843cb7c37c986c222b7acc11f7b75eb7373' \ + '1b5277da9da5474af2eab1468a6bf6219f346b6e' \ + '0c5343b66970b4084b9bf600fc4d71447288adbc' \ + 'a8d7e5762e6b5c6d9f70243e98bc96cec760b1b3') + + +# FSA fix *** +source=(${source[@]} CVE-2013-6890.patch) +sha1sums=(${sha1sums[@]} '04b64d2befcc1ae3f0f842a018e4d8cda2f31a7d') +# *********** + build() { @@ -32,7 +46,3 @@ build() } -sha1sums=('02143843cb7c37c986c222b7acc11f7b75eb7373' \ - '8041db79843e31f93485d02962f2cba8c7842c19' \ - '0c5343b66970b4084b9bf600fc4d71447288adbc' \ - 'a8d7e5762e6b5c6d9f70243e98bc96cec760b1b3') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
