From 6a0e41bf4744eb3ad6ed5087f0492bb03ffdb3ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:11:19 +0000 Subject: [PATCH 01/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 43cc03c..dde0823 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 8%{?dist} +Release: 9%{?dist} Group: Applications/System License: EPL Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 @@ -129,6 +129,9 @@ fi; %files -f _pkg_list %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.4.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.4.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From f3f2976e4693dea622e2b7e25f57fdadc6cfbb23 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 14 Feb 2018 10:38:42 +0100 Subject: [PATCH 02/35] Fix null pointer (DoS) vulnerability via POST request to /cimom (CVE-2018-6644) --- ...cb-1.4.9-fix-null-content-type-crash.patch | 47 +++++++++++++++++++ sblim-sfcb.spec | 12 ++++- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 sblim-sfcb-1.4.9-fix-null-content-type-crash.patch diff --git a/sblim-sfcb-1.4.9-fix-null-content-type-crash.patch b/sblim-sfcb-1.4.9-fix-null-content-type-crash.patch new file mode 100644 index 0000000..4009126 --- /dev/null +++ b/sblim-sfcb-1.4.9-fix-null-content-type-crash.patch @@ -0,0 +1,47 @@ +Author: Adam Majer +Summary: Fix crash caused by NULL content_type + +Also, allow requests with Content-Type set to text/xml + +==31976== Invalid read of size 1 +==31976== at 0x5883DEB: scanCimXmlRequest (cimXmlParserProcessed.c:1739) +==31976== by 0x588C88E: handleCimRequest (cimRequest.c:1850) +==31976== by 0x4E3D95A: doHttpRequest (httpAdapter.c:1399) +==31976== by 0x4E3EC96: handleHttpRequest (httpAdapter.c:1741) +==31976== by 0x4E3EC96: acceptRequest (httpAdapter.c:2022) +==31976== by 0x4E40B0C: httpDaemon (httpAdapter.c:2464) +==31976== by 0x404866: startHttpd (sfcBroker.c:540) +==31976== by 0x4038B3: main (sfcBroker.c:1062) +==31976== Address 0x0 is not stack'd, malloc'd or (recently) free'd +==31976== +==31976== +==31976== Process terminating with default action of signal 11 (SIGSEGV): dumping core +==31976== Access not within mapped region at address 0x0 +==31976== at 0x5883DEB: scanCimXmlRequest (cimXmlParserProcessed.c:1739) +==31976== by 0x588C88E: handleCimRequest (cimRequest.c:1850) +==31976== by 0x4E3D95A: doHttpRequest (httpAdapter.c:1399) +==31976== by 0x4E3EC96: handleHttpRequest (httpAdapter.c:1741) +==31976== by 0x4E3EC96: acceptRequest (httpAdapter.c:2022) +==31976== by 0x4E40B0C: httpDaemon (httpAdapter.c:2464) +==31976== by 0x404866: startHttpd (sfcBroker.c:540) +==31976== by 0x4038B3: main (sfcBroker.c:1062) + +(gdb) p *ctx +$3 = {cimDoc = 0x69058c0 "", principal = 0x0, host = 0x69054d9 "xxx.xx.xxx.xxx:5989", contentType = 0x0, teTrailers = 0, + sessionId = 1, role = 0x0, cimDocLength = 0, commHndl = 0xffefffab0, chunkFncs = 0x5044798 , + className = 0x0, operation = 0, verb = 0x6905480 "POST", path = 0x6905485 "/"} + +Index: sblim-sfcb-1.4.8/httpAdapter.c +=================================================================== +--- sblim-sfcb-1.4.8.orig/httpAdapter.c ++++ sblim-sfcb-1.4.8/httpAdapter.c +@@ -1047,7 +1047,7 @@ doHttpRequest(CommHndl conn_fd) + + inBuf.authorization = ""; + inBuf.protocol = "HTTP/1.1"; +- inBuf.content_type = NULL; ++ inBuf.content_type = "application/xml"; + inBuf.content_length = UINT_MAX; + inBuf.host = NULL; + inBuf.useragent = ""; + diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index dde0823..2b51b32 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,8 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 9%{?dist} -Group: Applications/System +Release: 10%{?dist} License: EPL Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -34,6 +33,9 @@ Patch5: sblim-sfcb-1.4.8-default-ecdh-curve-name.patch Patch6: sblim-sfcb-1.4.9-fix-ftbfs.patch # Patch7: fix possible null pointer dereference (CVE-2015-5185), rhbz#1255802 Patch7: sblim-sfcb-1.4.9-fix-null-deref.patch +# Patch8: fix null pointer (DoS) vulnerability via POST request to /cimom +# (CVE-2018-6644), patch by Adam Majer, rhbz#1543826 +Patch8: sblim-sfcb-1.4.9-fix-null-content-type-crash.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon @@ -70,6 +72,7 @@ Programming Interface (CMPI). %patch5 -p1 -b .default-ecdh-curve-name %patch6 -p1 -b .fix-ftbfs %patch7 -p1 -b .fix-null-deref +%patch8 -p1 -b .fix-null-content-type-crash %build %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \ @@ -129,6 +132,11 @@ fi; %files -f _pkg_list %changelog +* Wed Feb 14 2018 Vitezslav Crhonek - 1.4.9-10 +- Fix null pointer (DoS) vulnerability via POST request to /cimom (CVE-2018-6644) + (patch by Adam Majer) + Resolves: #1543825 + * Fri Feb 09 2018 Fedora Release Engineering - 1.4.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c8445f347c0631bba095eb0322dbc06e73256643 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 27 Feb 2018 09:26:12 +0100 Subject: [PATCH 03/35] Add BuildRequires gcc --- sblim-sfcb.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 2b51b32..e10e10c 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 10%{?dist} +Release: 11%{?dist} License: EPL Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -50,6 +50,7 @@ BuildRequires: sblim-cmpi-devel BuildRequires: systemd BuildRequires: sblim-sfcCommon-devel BuildRequires: openslp-devel +BuildRequires: gcc Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -132,6 +133,9 @@ fi; %files -f _pkg_list %changelog +* Tue Feb 27 2018 Vitezslav Crhonek - 1.4.9-11 +- Add BuildRequires gcc + * Wed Feb 14 2018 Vitezslav Crhonek - 1.4.9-10 - Fix null pointer (DoS) vulnerability via POST request to /cimom (CVE-2018-6644) (patch by Adam Majer) From 099e4d4e21d0499d9bb9ed72e8b3b9c3623e7f03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 05:45:45 +0000 Subject: [PATCH 04/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index e10e10c..2b881fd 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 11%{?dist} +Release: 12%{?dist} License: EPL Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -133,6 +133,9 @@ fi; %files -f _pkg_list %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.4.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Feb 27 2018 Vitezslav Crhonek - 1.4.9-11 - Add BuildRequires gcc From d2fa46a9cc48fd80f2a09bc448474b31ea2a30a4 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 8 Oct 2018 11:06:50 +0200 Subject: [PATCH 05/35] Fix license tag --- sblim-sfcb.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 2b881fd..7dee969 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,8 +8,8 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 12%{?dist} -License: EPL +Release: 13%{?dist} +License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service # Missing man pages @@ -133,6 +133,9 @@ fi; %files -f _pkg_list %changelog +* Mon Oct 08 2018 Vitezslav Crhonek - 1.4.9-13 +- Fix license tag + * Sat Jul 14 2018 Fedora Release Engineering - 1.4.9-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b72255aa0675309b4f3c08f161bb2323c955fc80 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 11 Oct 2018 10:41:14 +0200 Subject: [PATCH 06/35] Various docdir/license fixes --- sblim-sfcb-1.4.9-docdir-license.patch | 21 +++++++++++++++++++++ sblim-sfcb.spec | 17 +++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 sblim-sfcb-1.4.9-docdir-license.patch diff --git a/sblim-sfcb-1.4.9-docdir-license.patch b/sblim-sfcb-1.4.9-docdir-license.patch new file mode 100644 index 0000000..1262628 --- /dev/null +++ b/sblim-sfcb-1.4.9-docdir-license.patch @@ -0,0 +1,21 @@ +diff -up sblim-sfcb-1.4.9/Makefile.in.orig sblim-sfcb-1.4.9/Makefile.in +--- sblim-sfcb-1.4.9/Makefile.in.orig 2018-10-11 10:03:54.533549400 +0200 ++++ sblim-sfcb-1.4.9/Makefile.in 2018-10-11 10:04:12.199570473 +0200 +@@ -619,7 +619,7 @@ top_srcdir = @top_srcdir@ + # + # + AUTOMAKE_OPTIONS = no-dist-gzip dist-bzip2 +-sfcbdocdir = $(datadir)/doc/sfcb-$(VERSION) ++sfcbdocdir = $(datadir)/doc/sblim-sfcb + sfcbdatadir = $(datadir)/sfcb + sfcbconfdir = $(sysconfdir)/sfcb + sfcbstatedir = $(localstatedir)/lib/sfcb +@@ -908,7 +908,7 @@ dist_sfcbdata_DATA = default.reg 10_inte + nodist_bin_SCRIPTS = sfcbrepos sfcbstage sfcbunstage sfcbuuid + dist_bin_SCRIPTS = wbemcat xmltest + init_SCRIPTS = sfcb +-sfcbdoc_DATA = README AUTHORS COPYING ++sfcbdoc_DATA = README AUTHORS + sfcbconf_DATA = sfcb.cfg + @PAM_TRUE@dist_pam_DATA = pam/sfcb + @DOCS_TRUE@noinst_DATA = doc/html/index.html diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 7dee969..dfdb7fd 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 13%{?dist} +Release: 14%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -36,6 +36,9 @@ Patch7: sblim-sfcb-1.4.9-fix-null-deref.patch # Patch8: fix null pointer (DoS) vulnerability via POST request to /cimom # (CVE-2018-6644), patch by Adam Majer, rhbz#1543826 Patch8: sblim-sfcb-1.4.9-fix-null-content-type-crash.patch +# Patch9: fixes docdir name and removes install of COPYING with license +# which is included through %%license +Patch9: sblim-sfcb-1.4.9-docdir-license.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon @@ -74,6 +77,7 @@ Programming Interface (CMPI). %patch6 -p1 -b .fix-ftbfs %patch7 -p1 -b .fix-null-deref %patch8 -p1 -b .fix-null-content-type-crash +%patch9 -p1 -b .docdir-license %build %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \ @@ -93,13 +97,12 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/ # remove unused static libraries and so files rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la -echo "%defattr(-,root,root,-)" > _pkg_list - +echo "%%license COPYING" > _pkg_list find $RPM_BUILD_ROOT/%{_datadir}/sfcb -type f | grep -v $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM >> _pkg_list sed -i s?$RPM_BUILD_ROOT??g _pkg_list > _pkg_list_2 echo "%config(noreplace) %{_sysconfdir}/sfcb/*" >> _pkg_list echo "%config(noreplace) %{_sysconfdir}/pam.d/*" >> _pkg_list -echo "%doc %{_datadir}/doc/*" >> _pkg_list +echo "%doc %{_datadir}/doc/sblim-sfcb/[!COPYING]*" >> _pkg_list echo "%{_datadir}/man/man1/*" >> _pkg_list echo "%{_unitdir}/sblim-sfcb.service" >> _pkg_list echo "%{_localstatedir}/lib/sfcb" >> _pkg_list @@ -133,6 +136,12 @@ fi; %files -f _pkg_list %changelog +* Thu Oct 11 2018 Vitezslav Crhonek - 1.4.9-14 +- Use %%license for file which contains the text of the license +- Change versioned docdir to unversioned and rename the docdir to match + the package name +- Remove %%defattr + * Mon Oct 08 2018 Vitezslav Crhonek - 1.4.9-13 - Fix license tag From 55786403b88e44339b548b74a3fee5c2c038cda5 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 11 Oct 2018 10:53:15 +0200 Subject: [PATCH 07/35] Don't decrease optimization level to -O0 on ppc64le --- sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch | 12 ++++++++++++ sblim-sfcb.spec | 10 +++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch diff --git a/sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch b/sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch new file mode 100644 index 0000000..f1ebb45 --- /dev/null +++ b/sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch @@ -0,0 +1,12 @@ +diff -up sblim-sfcb-1.4.9/configure.orig sblim-sfcb-1.4.9/configure +--- sblim-sfcb-1.4.9/configure.orig 2018-09-26 09:43:18.678547933 +0200 ++++ sblim-sfcb-1.4.9/configure 2018-09-26 09:43:31.603560105 +0200 +@@ -5426,8 +5426,6 @@ case $host_cpu in + $as_echo "#define SFCB_IX86 1" >>confdefs.h + + ;; +- powerpc*) CFLAGS="$CFLAGS -O0" +- ;; + esac + + diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index dfdb7fd..03fd428 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -36,9 +36,11 @@ Patch7: sblim-sfcb-1.4.9-fix-null-deref.patch # Patch8: fix null pointer (DoS) vulnerability via POST request to /cimom # (CVE-2018-6644), patch by Adam Majer, rhbz#1543826 Patch8: sblim-sfcb-1.4.9-fix-null-content-type-crash.patch -# Patch9: fixes docdir name and removes install of COPYING with license +# Patch9: removes decrease of optimization level to -O0 on ppc64le +Patch9: sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch +# Patch10: fixes docdir name and removes install of COPYING with license # which is included through %%license -Patch9: sblim-sfcb-1.4.9-docdir-license.patch +Patch10: sblim-sfcb-1.4.9-docdir-license.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon @@ -77,7 +79,8 @@ Programming Interface (CMPI). %patch6 -p1 -b .fix-ftbfs %patch7 -p1 -b .fix-null-deref %patch8 -p1 -b .fix-null-content-type-crash -%patch9 -p1 -b .docdir-license +%patch9 -p1 -b .fix-ppc-optimization-level +%patch10 -p1 -b .docdir-license %build %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \ @@ -137,6 +140,7 @@ fi; %changelog * Thu Oct 11 2018 Vitezslav Crhonek - 1.4.9-14 +- Don't decrease optimization level to -O0 on ppc64le - Use %%license for file which contains the text of the license - Change versioned docdir to unversioned and rename the docdir to match the package name From c9d544b497d227c4e3abe7581f031dab66e8581d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 14:50:52 +0000 Subject: [PATCH 08/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 03fd428..bfd3b84 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 14%{?dist} +Release: 15%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -139,6 +139,9 @@ fi; %files -f _pkg_list %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.4.9-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Oct 11 2018 Vitezslav Crhonek - 1.4.9-14 - Don't decrease optimization level to -O0 on ppc64le - Use %%license for file which contains the text of the license From c3852cdead91e3882c8afe882d285c882c06b129 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 22:47:08 +0000 Subject: [PATCH 09/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index bfd3b84..221e481 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 15%{?dist} +Release: 16%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -139,6 +139,9 @@ fi; %files -f _pkg_list %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.4.9-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 1.4.9-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 65c3497d0a068b1b3f1f5eec6bdf94baa57202e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 22:54:38 +0000 Subject: [PATCH 10/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 221e481..ce208ae 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 16%{?dist} +Release: 17%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -139,6 +139,9 @@ fi; %files -f _pkg_list %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.4.9-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.4.9-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ce9b22198e9e303af2aca77729a9e7805cfe6068 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 12 Feb 2020 14:44:29 +0100 Subject: [PATCH 11/35] Fixes multiple definiton of variables (FTBFS with GCC 10) --- ...m-sfcb-1.4.9-fix-multiple-definition.patch | 71 +++++++++++++++++++ sblim-sfcb.spec | 9 ++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 sblim-sfcb-1.4.9-fix-multiple-definition.patch diff --git a/sblim-sfcb-1.4.9-fix-multiple-definition.patch b/sblim-sfcb-1.4.9-fix-multiple-definition.patch new file mode 100644 index 0000000..db9e1fb --- /dev/null +++ b/sblim-sfcb-1.4.9-fix-multiple-definition.patch @@ -0,0 +1,71 @@ +diff -up sblim-sfcb-1.4.9/control.h.orig sblim-sfcb-1.4.9/control.h +--- sblim-sfcb-1.4.9/control.h.orig 2014-11-25 02:43:10.000000000 +0100 ++++ sblim-sfcb-1.4.9/control.h 2020-02-12 12:14:46.078102974 +0100 +@@ -28,7 +28,7 @@ int getControlUNum(char *id, + int getControlULong(char *id, unsigned long *val); + int getControlNum(char *id, long *val); + int getControlBool(char *id, int *val); +-const char * sfcBrokerStart; ++extern const char * sfcBrokerStart; + + #endif + /* MODELINES */ +diff -up sblim-sfcb-1.4.9/providerMgr.c.orig sblim-sfcb-1.4.9/providerMgr.c +--- sblim-sfcb-1.4.9/providerMgr.c.orig 2020-02-12 12:14:46.065102946 +0100 ++++ sblim-sfcb-1.4.9/providerMgr.c 2020-02-12 12:19:15.879677891 +0100 +@@ -53,6 +53,8 @@ + #define SFCB_ASM(x) + #endif + ++sigset_t mask, old_mask; ++ + static pthread_mutex_t resultsocketMutex = PTHREAD_MUTEX_INITIALIZER; + + extern CMPIBroker *Broker; +diff -up sblim-sfcb-1.4.9/providerMgr.h.orig sblim-sfcb-1.4.9/providerMgr.h +--- sblim-sfcb-1.4.9/providerMgr.h.orig 2014-11-25 02:43:12.000000000 +0100 ++++ sblim-sfcb-1.4.9/providerMgr.h 2020-02-12 12:14:46.078102974 +0100 +@@ -398,7 +398,7 @@ BinResponseHdr **invokeProviders(BinRequ + BinResponseHdr *invokeProvider(BinRequestContext * ctx); + void freeResponseHeaders(BinResponseHdr ** resp, + BinRequestContext * ctx); +-sigset_t mask, old_mask; ++extern sigset_t mask, old_mask; + + #endif + /* MODELINES */ +diff -up sblim-sfcb-1.4.9/sfcBroker.c.orig sblim-sfcb-1.4.9/sfcBroker.c +--- sblim-sfcb-1.4.9/sfcBroker.c.orig 2014-11-25 02:43:13.000000000 +0100 ++++ sblim-sfcb-1.4.9/sfcBroker.c 2020-02-12 12:22:21.768073986 +0100 +@@ -52,6 +52,8 @@ + #include "config.h" + #endif + ++const char *sfcBrokerStart; ++ + int sfcBrokerPid = 0; + + extern int sfcbUseSyslog; +diff -up sblim-sfcb-1.4.9/trace.c.orig sblim-sfcb-1.4.9/trace.c +--- sblim-sfcb-1.4.9/trace.c.orig 2014-11-25 02:43:17.000000000 +0100 ++++ sblim-sfcb-1.4.9/trace.c 2020-02-12 12:15:19.319173804 +0100 +@@ -48,6 +48,7 @@ + * --------------------------------------------------------------------------- + */ + ++int colorTrace; + char *processName = NULL; + int providerProcess = 0; + int idleThreadId = 0; +diff -up sblim-sfcb-1.4.9/trace.h.orig sblim-sfcb-1.4.9/trace.h +--- sblim-sfcb-1.4.9/trace.h.orig 2014-11-25 02:43:17.000000000 +0100 ++++ sblim-sfcb-1.4.9/trace.h 2020-02-12 12:14:46.078102974 +0100 +@@ -130,7 +130,7 @@ typedef struct traceId { + #define CYAN 6 + #define WHITE 7 + void changeTextColor(int reset); +-int colorTrace; ++extern int colorTrace; + + #define MAX_MSG_SIZE 1024 /* max length of trace message */ + diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index ce208ae..595091e 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 17%{?dist} +Release: 18%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -41,6 +41,8 @@ Patch9: sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch # Patch10: fixes docdir name and removes install of COPYING with license # which is included through %%license Patch10: sblim-sfcb-1.4.9-docdir-license.patch +# Patch11: fixes multiple definiton of variables (FTBFS with GCC 10) +Patch11: sblim-sfcb-1.4.9-fix-multiple-definition.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon @@ -81,6 +83,7 @@ Programming Interface (CMPI). %patch8 -p1 -b .fix-null-content-type-crash %patch9 -p1 -b .fix-ppc-optimization-level %patch10 -p1 -b .docdir-license +%patch11 -p1 -b .fix-multiple-definition %build %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \ @@ -139,6 +142,10 @@ fi; %files -f _pkg_list %changelog +* Wed Feb 12 2020 Vitezslav Crhonek - 1.4.9-18 +- Fixes multiple definiton of variables (FTBFS with GCC 10) + Resolves: #1800074 + * Thu Jan 30 2020 Fedora Release Engineering - 1.4.9-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d5a776d20f661c78b2fbc55b5c7803efccd30645 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 8 Jul 2020 09:03:53 +0200 Subject: [PATCH 12/35] Fix sfcbrepos redirection --- sblim-sfcb.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 595091e..6130be5 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 18%{?dist} +Release: 19%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -126,7 +126,7 @@ cat _pkg_list %post %{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || : /sbin/ldconfig -%{_bindir}/sfcbrepos -f > /dev/null 2>1 +%{_bindir}/sfcbrepos -f > /dev/null 2>&1 %systemd_post sblim-sfcb.service %preun @@ -142,6 +142,9 @@ fi; %files -f _pkg_list %changelog +* Wed Jul 08 2020 Vitezslav Crhonek - 1.4.9-19 +- Fix sfcbrepos redirection + * Wed Feb 12 2020 Vitezslav Crhonek - 1.4.9-18 - Fixes multiple definiton of variables (FTBFS with GCC 10) Resolves: #1800074 From f84e25148797302544129b2d1e76d56268b4244f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:17:38 +0000 Subject: [PATCH 13/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 6130be5..2b30996 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 19%{?dist} +Release: 20%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -142,6 +142,9 @@ fi; %files -f _pkg_list %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.9-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 08 2020 Vitezslav Crhonek - 1.4.9-19 - Fix sfcbrepos redirection From b3cc74fbf5db1ccbc287c1b08cef153c83a22d2a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:09:04 +0000 Subject: [PATCH 14/35] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- sblim-sfcb.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 2b30996..b967b8b 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -46,6 +46,7 @@ Patch11: sblim-sfcb-1.4.9-fix-multiple-definition.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon +BuildRequires: make BuildRequires: libcurl-devel BuildRequires: perl-generators BuildRequires: zlib-devel From d652c9ab4a7684b4d47d9b10be32b2ddb1e0bbed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 19:59:14 +0000 Subject: [PATCH 15/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index b967b8b..cf73d39 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 20%{?dist} +Release: 21%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -143,6 +143,9 @@ fi; %files -f _pkg_list %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.4.9-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.4.9-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c846b90dad80e215be4d7a25da5433eed2f1a448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:20 +0100 Subject: [PATCH 16/35] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- sblim-sfcb.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index cf73d39..b6e94df 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 21%{?dist} +Release: 22%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -143,6 +143,10 @@ fi; %files -f _pkg_list %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.4.9-22 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 1.4.9-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 888354226d2c466b1be64b04785adb7afe92a287 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:05:38 +0000 Subject: [PATCH 17/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index b6e94df..94a770c 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 22%{?dist} +Release: 23%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -143,6 +143,9 @@ fi; %files -f _pkg_list %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.9-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.4.9-22 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 0b9ecdc867fe8564e0ab0664778998c7d9283b5c Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:14:46 +0200 Subject: [PATCH 18/35] Rebuilt with OpenSSL 3.0.0 --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 94a770c..4801f78 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 23%{?dist} +Release: 24%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -143,6 +143,9 @@ fi; %files -f _pkg_list %changelog +* Tue Sep 14 2021 Sahana Prasad - 1.4.9-24 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.4.9-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 79690a9cfbb2d93c8cc469cda0e8bb8c14b412ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:23:47 +0000 Subject: [PATCH 19/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 4801f78..a296f93 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 24%{?dist} +Release: 25%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -143,6 +143,9 @@ fi; %files -f _pkg_list %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.4.9-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 1.4.9-24 - Rebuilt with OpenSSL 3.0.0 From 1ecafb02b95f26cd8309c8a707e879b734d882bc Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 27 Jan 2022 09:04:06 +0100 Subject: [PATCH 20/35] Change build flags, fix errors during the start of the service --- ...m-sfcb-1.4.9-fix-multiple-definition.patch | 71 ------------------- sblim-sfcb.spec | 10 +-- 2 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 sblim-sfcb-1.4.9-fix-multiple-definition.patch diff --git a/sblim-sfcb-1.4.9-fix-multiple-definition.patch b/sblim-sfcb-1.4.9-fix-multiple-definition.patch deleted file mode 100644 index db9e1fb..0000000 --- a/sblim-sfcb-1.4.9-fix-multiple-definition.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -up sblim-sfcb-1.4.9/control.h.orig sblim-sfcb-1.4.9/control.h ---- sblim-sfcb-1.4.9/control.h.orig 2014-11-25 02:43:10.000000000 +0100 -+++ sblim-sfcb-1.4.9/control.h 2020-02-12 12:14:46.078102974 +0100 -@@ -28,7 +28,7 @@ int getControlUNum(char *id, - int getControlULong(char *id, unsigned long *val); - int getControlNum(char *id, long *val); - int getControlBool(char *id, int *val); --const char * sfcBrokerStart; -+extern const char * sfcBrokerStart; - - #endif - /* MODELINES */ -diff -up sblim-sfcb-1.4.9/providerMgr.c.orig sblim-sfcb-1.4.9/providerMgr.c ---- sblim-sfcb-1.4.9/providerMgr.c.orig 2020-02-12 12:14:46.065102946 +0100 -+++ sblim-sfcb-1.4.9/providerMgr.c 2020-02-12 12:19:15.879677891 +0100 -@@ -53,6 +53,8 @@ - #define SFCB_ASM(x) - #endif - -+sigset_t mask, old_mask; -+ - static pthread_mutex_t resultsocketMutex = PTHREAD_MUTEX_INITIALIZER; - - extern CMPIBroker *Broker; -diff -up sblim-sfcb-1.4.9/providerMgr.h.orig sblim-sfcb-1.4.9/providerMgr.h ---- sblim-sfcb-1.4.9/providerMgr.h.orig 2014-11-25 02:43:12.000000000 +0100 -+++ sblim-sfcb-1.4.9/providerMgr.h 2020-02-12 12:14:46.078102974 +0100 -@@ -398,7 +398,7 @@ BinResponseHdr **invokeProviders(BinRequ - BinResponseHdr *invokeProvider(BinRequestContext * ctx); - void freeResponseHeaders(BinResponseHdr ** resp, - BinRequestContext * ctx); --sigset_t mask, old_mask; -+extern sigset_t mask, old_mask; - - #endif - /* MODELINES */ -diff -up sblim-sfcb-1.4.9/sfcBroker.c.orig sblim-sfcb-1.4.9/sfcBroker.c ---- sblim-sfcb-1.4.9/sfcBroker.c.orig 2014-11-25 02:43:13.000000000 +0100 -+++ sblim-sfcb-1.4.9/sfcBroker.c 2020-02-12 12:22:21.768073986 +0100 -@@ -52,6 +52,8 @@ - #include "config.h" - #endif - -+const char *sfcBrokerStart; -+ - int sfcBrokerPid = 0; - - extern int sfcbUseSyslog; -diff -up sblim-sfcb-1.4.9/trace.c.orig sblim-sfcb-1.4.9/trace.c ---- sblim-sfcb-1.4.9/trace.c.orig 2014-11-25 02:43:17.000000000 +0100 -+++ sblim-sfcb-1.4.9/trace.c 2020-02-12 12:15:19.319173804 +0100 -@@ -48,6 +48,7 @@ - * --------------------------------------------------------------------------- - */ - -+int colorTrace; - char *processName = NULL; - int providerProcess = 0; - int idleThreadId = 0; -diff -up sblim-sfcb-1.4.9/trace.h.orig sblim-sfcb-1.4.9/trace.h ---- sblim-sfcb-1.4.9/trace.h.orig 2014-11-25 02:43:17.000000000 +0100 -+++ sblim-sfcb-1.4.9/trace.h 2020-02-12 12:14:46.078102974 +0100 -@@ -130,7 +130,7 @@ typedef struct traceId { - #define CYAN 6 - #define WHITE 7 - void changeTextColor(int reset); --int colorTrace; -+extern int colorTrace; - - #define MAX_MSG_SIZE 1024 /* max length of trace message */ - diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index a296f93..0aa5ed7 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 25%{?dist} +Release: 26%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -41,8 +41,6 @@ Patch9: sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch # Patch10: fixes docdir name and removes install of COPYING with license # which is included through %%license Patch10: sblim-sfcb-1.4.9-docdir-license.patch -# Patch11: fixes multiple definiton of variables (FTBFS with GCC 10) -Patch11: sblim-sfcb-1.4.9-fix-multiple-definition.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon @@ -84,12 +82,11 @@ Programming Interface (CMPI). %patch8 -p1 -b .fix-null-content-type-crash %patch9 -p1 -b .fix-ppc-optimization-level %patch10 -p1 -b .docdir-license -%patch11 -p1 -b .fix-multiple-definition %build %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \ --enable-slp --enable-large_volume_support --enable-optimized-enumeration --enable-relax-mofsyntax \ - CFLAGS="$CFLAGS -D_GNU_SOURCE -fPIE -DPIE" LDFLAGS="$LDFLAGS -Wl,-z,now -pie" + CFLAGS="$CFLAGS -D_GNU_SOURCE -fPIE -DPIE -fcommon" LDFLAGS="$LDFLAGS -Wl,-z,now -pie" make @@ -143,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Thu Jan 27 2022 Vitezslav Crhonek - 1.4.9-26 +- Change build flags, fix errors during the start of the service + * Sat Jan 22 2022 Fedora Release Engineering - 1.4.9-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 64225a2e73e12c8e57b4ceab0e7675952f91b345 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:04:24 +0000 Subject: [PATCH 21/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 0aa5ed7..c7dbe3c 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 26%{?dist} +Release: 27%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -140,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.9-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 27 2022 Vitezslav Crhonek - 1.4.9-26 - Change build flags, fix errors during the start of the service From f278914d84a68dbe2e084efc8820a72f488566ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 02:42:26 +0000 Subject: [PATCH 22/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index c7dbe3c..d6408e4 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 27%{?dist} +Release: 28%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -140,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.9-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.4.9-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6f57bec50a1d1da7532bd292333c06af09b62508 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 14 Feb 2023 12:37:55 +0100 Subject: [PATCH 23/35] SPDX migration --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index d6408e4..cc49583 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 28%{?dist} +Release: 29%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -140,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Tue Feb 14 2023 Vitezslav Crhonek - 1.4.9-29 +- SPDX migration + * Sat Jan 21 2023 Fedora Release Engineering - 1.4.9-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5c92e229ce682b66e4c7b93a1122f28ddb587711 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:05:37 +0000 Subject: [PATCH 24/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index cc49583..1e7d386 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 29%{?dist} +Release: 30%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -140,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.4.9-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Feb 14 2023 Vitezslav Crhonek - 1.4.9-29 - SPDX migration From 03215c72002e4314f741f1bcea343e70ab77644c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:10:17 +0000 Subject: [PATCH 25/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 1e7d386..1cc0ac4 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 30%{?dist} +Release: 31%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -140,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.4.9-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.4.9-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e78b910da4588e7351daefe024764ae6679f5bf3 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 26/35] Eliminate use of obsolete %patchN syntax (#2283636) --- sblim-sfcb.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 1cc0ac4..a57d3a4 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -71,17 +71,17 @@ Programming Interface (CMPI). %prep %setup -q -T -b 0 -n %{name}-%{version} -%patch0 -p1 -b .sfcbrepos-schema-location -%patch1 -p1 -b .fix-provider-debugging -%patch2 -p1 -b .maxMsgLen -%patch3 -p1 -b .service -%patch4 -p1 -b .multilib-man-cfg -%patch5 -p1 -b .default-ecdh-curve-name -%patch6 -p1 -b .fix-ftbfs -%patch7 -p1 -b .fix-null-deref -%patch8 -p1 -b .fix-null-content-type-crash -%patch9 -p1 -b .fix-ppc-optimization-level -%patch10 -p1 -b .docdir-license +%patch -P0 -p1 -b .sfcbrepos-schema-location +%patch -P1 -p1 -b .fix-provider-debugging +%patch -P2 -p1 -b .maxMsgLen +%patch -P3 -p1 -b .service +%patch -P4 -p1 -b .multilib-man-cfg +%patch -P5 -p1 -b .default-ecdh-curve-name +%patch -P6 -p1 -b .fix-ftbfs +%patch -P7 -p1 -b .fix-null-deref +%patch -P8 -p1 -b .fix-null-content-type-crash +%patch -P9 -p1 -b .fix-ppc-optimization-level +%patch -P10 -p1 -b .docdir-license %build %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \ From d5bf56d5a1447a3899efb6acfc173ea3869e0d16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 04:52:08 +0000 Subject: [PATCH 27/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index a57d3a4..9bdb87a 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 31%{?dist} +Release: 32%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -140,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.4.9-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.4.9-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9070b8fc4375eb2f8b740deca8ac9952769c6a70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:02:48 +0000 Subject: [PATCH 28/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 9bdb87a..fe9509e 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 32%{?dist} +Release: 33%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -140,6 +140,9 @@ fi; %files -f _pkg_list %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.4.9-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.4.9-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 817f5b89c947f0294b49f331485e765e3e4f107d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 20:27:02 +0100 Subject: [PATCH 29/35] Add sysusers.d config file to allow rpm to create users/groups automatically Also drop attempt to delete group. This is not safe. --- sblim-sfcb.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index fe9509e..40a5605 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 33%{?dist} +Release: 34%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -83,6 +83,12 @@ Programming Interface (CMPI). %patch -P9 -p1 -b .fix-ppc-optimization-level %patch -P10 -p1 -b .docdir-license +# Create a sysusers.d config file +cat >sblim-sfcb.sysusers.conf <> _pkg_list cat _pkg_list -%pre -/usr/bin/getent group sfcb >/dev/null || /usr/sbin/groupadd -r sfcb -/usr/sbin/usermod -a -G sfcb root > /dev/null 2>&1 || : +install -m0644 -D sblim-sfcb.sysusers.conf %{buildroot}%{_sysusersdir}/sblim-sfcb.conf %post %{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || : @@ -133,13 +137,14 @@ cat _pkg_list %postun /sbin/ldconfig %systemd_postun_with_restart sblim-sfcb.service -if [ $1 -eq 0 ]; then - /usr/sbin/groupdel sfcb > /dev/null 2>&1 || :; -fi; %files -f _pkg_list +%{_sysusersdir}/sblim-sfcb.conf %changelog +* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 1.4.9-34 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 1.4.9-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4385afe0b4ba7801934f93f44e42cb79dafd7823 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 6 Mar 2025 10:31:32 +0100 Subject: [PATCH 30/35] bin and sbin unification --- sblim-sfcb.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 40a5605..eb4f31a 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 34%{?dist} +Release: 35%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -117,7 +117,6 @@ echo "%{_datadir}/man/man1/*" >> _pkg_list echo "%{_unitdir}/sblim-sfcb.service" >> _pkg_list echo "%{_localstatedir}/lib/sfcb" >> _pkg_list echo "%{_bindir}/*" >> _pkg_list -echo "%{_sbindir}/*" >> _pkg_list echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list echo "%{_libdir}/sfcb/*.so" >> _pkg_list @@ -142,6 +141,9 @@ install -m0644 -D sblim-sfcb.sysusers.conf %{buildroot}%{_sysusersdir}/sblim-sfc %{_sysusersdir}/sblim-sfcb.conf %changelog +* Thu Mar 06 2025 Vitezslav Crhonek - 1.4.9-35 +- bin and sbin unification + * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 1.4.9-34 - Add sysusers.d config file to allow rpm to create users/groups automatically From fc82b35f404a1233fea9ba0d4ab3264fbf0fd5b5 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 17 Jun 2025 11:54:44 +0200 Subject: [PATCH 31/35] Update to better support post-quantum cryptography --- sblim-sfcb-1.4.9-post-quantum.patch | 77 +++++++++++++++++++++++++++++ sblim-sfcb.spec | 9 +++- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 sblim-sfcb-1.4.9-post-quantum.patch diff --git a/sblim-sfcb-1.4.9-post-quantum.patch b/sblim-sfcb-1.4.9-post-quantum.patch new file mode 100644 index 0000000..16e64a4 --- /dev/null +++ b/sblim-sfcb-1.4.9-post-quantum.patch @@ -0,0 +1,77 @@ +diff -up sblim-sfcb-1.4.9/control.c.orig sblim-sfcb-1.4.9/control.c +--- sblim-sfcb-1.4.9/control.c.orig 2025-05-28 10:39:14.751599855 +0200 ++++ sblim-sfcb-1.4.9/control.c 2025-06-12 10:20:43.025624410 +0200 +@@ -171,10 +171,12 @@ static Control init[] = { + + {"sslKeyFilePath", CTL_STRING, SFCB_CONFDIR "/file.pem", {0}}, + {"sslCertificateFilePath", CTL_STRING, SFCB_CONFDIR "/server.pem", {0}}, ++ {"sslKeyFallbackFilePath", CTL_STRING, NULL, {0}}, ++ {"sslCertificateFallbackFilePath", CTL_STRING, NULL, {0}}, + {"sslCertList", CTL_STRING, SFCB_CONFDIR "/clist.pem", {0}}, + {"sslCiphers", CTL_STRING, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", {0}}, + {"sslDhParamsFilePath", CTL_STRING, NULL, {0}}, +- {"sslEcDhCurveName", CTL_STRING, "secp384r1", {0}}, ++ {"sslEcDhCurveName", CTL_STRING, NULL, {0}}, + {"enableSslCipherServerPref", CTL_BOOL, NULL, {.b=0}}, + + {"registrationDir", CTL_STRING, SFCB_STATEDIR "/registration", {0}}, +diff -up sblim-sfcb-1.4.9/httpAdapter.c.orig sblim-sfcb-1.4.9/httpAdapter.c +--- sblim-sfcb-1.4.9/httpAdapter.c.orig 2025-05-21 10:41:30.727123823 +0200 ++++ sblim-sfcb-1.4.9/httpAdapter.c 2025-06-12 11:14:32.906455875 +0200 +@@ -2053,6 +2053,24 @@ initSSL() + _SFCB_TRACE(1, ("--- sslKeyFilePath = %s", fnk)); + if (SSL_CTX_use_PrivateKey_file(ctx, fnk, SSL_FILETYPE_PEM) != 1) + intSSLerror("Error loading private key from file"); ++ ++ /* ++ * Add fall back certificate/key pair ++ */ ++ getControlChars("sslCertificateFallbackFilePath", &fnc); ++ if (fnc) { ++ _SFCB_TRACE(1, ("--- sslCertificateFallbackFilePath = %s", fnc)); ++ if (SSL_CTX_use_certificate_chain_file(ctx, fnc) != 1) ++ intSSLerror("Error loading certificate fall back from file"); ++ } ++ ++ getControlChars("sslKeyFallbackFilePath", &fnk); ++ if (fnk) { ++ _SFCB_TRACE(1, ("--- sslKeyFallbackFilePath = %s", fnk)); ++ if (SSL_CTX_use_PrivateKey_file(ctx, fnk, SSL_FILETYPE_PEM) != 1) ++ intSSLerror("Error loading private key fall back from file"); ++ } ++ + getControlChars("sslClientCertificate", &fnl); + _SFCB_TRACE(1, ("--- sslClientCertificate = %s", fnl)); + getControlChars("sslCertList", &fcert); +diff -up sblim-sfcb-1.4.9/sfcb.cfg.pre.in.orig sblim-sfcb-1.4.9/sfcb.cfg.pre.in +--- sblim-sfcb-1.4.9/sfcb.cfg.pre.in.orig 2025-05-28 10:05:42.359932525 +0200 ++++ sblim-sfcb-1.4.9/sfcb.cfg.pre.in 2025-06-12 11:23:37.424277273 +0200 +@@ -244,6 +244,15 @@ sslKeyFilePath: @sysconfdir@/sfcb/file.p + ## Default is @sysconfdir@/sfcb/server.pem + sslCertificateFilePath: @sysconfdir@/sfcb/server.pem + ++## Filename containing the fall back private key for the server's fall back certificate. ++## The file must be in PEM format and may not be passphrase-protected. The file is ++## relevant for both client connect and indications sent via https. ++#sslKeyFallbackFilePath: @sysconfdir@/sfcb/file-fallback.pem ++ ++## Filename containing the server's fall back certificate. Must be in PEM format. ++## The file is relevant for both client connect and indications sent via https. ++#sslCertificateFallbackFilePath: @sysconfdir@/sfcb/server-fallback.pem ++ + ## Filename containing list of certificates server accepts. + ## The file is relevant client connect only. + ## Default is @sysconfdir@/sfcb/clist.pem +@@ -302,10 +311,10 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STR + ## Configure a curve name for ECDH ephemeral key generation. See man + ## SSL_CTX_set_tmp_ecdh(3) for details. The value should be a curve name + ## listed by the "openssl ecparam -list_curves" command in the SFCB runtime +-## environment. If this value is not set, the indicated default is in effect. ++## environment. If this value is not set, ECDH ephemeral key generation is not used. + ## If the value is set but the curve name is not recognized by the underlying + ## openssl implementation, SFCB will abort. +-## Default is secp384r1 ++## Default is: not set + #sslEcDhCurveName: secp384r1 + + ## When set to true, sets the SSL_OP_CIPHER_SERVER_PREFERENCE flag for the ssl diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index eb4f31a..9ea10da 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 35%{?dist} +Release: 36%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -41,6 +41,9 @@ Patch9: sblim-sfcb-1.4.9-fix-ppc-optimization-level.patch # Patch10: fixes docdir name and removes install of COPYING with license # which is included through %%license Patch10: sblim-sfcb-1.4.9-docdir-license.patch +# Patch11: adds configuration options to specify fallback SSL cert/key pair +# and disables default ECDH ephemeral key generation +Patch11: sblim-sfcb-1.4.9-post-quantum.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon @@ -82,6 +85,7 @@ Programming Interface (CMPI). %patch -P8 -p1 -b .fix-null-content-type-crash %patch -P9 -p1 -b .fix-ppc-optimization-level %patch -P10 -p1 -b .docdir-license +%patch -P11 -p1 -b .post-quantum # Create a sysusers.d config file cat >sblim-sfcb.sysusers.conf < - 1.4.9-36 +- Update to better support post-quantum cryptography + * Thu Mar 06 2025 Vitezslav Crhonek - 1.4.9-35 - bin and sbin unification From 41777e138848d471dc6b8b3bd18463cf6300167e Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 17 Jun 2025 11:59:35 +0200 Subject: [PATCH 32/35] Add post-quantum support test --- .fmf/version | 1 + plans/basic.fmf | 9 +++ tests/post-quantum-cryptography/main.fmf | 6 ++ tests/post-quantum-cryptography/runtest.sh | 76 ++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/post-quantum-cryptography/main.fmf create mode 100755 tests/post-quantum-cryptography/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..a1bca5a --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,9 @@ +summary: Basic test plan +prepare: + how: install + package: + - sblim-sfcb +discover: + how: fmf +execute: + how: tmt diff --git a/tests/post-quantum-cryptography/main.fmf b/tests/post-quantum-cryptography/main.fmf new file mode 100644 index 0000000..51ba4e2 --- /dev/null +++ b/tests/post-quantum-cryptography/main.fmf @@ -0,0 +1,6 @@ +summary: Post-quantum cryptography support test +author: Vitezslav Crhonek +contact: Vitezslav Crhonek +require: patch +duration: 10m +test: ./runtest.sh diff --git a/tests/post-quantum-cryptography/runtest.sh b/tests/post-quantum-cryptography/runtest.sh new file mode 100755 index 0000000..568b5b2 --- /dev/null +++ b/tests/post-quantum-cryptography/runtest.sh @@ -0,0 +1,76 @@ +#!/bin/sh -eux + +function check_key_and_cert() +{ + echo -e "\n===== key info" + ssh-keygen -l -f /etc/sfcb/file.pem || : + file /etc/sfcb/file.pem + echo -e "\n\n\n" + + echo -e "\n===== cert info" + openssl x509 -in /etc/sfcb/server.pem --text --noout + echo -e "\n\n\n" +} + +function test_key_exchange() +{ + echo -e "\n===== check that it uses TLS 1.3 and the X25519MLKEM768 key exchange by default if the peer supports it" + openssl s_client -connect localhost:5989 -CAfile /etc/sfcb/client.pem > /etc/sfcb/sfcb.cfg +echo "sslCertificateFallbackFilePath: /etc/sfcb/server-fallback.pem" >> /etc/sfcb/sfcb.cfg + +systemctl start sblim-sfcb +check_key_and_cert +test_cert_support From 3c6fb27209c23023307347f3e4d5a51eb8afd7a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 17:57:28 +0000 Subject: [PATCH 33/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sblim-sfcb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 9ea10da..cd084de 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 36%{?dist} +Release: 37%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -145,6 +145,9 @@ install -m0644 -D sblim-sfcb.sysusers.conf %{buildroot}%{_sysusersdir}/sblim-sfc %{_sysusersdir}/sblim-sfcb.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.4.9-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 17 2025 Vitezslav Crhonek - 1.4.9-36 - Update to better support post-quantum cryptography From c7f19878f26a2f089fb933673447883075ed1cca Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 27 Aug 2025 10:47:27 +0200 Subject: [PATCH 34/35] Add rpminspect.yaml --- rpminspect.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 rpminspect.yaml diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..f82c3c2 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,9 @@ +--- +badfuncs: + allowed: + /usr/lib64/sfcb/libsfcHttpAdapter.so.*: + - inet_aton + +runpath: + allowed_paths: + - /usr/lib64/sfcb From fa442c877ef407d0e4c682b01087b8906e77a0eb Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Fri, 12 Sep 2025 10:50:24 +0200 Subject: [PATCH 35/35] Add support for Image Mode --- sblim-sfcb.spec | 16 +++++++++++++++- sblim-sfcb.tmpfiles | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 sblim-sfcb.tmpfiles diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index cd084de..c3e8c28 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.9 -Release: 37%{?dist} +Release: 38%{?dist} License: EPL-1.0 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sfcb.service @@ -16,6 +16,8 @@ Source1: sfcb.service Source2: sfcbdump.1.gz Source3: sfcbinst2mof.1.gz Source4: sfcbtrace.1.gz +# /etc/tmpfiles.d configuration file +Source5: sblim-sfcb.tmpfiles # Patch0: changes schema location to the path we use Patch0: sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch # Patch1: Fix provider debugging - variable for stopping wait-for-debugger @@ -127,15 +129,23 @@ echo "%{_libdir}/sfcb/*.so" >> _pkg_list cat _pkg_list install -m0644 -D sblim-sfcb.sysusers.conf %{buildroot}%{_sysusersdir}/sblim-sfcb.conf +mkdir -p %{buildroot}/%{_tmpfilesdir} +install -p -D -m 644 %{SOURCE5} %{buildroot}/%{_tmpfilesdir}/sblim-sfcb.conf %post %{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || : /sbin/ldconfig %{_bindir}/sfcbrepos -f > /dev/null 2>&1 %systemd_post sblim-sfcb.service +# copy content of /var/lib/sfcb to temporary place for Image Mode +(mkdir -p /usr/share/factory/var/lib && cp -a /var/lib/sfcb /usr/share/factory/var/lib/sfcb) >/dev/null 2>&1 || : %preun %systemd_preun sblim-sfcb.service +if [ $1 -eq 0 ]; then + # Package removal, not upgrade + rm -rf /usr/share/factory/var/lib/sfcb +fi %postun /sbin/ldconfig @@ -143,8 +153,12 @@ install -m0644 -D sblim-sfcb.sysusers.conf %{buildroot}%{_sysusersdir}/sblim-sfc %files -f _pkg_list %{_sysusersdir}/sblim-sfcb.conf +%{_tmpfilesdir}/sblim-sfcb.conf %changelog +* Fri Sep 12 2025 Vitezslav Crhonek - 1.4.9-38 +- Add support for Image Mode + * Fri Jul 25 2025 Fedora Release Engineering - 1.4.9-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sblim-sfcb.tmpfiles b/sblim-sfcb.tmpfiles new file mode 100644 index 0000000..897304c --- /dev/null +++ b/sblim-sfcb.tmpfiles @@ -0,0 +1,2 @@ +# populate /var/lib/sfcb with content from /usr/share/factory/var/lib/sfcb +C /var/lib/sfcb - - - -