diff --git a/.gitignore b/.gitignore index 9162fe6..eea63b2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ librelp-1.0.0.tar.gz /librelp-1.2.12.tar.gz /librelp-1.2.13.tar.gz /librelp-1.2.14.tar.gz +/librelp-1.2.15.tar.gz diff --git a/librelp-1.2.13-crypto-compliance.patch b/librelp-1.2.13-crypto-compliance.patch index a25d630..d5238d0 100644 --- a/librelp-1.2.13-crypto-compliance.patch +++ b/librelp-1.2.13-crypto-compliance.patch @@ -1,9 +1,8 @@ -diff --git a/src/tcp.c b/src/tcp.c -index 3c6acbb..4220ec4 100644 ---- a/src/tcp.c -+++ b/src/tcp.c -@@ -548,23 +548,8 @@ static relpRetVal - relpTcpTLSSetPrio(relpTcp_t *pThis) +diff -up ./src/tcp.c.fix ./src/tcp.c +--- ./src/tcp.c.fix 2018-03-26 13:44:07.627189911 +0200 ++++ ./src/tcp.c 2018-03-26 13:44:51.051915920 +0200 +@@ -556,23 +556,8 @@ static relpRetVal + relpTcpTLSSetPrio(relpTcp_t *const pThis) { int r; - char pristringBuf[4096]; diff --git a/librelp.spec b/librelp.spec index fff3375..8390fc6 100644 --- a/librelp.spec +++ b/librelp.spec @@ -1,7 +1,7 @@ Summary: The Reliable Event Logging Protocol library Name: librelp -Version: 1.2.14 -Release: 4%{?dist} +Version: 1.2.15 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Libraries URL: http://www.rsyslog.com/ @@ -65,6 +65,10 @@ fi %{_libdir}/pkgconfig/relp.pc %changelog +* Mon Mar 26 2018 Radovan Sroka - 1.2.15-1 +- rebase to 1.2.15 +- fixed CVE-2018-1000140 + * Wed Feb 07 2018 Fedora Release Engineering - 1.2.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 421167e..f9c4092 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (librelp-1.2.14.tar.gz) = b9a947edb7f23ba533f358d3271a61e80fcca7db8be0c20b39ec61ce4d913efed25173330a0604faebfbbdf33a051ed43234b2b41be2480dc3459c35b91acaae +SHA512 (librelp-1.2.15.tar.gz) = 9cf52c82c8e61f6970a83ead60da4bc64ab56a2bda42fedf184a1ae60c28f66d565a0c3a8720b55b9a2e5e3ffb7ec35601158f634c8f2965f8c0d3b4f1c15568