From 0dbcfff6b9b0768d5057430adb47f78eebdf11eb Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz Date: Wed, 8 Mar 2023 16:15:51 +0100 Subject: [PATCH] iperf3: update to 3.1.3, switch to 64 bit and drop static library --- components/sysutils/iperf3/Makefile | 23 +- components/sysutils/iperf3/iperf.license | 269 --------------------- components/sysutils/iperf3/iperf3.p5m | 10 +- .../sysutils/iperf3/manifests/sample-manifest.p5m | 10 +- components/sysutils/iperf3/pkg5 | 4 +- 5 files changed, 23 insertions(+), 293 deletions(-) delete mode 100644 components/sysutils/iperf3/iperf.license diff --git a/components/sysutils/iperf3/Makefile b/components/sysutils/iperf3/Makefile index df59eefab9..b40e74f4dc 100644 --- a/components/sysutils/iperf3/Makefile +++ b/components/sysutils/iperf3/Makefile @@ -27,29 +27,26 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= iperf -COMPONENT_VERSION= 3.1.2 +COMPONENT_VERSION= 3.1.3 COMPONENT_SUMMARY= iperf - tool for measuring maximum TCP and UDP bandwidth performance COMPONENT_PROJECT_URL= https://iperf.fr -COMPONENT_FMRI= benchmark/iperf3 -COMPONENT_CLASSIFICATION= Applications/System Utilities COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_URL= https://iperf.fr/download/source/iperf-$(COMPONENT_VERSION)-source.tar.gz -COMPONENT_ARCHIVE_HASH= sha256:48b5c783bb4a9c44f2bdcfe52c5d45b77ab1e1c82de3d0131f692457950811f9 +COMPONENT_ARCHIVE_HASH= sha256:e34cf60cffc80aa1322d2c3a9b81e662c2576d2b03e53ddf1079615634e6f553 +COMPONENT_FMRI= benchmark/iperf3 +COMPONENT_CLASSIFICATION= Applications/System Utilities COMPONENT_LICENSE= BSD-like -COMPONENT_LICENSE_FILE= $(COMPONENT_NAME).license +COMPONENT_LICENSE_FILE= LICENSE -include $(WS_MAKE_RULES)/prep.mk -include $(WS_MAKE_RULES)/configure.mk -include $(WS_MAKE_RULES)/ips.mk +TEST_TARGET= $(NO_TESTS) +include $(WS_MAKE_RULES)/common.mk COMPONENT_PRE_CONFIGURE_ACTION = \ ($(CLONEY) $(SOURCE_DIR) $(@D)) -build: $(BUILD_32) - -install: $(INSTALL_32) - -test: $(NO_TESTS) +CONFIGURE_OPTIONS += --enable-static=no +# Auto-generated dependencies REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff --git a/components/sysutils/iperf3/iperf.license b/components/sysutils/iperf3/iperf.license deleted file mode 100644 index 61b874784a..0000000000 --- a/components/sysutils/iperf3/iperf.license +++ /dev/null @@ -1,269 +0,0 @@ -"iperf, Copyright (c) 2014-2016, The Regents of the University of California, -through Lawrence Berkeley National Laboratory (subject to receipt of any -required approvals from the U.S. Dept. of Energy). All rights reserved." - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -(1) Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -(2) Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/ -or other materials provided with the distribution. - -(3) Neither the name of the University of California, Lawrence Berkeley -National Laboratory, U.S. Dept. of Energy nor the names of its contributors may -be used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -You are under no obligation whatsoever to provide any bug fixes, patches, or -upgrades to the features, functionality or performance of the source code -("Enhancements") to anyone; however, if you choose to make your Enhancements -available either publicly, or directly to Lawrence Berkeley National -Laboratory, without imposing a separate written license agreement for such -Enhancements, then you hereby grant the following license: a non-exclusive, -royalty-free perpetual license to install, use, modify, prepare derivative -works, incorporate into other computer software, distribute, and sublicense -such enhancements or derivative works thereof, in binary and source code form. - -===== - -This software contains source code (src/cjson.{c,h}) that is: - - Copyright (c) 2009 Dave Gamble - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -===== - -This software contains source code (src/net.{c,h}) that is: - - This software was developed as part of a project at MIT. - - Copyright (c) 2005-2007 Russ Cox, - Massachusetts Institute of Technology - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - === - - Contains parts of an earlier library that has: - - /* - * The authors of this software are Rob Pike, Sape Mullender, and Russ Cox - * Copyright (c) 2003 by Lucent Technologies. - * Permission to use, copy, modify, and distribute this software for any - * purpose without fee is hereby granted, provided that this entire notice - * is included in all copies of any software which is or includes a copy - * or modification of this software and in all copies of the supporting - * documentation for such software. - * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY - * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY - * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. - */ - -===== - -This software contains source code (src/queue.h) that is: - - /* - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 - */ - -===== - -This software contains source code (src/tcp_window_size.{c,h}) that is: - - /*--------------------------------------------------------------- - * Copyright (c) 1999,2000,2001,2002,2003 - * The Board of Trustees of the University of Illinois - * All Rights Reserved. - *--------------------------------------------------------------- - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software (Iperf) and associated - * documentation files (the "Software"), to deal in the Software - * without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, - * sublicense, and/or sell copies of the Software, and to permit - * persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and - * the following disclaimers. - * - * - * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials - * provided with the distribution. - * - * - * Neither the names of the University of Illinois, NCSA, - * nor the names of its contributors may be used to endorse - * or promote products derived from this Software without - * specific prior written permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * ________________________________________________________________ - * National Laboratory for Applied Network Research - * National Center for Supercomputing Applications - * University of Illinois at Urbana-Champaign - * http://www.ncsa.uiuc.edu - * ________________________________________________________________ - * - * tcp_window_size.c - * by Mark Gates - * ------------------------------------------------------------------- - * set/getsockopt - * ------------------------------------------------------------------- */ - -===== - -This software contains source code (src/units.{c.h}) that is: - - /*--------------------------------------------------------------- - * Copyright (c) 1999,2000,2001,2002,2003 - * The Board of Trustees of the University of Illinois - * All Rights Reserved. - *--------------------------------------------------------------- - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software (Iperf) and associated - * documentation files (the "Software"), to deal in the Software - * without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, - * sublicense, and/or sell copies of the Software, and to permit - * persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * - * Redistributions of source code must retain the above - * copyright notice, this list of conditions and - * the following disclaimers. - * - * - * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimers in the documentation and/or other materials - * provided with the distribution. - * - * - * Neither the names of the University of Illinois, NCSA, - * nor the names of its contributors may be used to endorse - * or promote products derived from this Software without - * specific prior written permission. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * ________________________________________________________________ - * National Laboratory for Applied Network Research - * National Center for Supercomputing Applications - * University of Illinois at Urbana-Champaign - * http://www.ncsa.uiuc.edu - * ________________________________________________________________ - * - * stdio.c - * by Mark Gates - * and Ajay Tirumalla - * ------------------------------------------------------------------- - * input and output numbers, converting with kilo, mega, giga - * ------------------------------------------------------------------- */ - -===== - -This software contains source code (src/portable_endian.h) that is: - -// "License": Public Domain -// I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like. - -===== - - - diff --git a/components/sysutils/iperf3/iperf3.p5m b/components/sysutils/iperf3/iperf3.p5m index d4d8193602..59e0996f77 100644 --- a/components/sysutils/iperf3/iperf3.p5m +++ b/components/sysutils/iperf3/iperf3.p5m @@ -10,10 +10,11 @@ # # -# Copyright 2016 Adam Stevko +# Copyright 2023 Andreas Wacknitz # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) @@ -24,9 +25,8 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/bin/iperf3 file path=usr/include/iperf_api.h -file path=usr/lib/libiperf.a -link path=usr/lib/libiperf.so target=libiperf.so.0.0.0 -link path=usr/lib/libiperf.so.0 target=libiperf.so.0.0.0 -file path=usr/lib/libiperf.so.0.0.0 +link path=usr/lib/$(MACH64)/libiperf.so target=libiperf.so.0.0.0 +link path=usr/lib/$(MACH64)/libiperf.so.0 target=libiperf.so.0.0.0 +file path=usr/lib/$(MACH64)/libiperf.so.0.0.0 file path=usr/share/man/man1/iperf3.1 file path=usr/share/man/man3/libiperf.3 diff --git a/components/sysutils/iperf3/manifests/sample-manifest.p5m b/components/sysutils/iperf3/manifests/sample-manifest.p5m index 97e2a41ba1..c811432aec 100644 --- a/components/sysutils/iperf3/manifests/sample-manifest.p5m +++ b/components/sysutils/iperf3/manifests/sample-manifest.p5m @@ -10,10 +10,11 @@ # # -# Copyright 2016 +# Copyright 2023 # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) @@ -24,9 +25,8 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/bin/iperf3 file path=usr/include/iperf_api.h -file path=usr/lib/libiperf.a -link path=usr/lib/libiperf.so target=libiperf.so.0.0.0 -link path=usr/lib/libiperf.so.0 target=libiperf.so.0.0.0 -file path=usr/lib/libiperf.so.0.0.0 +link path=usr/lib/$(MACH64)/libiperf.so target=libiperf.so.0.0.0 +link path=usr/lib/$(MACH64)/libiperf.so.0 target=libiperf.so.0.0.0 +file path=usr/lib/$(MACH64)/libiperf.so.0.0.0 file path=usr/share/man/man1/iperf3.1 file path=usr/share/man/man3/libiperf.3 diff --git a/components/sysutils/iperf3/pkg5 b/components/sysutils/iperf3/pkg5 index e8f02c4edb..e783e7ceb8 100644 --- a/components/sysutils/iperf3/pkg5 +++ b/components/sysutils/iperf3/pkg5 @@ -1,7 +1,9 @@ { "dependencies": [ "SUNWcs", - "system/library" + "shell/ksh93", + "system/library", + "system/library/math" ], "fmris": [ "benchmark/iperf3" -- 2.11.4.GIT