Compare commits

..

No commits in common. "rawhide" and "f42" have entirely different histories.

2 changed files with 3 additions and 112 deletions

View file

@ -1,90 +0,0 @@
From c271800aeb027f3f8c0b1f2463a06e3f5a948f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terjeros@gmail.com>
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 <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h> /* basic socket definitions */
@@ -36,7 +37,7 @@
#include <netinet/tcp.h>
#include <inttypes.h>
#include <openssl/ssl.h>
-#include <openssl/engine.h>
+#include <openssl/err.h>
#include <pthread.h>
#include <string.h>
#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

View file

@ -1,19 +1,18 @@
Summary: Network performance tool with modelling and replay support
Name: uperf
Version: 1.0.8
Release: 11%{?dist}
Release: 6%{?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
%if 0%{?fedora} > 40
BuildRequires: openssl-devel-engine
%endif
%description
@ -21,10 +20,7 @@ Network performance tool that supports modelling and replay of various
networking patterns.
%prep
%autosetup -N
%if 0%{?fedora} > 44
%autopatch -p1
%endif
%autosetup
chmod 0644 workloads/{tcp-change-cc.xml,sctp-over-udp.xml,tcp-freebsd-change-stack.xml}
%build
@ -53,21 +49,6 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc
%{_datadir}/uperf
%changelog
* Thu Aug 06 2026 Terje Røsten <terjeros@gmail.com> - 1.0.8-11
- Newer OpenSSL has removed engine support
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.0.8-9
- Rebuilt for openssl 4.0
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild