Hello community, here is the log from the commit of package netperf for openSUSE:Factory:NonFree checked in at 2020-06-12 21:33:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/netperf (Old) and /work/SRC/openSUSE:Factory:NonFree/.netperf.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netperf" Fri Jun 12 21:33:35 2020 rev:4 rq:813404 version:2.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/netperf/netperf.changes 2015-09-03 18:13:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.netperf.new.3606/netperf.changes 2020-06-12 21:33:35.567263138 +0200 @@ -1,0 +2,9 @@ +Thu Jun 11 07:26:21 UTC 2020 - Martin Pluskal <mplus...@suse.com> + +- Fix building with gcc10 +- Sync patches from gentoo, add: + * netperf-2.7.0-inline.patch + * netperf-2.7.0-space.patch +- Do not use url for sources as upstream is not reachable + +------------------------------------------------------------------- New: ---- netperf-2.7.0-inline.patch netperf-2.7.0-space.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netperf.spec ++++++ --- /var/tmp/diff_new_pack.vKMsZR/_old 2020-06-12 21:33:36.055262737 +0200 +++ /var/tmp/diff_new_pack.vKMsZR/_new 2020-06-12 21:33:36.059262734 +0200 @@ -1,7 +1,7 @@ # # spec file for package netperf # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,19 +20,20 @@ Version: 2.7.0 Release: 0 Summary: Network benchmarking tool -License: SUSE-NonFree +License: NonFree Group: System/Benchmark -Url: http://www.netperf.org/ -Source: ftp://ftp.netperf.org/netperf/%{name}-%{version}.tar.bz2 +URL: http://www.netperf.org/ +Source: %{name}-%{version}.tar.bz2 # Patches from gentoo package Patch0: netperf-fix-scripts.patch Patch1: netperf-2.6.0-log-dir.patch Patch2: netperf-2.7.0-includes.patch +Patch3: netperf-2.7.0-inline.patch +Patch4: netperf-2.7.0-space.patch BuildRequires: lksctp-tools-devel Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} Recommends: ethtool -BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifarch ix86 x86_64 BuildRequires: libsmbios-devel %endif @@ -46,22 +47,20 @@ * SCTP for both IPv4 and IPv6 %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build -CFLAGS="%{optflags} -fno-strict-aliasing" +CFLAGS="%{optflags} -fno-strict-aliasing -fcommon" +CXXFLAGS="%{optflgags} -D_GNU_SOURCE" %configure \ --enable-unixdomain \ --enable-dccp \ - --enable-sctp - -make %{?_smp_mflags} + --enable-sctp \ + --enable-demo +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install rm doc/examples/Makefile* %post @@ -71,12 +70,12 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %files -%defattr(-, root, root,) -%doc AUTHORS COPYING ChangeLog README +%license COPYING +%doc AUTHORS ChangeLog README %{_bindir}/netperf %{_bindir}/netserver %doc doc/examples %{_mandir}/man1/* -%{_infodir}/%{name}.info.gz +%{_infodir}/%{name}.info%{?ext_info} %changelog ++++++ netperf-2.7.0-inline.patch ++++++ # Copyright Seblu 2015 --- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 +++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 @@ -3997,11 +3997,7 @@ } } -#ifdef WIN32 -__forceinline void demo_interval_display(double actual_interval) -#else - inline void demo_interval_display(double actual_interval) -#endif +void demo_interval_display(double actual_interval) { static int count = 0; struct timeval now; @@ -4060,15 +4056,7 @@ important compilers have supported such a construct so it should not be a big deal. raj 2012-01-23 */ -#ifdef WIN32 -/* It would seem that the Microsoft compiler will not inline across - source files. So there is little point in having an inline - directive in that situation. Of course that makes me wonder if an - inline directive has to appear in netlib.h... */ void demo_interval_tick(uint32_t units) -#else - inline void demo_interval_tick(uint32_t units) -#endif { double actual_interval = 0.0; ++++++ netperf-2.7.0-space.patch ++++++ --- a/src/netserver.c +++ b/src/netserver.c @@ -165,12 +165,12 @@ #elif defined(ANDROID) #define DEBUG_LOG_FILE_DIR "/data/local/tmp/" #else -#define DEBUG_LOG_FILE_DIR "/var/log/" +#define DEBUG_LOG_FILE_DIR "/var/log/netperf/" #endif #endif /* DEBUG_LOG_FILE_DIR */ #ifndef DEBUG_LOG_FILE -#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR"netserver.debug" +#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR "/netserver.debug" #endif #if !defined(PATH_MAX)
