From 122dd374d02416bbebed4513d641f34176365b8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:11:14 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index bbbebb0..b51b0e7 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz @@ -45,6 +45,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Sep 10 2023 Terje Rosten - 1.0.8-1 - 1.0.8 From 620e46bb971fe9831fc8a35d5f4448c3cf5e0cee Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 7 Jul 2024 14:49:14 +0200 Subject: [PATCH 02/10] Fix build deps after openssl changes --- uperf.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index b51b0e7..63c5be6 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz @@ -11,6 +11,9 @@ BuildRequires: gcc BuildRequires: lksctp-tools-devel BuildRequires: make BuildRequires: openssl-devel +%if 0%{?fedora} > 40 +BuildRequires: openssl-devel-engine +%endif %description Network performance tool that supports modelling and replay of various networking patterns. @@ -45,6 +48,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sun Jul 07 2024 Terje Rosten - 1.0.8-3 +- Fix build deps after openssl changes + * Sat Jan 27 2024 Fedora Release Engineering - 1.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 97c2600acc5444f3067434c6036060d0db73fe28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:20:25 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 63c5be6..6158aaf 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz @@ -48,6 +48,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jul 07 2024 Terje Rosten - 1.0.8-3 - Fix build deps after openssl changes From b8e83dfc6bd1c63293caa2df5b8e533953d4161d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 14:43:47 +0200 Subject: [PATCH 04/10] convert GPLv3 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- uperf.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uperf.spec b/uperf.spec index 6158aaf..378da5f 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,8 +1,9 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 4%{?dist} -License: GPLv3 +Release: 5%{?dist} +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz BuildRequires: autoconf @@ -48,6 +49,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Mon Jul 29 2024 Miroslav Suchý - 1.0.8-5 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.0.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 70fdd0f5fbb1f5e9a74a62997d68fd896b9a4980 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:50:48 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 378da5f..1086474 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 5%{?dist} +Release: 6%{?dist} # Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only URL: http://www.uperf.org/ @@ -49,6 +49,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 1.0.8-5 - convert license to SPDX From 992cdc42ec7aff648ae96493ceafca45a6d9149b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:49:47 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 1086474..ec37554 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 6%{?dist} +Release: 7%{?dist} # Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only URL: http://www.uperf.org/ @@ -49,6 +49,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.0.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6907e38534c3b26205afda8db2e1b18a18c2b9fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:39:12 +0000 Subject: [PATCH 07/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index ec37554..1cec08d 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 7%{?dist} +Release: 8%{?dist} # Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only URL: http://www.uperf.org/ @@ -49,6 +49,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.0.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.0.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 25b55b84555182161bb9353872eac64fec1054a9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:00:23 -0400 Subject: [PATCH 08/10] Rebuilt for openssl 4.0 --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 1cec08d..494f3b5 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 8%{?dist} +Release: 9%{?dist} # Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only URL: http://www.uperf.org/ @@ -49,6 +49,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 1.0.8-9 +- Rebuilt for openssl 4.0 + * Sat Jan 17 2026 Fedora Release Engineering - 1.0.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From f7ec37931df2aa89bca73fae2645604e56f3d5a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:13:49 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 494f3b5..c60c8bd 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,7 +1,7 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 9%{?dist} +Release: 10%{?dist} # Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only URL: http://www.uperf.org/ @@ -49,6 +49,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.0.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 1.0.8-9 - Rebuilt for openssl 4.0 From bdf265f0c723f52b9715e7168f24331d8399505b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Thu, 6 Aug 2026 21:23:39 +0200 Subject: [PATCH 10/10] Newer OpenSSL has removed engine support --- 0001-Remove-obsolete-SSL-engine-support.patch | 90 +++++++++++++++++++ uperf.spec | 13 ++- 2 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 0001-Remove-obsolete-SSL-engine-support.patch diff --git a/0001-Remove-obsolete-SSL-engine-support.patch b/0001-Remove-obsolete-SSL-engine-support.patch new file mode 100644 index 0000000..c10e2e8 --- /dev/null +++ b/0001-Remove-obsolete-SSL-engine-support.patch @@ -0,0 +1,90 @@ +From c271800aeb027f3f8c0b1f2463a06e3f5a948f20 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Terje=20R=C3=B8sten?= +Date: Thu, 6 Aug 2026 19:46:04 +0200 +Subject: [PATCH] Remove obsolete SSL engine support + +--- + src/ssl.c | 31 +++++-------------------------- + 1 file changed, 5 insertions(+), 26 deletions(-) + +diff --git a/src/ssl.c b/src/ssl.c +index f5bee81..77fc923 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -24,6 +24,7 @@ + #include "../config.h" + #endif /* HAVE_CONFIG_H */ + ++#include + #include + #include + #include /* basic socket definitions */ +@@ -36,7 +37,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "logging.h" +@@ -67,7 +68,7 @@ static protocol_t *protocol_ssl_new(); + static SSL_CTX *initialize_ctx(char *keyfile, char *password, + const char *method); + static int pwd_cb(char *buf, int num, int rwflag, void *userdata); +-static int load_engine(const char *engine_id); ++static int load_engine(const char *engine_id __attribute__((unused))); + static SSL_CTX *ctx; + + +@@ -137,12 +138,6 @@ file_present(char *file) + return (0); + } + +-static void +-ssl_cleanup(void) +-{ +- ENGINE_cleanup(); +-} +- + /* Called only once during beginning of the program */ + int + ssl_init(void *arg) +@@ -173,12 +168,6 @@ ssl_init(void *arg) + } + CRYPTO_set_id_callback((unsigned long (*)())id_function); + CRYPTO_set_locking_callback((void (*)())locking_function); +- +- /* +- * We also register an atexit function to cleanup the ENGINE +- * datastructures +- */ +- atexit(ssl_cleanup); + return (0); + } + +@@ -434,19 +423,9 @@ pwd_cb(char *buf, int num, int rwflag, void *userdata) + } + + static int +-load_engine(const char *engine_id) ++load_engine(const char *engine_id __attribute__((unused))) + { +- ENGINE *e; +- +- if (!engine_id) +- return (-1); +- ENGINE_load_builtin_engines(); +- e = ENGINE_by_id(engine_id); +- if (!e) { +- return (-1); +- } +- ENGINE_register_complete(e); +- return (0); ++ return (-1); + } + + static protocol_t * +-- +2.55.0 + diff --git a/uperf.spec b/uperf.spec index c60c8bd..0f497a4 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,18 +1,19 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.8 -Release: 10%{?dist} +Release: 11%{?dist} # Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz +Patch: 0001-Remove-obsolete-SSL-engine-support.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: lksctp-tools-devel BuildRequires: make BuildRequires: openssl-devel -%if 0%{?fedora} > 40 +%if 0%{?fedora} > 40 && 0%{?fedora} < 45 BuildRequires: openssl-devel-engine %endif %description @@ -20,7 +21,10 @@ Network performance tool that supports modelling and replay of various networking patterns. %prep -%autosetup +%autosetup -N +%if 0%{?fedora} > 44 +%autopatch -p1 +%endif chmod 0644 workloads/{tcp-change-cc.xml,sctp-over-udp.xml,tcp-freebsd-change-stack.xml} %build @@ -49,6 +53,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Thu Aug 06 2026 Terje Røsten - 1.0.8-11 +- Newer OpenSSL has removed engine support + * Fri Jul 17 2026 Fedora Release Engineering - 1.0.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild