- Update to version 1.0.5:

* No upstream changelog available
- Drop no longer needed patches:
  * uperf-parse-fix-buffer-overflow.patch
  * uperf-1.0.4-dso.patch
- Small packaging cleanups

OBS-URL: https://build.opensuse.org/package/show/benchmark/uperf?expand=0&rev=8

uperf.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Mar 24 18:49:58 UTC 2017 - mpluskal@suse.com
+
+- Update to version 1.0.5:
+  * No upstream changelog available
+- Drop no longer needed patches:
+  * uperf-parse-fix-buffer-overflow.patch
+  * uperf-1.0.4-dso.patch
+- Small packaging cleanups
+
 -------------------------------------------------------------------
 Sat Apr  4 10:46:27 UTC 2015 - mpluskal@suse.com
 

uperf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package uperf
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,15 @@
 
 
 Name:           uperf
-Version:        1.0.4
+Version:        1.0.5
 Release:        0
 Summary:        Unified Network Performance Tool
 License:        GPL-3.0
 Group:          Productivity/Networking/Diagnostic
 Url:            http://www.uperf.org/
-Source0:        http://sourceforge.net/projects/uperf/files/uperf/uperf-%{version}.tar.bz2
-Patch0:		uperf-1.0.4-dso.patch
-Patch3:         uperf-parse-fix-buffer-overflow.patch
+Source0:        http://sourceforge.net/projects/uperf/files/uperf/uperf-%{version}.tar.gz
 BuildRequires:  lksctp-tools-devel
 BuildRequires:  openssl-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 uperf is a network performance tool that supports modelling and replay of
@@ -57,32 +54,27 @@ Some of the questions you could answer using uperf are
 and much more!
 
 %prep
-%setup -q 
-%patch0 -p1
-%patch3
-
-chmod 0644 AUTHORS ChangeLog COPYING NEWS README *.pem
+%setup -q
 
 %build
 %configure \
-    --datadir="%{_datadir}/%{name}" \
-    --enable-cpc \
-    --enable-netstat \
-    --enable-udp \
-    --enable-ssl \
-    --enable-sctp
-
+  --datadir="%{_datadir}/%{name}" \
+  --enable-cpc \
+  --enable-netstat \
+  --enable-udp \
+  --enable-ssl \
+  --enable-sctp
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
+chmod 0644 AUTHORS ChangeLog COPYING NEWS README *.pem
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README
-%doc client.pem server.pem
 %{_bindir}/uperf
 %dir %{_datadir}/%{name}
-%config %{_datadir}/%{name}/*.xml
+%{_datadir}/%{name}/*.xml
 
 %changelog

uperf-1.0.4-dso.patch

@@ -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"

uperf-1.0.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43af6aaed2b28a3e2c66df2de6ca00d96fadaa1e35dba19262d1c1869207d9aa
-size 202845

uperf-1.0.5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96120d9a1ffbb67b0a395e654bcb39c8a83b876b79847b31ac0526f51e115d53
+size 180293

uperf-parse-fix-buffer-overflow.patch

@@ -1,13 +0,0 @@
-Index: src/parse.c
-===================================================================
---- src/parse.c.orig
-+++ src/parse.c
-@@ -246,7 +246,7 @@ parse(char *buffer, struct symbol *list)
- 		if (merge == 1) {
- 			/* merge this with prev symbol */
- 			strlcpy(sym, curr->symbol, 1024);
--			strlcat(sym, token, 1024);
-+			strlcat(sym, token, 1024 - strlen(curr->symbol));
- 			if (curr->symbol)
- 				free(curr->symbol);
- 			curr->type = token_type(sym);