diff --git a/.gitignore b/.gitignore index 2968649..7617e55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ uperf-1.0.3-beta.tar.gz /uperf-1.0.4.tar.bz2 +/uperf-1.0.5.tar.gz +/v1.0.6.tar.gz +/1.0.7.tar.gz +/v1.0.8.tar.gz 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/sources b/sources index 07128e2..02e0c3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ccbc52686451c14c5532d7ccd67b699c uperf-1.0.4.tar.bz2 +SHA512 (v1.0.8.tar.gz) = 7a6c2b6518f6e4e7281fcd527e6c9cd98f095dcbc6824803733341168fed572d3f632d0123b69e4042aed7926d499c93167828d06dfec4598f2f4d3c23c111ab diff --git a/uperf-1.0.4-dso.patch b/uperf-1.0.4-dso.patch deleted file mode 100644 index b13182c..0000000 --- a/uperf-1.0.4-dso.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index e94aded..aa79dfd 100755 ---- a/configure -+++ b/configure -@@ -3542,7 +3542,7 @@ _ACEOF - sctp_default="yes" - ssl_default="no" - cpc_default="no" -- UPERF_LIBS="$UPERF_LIBS -lrt -lm" -+ UPERF_LIBS="$UPERF_LIBS -lpthread -lrt -lm" - CFLAGS="-D_GNU_SOURCE $CFLAGS" - SCTP_LIBS="-lsctp" - SCTP_LIBNAME="sctp" diff --git a/uperf.spec b/uperf.spec index d924353..0f497a4 100644 --- a/uperf.spec +++ b/uperf.spec @@ -1,53 +1,163 @@ -Summary: Network performance tool with modelling and replay support -Name: uperf -Version: 1.0.4 -Release: 3%{?dist} -License: GPLv3 -Group: Applications/Internet -URL: http://www.uperf.org/ -Source0: http://downloads.sourceforge.net/uperf/uperf-%{version}.tar.bz2 -Patch0: uperf-1.0.4-dso.patch -BuildRequires: lksctp-tools-devel openssl-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Summary: Network performance tool with modelling and replay support +Name: uperf +Version: 1.0.8 +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 && 0%{?fedora} < 45 +BuildRequires: openssl-devel-engine +%endif %description Network performance tool that supports modelling and replay of various networking patterns. %prep -%setup -q -n %{name}-%{version} -%patch0 -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 -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 +autoreconf --install %configure \ --enable-cpc \ --enable-netstat \ --enable-udp \ --enable-sctp \ --enable-ssl -%{__make} %{?_smp_mflags} +%make_build %install -%{__rm} -rf %{buildroot} -%{__make} install DESTDIR=%{buildroot} +%make_install # Move stuff to own subdir -%{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name} -%{__install} -p -m 0644 %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/%{name} -%{__rm} -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc - -%clean -%{__rm} -rf %{buildroot} +install -d -m 0755 %{buildroot}%{_datadir}/%{name} +install -p -m 0644 %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/%{name} +install -p -m 0644 {server,client}.pem %{buildroot}%{_datadir}/%{name} +rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc %files -%defattr(-, root, root, -) -%doc AUTHORS ChangeLog COPYING README -%{_bindir}/%{name} -%{_datadir}/%{name} +%license COPYING +%doc AUTHORS ChangeLog README.md +%{_bindir}/uperf +%{_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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Fri Apr 17 2020 Terje Rosten - 1.0.7-1 +- 1.0.7 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Sep 30 2019 Terje Rosten - 1.0.6-1 +- 1.0.6 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.0.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Nov 20 2016 Terje Rosten - 1.0.5-1 +- 1.0.5 + +* Fri Feb 05 2016 Fedora Release Engineering - 1.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.0.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.0.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild