diff --git a/librelp-1.2.13-crypto-compliance.patch b/librelp-1.2.13-crypto-compliance.patch new file mode 100644 index 0000000..a25d630 --- /dev/null +++ b/librelp-1.2.13-crypto-compliance.patch @@ -0,0 +1,29 @@ +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) + { + int r; +- char pristringBuf[4096]; +- char *pristring; + ENTER_RELPFUNC; +- /* Compute priority string (in simple cases where the user does not care...) */ +- if(pThis->pristring == NULL) { +- if(pThis->bEnableTLSZip) { +- strncpy(pristringBuf, "NORMAL:+ANON-DH:+COMP-ALL", sizeof(pristringBuf)); +- } else { +- strncpy(pristringBuf, "NORMAL:+ANON-DH:+COMP-NULL", sizeof(pristringBuf)); +- } +- pristringBuf[sizeof(pristringBuf)-1] = '\0'; +- pristring = pristringBuf; +- } else { +- pristring = pThis->pristring; +- } +- +- r = gnutls_priority_set_direct(pThis->session, pristring, NULL); ++ r = gnutls_set_default_priority(pThis->session); + if(r == GNUTLS_E_INVALID_REQUEST) { + ABORT_FINALIZE(RELP_RET_INVLD_TLS_PRIO); + } else if(r != GNUTLS_E_SUCCESS) { diff --git a/librelp.spec b/librelp.spec index 89ed251..b17d109 100644 --- a/librelp.spec +++ b/librelp.spec @@ -1,7 +1,7 @@ Summary: The Reliable Event Logging Protocol library Name: librelp -Version: 1.2.12 -Release: 2%{?dist} +Version: 1.2.13 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Libraries URL: http://www.rsyslog.com/ @@ -11,6 +11,8 @@ Requires(postun): /sbin/ldconfig BuildRequires: gnutls-devel >= 1.4.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: librelp-1.2.13-crypto-compliance.patch + %description Librelp is an easy to use library for the RELP protocol. RELP (stands for Reliable Event Logging Protocol) is a general-purpose, extensible @@ -21,6 +23,9 @@ Summary: Development files for the %{name} package Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description devel Librelp is an easy to use library for the RELP protocol. The @@ -29,8 +34,10 @@ to develop applications using librelp. %prep %setup -q +%patch0 -p1 %build +autoreconf -ivf %configure --disable-static make %{?_smp_mflags} @@ -62,6 +69,14 @@ fi %{_libdir}/pkgconfig/relp.pc %changelog +* Thu Feb 23 2017 Jiri Vymazal - 1.2.13-1 +- rebase to 1.2.13 + resolves: rhbz#1425638 +- added patch for GnuTLS crypto-policy adherence + resolves: rhbz#1179317 +- added autoconf, automake and libtool because package + has patches now + * Fri Feb 10 2017 Fedora Release Engineering - 1.2.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild