Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1cb8a18756bbf5f3a4050f62245b01d276f117f3
commit 1cb8a18756bbf5f3a4050f62245b01d276f117f3 Author: kikadf <[email protected]> Date: Sun Oct 12 17:38:24 2014 +0200 rsyslog-5.8.13-4-x86_64 * Fix CVE-2014-3683 diff --git a/source/base/rsyslog/CVE-2014-3683.patch b/source/base/rsyslog/CVE-2014-3683.patch new file mode 100644 index 0000000..6978606 --- /dev/null +++ b/source/base/rsyslog/CVE-2014-3683.patch @@ -0,0 +1,12 @@ +diff -Naur rsyslog-5.8.13.old/runtime/rsyslog.h rsyslog-5.8.13/runtime/rsyslog.h +--- rsyslog-5.8.13.old/runtime/rsyslog.h 2014-10-02 11:18:26.126522600 +0200 ++++ rsyslog-5.8.13/runtime/rsyslog.h 2014-10-10 11:21:03.196761200 +0200 +@@ -119,7 +119,7 @@ + */ + static inline int pri2fac(const int pri) + { +- int fac = pri >> 3; ++ unsigned fac = pri >> 3; + return (fac > 23) ? LOG_FAC_INVLD : fac; + } + static inline int pri2sev(const int pri) diff --git a/source/base/rsyslog/FrugalBuild b/source/base/rsyslog/FrugalBuild index d90cde8..fe433f5 100644 --- a/source/base/rsyslog/FrugalBuild +++ b/source/base/rsyslog/FrugalBuild @@ -4,7 +4,7 @@ pkgname=rsyslog pkgver=5.8.13 -pkgrel=3 +pkgrel=4 pkgdesc="Enhanced system logging and kernel message trapping daemon" url="http://www.rsyslog.com/"; backup=(etc/rsyslog.conf) @@ -68,8 +68,9 @@ subgroups=("${subgroups[@]}" 'apps-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') # FSA fix *** -source=(${source[@]} CVE-2014-3634.patch) -sha1sums=(${sha1sums[@]} '8684723c1f464e731f01ad12ea25224fdd3bc653') +source=(${source[@]} CVE-2014-3634.patch CVE-2014-3683.patch) +sha1sums=(${sha1sums[@]} '8684723c1f464e731f01ad12ea25224fdd3bc653' \ + 'e39de31904d4499c1f13b14c69bf72bc281118a2') # *********** _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
