From 954b0928438f25000d3699058cc1c621d9ea822c Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 16 May 2013 20:05:20 +0300
Subject: [PATCH 1/2] Revert "iperf: move to debug tools"

This reverts commit 69258d33bfc7004aa9a76a8c7bafc89f06ccb1ba.
---
 .../networking/testing/iperf/addon}           |   4 +--
 .../networking/testing}/iperf/build           |   0
 .../networking/testing/iperf/changelog.txt    |   5 ++++
 .../networking/testing/iperf/icon/icon.png    | Bin 0 -> 2360 bytes
 .../networking/testing}/iperf/meta            |   5 ++--
 .../testing/iperf/source/default.py           |  23 ++++++++++++++++++
 packages/debug/meta                           |   2 +-
 7 files changed, 34 insertions(+), 5 deletions(-)
 rename packages/{debug/iperf/install => addons/networking/testing/iperf/addon} (91%)
 rename packages/{debug => addons/networking/testing}/iperf/build (100%)
 create mode 100644 packages/addons/networking/testing/iperf/changelog.txt
 create mode 100644 packages/addons/networking/testing/iperf/icon/icon.png
 rename packages/{debug => addons/networking/testing}/iperf/meta (95%)
 create mode 100644 packages/addons/networking/testing/iperf/source/default.py

diff --git a/packages/debug/iperf/install b/packages/addons/networking/testing/iperf/addon
similarity index 91%
rename from packages/debug/iperf/install
rename to packages/addons/networking/testing/iperf/addon
index 784de83914..cade4ce551 100755
--- a/packages/debug/iperf/install
+++ b/packages/addons/networking/testing/iperf/addon
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin/
-  cp $PKG_BUILD/src/iperf $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/src/iperf $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/debug/iperf/build b/packages/addons/networking/testing/iperf/build
similarity index 100%
rename from packages/debug/iperf/build
rename to packages/addons/networking/testing/iperf/build
diff --git a/packages/addons/networking/testing/iperf/changelog.txt b/packages/addons/networking/testing/iperf/changelog.txt
new file mode 100644
index 0000000000..353ab309e7
--- /dev/null
+++ b/packages/addons/networking/testing/iperf/changelog.txt
@@ -0,0 +1,5 @@
+3.0.1
+- bump addon version
+
+2.1.1
+- initial addon based on iperf-2.0.5
diff --git a/packages/addons/networking/testing/iperf/icon/icon.png b/packages/addons/networking/testing/iperf/icon/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f8063f8858e71cd245625a9067be902588d51cd
GIT binary patch
literal 2360
zcmeHH{WsHl9RGZ6v#dPatcaslN+S<zm1M~n%}%k^Oj2XggvHz$8kKqO>6Vj9*{LW>
zrCj78<zYz@(KEYSR&Lr@8cUn5w7dR>?hp5e-sil|>vdk|ykF;iUO&7K(}KvRC>s<2
zz?2f;w-o@$AR#adW*|;wXt06cdwc?Y0H{7O`&%Re02rWc4)!<rNF>tS+}z5_%GTD_
z&d$!>-rmvC(Z$6DkH@>ayL)<i5(oruZ*LzTA75YJjT<+T$z%$JLZwpabb44=7?a72
zii(Phi{o%OTrM{`IaweOq@|^$r>AFTX6EGN6crVTM53~?vhwosii(Pwnwt9h`i6#v
z#>U2`rlyvb7O`0T@ZrN}&z`+{^=e>XKq8UIWU|4*LAhM6P$-m2<>=_BN~Ibb8&j**
z6B83Uoo;%1TCdj|j{h~k8u*z8#O~=j!@fyk!1g2nX3zZr==qz2-wY;_PYLu#N{wNr
z&Q_wKNDqVM!}ky6leqEm>;yg_@z{}k_HImSEI$Sl9K*(tDS<Q;io{J6@M8DG@G)4D
zBL<Jd;W4`en7~LLKQ;kF<8t?+QW!SnhA^8SVRUXZKQ)ra2DHf71iovKe=sIxmFpVU
zl{nlauM_}80L9NIcwhKfvC8)a(IU4Hb!i{u7fietOmoe8Yid!f%W#fODU43t(X`Gn
z9-lO2(!*DXl2Y774(Bu%{RA@$AR6@8<f+kPL|b6N{1U_|O9N&L>B9fDK2+QG`GH=t
z0Fjold0U8l5fdSxW}$oC{$UIC+nY~+`TeU#-|9VrRlIkypGQLquW_zrs17>KY5Ooe
zG|V9gmr|y)owD-4$+A>yZFL9AT01tvW_SGoE$uo(x;;GqQSROSE0^G4psSe5N<iU~
zKfY%mb{v&p9!EsX3`V$V8-`UUg-q3CVE?8f=6Q81R>P<t99@X>8hM~UB!jDf^>_8~
zEv6<q3AE2?y&%~y@BCCb1}k89UfZsrRC|O%f~?Ff5t{3(Kur|4;|bUeBOK1~fL|)?
zl^V78Nms+a|J8Rq{6;HsV2WP&se}MN9yzfG&SI^vliC5;i<(`Ys~JQso~r20RF)n6
zlNfz_XQfBlO-pB1J`Un{8r6ohiH?Vr4Aj}|V68!p-yxxJQf;NX*tYg+6ImQ{{pbL^
zPd1NSm3-e}%7t1q$R|UKWb^v>+e|LHV@%cXxp$M$EjTmmHkk!cuI%zMk*6-xuKHv$
zl6k>ceIfjH&yl`+`HMeG$2(gsC(((lB^%NhZ%D~vkg&Gri2Un`b_-#*i)DzycXuf;
z&iASvB8zha;z6ozaaH`&zqh#Sps1bCbD=4nB1U@VV%cy!QIPHR=G;5e+c&xP6|Ic)
zwzIBfS5Nae$HkcQsa<>V<mKnv*J0q}1CpA{{hlGvNcfjLi9Ga5cieA4D_gtZ320pY
z)(j{QXb7+8v?&v+>z0e38*N%4omP~-k2AvdL0Wi0NchTQCk;v2h%3#9kA>gRJG0c;
zE2^wdLD=3?V#f+L{jC^Xz;v@s|5}y%5<L2t#F*N8i=hza)7zBk77;Ve&S_C28V8S^
zcMn*b<(1k1ZP5CO{L+P>13R8)pkZuce(91QlvnBihHEpDWfexa1hmo!7me;QB|flP
zW^e9Wr-rW}pG`z#VFgU7+rrbAiMB$XedSDf_7(EGl+Y5MLwz3os&J^gxT9bF!MH?R
z$LS_<nr-(AT%KxXf%^{FLnw=vn=8;xzx038gVK90egkqQ$84S9^8$*0kl!s|R@T3j
CE9Arg

literal 0
HcmV?d00001

diff --git a/packages/debug/iperf/meta b/packages/addons/networking/testing/iperf/meta
similarity index 95%
rename from packages/debug/iperf/meta
rename to packages/addons/networking/testing/iperf/meta
index 7ce5def105..e8726f04bd 100644
--- a/packages/debug/iperf/meta
+++ b/packages/addons/networking/testing/iperf/meta
@@ -28,10 +28,11 @@ PKG_URL="$SOURCEFORGE_SRC/iperf/files/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain $ICONV"
 PKG_PRIORITY="optional"
-PKG_SECTION="debug/tools"
+PKG_SECTION="network/testing"
 PKG_SHORTDESC="iperf: A modern alternative for measuring maximum TCP and UDP bandwidth performance"
 PKG_LONGDESC="Iperf was developed by NLANR/DAST as a modern alternative for measuring maximum TCP and UDP bandwidth performance. Iperf allows the tuning of various parameters and UDP characteristics. Iperf reports bandwidth, delay jitter, datagram loss."
 
-PKG_IS_ADDON="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/networking/testing/iperf/source/default.py b/packages/addons/networking/testing/iperf/source/default.py
new file mode 100644
index 0000000000..8d4c5e9e96
--- /dev/null
+++ b/packages/addons/networking/testing/iperf/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon
diff --git a/packages/debug/meta b/packages/debug/meta
index 99b211cea6..89e78eaf05 100644
--- a/packages/debug/meta
+++ b/packages/debug/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools tcpdump iperf"
+PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools tcpdump"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

From 5fdb247ae4d3aa4aeb70f54baf93dbc220a427ac Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 16 May 2013 20:06:26 +0300
Subject: [PATCH 2/2] iperf: bump to trigger a rebuild

---
 packages/addons/networking/testing/iperf/changelog.txt | 3 +++
 packages/addons/networking/testing/iperf/meta          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/addons/networking/testing/iperf/changelog.txt b/packages/addons/networking/testing/iperf/changelog.txt
index 353ab309e7..c053248905 100644
--- a/packages/addons/networking/testing/iperf/changelog.txt
+++ b/packages/addons/networking/testing/iperf/changelog.txt
@@ -1,3 +1,6 @@
+3.0.2
+- rebuild
+
 3.0.1
 - bump addon version
 
diff --git a/packages/addons/networking/testing/iperf/meta b/packages/addons/networking/testing/iperf/meta
index e8726f04bd..848adaef78 100644
--- a/packages/addons/networking/testing/iperf/meta
+++ b/packages/addons/networking/testing/iperf/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="iperf"
 PKG_VERSION="2.0.5"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sourceforge.net/projects/iperf/"