public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/uperf] epel10.2: 1.0.6
@ 2026-09-10 15:19
0 siblings, 0 replies; only message in thread
From: @ 2026-09-10 15:19 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/uperf
Branch : epel10.2
Commit : 13e3aa49b0334149a465982294a1e438b798cfb8
Author : Terje Røsten <terje.rosten@ntnu.no>
Date : 2019-09-30T19:50:29+02:00
Stats : +156/-4 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/uperf/c/13e3aa49b0334149a465982294a1e438b798cfb8?branch=epel10.2
Log:
1.0.6
---
diff --git a/.gitignore b/.gitignore
index e358467..64cca9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
uperf-1.0.3-beta.tar.gz
/uperf-1.0.4.tar.bz2
/uperf-1.0.5.tar.gz
+/v1.0.6.tar.gz
diff --git a/sources b/sources
index a383584..203fcea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95ee2a915babf79c183d2a72543e4d31 uperf-1.0.5.tar.gz
+SHA512 (v1.0.6.tar.gz) = 2fa36e4af17d7f8fd947aac940fc8ba47a1a92eeccabd85d21871e98950736854c9bd35593eaa82ae75e13d0461cdafd6550bf7db83b4599c1ccc3e93dd01a6e
diff --git a/uperf-1.0.6-09fbbdb93.patch b/uperf-1.0.6-09fbbdb93.patch
new file mode 100644
index 0000000..62f7747
--- /dev/null
+++ b/uperf-1.0.6-09fbbdb93.patch
@@ -0,0 +1,105 @@
+$ 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
new file mode 100644
index 0000000..034983f
--- /dev/null
+++ b/uperf-1.0.6-ssl-crash.patch
@@ -0,0 +1,38 @@
+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 <stdio.h>
++#include <string.h>
++#include <errno.h>
+ #include <stdlib.h>
+ #include <sys/socket.h> /* basic socket definitions */
+ #include <netdb.h>
+@@ -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.spec b/uperf.spec
index 8036d4b..ff18169 100644
--- a/uperf.spec
+++ b/uperf.spec
@@ -1,10 +1,12 @@
Summary: Network performance tool with modelling and replay support
Name: uperf
-Version: 1.0.5
-Release: 8%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
License: GPLv3
URL: http://www.uperf.org/
-Source0: http://downloads.sourceforge.net/uperf/uperf-%{version}.tar.gz
+Source0: https://github.com/uperf/uperf/archive/v%{version}.tar.gz
+Patch0: uperf-1.0.6-09fbbdb93.patch
+Patch1: uperf-1.0.6-ssl-crash.patch
BuildRequires: gcc
BuildRequires: lksctp-tools-devel
BuildRequires: openssl-devel
@@ -14,6 +16,8 @@ networking patterns.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -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
@@ -33,6 +37,7 @@ make install DESTDIR=%{buildroot}
# Move stuff to own subdir
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
@@ -42,6 +47,9 @@ rm -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc
%{_datadir}/uperf
%changelog
+* Mon Sep 30 2019 Terje Rosten <terje.rosten@ntnu.no> - 1.0.6-1
+- 1.0.6
+
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-10 15:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-10 15:19 [rpms/uperf] epel10.2: 1.0.6
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox