From 7c61a5a1102fe3dc6da829f60789acd5b35d3466 Mon Sep 17 00:00:00 2001
From: alakatos <alakatos@redhat.com>
Date: Sep 11 2020 08:14:16 +0000
Subject: rebase to 1.7.0

  resolves: rhbz#1826269
  removed patch is part of the new version

---

diff --git a/.gitignore b/.gitignore
index 1caa599..794f019 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ librelp-1.0.0.tar.gz
 /librelp-1.2.16.tar.gz
 /librelp-1.4.0.tar.gz
 /librelp-1.5.0.tar.gz
+/librelp-1.7.0.tar.gz
diff --git a/librelp-1.4.0-crypto-compliance.patch b/librelp-1.4.0-crypto-compliance.patch
deleted file mode 100644
index 6c36c4f..0000000
--- a/librelp-1.4.0-crypto-compliance.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 01bbdc98d6e1a897111a93e0137dc41b0dd4e083 Mon Sep 17 00:00:00 2001
-From: Jiri Vymazal <jvymazal@redhat.com>
-Date: Wed, 10 Jul 2019 13:49:43 +0200
-Subject: [PATCH] Modified GnuTLS priority according to standard crypto-policy
- guideline
-
-Edited TLS priority string default to conform to system-wide default
-and align librelp behavior with other crypto-utilizing packages
----
- src/tcp.c | 25 +++++++++++++++++--------
- 1 file changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/src/tcp.c b/src/tcp.c
-index bd9bf1d..36e8712 100644
---- a/src/tcp.c
-+++ b/src/tcp.c
-@@ -1136,20 +1136,29 @@ relpTcpTLSSetPrio_gtls(relpTcp_t *const pThis)
- 	char pristringBuf[4096];
- 	char *pristring;
- 	ENTER_RELPFUNC;
--	/* Compute priority string (in simple cases where the user does not care...) */
-+	/* Set default 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));
-+		if (pThis->authmode == eRelpAuthMode_None) {
-+			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;
-+			pristringBuf[sizeof(pristringBuf)-1] = '\0';
-+			pristring = pristringBuf;
-+			r = gnutls_priority_set_direct(pThis->session, pristring, NULL);
-+		} else {
-+			r = gnutls_set_default_priority(pThis->session);
-+			strncpy(pristringBuf, "to recommended system default", sizeof(pristringBuf));
-+			pristringBuf[sizeof(pristringBuf)-1] = '\0';
-+			pristring = pristringBuf;
-+		}
-+
- 	} else {
- 		pristring = pThis->pristring;
-+		r = gnutls_priority_set_direct(pThis->session, pristring, NULL);
- 	}
- 
--	r = gnutls_priority_set_direct(pThis->session, pristring, NULL);
- 	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 40ed470..1ee8321 100644
--- a/librelp.spec
+++ b/librelp.spec
@@ -1,14 +1,12 @@
 Summary: The Reliable Event Logging Protocol library
 Name: librelp
-Version: 1.5.0
-Release: 2%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.rsyslog.com/
-Source0: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz
+Source0: http://download.rsyslog.com/%{name}/%{name}-%{version}.tar.gz
 BuildRequires: gnutls-devel >= 1.4.0
 
-Patch0: librelp-1.4.0-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
@@ -29,7 +27,6 @@ to develop applications using librelp.
 
 %prep
 %setup -q
-%patch0 -p1 -b .crypto
 
 %build
 autoreconf -ivf
@@ -54,6 +51,10 @@ rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_libdir}/pkgconfig/relp.pc
 
 %changelog
+* Tue Sep 08 2020 Attila Lakatos <alakatos@redhat.com> - 1.7.0-1
+- rebase to 1.7.0
+  resolves: rhbz#1826269
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 10f09fa..a93ce79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (librelp-1.5.0.tar.gz) = b7fb35e4ddb5c3c14ef733699405f8aa62911adef305cd4f494170e111bc61a9208b84dab472a708582cd76ad9976894dae0e7574e60acdae2b56491aa7daf36
+SHA512 (librelp-1.7.0.tar.gz) = e9d71f27d5c50b043254a3f1b0643e7172e5678b6a5a7dddb9d4a9e3afa3ed0adf818a4e868960c1607da5f63430f163f9e76c882ed5460149cb1cceff42b4bd