From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- net-misc/iperf/Manifest | 3 + .../iperf/files/iperf-3.17.1-Unbundle-cJSON.patch | 110 +++++++++++++++++++++ net-misc/iperf/iperf-3.17.1.ebuild | 53 ++++++++++ 3 files changed, 166 insertions(+) create mode 100644 net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch create mode 100644 net-misc/iperf/iperf-3.17.1.ebuild (limited to 'net-misc/iperf') diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 546149149832..1ae8ea0acd61 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -2,14 +2,17 @@ AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737 AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19 AUX iperf-3.10.1-drop-forced-debugging-symbols.patch 4250 BLAKE2B bbad11654523de15816e8b1429a5df99fca6c5b110217896d4554ba54f3d75bc6f9d8487993ba8368d1cc7e385569510727acba86b95251174c0ffe03f6ad115 SHA512 97e8dd9e317c7713d280863f501dc7a056a2c2088cccc9237cec8c4583185161becae692e21253700bce33eadd9aabd69be0deacaf8ac0950456a23501a93f54 AUX iperf-3.12-Unbundle-cJSON.patch 2894 BLAKE2B 74981580ed628224fbbbf19f35c5a7972b066029d45ba8a86b437f7aafda80a6f1bba5696b5a35f210993bd9af0406de1ff168f41ec36f8bfbe2674dd626b34f SHA512 c9f7d8f0286135043e1d686e2936f4765d8b344b57ea3c7b887c94665201904e10119f6f7fed028fef898ae75a25aa9157b26def007515921ec249503fa9d66a +AUX iperf-3.17.1-Unbundle-cJSON.patch 2784 BLAKE2B 67fa2a15bb0970844f062423d4a3448f32cd6644ba92a02d06fcb76dc60a9e62d0948006765de80458b420344b4f380dde4dbf90f296449664c4fbfdd72ad99a SHA512 dfd2ac4cc3d6666887bff8515399ec79a10f350484c340c615f2a1dc22547c3ac64800499b831caf647a50f7eccb4ceb381942a5f7cacd859333c3afbe2661ae AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea DIST iperf-3.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2 DIST iperf-3.16.tar.gz 664751 BLAKE2B 4ca930b58c54d5ae5b0c8b14aca2556224ff2c7b943d32e65486dc2a7e1abd2d26b229e9f759358c326be8754e88a203e11a3ab0f029daa982375a880c3f1cbd SHA512 9ba97e03f17f3b939343b07ed3d508fbf57489e2b984b77a3dc3ada535f981350e56495154bdd108a83b3c507ccbed599b2b7b25de0d1778912d2c01b4ad4e7c +DIST iperf-3.17.1.tar.gz 670547 BLAKE2B 90afa47ba2de2f789b118ea42d7eabe3a7ec202116d51915b05350932231788a95ae142bdf2cff041f5504e67ae5ac1da2c66f408bc302c4e230ef4b7e496e15 SHA512 99c731e2e060d2b241d3137742bf92a975f2b7a94c6c723c9c1625f69c294fd7fe15b7dbf085a6120038fc1dd7628c83d2c7d16b059849fdbecbc88e48fb0974 EBUILD iperf-2.0.14a.ebuild 876 BLAKE2B cd791db9fa5b74ff692cba8cb61caf649aec855a3f80c01d7ce9e3179f95f85ced11a23e81cb43891803c0767d2bd10236bda4d09bbe91368863888f9937f278 SHA512 10d04995d8046b6c0fca3f7b6985909fb54baffc299c0c4f8351b34b89a3534e8e2a482562f00b1cb40ba5e4666d6233f8a982ac4bf57ed1fc65d9e947d88e80 EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7 EBUILD iperf-3.15.ebuild 1141 BLAKE2B 20133db4023bc0efcfd458572e2dc543a4e6db5d3116361f4375e84123a83b492288ed27c3c51f3784be81976f0c4c2db594477c0cbeaa02b4ad514823ee3b64 SHA512 1015cfb39c2a16747561a758d7c7ac7c42c4157902d96f986b9b50344d47fe625a2fa8605a6016780675daaa0aa053c530dac4b478560383e6b21f3dc431e12d EBUILD iperf-3.16.ebuild 1141 BLAKE2B 46f404667f6f2681bcde647201b69c85e72e7decbc01e8d6b50044af007f337dcf9385abfd93ac03b5ce0c0cb7a381191b3389a15979324442876b22d4877058 SHA512 a4be321fb7545c18a03cc0574ce0274a02da891f915669e558e95249d78a4f62e44216ae4cbe509bf0795267b33a4495ac4af30689d7052f2f148c6a3d8ca1de +EBUILD iperf-3.17.1.ebuild 1136 BLAKE2B 3b86b8365fa97418a976449cb76cc117a7c63d94b076245c73e17b14b624520af512f0d2dadb2ea07f9060634045a29ba98539a63824ef85ec0cb31a792b01cc SHA512 4ab38234e09786e5dbc5ce6b43c5bc811ce3801b0683c4bc3cd788b22e60b0f3d0dd952350b3c417bfe705681e56358d1963f72b8a5408f90ddd6749b5293824 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc diff --git a/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch new file mode 100644 index 000000000000..856403ca6b65 --- /dev/null +++ b/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch @@ -0,0 +1,110 @@ +Date: Tue, 30 Jul 2024 21:11:48 +0300 +Subject: [PATCH] Unbundle cJSON + +Signed-off-by: Arthur Zamarin +--- a/configure.ac ++++ b/configure.ac +@@ -61,6 +61,8 @@ AC_ARG_ENABLE([profiling], + AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary])) + AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes]) + ++PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15]) ++ + # Check for the math library (needed by cjson on some platforms) + AC_SEARCH_LIBS(floor, [m], [], [ + echo "floor()" +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -10,8 +10,6 @@ include_HEADERS = iperf_api.h # Define + + # Specify the source files and flags for the iperf library + libiperf_la_SOURCES = \ +- cjson.c \ +- cjson.h \ + flowlabel.h \ + iperf.h \ + iperf_api.c \ +@@ -46,10 +44,13 @@ libiperf_la_SOURCES = \ + units.c \ + units.h \ + version.h ++libiperf_la_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@ ++libiperf_la_LIBADD = @libcjson_LIBS@ + + # Specify the sources and various flags for the iperf binary + iperf3_SOURCES = main.c +-iperf3_LDADD = libiperf.la ++iperf3_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@ ++iperf3_LDADD = libiperf.la @libcjson_LIBS@ + + if ENABLE_PROFILING + # If the iperf-profiled-binary is enabled +--- a/src/iperf.h ++++ b/src/iperf.h +@@ -52,7 +52,7 @@ + + #include "timer.h" + #include "queue.h" +-#include "cjson.h" ++#include + #include "iperf_time.h" + #include "portable_endian.h" + +--- a/src/iperf_api.c ++++ b/src/iperf_api.c +@@ -79,7 +79,7 @@ + #endif /* HAVE_SCTP_H */ + #include "timer.h" + +-#include "cjson.h" ++#include + #include "units.h" + #include "iperf_util.h" + #include "iperf_locale.h" +--- a/src/iperf_tcp.c ++++ b/src/iperf_tcp.c +@@ -42,7 +42,7 @@ + #include "iperf_api.h" + #include "iperf_tcp.h" + #include "net.h" +-#include "cjson.h" ++#include + + #if defined(HAVE_FLOWLABEL) + #include "flowlabel.h" +--- a/src/iperf_udp.c ++++ b/src/iperf_udp.c +@@ -45,7 +45,7 @@ + #include "iperf_udp.h" + #include "timer.h" + #include "net.h" +-#include "cjson.h" ++#include + + /* iperf_udp_recv + * +--- a/src/iperf_util.c ++++ b/src/iperf_util.c +@@ -46,7 +46,7 @@ + #include + #include + +-#include "cjson.h" ++#include + #include "iperf.h" + #include "iperf_api.h" + +--- a/src/iperf_util.h ++++ b/src/iperf_util.h +@@ -28,7 +28,7 @@ + #define __IPERF_UTIL_H + + #include "iperf_config.h" +-#include "cjson.h" ++#include + #include + #include + +-- +2.45.2 + diff --git a/net-misc/iperf/iperf-3.17.1.ebuild b/net-misc/iperf/iperf-3.17.1.ebuild new file mode 100644 index 000000000000..999cff75ed27 --- /dev/null +++ b/net-misc/iperf/iperf-3.17.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" +HOMEPAGE="https://github.com/esnet/iperf" +SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="sctp" + +DEPEND=" + >=dev-libs/cJSON-1.7.15 + dev-libs/openssl:= + sctp? ( net-misc/lksctp-tools ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( README.md RELNOTES.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch + "${FILESDIR}"/${PN}-3.17.1-Unbundle-cJSON.patch +) + +src_prepare() { + default + + # Drop bundled cjson + rm src/cjson.{c,h} || die + + eautoreconf +} + +src_configure() { + econf $(use_with sctp) +} + +src_install() { + default + + newconfd "${FILESDIR}"/iperf.confd iperf3 + newinitd "${FILESDIR}"/iperf3.initd iperf3 + systemd_dounit contrib/iperf3.service + + find "${ED}" -name '*.la' -type f -delete || die +} -- cgit v1.2.3