diff --git a/librelp-1.11.0.tar.gz b/librelp-1.11.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4381f3b197c5afb5adef7dc55f2c03c9b6f2ebd4 Binary files /dev/null and b/librelp-1.11.0.tar.gz differ diff --git a/librelp-1.2.13-crypto-compliance.patch b/librelp-1.2.13-crypto-compliance.patch deleted file mode 100644 index d5238d002636679c61911b467024eccaee5a593c..0000000000000000000000000000000000000000 --- a/librelp-1.2.13-crypto-compliance.patch +++ /dev/null @@ -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) { diff --git a/librelp-1.2.16.tar.gz b/librelp-1.2.16.tar.gz deleted file mode 100644 index 5518ee55eed4a6017cacd715f7c7e3f0206b7e3d..0000000000000000000000000000000000000000 Binary files a/librelp-1.2.16.tar.gz and /dev/null differ diff --git a/librelp.spec b/librelp.spec index e0f1737037d5837c166b7a926d3a04e2fdd16133..b9631980eec009dff1f3b5641bb65a4d9627aec6 100644 --- a/librelp.spec +++ b/librelp.spec @@ -1,12 +1,10 @@ Name: librelp -Version: 1.2.16 -Release: 4 +Version: 1.11.0 +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 - 1.2.16-4 - remove AM_INIT_AUTOMAKE to fix AM_INIT_AUTOMAKE expanded multiple times diff --git a/remove-AM_INIT_AUTOMAKE.patch b/remove-AM_INIT_AUTOMAKE.patch deleted file mode 100644 index 2d50a446699326febd3356fb65b688e2c5f5c787..0000000000000000000000000000000000000000 --- a/remove-AM_INIT_AUTOMAKE.patch +++ /dev/null @@ -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])