flent: Rename and update package

Update the Flent package and move it to net/, renaming it to just 'flent'
instead of python3-flent (it's not a library, having the python3- prefix
makes no sense). Also add python3-defusedxml as a dependency to protect
against XML bombs if using the one of the backends that use XML-RPC, and
trim the dependencies to those used directly by Flent.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

diff --git a/lang/python/python3-flent/Makefile b/lang/python/python3-flent/Makefile
deleted file mode 100644 (file)
index 80433c5..0000000
--- a/lang/python/python3-flent/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python3-flent
-PKG_VERSION:=2.0.1
-PKG_RELEASE:=$(AUTORELEASE)
-
-PYPI_NAME:=flent
-PKG_HASH:=300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796
-
-PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
-PKG_LICENSE:=GPL-3.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include ../pypi.mk
-include $(INCLUDE_DIR)/package.mk
-include ../python3-package.mk
-
-define Package/python3-flent
-  SECTION:=lang-python
-  CATEGORY:=Languages
-  SUBMENU:=Python
-  TITLE:=The FLExible Network Tester
-  URL:=https://github.com/tohojo/flent
-  DEPENDS:= \
-    +python3-light \
-    +python3-email \
-    +python3-urllib \
-    +python3-uuid \
-    +python3-logging \
-    +python3-xml \
-    +python3-decimal \
-    +python3-distutils \
-    +netperf \
-    +fping
-endef
-
-define Package/python3-flent/description
-  Flent is a Python wrapper to run multiple simultaneous
-  netperf/iperf/ping instances and aggregate the results.
-endef
-
-$(eval $(call Py3Package,python3-flent))
-$(eval $(call BuildPackage,python3-flent))
-$(eval $(call BuildPackage,python3-flent-src))

diff --git a/net/flent/Makefile b/net/flent/Makefile
new file mode 100644 (file)
index 0000000..15180f2
--- /dev/null
+++ b/net/flent/Makefile
@@ -0,0 +1,41 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=flent
+PKG_VERSION:=2.1.1
+PKG_RELEASE:=1
+
+PYPI_NAME:=flent
+PKG_HASH:=db581deac3d8099965dd0d8eee4b9c4d1857bdce5bc97790af9d3ed5b6554f73
+
+PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
+PKG_LICENSE:=GPL-3.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include ../../lang/python/pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/python/python3-package.mk
+
+define Package/flent
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=The FLExible Network Tester
+  URL:=https://flent.org
+  CONFLICTS:=python3-flent
+  DEPENDS:= \
+    +python3-light \
+    +python3-uuid \
+    +python3-logging \
+    +python3-distutils \
+    +python3-defusedxml \
+    +netperf \
+    +fping
+endef
+
+define Package/flent/description
+  Flent is a Python wrapper to run multiple simultaneous
+  netperf/iperf/ping instances and aggregate the results.
+endef
+
+$(eval $(call Py3Package,flent))
+$(eval $(call BuildPackage,flent))
+$(eval $(call BuildPackage,flent-src))