[rpms/uperf] epel10.3: 1.0.8

[rpms/uperf] epel10.3: 1.0.8

[Terje Rosten]

A new commit has been pushed.

Repo   : rpms/uperf
Branch : epel10.3
Commit : f217ef7f0cfb673f1027dee6c4f3c053964b419f
Author : Terje Rosten <terje.rosten@ntnu.no>
Date   : 2023-09-10T13:15:50+02:00
Stats  : +21/-199 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/uperf/c/f217ef7f0cfb673f1027dee6c4f3c053964b419f?branch=epel10.3

Log:
1.0.8

---
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 <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-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: <https://github.com/uperf/uperf/pull/54>
-
-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 <sys/sendfile.h>
--		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 <sys/byteorder.h>
- # Linux 2.6 does not have sendfilev
- AC_MSG_CHECKING(sendfilev)
- AC_LINK_IFELSE([AC_LANG_SOURCE[#include <sys/sendfile.h>
--		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 <terje.rosten@ntnu.no> - 1.0.8-1
+- 1.0.8
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild