From e643e033ee1f4f25825582ebf72c7168eb1a19dd Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Wed, 6 Dec 2023 16:54:13 +0100 Subject: [PATCH 01/17] New release hipercontracer-1.6.10. --- CMakeLists.txt | 2 +- ChangeLog | 12 ++++++++++++ debian/changelog | 6 ++++++ freebsd/hipercontracer/Makefile | 2 +- rpm/hipercontracer.spec | 4 +++- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dad707f..1741303c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ PROJECT(hipercontracer LANGUAGES C CXX) SET(BUILD_MAJOR "1") SET(BUILD_MINOR "6") -SET(BUILD_PATCH "9") +SET(BUILD_PATCH "10") SET(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_PATCH}) SET(CMAKE_CXX_STANDARD 14) diff --git a/ChangeLog b/ChangeLog index 0322e3db..de4683d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +commit f8c82974d305b4c1c9fb8ded8c8076cebf43d826 +Author: Thomas Dreibholz +Date: Sat Nov 11 17:51:23 2023 +0100 + + Workflows update. + +commit 2e495459e16f2937232127f610702203675f574d +Author: Thomas Dreibholz +Date: Thu Sep 21 17:13:34 2023 +0200 + + New release hipercontracer-1.6.9. + commit ad7d5f20f6da74930cbde48ce473d6f06d83bf54 Author: Thomas Dreibholz Date: Thu Sep 21 16:24:23 2023 +0200 diff --git a/debian/changelog b/debian/changelog index a83ad393..b3609753 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hipercontracer (1.6.10-1ubuntu1) jammy; urgency=medium + + * New upstream release. + + -- Thomas Dreibholz Wed, 06 Dec 2023 16:54:11 +0100 + hipercontracer (1.6.9-1ubuntu1) jammy; urgency=medium * New upstream release. diff --git a/freebsd/hipercontracer/Makefile b/freebsd/hipercontracer/Makefile index 3b9a0834..7d149ad7 100644 --- a/freebsd/hipercontracer/Makefile +++ b/freebsd/hipercontracer/Makefile @@ -1,7 +1,7 @@ # Created by: Thomas Dreibholz PORTNAME= hipercontracer -PORTVERSION= 1.6.9 +PORTVERSION= 1.6.10 CATEGORIES= benchmarks MASTER_SITES= https://www.nntb.no/~dreibh/hipercontracer/download/ diff --git a/rpm/hipercontracer.spec b/rpm/hipercontracer.spec index 51b4e2f7..bc3f21f8 100644 --- a/rpm/hipercontracer.spec +++ b/rpm/hipercontracer.spec @@ -1,5 +1,5 @@ Name: hipercontracer -Version: 1.6.9 +Version: 1.6.10 Release: 1 Summary: High-Performance Connectivity Tracer (HiPerConTracer) Group: Applications/Internet @@ -144,6 +144,8 @@ This tool triggers HiPerConTracer by incoming "Ping" packets. %changelog +* Wed Dec 06 2023 Thomas Dreibholz - 1.6.10 +- New upstream release. * Thu Sep 21 2023 Thomas Dreibholz - 1.6.9 - New upstream release. * Tue Apr 18 2023 Thomas Dreibholz - 1.6.8 From d80b03ff47643855288614b608056bb5377a55aa Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Wed, 6 Dec 2023 17:01:29 +0100 Subject: [PATCH 02/17] Updated LSM entry. --- hipercontracer.lsm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hipercontracer.lsm b/hipercontracer.lsm index 060d787b..f1458cee 100644 --- a/hipercontracer.lsm +++ b/hipercontracer.lsm @@ -1,7 +1,7 @@ Begin4 Title: hipercontracer -Version: 1.6.5 -Entered-date: 2022-02-16 +Version: 1.6.10 +Entered-date: 2023-12-06 Description: High-Performance Connectivity Tracer (HiPerConTracer) is a ping/traceroute service. It performs regular ping and traceroute runs among sites and can export the results into @@ -10,7 +10,7 @@ Keywords: Ping, Traceroute, Connectivity, Measurements Author: thomas.dreibholz@gmail.com (Thomas Dreibholz) Maintained-by: thomas.dreibholz@gmail.com (Thomas Dreibholz) Primary-site: https://www.nntb.no/~dreibh/hipercontracer - 175 kB download/hipercontracer-1.6.5.tar.xz + 177 kB download/hipercontracer-1.6.10.tar.xz Original-site: https://www.nntb.no/~dreibh/hipercontracer Platforms: Linux Copying-policy: GPL-3+ From a924d4ed89adbf9be74688b7c07d6d605c87f31c Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Thu, 7 Dec 2023 10:20:16 +0100 Subject: [PATCH 03/17] Updated packaging configuration. --- packaging.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging.conf b/packaging.conf index 511b7131..4507c0dc 100644 --- a/packaging.conf +++ b/packaging.conf @@ -2,7 +2,7 @@ # --------------------------------------------------------- MAKE_DIST="cmake -DCMAKE_INSTALL_PREFIX=/usr . && make dist" -NOT_TARGET_DISTRIBUTIONS="lucid precise trusty" # <<-- Distrubutions which are *not* supported! +NOT_TARGET_DISTRIBUTIONS="lucid precise trusty xenial" # <<-- Distrubutions which are *not* supported! MAINTAINER="Thomas Dreibholz " MAINTAINER_KEY="21412672518D8B2D1862EFEF5CD5D12AA0877B49" DEBIAN_LAST_ENTRY="FIRST" From 83fad1911822dd84b5357e0b0647c08e5162016e Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Thu, 7 Dec 2023 11:51:40 +0100 Subject: [PATCH 04/17] Updated LSM entry. --- hipercontracer.lsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hipercontracer.lsm b/hipercontracer.lsm index f1458cee..1b4eed89 100644 --- a/hipercontracer.lsm +++ b/hipercontracer.lsm @@ -1,7 +1,7 @@ Begin4 Title: hipercontracer Version: 1.6.10 -Entered-date: 2023-12-06 +Entered-date: 2023-12-07 Description: High-Performance Connectivity Tracer (HiPerConTracer) is a ping/traceroute service. It performs regular ping and traceroute runs among sites and can export the results into From 2aee73985f932d0210fdb239c9770c66033b1cef Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Thu, 7 Dec 2023 12:31:20 +0100 Subject: [PATCH 05/17] Updated build scripts --- build-deb | 2 +- build-rpm | 2 +- clean-deb | 2 +- fetch-debian-changelog | 2 +- filter-debian-changelog | 2 +- make-deb | 2 +- make-ppa | 4 ++-- make-srpm | 2 +- make-upstream-package | 2 +- merge-debian-changelogs | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-deb b/build-deb index 13d73b08..dec2ce71 100755 --- a/build-deb +++ b/build-deb @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Debian/Ubuntu Packaging Scripts -# Copyright (C) 2002-2023 by Thomas Dreibholz +# Copyright (C) 2002-2024 by Thomas Dreibholz # # 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 diff --git a/build-rpm b/build-rpm index 3170acee..19ac7dcb 100755 --- a/build-rpm +++ b/build-rpm @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Packaging Scripts -# Copyright (C) 2017-2023 by Thomas Dreibholz +# Copyright (C) 2017-2024 by Thomas Dreibholz # # 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 diff --git a/clean-deb b/clean-deb index 47997d13..defcd758 100755 --- a/clean-deb +++ b/clean-deb @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Debian/Ubuntu Packaging Scripts -# Copyright (C) 2002-2023 by Thomas Dreibholz +# Copyright (C) 2002-2024 by Thomas Dreibholz # # 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 diff --git a/fetch-debian-changelog b/fetch-debian-changelog index 4d84f09b..c202ffb4 100755 --- a/fetch-debian-changelog +++ b/fetch-debian-changelog @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Packaging Scripts -# Copyright (C) 2021-2023 by Thomas Dreibholz +# Copyright (C) 2021-2024 by Thomas Dreibholz # # 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 diff --git a/filter-debian-changelog b/filter-debian-changelog index 6542eb7e..88ecd1e8 100755 --- a/filter-debian-changelog +++ b/filter-debian-changelog @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Debian/Ubuntu Packaging Scripts -# Copyright (C) 2002-2023 by Thomas Dreibholz +# Copyright (C) 2002-2024 by Thomas Dreibholz # # 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 diff --git a/make-deb b/make-deb index 8b741209..3566af57 100755 --- a/make-deb +++ b/make-deb @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Debian/Ubuntu Packaging Scripts -# Copyright (C) 2002-2023 by Thomas Dreibholz +# Copyright (C) 2002-2024 by Thomas Dreibholz # # 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 diff --git a/make-ppa b/make-ppa index 13eb22fa..bd9a93f7 100755 --- a/make-ppa +++ b/make-ppa @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Packaging Scripts -# Copyright (C) 2002-2023 by Thomas Dreibholz +# Copyright (C) 2002-2024 by Thomas Dreibholz # # 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 @@ -25,7 +25,7 @@ COPR=0 DPUT=0 # NOTE: These are the supported distributions by Ubuntu Launchpad and Debian: -DPUT_DISTRIBUTIONS="precise trusty xenial bionic focal jammy lunar mantic unstable" +DPUT_DISTRIBUTIONS="precise trusty xenial bionic focal jammy lunar mantic noble unstable" while [ $# -gt 0 ] ; do if [ "$1" == "dput" ] ; then diff --git a/make-srpm b/make-srpm index f4505075..3e80c015 100755 --- a/make-srpm +++ b/make-srpm @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Packaging Scripts -# Copyright (C) 2017-2023 by Thomas Dreibholz +# Copyright (C) 2017-2024 by Thomas Dreibholz # # 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 diff --git a/make-upstream-package b/make-upstream-package index 8fa5893b..56df24fa 100755 --- a/make-upstream-package +++ b/make-upstream-package @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Packaging Scripts -# Copyright (C) 2017-2023 by Thomas Dreibholz +# Copyright (C) 2017-2024 by Thomas Dreibholz # # 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 diff --git a/merge-debian-changelogs b/merge-debian-changelogs index be282031..c7f33343 100755 --- a/merge-debian-changelogs +++ b/merge-debian-changelogs @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Packaging Scripts -# Copyright (C) 2021-2023 by Thomas Dreibholz +# Copyright (C) 2021-2024 by Thomas Dreibholz # # 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 From 329ab5fd0cb6bf6cbdc70440db2cc4572f516d27 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Thu, 7 Dec 2023 12:31:22 +0100 Subject: [PATCH 06/17] Updated CI scripts --- ci/ci-build | 2 +- ci/ci-install | 2 +- ci/ci-setup | 2 +- ci/ci-test | 2 +- ci/get-dependencies | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/ci-build b/ci/ci-build index 5882333c..0e18d61f 100755 --- a/ci/ci-build +++ b/ci/ci-build @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2023 by Thomas Dreibholz +# Copyright (C) 2021-2024 by Thomas Dreibholz # # 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 diff --git a/ci/ci-install b/ci/ci-install index 533ef5b6..8e92f65d 100755 --- a/ci/ci-install +++ b/ci/ci-install @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2023 by Thomas Dreibholz +# Copyright (C) 2021-2024 by Thomas Dreibholz # # 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 diff --git a/ci/ci-setup b/ci/ci-setup index 56df8703..4e0a9637 100755 --- a/ci/ci-setup +++ b/ci/ci-setup @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2023 by Thomas Dreibholz +# Copyright (C) 2021-2024 by Thomas Dreibholz # # 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 diff --git a/ci/ci-test b/ci/ci-test index dbea62c9..914f7a3b 100755 --- a/ci/ci-test +++ b/ci/ci-test @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2023 by Thomas Dreibholz +# Copyright (C) 2021-2024 by Thomas Dreibholz # # 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 diff --git a/ci/get-dependencies b/ci/get-dependencies index f8f6d740..3edde450 100755 --- a/ci/get-dependencies +++ b/ci/get-dependencies @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Travis CI Scripts -# Copyright (C) 2018-2023 by Thomas Dreibholz +# Copyright (C) 2018-2024 by Thomas Dreibholz # # 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 From 599812f81a8b86269feefcf13b7079f1ec8a5db2 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Thu, 7 Dec 2023 12:32:38 +0100 Subject: [PATCH 07/17] Improved FreeBSD test script. --- freebsd/hipercontracer/test-packaging | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/freebsd/hipercontracer/test-packaging b/freebsd/hipercontracer/test-packaging index 1b88ed4a..205adcbc 100755 --- a/freebsd/hipercontracer/test-packaging +++ b/freebsd/hipercontracer/test-packaging @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Free Packaging Test Script -# Copyright (C) 2010-2022 by Thomas Dreibholz +# Copyright (C) 2010-2024 by Thomas Dreibholz # # 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 @@ -53,22 +53,19 @@ make package && \ echo "4. ###### make deinstall ##############################################" && \ make deinstall && \ echo "5. ###### pkg add #####################################################" && \ -if [ ! -e "work/pkg/${PACKAGE}-${PACKAGE_VERSION}.txz" ] ; then - echo >&2 "ERROR: Package work/pkg/${PACKAGE}-${PACKAGE_VERSION}.txz not found!" +if [ ! -e "/usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg" ] ; then + echo >&2 "ERROR: Package /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg not found!" exit 1 -else - mkdir -p /usr/ports/packages/All - cp work/pkg/${PACKAGE}-${PACKAGE_VERSION}.txz /usr/ports/packages/All -fi -pkg add /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.txz && \ +fi && \ +pkg add /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg && \ echo "6. ###### make deinstall ##############################################" && \ make deinstall && \ echo "7. ###### make reinstall ##############################################" && \ make reinstall && \ echo "8. ###### make package ################################################" && \ make package && \ -echo "9. ###### tar tzvf *.txz ##############################################" && \ -tar tzvf /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.txz && \ +echo "9. ###### tar tzvf *.pkg ##############################################" && \ +tar tzvf /usr/ports/packages/All/${PACKAGE}-${PACKAGE_VERSION}.pkg && \ echo "Running portlint ..." && \ portlint && \ echo "====== Successfully completed! ======" From 5c180db64fbffb2a4e160d00b7da470ab5463c2e Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Thu, 7 Dec 2023 12:46:55 +0100 Subject: [PATCH 08/17] FreeBSD packaging update. --- freebsd/hipercontracer/Makefile | 3 ++- freebsd/hipercontracer/distinfo | 6 +++--- freebsd/hipercontracer/pkg-descr | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/freebsd/hipercontracer/Makefile b/freebsd/hipercontracer/Makefile index 7d149ad7..49a2c5d5 100644 --- a/freebsd/hipercontracer/Makefile +++ b/freebsd/hipercontracer/Makefile @@ -7,6 +7,7 @@ MASTER_SITES= https://www.nntb.no/~dreibh/hipercontracer/download/ MAINTAINER= thomas.dreibholz@gmail.com COMMENT= High-Performance Connectivity Tracer (HiPerConTracer) +WWW= https://www.nntb.no/~dreibh/hipercontracer/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING @@ -19,7 +20,7 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs -USES= cmake compiler:c++14-lang python shebangfix tar:xz +USES= cmake compiler:c++14-lang python:3.9+ shebangfix tar:xz USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} diff --git a/freebsd/hipercontracer/distinfo b/freebsd/hipercontracer/distinfo index 7980a627..21ac9dde 100644 --- a/freebsd/hipercontracer/distinfo +++ b/freebsd/hipercontracer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620046418 -SHA256 (hipercontracer-1.6.0.tar.xz) = f424a3cb31f2dbdf7d01a495934fa89c9ea1dc1f635bc3a1f35f7adde2020dcf -SIZE (hipercontracer-1.6.0.tar.xz) = 178508 +TIMESTAMP = 1701949463 +SHA256 (hipercontracer-1.6.10.tar.xz) = 5af4497a1fe78b93050673a5a519be1d98e1e2c59532407193717b863b94f564 +SIZE (hipercontracer-1.6.10.tar.xz) = 181536 diff --git a/freebsd/hipercontracer/pkg-descr b/freebsd/hipercontracer/pkg-descr index 001dd187..08787649 100644 --- a/freebsd/hipercontracer/pkg-descr +++ b/freebsd/hipercontracer/pkg-descr @@ -2,5 +2,3 @@ High-Performance Connectivity Tracer (HiPerConTracer) is a ping/traceroute service. It performs regular ping and traceroute runs among sites and can export the results into an SQL database. - -WWW: https://www.nntb.no/~dreibh/hipercontracer/ From 69f35563f25c40ef5237ff99bc94fc67a36d722d Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Thu, 7 Dec 2023 13:24:58 +0100 Subject: [PATCH 09/17] Packaging fix. --- freebsd/hipercontracer/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/freebsd/hipercontracer/Makefile b/freebsd/hipercontracer/Makefile index 49a2c5d5..b49d5092 100644 --- a/freebsd/hipercontracer/Makefile +++ b/freebsd/hipercontracer/Makefile @@ -23,8 +23,9 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ USES= cmake compiler:c++14-lang python:3.9+ shebangfix tar:xz USE_LDCONFIG= yes -PLIST_SUB= PORTVERSION=${PORTVERSION} -CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man SHEBANG_FILES= src/addressinfogenerator src/get-default-ips src/tracedataimporter +CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man +PLIST_SUB= PORTVERSION=${PORTVERSION} + .include From 13e8d510fa797588bfd40238960228771660f7d3 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Mon, 18 Dec 2023 10:06:46 +0100 Subject: [PATCH 10/17] Updated FreeBSD packaging. --- freebsd/hipercontracer/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/freebsd/hipercontracer/Makefile b/freebsd/hipercontracer/Makefile index b49d5092..6d90b9d6 100644 --- a/freebsd/hipercontracer/Makefile +++ b/freebsd/hipercontracer/Makefile @@ -1,5 +1,3 @@ -# Created by: Thomas Dreibholz - PORTNAME= hipercontracer PORTVERSION= 1.6.10 CATEGORIES= benchmarks From 933585eac640d1592057fc9c46a73bfac652e8d4 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Mon, 18 Dec 2023 11:43:04 +0100 Subject: [PATCH 11/17] Updated FreeBSD packaging. --- freebsd/hipercontracer/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/freebsd/hipercontracer/Makefile b/freebsd/hipercontracer/Makefile index 6d90b9d6..8ee3fad7 100644 --- a/freebsd/hipercontracer/Makefile +++ b/freebsd/hipercontracer/Makefile @@ -1,5 +1,6 @@ PORTNAME= hipercontracer PORTVERSION= 1.6.10 +PORTREVISION= 1 CATEGORIES= benchmarks MASTER_SITES= https://www.nntb.no/~dreibh/hipercontracer/download/ @@ -10,20 +11,14 @@ WWW= https://www.nntb.no/~dreibh/hipercontracer/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ - libboost_filesystem.so:devel/boost-libs \ - libboost_iostreams.so:devel/boost-libs \ - libboost_log.so:devel/boost-libs \ - libboost_program_options.so:devel/boost-libs \ - libboost_system.so:devel/boost-libs \ - libboost_thread.so:devel/boost-libs +LIB_DEPENDS= libboost_atomic.so:devel/boost-libs -USES= cmake compiler:c++14-lang python:3.9+ shebangfix tar:xz +USES= cmake compiler:c++14-lang python shebangfix tar:xz USE_LDCONFIG= yes SHEBANG_FILES= src/addressinfogenerator src/get-default-ips src/tracedataimporter -CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man +CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:PATH=${PREFIX}/man PLIST_SUB= PORTVERSION=${PORTVERSION} .include From 9ef53ee324508aba2108b8c81f5df2f55d99b231 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Sat, 10 Feb 2024 13:11:38 +0100 Subject: [PATCH 12/17] Updated FreeBSD packaging files. --- freebsd/hipercontracer/Makefile | 1 - freebsd/hipercontracer/pkg-plist | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/freebsd/hipercontracer/Makefile b/freebsd/hipercontracer/Makefile index 8ee3fad7..6b2b45d8 100644 --- a/freebsd/hipercontracer/Makefile +++ b/freebsd/hipercontracer/Makefile @@ -18,7 +18,6 @@ USE_LDCONFIG= yes SHEBANG_FILES= src/addressinfogenerator src/get-default-ips src/tracedataimporter -CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:PATH=${PREFIX}/man PLIST_SUB= PORTVERSION=${PORTVERSION} .include diff --git a/freebsd/hipercontracer/pkg-plist b/freebsd/hipercontracer/pkg-plist index 7b0f844e..9219328c 100644 --- a/freebsd/hipercontracer/pkg-plist +++ b/freebsd/hipercontracer/pkg-plist @@ -15,11 +15,11 @@ lib/libhipercontracer.a lib/libhipercontracer.so lib/libhipercontracer.so.1 lib/libhipercontracer.so.%%PORTVERSION%% -man/man1/addressinfogenerator.1.gz -man/man1/get-default-ips.1.gz -man/man1/hipercontracer.1.gz -man/man1/hpcttrigger.1.gz -man/man1/tracedataimporter.1.gz +share/man/man1/addressinfogenerator.1.gz +share/man/man1/get-default-ips.1.gz +share/man/man1/hipercontracer.1.gz +share/man/man1/hpcttrigger.1.gz +share/man/man1/tracedataimporter.1.gz %%DOCSDIR%%/examples/NoSQL/R-query-example.R %%DOCSDIR%%/examples/NoSQL/README %%DOCSDIR%%/examples/NoSQL/admin.ms From 12c3d7a01d9ff18bf9c67c62d88f6550c35062f9 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Mon, 26 Feb 2024 13:07:47 +0100 Subject: [PATCH 13/17] Fix for handling link-local IPv6 addresses with scope. --- src/tracedataimporter | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tracedataimporter b/src/tracedataimporter index 09498502..68e47ced 100755 --- a/src/tracedataimporter +++ b/src/tracedataimporter @@ -33,6 +33,7 @@ # Contact: dreibh@simula.no import os +import re import sys import io import datetime @@ -93,8 +94,8 @@ def processInput(inputFile, outputType): elif inputType != IT_PING: raise Exception('Multiple input types in the same file?!') - sourceIP = ip_address(tuples[1]) - destinationIP = ip_address(tuples[2]) + sourceIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[1])) + destinationIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[2])) timeStamp = int(tuples[3], 16) checksum = int(tuples[4], 16) status = int(tuples[5]) @@ -149,8 +150,8 @@ def processInput(inputFile, outputType): elif inputType != IT_TRACEROUTE: raise Exception('Multiple input types in the same file?!') - sourceIP = ip_address(tuples[1]) - destinationIP = ip_address(tuples[2]) + sourceIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[1])) + destinationIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[2])) timeStamp = int(tuples[3], 16) roundNumber = int(tuples[4]) checksum = int(tuples[5], 16) @@ -204,7 +205,7 @@ def processInput(inputFile, outputType): hopNumber = int(tuples[1]) status = int(tuples[2], 16) rtt = int(tuples[3]) - hopIP = ip_address(tuples[4]) + hopIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[4])) assert hopNumber <= totalHops assert ('0x' + tuples[2]) == hex(status) From e1f3de3bfa79a670a79889c05c383ca6638859d5 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Mon, 26 Feb 2024 13:15:18 +0100 Subject: [PATCH 14/17] Improved regex. --- src/tracedataimporter | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tracedataimporter b/src/tracedataimporter index 68e47ced..6fd923cd 100755 --- a/src/tracedataimporter +++ b/src/tracedataimporter @@ -94,8 +94,8 @@ def processInput(inputFile, outputType): elif inputType != IT_PING: raise Exception('Multiple input types in the same file?!') - sourceIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[1])) - destinationIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[2])) + sourceIP = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[1])) + destinationIP = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[2])) timeStamp = int(tuples[3], 16) checksum = int(tuples[4], 16) status = int(tuples[5]) @@ -150,8 +150,8 @@ def processInput(inputFile, outputType): elif inputType != IT_TRACEROUTE: raise Exception('Multiple input types in the same file?!') - sourceIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[1])) - destinationIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[2])) + sourceIP = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[1])) + destinationIP = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[2])) timeStamp = int(tuples[3], 16) roundNumber = int(tuples[4]) checksum = int(tuples[5], 16) @@ -205,7 +205,7 @@ def processInput(inputFile, outputType): hopNumber = int(tuples[1]) status = int(tuples[2], 16) rtt = int(tuples[3]) - hopIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[4])) + hopIP = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[4])) assert hopNumber <= totalHops assert ('0x' + tuples[2]) == hex(status) From 1b7833a98b1fe953b16fb1c3804cdff9372c2233 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Wed, 18 Sep 2024 14:32:19 +0200 Subject: [PATCH 15/17] GitHub Workflows update. --- .github/workflows/linux.yml | 18 +++++++----------- .github/workflows/multiarch.yml | 16 ++++++++-------- .github/workflows/packaging.yml | 1 + 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3bcb5f89..d520330c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -33,6 +33,10 @@ jobs: include: # ====== Ubuntu Linux ============================================= + - label: "Ubuntu 24.04 (Noble Numbat) with GCC" + image: ubuntu:24.04 + cc: gcc + cxx: g++ - label: "Ubuntu 22.04 (Jammy Jellyfish) with GCC" image: ubuntu:22.04 cc: gcc @@ -41,10 +45,6 @@ jobs: image: ubuntu:20.04 cc: gcc cxx: g++ - - label: "Ubuntu 18.04 (Bionic Beaver) with GCC" - image: ubuntu:18.04 - cc: gcc - cxx: g++ # ====== Debian Linux ============================================= - label: "Debian 12 (Bookworm) with GCC" @@ -61,12 +61,8 @@ jobs: cxx: g++ # ====== Fedora Linux ============================================= - - label: "Fedora 39 with Clang" - image: fedora:35 - cc: clang - cxx: clang++ - - label: "Fedora 38 with Clang" - image: fedora:34 + - label: "Fedora 40 with Clang" + image: fedora:40 cc: clang cxx: clang++ @@ -78,7 +74,7 @@ jobs: image: ${{ matrix.image }} steps: # NOTE: actions/checkout@v4 does not work for old Ubuntu 18.04! - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build shell: bash run: | diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml index 305a6f0d..cc7d571e 100644 --- a/.github/workflows/multiarch.yml +++ b/.github/workflows/multiarch.yml @@ -33,19 +33,19 @@ jobs: include: # ====== Ubuntu Linux ============================================= - - label: "Ubuntu 22.04 (Focal Fossa): Clang/ARMv8" + - label: "Ubuntu 24.04 (Focal Fossa): Clang/ARMv8" arch: aarch64 - distro: ubuntu22.04 + distro: ubuntu24.04 cc: clang cxx: clang++ - - label: "Ubuntu 22.04 (Focal Fossa): GCC/S390x" + - label: "Ubuntu 24.04 (Focal Fossa): GCC/S390x" arch: s390x - distro: ubuntu22.04 + distro: ubuntu24.04 cc: gcc cxx: g++ - - label: "Ubuntu 22.04 (Focal Fossa): GCC/RISC-V" + - label: "Ubuntu 24.04 (Focal Fossa): GCC/RISC-V" arch: riscv64 - distro: ubuntu22.04 + distro: ubuntu24.04 cc: gcc cxx: g++ @@ -62,9 +62,9 @@ jobs: cxx: clang++ # ====== Fedora Linux ============================================= - - label: "Fedora 39: GCC/PPC64" + - label: "Fedora 40: GCC/PPC64" arch: ppc64le - distro: fedora39 + distro: fedora40 cc: gcc cxx: g++ diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index fdfe441e..35087953 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -23,6 +23,7 @@ on: branches: - master - dreibh/github-actions + - dreibh/udpping jobs: # ====== Ubuntu Linux ===================================================== From 34df0f50e88d1c08025b500a34b596df0a8f94ba Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Wed, 18 Sep 2024 14:34:33 +0200 Subject: [PATCH 16/17] Another GitHub Workflows update. --- .github/workflows/freebsd.yml | 2 ++ .github/workflows/linux.yml | 2 ++ .github/workflows/multiarch.yml | 2 ++ .github/workflows/packaging.yml | 1 + 4 files changed, 7 insertions(+) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 5651a3a6..53f06fd5 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -24,6 +24,8 @@ on: - master - dreibh/github-actions - dreibh/github-actions-freebsd + - dreibh/udpping + - tartan jobs: build_job: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d520330c..d957ca71 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,6 +23,8 @@ on: branches: - master - dreibh/github-actions + - dreibh/udpping + - tartan jobs: build_job: diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml index cc7d571e..b905f9cc 100644 --- a/.github/workflows/multiarch.yml +++ b/.github/workflows/multiarch.yml @@ -23,6 +23,8 @@ on: branches: - master - dreibh/github-actions + - dreibh/udpping + - tartan jobs: build_job: diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 35087953..ececf836 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -24,6 +24,7 @@ on: - master - dreibh/github-actions - dreibh/udpping + - tartan jobs: # ====== Ubuntu Linux ===================================================== From c06ab1429e17ab2fc003b51ac8118e0658442511 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Wed, 18 Sep 2024 14:36:05 +0200 Subject: [PATCH 17/17] Another try. --- .github/workflows/multiarch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml index b905f9cc..ec243709 100644 --- a/.github/workflows/multiarch.yml +++ b/.github/workflows/multiarch.yml @@ -64,9 +64,9 @@ jobs: cxx: clang++ # ====== Fedora Linux ============================================= - - label: "Fedora 40: GCC/PPC64" + - label: "Fedora 39: GCC/PPC64" arch: ppc64le - distro: fedora40 + distro: fedora39 cc: gcc cxx: g++