.gitignore

@@ -1 +1,2 @@
-SOURCES/librelp-1.10.0.tar.gz
+SOURCES/librelp-1.9.0.tar.gz
+/librelp-1.9.0.tar.gz

.librelp.metadata

@@ -1 +0,0 @@
-595a718aabe368762d2c14512956bf94364da489 SOURCES/librelp-1.10.0.tar.gz

SOURCES/librelp-1.10.0-rhbz1972067-relpEngineSetTLSLibByName.patch

@@ -1,15 +0,0 @@
-diff -up librelp-1.10.0/src/relp.c.orig librelp-1.10.0/src/relp.c
---- librelp-1.10.0/src/relp.c.orig	2021-08-17 08:33:12.416786299 +0200
-+++ librelp-1.10.0/src/relp.c	2021-08-17 08:33:45.070119507 +0200
-@@ -385,9 +385,9 @@ relpEngineSetTLSLibByName(relpEngine_t *
- 	}
- 
- 	if(!strcasecmp(name, "gnutls")) {
--		relpEngineSetTLSLib(pThis, RELP_USE_GNUTLS);
-+		CHKRet(relpEngineSetTLSLib(pThis, RELP_USE_GNUTLS));
- 	}else if(!strcasecmp(name, "openssl")) {
--		relpEngineSetTLSLib(pThis, RELP_USE_OPENSSL);
-+		CHKRet(relpEngineSetTLSLib(pThis, RELP_USE_OPENSSL));
- 	} else {
- 		relpEngineCallOnGenericErr(pThis, "librelp", RELP_RET_PARAM_ERROR,
- 				"invalid tls lib '%s' requested; this version of "

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

librelp-1.9.0-crypto-compliance.patch

@@ -1,6 +1,6 @@
-diff -up librelp-1.10.0/src/tcp.c.crypto-compliance librelp-1.10.0/src/tcp.c
+diff -up librelp-1.9.0/src/tcp.c.orig librelp-1.9.0/src/tcp.c
---- librelp-1.10.0/src/tcp.c.crypto-compliance	2021-02-16 09:07:24.000000000 +0100
+--- librelp-1.9.0/src/tcp.c.orig	2021-04-26 12:50:02.988053548 +0200
-+++ librelp-1.10.0/src/tcp.c	2021-08-17 10:13:53.368936612 +0200
++++ librelp-1.9.0/src/tcp.c	2021-04-26 15:12:58.292600192 +0200
 @@ -1155,32 +1155,8 @@ static relpRetVal LIBRELP_ATTR_NONNULL()
  relpTcpTLSSetPrio_gtls(relpTcp_t *const pThis)
  {
@@ -44,7 +44,7 @@ diff -up librelp-1.10.0/src/tcp.c.crypto-compliance librelp-1.10.0/src/tcp.c
  
  	if(iRet != RELP_RET_OK) {
  		chkGnutlsCode(pThis, "Failed to set GnuTLS priority", iRet, r);
-@@ -1207,38 +1183,15 @@ relpTcpTLSSetPrio_gtls(LIBRELP_ATTR_UNUS
+@@ -1207,37 +1183,15 @@ relpTcpTLSSetPrio_gtls(LIBRELP_ATTR_UNUS
  static relpRetVal LIBRELP_ATTR_NONNULL()
  relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
  {
@@ -69,13 +69,12 @@ diff -up librelp-1.10.0/src/tcp.c.crypto-compliance librelp-1.10.0/src/tcp.c
 -		pristringBuf[sizeof(pristringBuf)-1] = '\0';
 -		pristring = pristringBuf;
 -	} else {
--		/* We use custom CipherString if used sets it by SslConfCmd */
 -		pristring = pThis->pristring;
 -	}
  
 -	if ( SSL_set_cipher_list(pThis->ssl, pristring) == 0 ){
 -		pThis->pEngine->dbgprint((char*)"relpTcpTLSSetPrio_ossl: Error setting ciphers '%s'\n", pristring);
-+	if (SSL_set_cipher_list(pThis->ssl, "PROFILE=SYSTEM") == 0){
++	if ( SSL_set_cipher_list(pThis->ssl, "PROFILE=SYSTEM") == 0 ){
 +		pThis->pEngine->dbgprint((char*)"relpTcpTLSSetPrio_ossl: Error setting ciphers to system default\n");
  		ABORT_FINALIZE(RELP_RET_ERR_TLS_SETUP);
  	}

librelp.spec

@@ -1,14 +1,18 @@
 Summary: The Reliable Event Logging Protocol library
 Name: librelp
-Version: 1.10.0
+Version: 1.9.0
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: GPLv3+
+Group: System Environment/Libraries
 URL: http://www.rsyslog.com/
-Source0: http://download.rsyslog.com/%{name}/%{name}-%{version}.tar.gz
+Source0: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: openssl-libs
 BuildRequires: gnutls-devel >= 1.4.0
+BuildRequires: openssl-devel
 
-Patch0: librelp-1.10.0-rhbz1972067-relpEngineSetTLSLibByName.patch
+Patch0: librelp-1.9.0-crypto-compliance.patch
-Patch1: librelp-1.10.0-crypto-compliance.patch
 
 %description
 Librelp is an easy to use library for the RELP protocol. RELP (stands
@@ -17,14 +21,12 @@ logging protocol.
 
 %package devel
 Summary: Development files for the %{name} package
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: openssl-libs
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: make
-BuildRequires: openssl-devel
 
 %description devel
 Librelp is an easy to use library for the RELP protocol. The
@@ -33,8 +35,7 @@ to develop applications using librelp.
 
 %prep
 %setup -q
-%patch0 -p1 -b .tls-by-name
+%patch0 -p1 -b .crypto-compliance
-%patch1 -p1 -b .crypto-compliance
 
 %build
 autoreconf -ivf
@@ -47,77 +48,36 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+%postun
+if [ "$1" = "0" ] ; then
+    /sbin/ldconfig
+fi
 
 %files
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README doc/*html
 %{_libdir}/librelp.so.*
 
 %files devel
+%defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/librelp.so
 %{_libdir}/pkgconfig/relp.pc
 
 %changelog
-* Wed Aug 02 2023 Attila Lakatos <alakatos@redhat.com> - 1.10.0-5
+* Mon Apr 26 2021 Attila Lakatos <alakatos@redhat.com> - 1.9.0-1
-- Rebuild
-  resolves: rhbz#2227723
-
-* Fri Aug 06 2021 Attila Lakatos <alakatos@redhat.com> - 1.10.0-4
-- Replace GNUTLS_SHUT_RDWR by GNUTLS_SHUT_WR when ending TLS connections
-  resolves: rhbz#1990735
-- Add patch to comply with crypto policies
-- Forward return code from relpEngineSetTLSLib to relpEngineSetTLSLibByName
-- Enable openssl
-  resolves: rhbz#1972067
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.0-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Mar 08 2021 Attila Lakatos <alakatos@redhat.com> - 1.10.0-1
-- rebase to 1.10.0
-  resolves: rhbz#1929153
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Sep 18 2020 Attila Lakatos <alakatos@redhat.com> - 1.9.0-1
 - rebase to 1.9.0
-  resolves: rhbz#1883471
+- add patch to comply with crypto policies
+- add support for openssl
+  resolves: rhbz#1932783
+- Properly end TLS connections
+  resolves: rhbz#1886400
 
-* Tue Sep 08 2020 Attila Lakatos <alakatos@redhat.com> - 1.7.0-1
+* Wed Aug 08 2018 Jiri Vymazal <jvymazal@redhat.com> - 1.2.16-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
-
-* Mon Feb 03 2020 Jiri Vymazal <jvymazal@redhat.com> - 1.5.0-1
-- rebase to 1.5.0
-  resolves: rhbz#1790820
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 10 2019 Jiri Vymazal <jvymazal@redhat.com> - 1.4.0-1
-- rebase to 1.4.0
-  resolves: rhbz#1425638
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.16-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Radovan Sroka <rsroka@redhat.com> - 1.2.16-1
 - rebase to 1.2.16
+  resolves: rhbz#1613876
 
 * Mon Mar 26 2018 Radovan Sroka <rsroka@redhat.com> - 1.2.15-1
 - rebase to 1.2.15

sources

@@ -0,0 +1 @@
+SHA512 (librelp-1.9.0.tar.gz) = 3cb8cf2707cff662bd0b9100c737458b6b96820db7e362094c77cdb50455fcb944d7760921e0b758a3a6cd15d685f488a976fe909de034c289635c660caae723