Update to 1.11.0

librelp-1.2.13-crypto-compliance.patch

@@ -1,28 +0,0 @@
-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];
--	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) {

librelp.spec

@@ -1,12 +1,10 @@
 Name:             librelp
-Version:          1.2.16
+Version:          1.11.0
-Release:          4
+Release:          1
 Summary:          An Easy To Use Library For The RELP Protocol
 License:          GPLv3+
 URL:              http://www.rsyslog.com/
 Source0:          http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz
-Patch0001:        librelp-1.2.13-crypto-compliance.patch
-Patch0002:        remove-AM_INIT_AUTOMAKE.patch
 Requires(post):   glibc
 Requires(postun): glibc
 BuildRequires:    gnutls-devel >= 1.4.0
@@ -29,7 +27,7 @@ for the librelp library.
 
 %build
 autoreconf -ivf
-%configure --disable-static
+%configure --disable-static --disable-tls-openssl
 %make_build
 
 %install
@@ -52,6 +50,9 @@ autoreconf -ivf
 %{_libdir}/pkgconfig/relp.pc
 
 %changelog
+* Wed Jun 07 2023 wangkai <13474090681@163.com> - 1.11.0-1
+- Update to 1.11.0
+
 * Tue Jan 12 2021 xu_ping<xuping33@huawei.com> - 1.2.16-4
 - remove AM_INIT_AUTOMAKE to fix AM_INIT_AUTOMAKE expanded multiple times
 

remove-AM_INIT_AUTOMAKE.patch

@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ede924d..0e38421 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,6 @@
- AC_PREREQ(2.61)
- AC_INIT([librelp], [1.2.16], [rgerhards@adiscon.com])
- AM_INIT_AUTOMAKE
--AM_INIT_AUTOMAKE
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AC_CONFIG_SRCDIR([src/relp.c])
- AC_CONFIG_HEADER([config.h])