From 3709f9c59943a9fb8275919590d9bccea6e0e7a2 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 15 Jan 2018 12:41:27 +0000 Subject: [PATCH] update to flent-1.1.1 --- benchmarks/netperf-wrapper/Makefile | 8 +++----- benchmarks/netperf-wrapper/distinfo | 4 ++-- .../patches/patch-flent_build_info_py | 9 +++++---- benchmarks/netperf-wrapper/patches/patch-setup_py | 13 +++++++------ benchmarks/netperf-wrapper/pkg/PLIST-main | 11 ++++++++--- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/benchmarks/netperf-wrapper/Makefile b/benchmarks/netperf-wrapper/Makefile index 1df6d191087..0df396ce5f6 100644 --- a/benchmarks/netperf-wrapper/Makefile +++ b/benchmarks/netperf-wrapper/Makefile @@ -1,18 +1,16 @@ -# $OpenBSD: Makefile,v 1.8 2017/07/17 19:13:37 kili Exp $ +# $OpenBSD: Makefile,v 1.9 2018/01/15 12:41:27 sthen Exp $ COMMENT-main= test network latency under load via netperf COMMENT-gui= GUI for flent (test network latency under load via netperf) -MODPY_EGG_VERSION= 1.0.1 +MODPY_EGG_VERSION= 1.1.1 DISTNAME= flent-${MODPY_EGG_VERSION} PKGNAME-main= flent-${MODPY_EGG_VERSION} PKGNAME-gui= flent-gui-${MODPY_EGG_VERSION} -REVISION-gui= 0 - CATEGORIES= benchmarks net -HOMEPAGE= https://github.com/tohojo/netperf-wrapper +HOMEPAGE= https://flent.org/ # GPLv3+ PERMIT_PACKAGE_CDROM= Yes diff --git a/benchmarks/netperf-wrapper/distinfo b/benchmarks/netperf-wrapper/distinfo index 6891fcf9d6e..c21caaac422 100644 --- a/benchmarks/netperf-wrapper/distinfo +++ b/benchmarks/netperf-wrapper/distinfo @@ -1,2 +1,2 @@ -SHA256 (flent-1.0.1.tar.gz) = CQQ/RBhdMLkYQ4lxB4sksnhY8UWaA8hXM9TydWB4jKE= -SIZE (flent-1.0.1.tar.gz) = 1663944 +SHA256 (flent-1.1.1.tar.gz) = qy2QfUBzVoktbuXcyxa8vHZqbzdzGpAqzXqLlDm4ctU= +SIZE (flent-1.1.1.tar.gz) = 2247385 diff --git a/benchmarks/netperf-wrapper/patches/patch-flent_build_info_py b/benchmarks/netperf-wrapper/patches/patch-flent_build_info_py index 5815860fddd..3f6ca0d028f 100644 --- a/benchmarks/netperf-wrapper/patches/patch-flent_build_info_py +++ b/benchmarks/netperf-wrapper/patches/patch-flent_build_info_py @@ -1,9 +1,10 @@ -$OpenBSD: patch-flent_build_info_py,v 1.1 2017/03/09 18:55:47 sthen Exp $ ---- flent/build_info.py.orig Mon Jan 16 00:02:20 2017 -+++ flent/build_info.py Thu Mar 9 17:50:35 2017 +$OpenBSD: patch-flent_build_info_py,v 1.2 2018/01/15 12:41:27 sthen Exp $ +Index: flent/build_info.py +--- flent/build_info.py.orig ++++ flent/build_info.py @@ -2,4 +2,4 @@ import os - VERSION='1.0.1' + VERSION='1.1.1' -DATA_DIR=os.path.dirname(__file__) +DATA_DIR='/usr/local/share/flent' diff --git a/benchmarks/netperf-wrapper/patches/patch-setup_py b/benchmarks/netperf-wrapper/patches/patch-setup_py index af74c437ad6..e3a780d3381 100644 --- a/benchmarks/netperf-wrapper/patches/patch-setup_py +++ b/benchmarks/netperf-wrapper/patches/patch-setup_py @@ -1,10 +1,11 @@ -$OpenBSD: patch-setup_py,v 1.2 2017/03/09 18:55:47 sthen Exp $ ---- setup.py.orig Sun Jan 15 13:47:03 2017 -+++ setup.py Thu Mar 9 17:49:55 2017 -@@ -83,7 +83,7 @@ class sdist(_sdist): - data_files = [('share/doc/flent', +$OpenBSD: patch-setup_py,v 1.3 2018/01/15 12:41:27 sthen Exp $ +Index: setup.py +--- setup.py.orig ++++ setup.py +@@ -84,7 +84,7 @@ data_files = [('share/doc/flent', ['BUGS', - 'README.rst'] + glob("*.example")), + 'README.rst', + 'flent-paper.batch'] + glob("*.example")), - ('share/man/man1', + ('man/man1', ['man/flent.1']), diff --git a/benchmarks/netperf-wrapper/pkg/PLIST-main b/benchmarks/netperf-wrapper/pkg/PLIST-main index df1c4b5e815..1d3066c9291 100644 --- a/benchmarks/netperf-wrapper/pkg/PLIST-main +++ b/benchmarks/netperf-wrapper/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2017/03/09 18:55:47 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2018/01/15 12:41:27 sthen Exp $ bin/flent lib/python${MODPY_VERSION}/site-packages/flent/ lib/python${MODPY_VERSION}/site-packages/flent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ @@ -43,8 +43,8 @@ lib/python${MODPY_VERSION}/site-packages/flent/plotters.py lib/python${MODPY_VERSION}/site-packages/flent/resultset.py lib/python${MODPY_VERSION}/site-packages/flent/runners.py lib/python${MODPY_VERSION}/site-packages/flent/scripts/ -lib/python${MODPY_VERSION}/site-packages/flent/scripts/#stat_iterate.sh# lib/python${MODPY_VERSION}/site-packages/flent/scripts/netstat_iterate.sh +lib/python${MODPY_VERSION}/site-packages/flent/scripts/ss_iterate.sh lib/python${MODPY_VERSION}/site-packages/flent/scripts/stat_iterate.sh lib/python${MODPY_VERSION}/site-packages/flent/scripts/tc_iterate.sh lib/python${MODPY_VERSION}/site-packages/flent/scripts/wifistats_iterate.sh @@ -88,13 +88,16 @@ lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_100_up.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_50_down.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_50_up.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_be.conf +lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_be_iperf.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_be_nflows.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_cs8.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_icmp.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_noclassification.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_prio.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_torrent.conf +lib/python${MODPY_VERSION}/site-packages/flent/tests/rrul_up.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rtt_fair.conf +lib/python${MODPY_VERSION}/site-packages/flent/tests/rtt_fair.inc lib/python${MODPY_VERSION}/site-packages/flent/tests/rtt_fair4be.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rtt_fair6be.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/rtt_fair_up.conf @@ -124,6 +127,7 @@ lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_bidirectional.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_download.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_ndown.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_nup.conf +lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_stats.inc lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_upload.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_upload_1000.conf lib/python${MODPY_VERSION}/site-packages/flent/tests/tcp_upload_prio.conf @@ -149,14 +153,15 @@ share/doc/flent/ share/doc/flent/BUGS share/doc/flent/README.rst share/doc/flent/batchfile.example +share/doc/flent/flent-paper.batch share/doc/flent/flentrc.example share/doc/flent/misc/ share/doc/flent/misc/Makefile share/doc/flent/misc/ditg-control-server.py +share/doc/flent/misc/ditg-control-server@.service share/doc/flent/misc/ditg-ignore-client-log.patch share/doc/flent/misc/file_iterate.c share/doc/flent/misc/iperf-server.py -share/doc/flent/misc/tc_iterate share/doc/flent/misc/tc_iterate.c share/doc/flent/misc/tcpdump-wrapper.py share/doc/flent/misc/test-exec.sh