aboutsummaryrefslogtreecommitdiffstats
path: root/main/iperf
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2016-08-14 14:01:40 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2016-08-14 14:01:40 +0000
commit027f806ca57cbaed7871676df21ce978b8c21a3f (patch)
tree8ff06a4068cf1174c713f3e437a575548922aaf5 /main/iperf
parent42157a0b196837c42cbdc0f654410ad5b5d247d4 (diff)
downloadaports-027f806ca57cbaed7871676df21ce978b8c21a3f.tar.bz2
aports-027f806ca57cbaed7871676df21ce978b8c21a3f.tar.xz
main/iperf: rename to iperf3
Diffstat (limited to 'main/iperf')
-rw-r--r--main/iperf/1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch36
-rw-r--r--main/iperf/APKBUILD59
-rw-r--r--main/iperf/iperf.confd3
-rw-r--r--main/iperf/iperf.initd18
-rw-r--r--main/iperf/remove-pg-flags.patch28
5 files changed, 0 insertions, 144 deletions
diff --git a/main/iperf/1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch b/main/iperf/1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
deleted file mode 100644
index 4d53c4bd92..0000000000
--- a/main/iperf/1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sat, 30 Jan 2016 19:23:20 +0100
-Subject: [PATCH] Fix build using musl libc
-
-Fixes https://github.com/esnet/iperf/issues/331
----
- src/cjson.h | 2 ++
- src/timer.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/cjson.h b/src/cjson.h
-index d4449e6..7af19a9 100644
---- a/src/cjson.h
-+++ b/src/cjson.h
-@@ -23,6 +23,8 @@
- #ifndef cJSON__h
- #define cJSON__h
-
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C"
- {
-diff --git a/src/timer.h b/src/timer.h
-index 0f9c5eb..9b22b7f 100644
---- a/src/timer.h
-+++ b/src/timer.h
-@@ -30,6 +30,7 @@
- #ifndef __TIMER_H
- #define __TIMER_H
-
-+#include <stdint.h>
- #include <sys/time.h>
-
- /* TimerClientData is an opaque value that tags along with a timer. The
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
deleted file mode 100644
index 07d5431a55..0000000000
--- a/main/iperf/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=iperf
-pkgver=3.1.3
-pkgrel=0
-pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
-url="https://github.com/esnet/iperf"
-arch="all"
-license="BSD"
-depends=""
-makedepends=""
-install=""
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/esnet/iperf/archive/$pkgver.tar.gz
- iperf.initd
- iperf.confd
-
- 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
- remove-pg-flags.patch
- "
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
- cd "$builddir"
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- || return 1
- make || return 1
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
- install -D -m0755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- install -D -m0644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-md5sums="7d9e550129d1ba68d4f49ea9dd412ada iperf-3.1.3.tar.gz
-291084a99bc42217bf20a3f9f479e4d0 iperf.initd
-baf349898c6d08eaa3883d7e6802745c iperf.confd
-056442b6d4bef2a390f49124150fd4c9 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
-2bbaa32466ae3a3d7cf2c26d46d97324 remove-pg-flags.patch"
-sha256sums="e34cf60cffc80aa1322d2c3a9b81e662c2576d2b03e53ddf1079615634e6f553 iperf-3.1.3.tar.gz
-b109c524d71a9da0db18c271b74238ef5f85b270d2f60dc6ae8f097a3342d00d iperf.initd
-2063bd3defe0e58d43741ed6067f3f5552e579385620d0e0f5aa2b8e96b21151 iperf.confd
-3bf6329c14a30fd3ce7adaeafe5d95485111e73440fd1d91f8429e3af1c0bb63 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
-35131030c9384025dc511f3fe359a0845b09ed8dede5960a7e9308ad15fccc52 remove-pg-flags.patch"
-sha512sums="67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9 iperf-3.1.3.tar.gz
-339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8 iperf.initd
-fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd
-94a37158a1486442ef8f4a9bfb7f1fd02786dc5a3352a7249e2b5f0c910f0d2b951e40bdb94619aa8ca76ce8cda4c574a7fa85e12832c9fd684d074886aee7c7 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6.patch
-81808862eecacdd7be658daa094385d7a57594281992b6b9b842cee676137d6990dce592b25e5db9fb80ea86628286ff7d234787d2939ef1f99820a361e1f3c6 remove-pg-flags.patch"
diff --git a/main/iperf/iperf.confd b/main/iperf/iperf.confd
deleted file mode 100644
index 1f425faa67..0000000000
--- a/main/iperf/iperf.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default option for iperf: --server (runs in TCP/5001 mode)
-# For further server options check --help flag
-command_args=""
diff --git a/main/iperf/iperf.initd b/main/iperf/iperf.initd
deleted file mode 100644
index a135bafc92..0000000000
--- a/main/iperf/iperf.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-
-command="/usr/bin/iperf"
-pidfile="/var/run/$SVCNAME/$SVCNAME.pid"
-
-depend() {
- need net
- after firewall
-}
-
-start() {
- ebegin "Starting $SVCNAME"
- start-stop-daemon --start --make-pid --user ${exec_user:-nobody} \
- --pidfile ${pidfile} --background --exec $command \
- -- --server ${command_args}
- eend
-}
-
diff --git a/main/iperf/remove-pg-flags.patch b/main/iperf/remove-pg-flags.patch
deleted file mode 100644
index 4d6482d3d8..0000000000
--- a/main/iperf/remove-pg-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./src/Makefile.am.orig
-+++ ./src/Makefile.am
-@@ -49,9 +49,9 @@
- iperf3_profile_SOURCES = main.c \
- $(libiperf_la_SOURCES)
-
--iperf3_profile_CFLAGS = -pg -g
-+iperf3_profile_CFLAGS = -g
- iperf3_profile_LDADD = libiperf.la
--iperf3_profile_LDFLAGS = -pg -g
-+iperf3_profile_LDFLAGS = -g
-
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES = t_timer.c
---- ./src/Makefile.in.orig
-+++ ./src/Makefile.in
-@@ -610,9 +610,9 @@
- iperf3_profile_SOURCES = main.c \
- $(libiperf_la_SOURCES)
-
--iperf3_profile_CFLAGS = -pg -g
-+iperf3_profile_CFLAGS = -g
- iperf3_profile_LDADD = libiperf.la
--iperf3_profile_LDFLAGS = -pg -g
-+iperf3_profile_LDFLAGS = -g
-
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES = t_timer.c