From d52512aa1fbb6a6b8bda2804442cd92741b8b6e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:21:32 +0000 Subject: [PATCH 01/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 95adecf..eb2449f 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.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -45,6 +45,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Apr 17 2020 Terje Rosten - 1.0.7-1 - 1.0.7 From aac1c0632d4fbc451be90c846348bc1d244c0c2d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:26:28 +0000 Subject: [PATCH 02/22] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- uperf.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uperf.spec b/uperf.spec index eb2449f..37c6e19 100644 --- a/uperf.spec +++ b/uperf.spec @@ -6,6 +6,7 @@ License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz Patch1: uperf-1.0.6-ssl-crash.patch +BuildRequires: make BuildRequires: gcc BuildRequires: lksctp-tools-devel BuildRequires: openssl-devel From 356cb15a25cf96cc58b3092bf157051a4bd6459f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:43:52 +0000 Subject: [PATCH 03/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 37c6e19..5a027eb 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.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -46,6 +46,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 953c8a75956389baf16ac9e3cb2489569dc64af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:06:12 +0000 Subject: [PATCH 04/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 5a027eb..ed91fc2 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.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -46,6 +46,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.0.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 298c67279d6dd7b7ba1d34260bca66b2d0715dbc Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:17:20 +0200 Subject: [PATCH 05/22] Rebuilt with OpenSSL 3.0.0 --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index ed91fc2..18e2104 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.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -46,6 +46,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Tue Sep 14 2021 Sahana Prasad - 1.0.7-5 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.0.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d97984b6f448506bd4f212c2bdf0dc3e9a7a5606 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:35:12 +0000 Subject: [PATCH 06/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index 18e2104..b38f1d5 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.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -46,6 +46,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 1.0.7-5 - Rebuilt with OpenSSL 3.0.0 From 518d27ca76fd0f78dfaca67371093e89d15b6ad8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:28:00 +0000 Subject: [PATCH 07/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index b38f1d5..0dbc2be 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.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -46,6 +46,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.0.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e29b9ed40ba8351abae9832f96f9c64630ec65c7 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 25 Nov 2022 23:05:59 +0100 Subject: [PATCH 08/22] Fix sendfilev configure glitch with C99 compilers Related to: --- uperf-configure-c99.patch | 32 ++++++++++++++++++++++++++++++++ uperf.spec | 9 ++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 uperf-configure-c99.patch diff --git a/uperf-configure-c99.patch b/uperf-configure-c99.patch new file mode 100644 index 0000000..144e9be --- /dev/null +++ b/uperf-configure-c99.patch @@ -0,0 +1,32 @@ +Avoid an implicit int in the sendfilev check. This is harmless +on Linux, which does not support senfilev, but this patch avoids +flagging the test as a potential C99 compatibility issue. + +Submitted upstream: + +diff --git a/configure b/configure +index 570a98c4ee663eef..c240333ae04cf743 100755 +--- a/configure ++++ b/configure +@@ -4372,7 +4372,7 @@ $as_echo_n "checking sendfilev... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +- main() {int i=sendfilev(1,0, 1, 0);} ++ int main() {int i=sendfilev(1,0, 1, 0);} + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +diff --git a/configure.ac b/configure.ac +index 4bc192934f1daf6e..b2a08df3c3ee402a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,7 +99,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE[#include + # Linux 2.6 does not have sendfilev + AC_MSG_CHECKING(sendfilev) + AC_LINK_IFELSE([AC_LANG_SOURCE[#include +- main() {int i=sendfilev(1,0, 1, 0);}]], ++ int main() {int i=sendfilev(1,0, 1, 0);}]], + [AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_SENDFILEV],[1],[Have sendfilev]) + ], diff --git a/uperf.spec b/uperf.spec index 0dbc2be..f7d4d54 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,11 +1,12 @@ Summary: Network performance tool with modelling and replay support Name: uperf Version: 1.0.7 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz Patch1: uperf-1.0.6-ssl-crash.patch +Patch2: uperf-configure-c99.patch BuildRequires: make BuildRequires: gcc BuildRequires: lksctp-tools-devel @@ -17,11 +18,14 @@ networking patterns. %prep %setup -q -n %{name}-%{version} %patch1 -p1 +%patch2 -p1 find src -type f -print0 | xargs --null chmod 0644 find workloads -type f -print0 | xargs --null chmod 0644 chmod 0644 AUTHORS ChangeLog COPYING README %build +# Prevent rebuilding of the configure script (for uperf-configure-c99.patch). +touch aclocal.m4 Makefile.in config.h.in configure %configure \ --enable-cpc \ --enable-netstat \ @@ -46,6 +50,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Fri Nov 25 2022 Florian Weimer - 1.0.7-8 +- Fix sendfilev configure glitch with C99 compilers + * Sat Jul 23 2022 Fedora Release Engineering - 1.0.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 044cc254ff322d9d191f01a64ff28e66e249a90f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:53:13 +0000 Subject: [PATCH 09/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index f7d4d54..f045dd6 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.7 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -50,6 +50,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Nov 25 2022 Florian Weimer - 1.0.7-8 - Fix sendfilev configure glitch with C99 compilers From 7e0f8778df3af52ba74d4294782b4d718e8d61b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:11:18 +0000 Subject: [PATCH 10/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uperf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uperf.spec b/uperf.spec index f045dd6..f1db87b 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.7 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz @@ -50,6 +50,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %{_datadir}/uperf %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.0.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f217ef7f0cfb673f1027dee6c4f3c053964b419f Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 10 Sep 2023 13:15:50 +0200 Subject: [PATCH 11/22] 1.0.8 --- .gitignore | 1 + sources | 2 +- uperf-1.0.6-09fbbdb93.patch | 105 ------------------------------------ uperf-1.0.6-ssl-crash.patch | 38 ------------- uperf-configure-c99.patch | 32 ----------- uperf.spec | 42 +++++++-------- 6 files changed, 21 insertions(+), 199 deletions(-) delete mode 100644 uperf-1.0.6-09fbbdb93.patch delete mode 100644 uperf-1.0.6-ssl-crash.patch delete mode 100644 uperf-configure-c99.patch diff --git a/.gitignore b/.gitignore index 708706b..7617e55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ uperf-1.0.3-beta.tar.gz /uperf-1.0.5.tar.gz /v1.0.6.tar.gz /1.0.7.tar.gz +/v1.0.8.tar.gz diff --git a/sources b/sources index c2563e7..02e0c3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1.0.7.tar.gz) = 27ee5e5852e8cb702c84958e4f00a8ab0df004681944e6a267e04fbb1e9448d011537ffdfcbb9d68b2a42eb59571ebed9579b9fcfa7947c6fc2a26bf80b34d59 +SHA512 (v1.0.8.tar.gz) = 7a6c2b6518f6e4e7281fcd527e6c9cd98f095dcbc6824803733341168fed572d3f632d0123b69e4042aed7926d499c93167828d06dfec4598f2f4d3c23c111ab diff --git a/uperf-1.0.6-09fbbdb93.patch b/uperf-1.0.6-09fbbdb93.patch deleted file mode 100644 index 62f7747..0000000 --- a/uperf-1.0.6-09fbbdb93.patch +++ /dev/null @@ -1,105 +0,0 @@ -$ git diff v1.0.6..09fbbdb93 src > ../uperf-1.0.6-09fbbdb93.patch - -diff --git a/src/parse.c b/src/parse.c -index aedab06..bdedd0c 100644 ---- a/src/parse.c -+++ b/src/parse.c -@@ -774,6 +774,7 @@ build_worklist(struct symbol *list) - int txnid = 0; - int fid = 0; - int in_group = 0; -+ int in_txn = 0; - - w.ngrp = 0; - bzero(&w, sizeof (workorder_t)); -@@ -799,6 +800,12 @@ build_worklist(struct symbol *list) - in_group = 0; - break; - case TOKEN_TXN_START: -+ if (!in_group) { -+ snprintf(err, sizeof (err), -+ "No current group"); -+ add_error(err); -+ return (NULL); -+ } - curr_grp->ntxn++; - if (curr_txn == 0) { - curr_grp->tlist = calloc(1, sizeof (txn_t)); -@@ -813,10 +820,18 @@ build_worklist(struct symbol *list) - curr_txn->iter = 1; - curr_flowop = 0; - fid = 0; -+ in_txn = 1; - break; - case TOKEN_TXN_END: -+ in_txn = 0; - break; - case TOKEN_FLOWOP_START: -+ if (!in_txn) { -+ snprintf(err, sizeof (err), -+ "No current transaction"); -+ add_error(err); -+ return (NULL); -+ } - curr_txn->nflowop++; - if (curr_flowop == NULL) { - curr_txn->flist = calloc(1, sizeof (flowop_t)); -@@ -839,6 +854,12 @@ build_worklist(struct symbol *list) - } - break; - case TOKEN_ITERATIONS: -+ if (!in_txn) { -+ snprintf(err, sizeof (err), -+ "No current transaction"); -+ add_error(err); -+ return (NULL); -+ } - curr_txn->iter = string2int(list->symbol); - break; - case TOKEN_TYPE: -@@ -858,14 +879,32 @@ build_worklist(struct symbol *list) - flowop_parse_options(list->symbol, curr_flowop); - break; - case TOKEN_RATE: -+ if (!in_txn) { -+ snprintf(err, sizeof (err), -+ "No current transaction"); -+ add_error(err); -+ return (NULL); -+ } - strlcpy(curr_txn->rate_str, list->symbol, NAMELEN); - curr_txn->rate_count = string2int(list->symbol); - break; - case TOKEN_DURATION: -+ if (!in_txn) { -+ snprintf(err, sizeof (err), -+ "No current transaction"); -+ add_error(err); -+ return (NULL); -+ } - curr_txn->duration = string2nsec(list->symbol); - curr_txn->iter = 1; - break; - case TOKEN_NTHREADS: -+ if (!in_group) { -+ snprintf(err, sizeof (err), -+ "No current group"); -+ add_error(err); -+ return (NULL); -+ } - curr_grp->nthreads = string2int(list->symbol); - curr_grp->strand_flag |= STRAND_TYPE_THREAD; - break; -@@ -876,6 +915,12 @@ build_worklist(struct symbol *list) - add_error(err); - return (NULL); - #else -+ if (!in_group) { -+ snprintf(err, sizeof (err), -+ "No current group"); -+ add_error(err); -+ return (NULL); -+ } - curr_grp->nthreads = string2int(list->symbol); - curr_grp->strand_flag |= STRAND_TYPE_PROCESS; - break; diff --git a/uperf-1.0.6-ssl-crash.patch b/uperf-1.0.6-ssl-crash.patch deleted file mode 100644 index 034983f..0000000 --- a/uperf-1.0.6-ssl-crash.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/ssl.c b/src/ssl.c -index 1352434..6507f26 100644 ---- a/src/ssl.c -+++ b/src/ssl.c -@@ -25,6 +25,8 @@ - #endif /* HAVE_CONFIG_H */ - - #include -+#include -+#include - #include - #include /* basic socket definitions */ - #include -@@ -152,11 +154,11 @@ ssl_init(void *arg) - int i; - - if (IS_MASTER(options)) { -- if (file_present("server.pem") == 0) -- ctx = initialize_ctx("server.pem", PASS, NULL); -+ if (file_present("/usr/share/uperf/server.pem") == 0) -+ ctx = initialize_ctx("/usr/share/uperf/server.pem", PASS, NULL); - } else { -- if (file_present("client.pem") == 0) -- ctx = initialize_ctx("client.pem", PASS, NULL); -+ if (file_present("/usr/share/uperf/client.pem") == 0) -+ ctx = initialize_ctx("/usr/share/uperf/client.pem", PASS, NULL); - } - if (ctx == NULL) - return (1); -@@ -394,7 +396,7 @@ initialize_ctx(char *keyfile, char *password, const char *method) - #else - SSL_METHOD *meth; - #endif -- SSL_CTX *ctx; -+ SSL_CTX *ctx = NULL; - - SSL_library_init(); - diff --git a/uperf-configure-c99.patch b/uperf-configure-c99.patch deleted file mode 100644 index 144e9be..0000000 --- a/uperf-configure-c99.patch +++ /dev/null @@ -1,32 +0,0 @@ -Avoid an implicit int in the sendfilev check. This is harmless -on Linux, which does not support senfilev, but this patch avoids -flagging the test as a potential C99 compatibility issue. - -Submitted upstream: - -diff --git a/configure b/configure -index 570a98c4ee663eef..c240333ae04cf743 100755 ---- a/configure -+++ b/configure -@@ -4372,7 +4372,7 @@ $as_echo_n "checking sendfilev... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -- main() {int i=sendfilev(1,0, 1, 0);} -+ int main() {int i=sendfilev(1,0, 1, 0);} - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -diff --git a/configure.ac b/configure.ac -index 4bc192934f1daf6e..b2a08df3c3ee402a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,7 +99,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE[#include - # Linux 2.6 does not have sendfilev - AC_MSG_CHECKING(sendfilev) - AC_LINK_IFELSE([AC_LANG_SOURCE[#include -- main() {int i=sendfilev(1,0, 1, 0);}]], -+ int main() {int i=sendfilev(1,0, 1, 0);}]], - [AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_SENDFILEV],[1],[Have sendfilev]) - ], diff --git a/uperf.spec b/uperf.spec index f1db87b..e5c9139 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,41 +1,34 @@ -Summary: Network performance tool with modelling and replay support -Name: uperf -Version: 1.0.7 -Release: 10%{?dist} -License: GPLv3 -URL: http://www.uperf.org/ -Source0: https://github.com/uperf/uperf/archive/%{version}.tar.gz -Patch1: uperf-1.0.6-ssl-crash.patch -Patch2: uperf-configure-c99.patch +Summary: Network performance tool with modelling and replay support +Name: uperf +Version: 1.0.8 +Release: 1%{?dist} +License: GPLv3 +URL: http://www.uperf.org/ +Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz +BuildRequires: gcc +BuildRequires: lksctp-tools-devel BuildRequires: make -BuildRequires: gcc -BuildRequires: lksctp-tools-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel %description Network performance tool that supports modelling and replay of various networking patterns. %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 -find src -type f -print0 | xargs --null chmod 0644 -find workloads -type f -print0 | xargs --null chmod 0644 -chmod 0644 AUTHORS ChangeLog COPYING README +%autosetup +chmod 0644 workloads/{tcp-change-cc.xml,sctp-over-udp.xml,tcp-freebsd-change-stack.xml} %build -# Prevent rebuilding of the configure script (for uperf-configure-c99.patch). -touch aclocal.m4 Makefile.in config.h.in configure +autoreconf --install %configure \ --enable-cpc \ --enable-netstat \ --enable-udp \ --enable-sctp \ --enable-ssl -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install # Move stuff to own subdir install -d -m 0755 %{buildroot}%{_datadir}/%{name} @@ -45,11 +38,14 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %files %license COPYING -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_bindir}/uperf %{_datadir}/uperf %changelog +* Sun Sep 10 2023 Terje Rosten - 1.0.8-1 +- 1.0.8 + * Sat Jul 22 2023 Fedora Release Engineering - 1.0.7-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9abc6c94469cdaafa7fcea803e6b39708bad160b Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Sun, 10 Sep 2023 13:48:49 +0200 Subject: [PATCH 12/22] Needs autoconf and automake --- uperf.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uperf.spec b/uperf.spec index e5c9139..bbbebb0 100644 --- a/uperf.spec +++ b/uperf.spec @@ -5,6 +5,8 @@ Release: 1%{?dist} License: GPLv3 URL: http://www.uperf.org/ Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc BuildRequires: lksctp-tools-devel BuildRequires: make From 122dd374d02416bbebed4513d641f34176365b8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:11:14 +0000 Subject: [PATCH 13/22] 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 14/22] 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 15/22] 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 16/22] 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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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