Merge branch 'master' into dreibh/udpping

dreibh · Oct 8, 2024 · 65bfe1e · 65bfe1e
2 parents e906bd0 + c06ab14
commit 65bfe1e
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 39 deletions.
diff --git 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
@@ -23,6 +23,8 @@ on:
     branches:
       - master
       - dreibh/github-actions
+      - dreibh/udpping
+      - tartan
 
 jobs:
   build_job:
@@ -33,6 +35,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 +47,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 +63,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 +76,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
@@ -23,6 +23,8 @@ on:
     branches:
       - master
       - dreibh/github-actions
+      - dreibh/udpping
+      - tartan
 
 jobs:
   build_job:
@@ -33,19 +35,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++
 

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -23,6 +23,8 @@ on:
     branches:
       - master
       - dreibh/github-actions
+      - dreibh/udpping
+      - tartan
 
 jobs:
   # ====== Ubuntu Linux =====================================================

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+commit f8c82974d305b4c1c9fb8ded8c8076cebf43d826
+Author: Thomas Dreibholz <dreibh@simula.no>
+Date:   Sat Nov 11 17:51:23 2023 +0100
+
+    Workflows update.
+
+commit 2e495459e16f2937232127f610702203675f574d
+Author: Thomas Dreibholz <dreibh@simula.no>
+Date:   Thu Sep 21 17:13:34 2023 +0200
+
+    New release hipercontracer-1.6.9.
+
 commit ad7d5f20f6da74930cbde48ce473d6f06d83bf54
 Author: Thomas Dreibholz <dreibh@simula.no>
 Date:   Thu Sep 21 16:24:23 2023 +0200

diff --git a/debian/changelog b/debian/changelog
@@ -4,6 +4,12 @@ hipercontracer (2.0.0~beta4-1ubuntu1) jammy; urgency=medium
 
  -- Thomas Dreibholz <thomas.dreibholz@gmail.com>  Fri, 01 Dec 2023 10:24:34 +0100
 
+hipercontracer (1.6.10-1ubuntu1) jammy; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Dreibholz <thomas.dreibholz@gmail.com>  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
@@ -1,5 +1,3 @@
-# Created by: Thomas Dreibholz <thomas.dreibholz@gmail.com>
-
 PORTNAME=	hipercontracer
 DISTVERSION=	2.0.0~beta4
 PORTREVISION=	1
@@ -57,4 +55,6 @@ IMPPGSQL_LIB_DEPENDS=	libpqxx.so:databases/postgresql-libpqxx
 IMPMONGO_CMAKE_BOOL=	ENABLE_BACKEND_MONGODB
 IMPMONGO_LIB_DEPENDS=	libmongo-c-driver.so:devel/mongo-c-driver
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 .include <bsd.port.mk>
diff --git 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/test-packaging b/freebsd/hipercontracer/test-packaging
@@ -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! ======"
diff --git 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-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
@@ -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+

diff --git a/rpm/hipercontracer.spec b/rpm/hipercontracer.spec
@@ -368,6 +368,8 @@ UDP Pings.
 
 
 %changelog
+* Wed Dec 06 2023 Thomas Dreibholz <thomas.dreibholz@gmail.com> - 1.6.10
+- New upstream release.
 * Thu Sep 21 2023 Thomas Dreibholz <thomas.dreibholz@gmail.com> - 1.6.9
 - New upstream release.
 * Tue Apr 18 2023 Thomas Dreibholz <thomas.dreibholz@gmail.com> - 1.6.8

diff --git a/src/deprecated/tracedataimporter b/src/deprecated/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)