Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package netperfmeter for openSUSE:Factory checked in at 2026-09-11 18:01:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netperfmeter (Old) and /work/SRC/openSUSE:Factory/.netperfmeter.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netperfmeter" Fri Sep 11 18:01:59 2026 rev:10 rq:1376958 version:2.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/netperfmeter/netperfmeter.changes 2026-08-01 18:38:22.006494564 +0200 +++ /work/SRC/openSUSE:Factory/.netperfmeter.new.1265/netperfmeter.changes 2026-09-11 18:05:19.137835292 +0200 @@ -1,0 +2,10 @@ +Thu Sep 10 11:26:11 UTC 2026 - Martin Hauke <[email protected]> + +- Update to version 2.0.11 + * Replaced hard-coded /etc by ${CMAKE_INSTALL_SYSCONFDIR} in + CMakeLists.txt. + * Improved CMakeLists.txt: PDF to SVG can now be processed by + pdf2svg, mutool, or Inkscape. + * QUIC updates. + +------------------------------------------------------------------- Old: ---- netperfmeter-2.0.10.tar.xz netperfmeter-2.0.10.tar.xz.asc New: ---- netperfmeter-2.0.11.tar.xz netperfmeter-2.0.11.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netperfmeter.spec ++++++ --- /var/tmp/diff_new_pack.vTFPeM/_old 2026-09-11 18:05:19.915867818 +0200 +++ /var/tmp/diff_new_pack.vTFPeM/_new 2026-09-11 18:05:19.917867902 +0200 @@ -18,7 +18,7 @@ %define services netperfmeter.service netperfmeter-module-loader.service Name: netperfmeter -Version: 2.0.10 +Version: 2.0.11 Release: 0 Summary: Network performance meter for the UDP, TCP, SCTP and DCCP protocols License: GPL-3.0-or-later @@ -51,13 +51,8 @@ %autosetup %build -# Remove cmake4 error due to not setting -# min cmake version - sflees.de -export CMAKE_POLICY_VERSION_MINIMUM=3.5 -# FIXME: you should use the %%cmake macros -mkdir build && cd build -cmake .. \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%cmake \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DWITH_NEAT=0 \ -DBUILD_TEST_PROGRAMS=1 \ -DBUILD_PLOT_PROGRAMS=1 ++++++ netperfmeter-2.0.10.tar.xz -> netperfmeter-2.0.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/CMakeLists.txt new/netperfmeter-2.0.11/CMakeLists.txt --- old/netperfmeter-2.0.10/CMakeLists.txt 2026-07-31 12:49:37.000000000 +0200 +++ new/netperfmeter-2.0.11/CMakeLists.txt 2026-09-10 11:08:09.000000000 +0200 @@ -30,7 +30,7 @@ SET(BUILD_MAJOR "2") SET(BUILD_MINOR "0") -SET(BUILD_PATCH "10") +SET(BUILD_PATCH "11") SET(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_PATCH}) @@ -386,7 +386,7 @@ # ------ Ghostscript ----------------------------------------------------- FIND_PROGRAM(GS gs HINTS /bin /usr/bin /usr/local/bin /usr/pkg/bin) - IF(GS) + IF (GS) EXECUTE_PROCESS(COMMAND ${GS} -version OUTPUT_VARIABLE GS_OUTPUT ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -402,12 +402,14 @@ " * FreeBSD: sudo pkg install -y ghostscript10\n" " * NetBSD: sudo pkgin -y install ghostscript\n" " * OpenBSD: sudo pkg_add ghostscript\n" - " * Apple: brew install ghostscript") + " * Solaris: sudo pkg install ghostscript gnu-gs-fonts-std gnu-gs-fonts-other dejavu\n" + " * Apple: brew install ghostscript\n" + "If desktop icons are not required, they can be disabled by setting WITH_ICONS=OFF (add -DWITH_ICONS=OFF to CMake options)!") ENDIF() # ------ GraphicsMagick or ImageMagick ----------------------------------- FIND_PROGRAM(GM gm magick HINTS /bin /usr/bin /usr/local/bin /usr/pkg/bin) - IF(GM) + IF (GM) EXECUTE_PROCESS(COMMAND ${GM} -version | head -n1 OUTPUT_VARIABLE GM_OUTPUT ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -423,29 +425,47 @@ " * FreeBSD: sudo pkg install -y GraphicsMagick\n" " * NetBSD: sudo pkgin -y install GraphicsMagick\n" " * OpenBSD: sudo pkg_add GraphicsMagick\n" - " * Apple: brew install graphicsmagick") + " * Solaris: sudo pkg install graphicsmagick\n" + " * Apple: brew install graphicsmagick\n" + "If desktop icons are not required, they can be disabled by setting WITH_ICONS=OFF (add -DWITH_ICONS=OFF to CMake options)!") ENDIF() - # ------ MuPDF mutool ---------------------------------------------------- - FIND_PROGRAM(MUTOOL mutool HINTS /bin /usr/bin /usr/local/bin /usr/pkg/bin) - IF(MUTOOL) + # ------ PDF to SVG Conversion (pdf2svg, mutool, or Inkscape) ------------ + FIND_PROGRAM(PDF2SVG pdf2svg HINTS /bin /usr/bin /usr/local/bin /usr/pkg/bin) + FIND_PROGRAM(MUTOOL mutool HINTS /bin /usr/bin /usr/local/bin /usr/pkg/bin) + FIND_PROGRAM(INKSCAPE inkscape HINTS /bin /usr/bin /usr/local/bin /usr/pkg/bin) + IF (PDF2SVG) + MESSAGE(STATUS "PDF2SVG found: ${PDF2SVG}") + ENDIF() + IF (MUTOOL) EXECUTE_PROCESS(COMMAND ${MUTOOL} -v ERROR_VARIABLE MUTOOL_OUTPUT OUTPUT_VARIABLE MUTOOL_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE) STRING(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+|[0-9]+\\.[0-9]+)" MUTOOL_VERSION "${MUTOOL_OUTPUT}") MESSAGE(STATUS "MuPDF mutool found: ${MUTOOL} (version ${MUTOOL_VERSION})") - ELSE() + ENDIF() + IF (INKSCAPE) + EXECUTE_PROCESS(COMMAND ${INKSCAPE} --version + ERROR_VARIABLE INKSCAPE_OUTPUT + OUTPUT_VARIABLE INKSCAPE_OUTPUT + OUTPUT_STRIP_TRAILING_WHITESPACE) + STRING(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+|[0-9]+\\.[0-9]+)" INKSCAPE_VERSION "${INKSCAPE_OUTPUT}") + MESSAGE(STATUS "Inkscape found: ${INKSCAPE} (version ${INKSCAPE_VERSION})") + ENDIF() + IF ((NOT PDF2SVG) AND (NOT MUTOOL) AND (NOT INKSCAPE)) MESSAGE(FATAL_ERROR - "Cannot find mupdf! Try:\n" - " * Ubuntu/Debian: sudo apt install -y mupdf-tools\n" - " * Fedora: sudo dnf install -y mupdf\n" - " * OpenSUSE: sudo zypper install -y mupdf\n" - " * Alpine: sudo apk add mupdf-tools\n" - " * FreeBSD: sudo pkg install -y mupdf\n" - " * NetBSD: sudo pkgin -y install mupdf\n" - " * OpenBSD: sudo pkg_add mupdf\n" - " * Apple: brew install mupdf-tools") + "Cannot find Inkscape! Try:\n" + " * Ubuntu/Debian: sudo apt install -y inkscape\n" + " * Fedora: sudo dnf install -y inkscape\n" + " * OpenSUSE: sudo zypper install -y inkscape\n" + " * Alpine: sudo apk add inkscape\n" + " * FreeBSD: sudo pkg install -y inkscape\n" + " * NetBSD: sudo pkgin -y install inkscape\n" + " * OpenBSD: sudo pkg_add inkscape\n" + " * Solaris: sudo pkg install inkscape\n" + " * Apple: brew install inkscape\n" + "If desktop icons are not required, they can be disabled by setting WITH_ICONS=OFF (add -DWITH_ICONS=OFF to CMake options)!") ENDIF() ELSE() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/ChangeLog new/netperfmeter-2.0.11/ChangeLog --- old/netperfmeter-2.0.10/ChangeLog 2026-07-31 12:49:37.000000000 +0200 +++ new/netperfmeter-2.0.11/ChangeLog 2026-09-10 11:08:10.000000000 +0200 @@ -1,3 +1,57 @@ +commit 8f509fa8f062e1dcb43c9a119c4441833c0c2c5a +Author: Thomas Dreibholz <[email protected]> +Date: Thu Sep 10 10:43:43 2026 +0200 + + Replaced hard-coded /etc by ${CMAKE_INSTALL_SYSCONFDIR} in CMakeLists.txt. + +commit b2423121305575428087c86ac4a383567162f601 +Author: Thomas Dreibholz <[email protected]> +Date: Thu Sep 10 10:19:21 2026 +0200 + + Updated FreeBSD port. + +commit 92bbc2293c684481078dab579923438d694c377c +Author: Thomas Dreibholz <[email protected]> +Date: Fri Sep 4 16:51:40 2026 +0200 + + Updated build helper script. + +commit 201e47481475f67b806ec477d5639a1bd8e6e4bd +Author: Thomas Dreibholz <[email protected]> +Date: Fri Sep 4 16:51:24 2026 +0200 + + Updated CI scripts + +commit 985f744c9fc0e2f440ac6a23e1eaf9a86621f469 +Author: Thomas Dreibholz <[email protected]> +Date: Fri Sep 4 16:47:31 2026 +0200 + + Further CMakeLists.txt improvements. + +commit fec2b4d7119427599a787d86aa7836a98de49e86 +Author: Thomas Dreibholz <[email protected]> +Date: Fri Sep 4 15:34:34 2026 +0200 + + Improved CMakeLists.txt: PDF to SVG can now be processed by pdf2svg, mutool, or Inkscape. + +commit 1bd90da6a902f207884acbb012c1848fd86ce50f +Author: NorNet Praesum Presum <nornetpp@pilestredet> +Date: Sun Aug 9 22:18:23 2026 +0200 + + QUIC updates. + +commit 30af827ba48dceb340adffeb03d14fef0957da62 +Author: Thomas Dreibholz <[email protected]> +Date: Fri Jul 31 13:21:44 2026 +0200 + + Updated APKBUILD file. + +commit aea0d512948129f6aa77fbaf457e57976d6e3ba4 +Author: Thomas Dreibholz <[email protected]> +Date: Fri Jul 31 12:49:38 2026 +0200 + + New release netperfmeter-2.0.10. + commit 11c6dc78853f203a3d967c8002a3f327410d725f Author: Thomas Dreibholz <[email protected]> Date: Tue Jul 28 14:40:04 2026 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/autogen.sh new/netperfmeter-2.0.11/autogen.sh --- old/netperfmeter-2.0.10/autogen.sh 2026-07-19 13:57:38.000000000 +0200 +++ new/netperfmeter-2.0.11/autogen.sh 2026-09-04 16:51:33.000000000 +0200 @@ -22,9 +22,9 @@ set -euo pipefail -CMAKE_OPTIONS="" -COMMAND="" -CORES=0 +cmakeOptions="" +makePrefix="" +cores=0 while [ $# -gt 0 ] ; do if [[ "$1" =~ ^(-|--)use-clang$ ]] ; then # Use these settings for CLang: @@ -36,7 +36,7 @@ export CC=clang # Ensure build with CLang Static Analyzer mkdir -p scan-build-reports - COMMAND="scan-build -o scan-build-reports" + makePrefix="scan-build -o scan-build-reports" elif [[ "$1" =~ ^(-|--)use-gcc$ ]] ; then # Use these settings for GCC: export CXX=g++ @@ -47,25 +47,25 @@ export CC=gcc export CFLAGS=-fanalyzer export CXXFLAGS=-fanalyzer - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=ON" + cmakeOptions="${cmakeOptions} -DCMAKE_VERBOSE_MAKEFILE=ON" elif [[ "$1" =~ ^(-|--)debug$ ]] ; then # Enable debugging build: - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE=Debug" + cmakeOptions="${cmakeOptions} -DCMAKE_BUILD_TYPE=Debug" elif [[ "$1" =~ ^(-|--)release$ ]] ; then # Enable debugging build: - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE=Release" + cmakeOptions="${cmakeOptions} -DCMAKE_BUILD_TYPE=Release" elif [[ "$1" =~ ^(-|--)release-with-debinfo$ ]] ; then # Enable debugging build: - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE=RelWithDebInfo" + cmakeOptions="${cmakeOptions} -DCMAKE_BUILD_TYPE=RelWithDebInfo" elif [[ "$1" =~ ^(-|--)verbose$ ]] ; then # Enable verbose Makefile: - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=ON" + cmakeOptions="${cmakeOptions} -DCMAKE_VERBOSE_MAKEFILE=ON" elif [[ "$1" =~ ^(-|--)cores ]] ; then if [[ ! "$2" =~ ^[0-9]+$ ]] ; then echo >&2 "ERROR: Number of cores must be an integer number!" exit 1 fi - CORES="$2" + cores="$2" shift elif [ "$1" == "--" ] ; then shift @@ -77,8 +77,10 @@ shift done -UNAME="$(uname)" -case "${UNAME}" in + +# ====== Obtain installation path prefix ==================================== +uname="$(uname)" +case "${uname}" in Linux|SunOS) installPrefix="/usr" ;; @@ -91,15 +93,44 @@ esac +# ====== Obtain number of cores ============================================= +if [ "${cores}" -lt 1 ] ; then + uname="$(uname)" + case "${uname}" in + Linux) + cores="$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo "1")" + ;; + FreeBSD) + cores="$(sysctl -n hw.ncpu 2>/dev/null || echo "1")" + ;; + NetBSD|OpenBSD) + cores="$(/sbin/sysctl -n hw.ncpuonline 2>/dev/null || echo "1")" + ;; + SunOS) + cores="$(getconf NPROCESSORS_ONLN 2>/dev/null || echo "1")" + ;; + Darwin) + cores="$(sysctl -n hw.logicalcpu 2>/dev/null || echo "1")" + ;; + *) + cores=1 + ;; + esac +fi +if [ "${cores}" -lt 1 ] ; then + cores="1" +fi + + # ====== Configure with CMake =============================================== if [ -e CMakeLists.txt ] ; then rm -f CMakeCache.txt if [ $# -gt 0 ] ; then - CMAKE_OPTIONS="${CMAKE_OPTIONS} $*" + cmakeOptions="${cmakeOptions} $*" fi - echo "CMake options:${CMAKE_OPTIONS} . -DCMAKE_INSTALL_PREFIX=\"${installPrefix}\"" + echo "CMake options:${cmakeOptions} . -DCMAKE_INSTALL_PREFIX=\"${installPrefix}\"" # shellcheck disable=SC2048,SC2086 - ${COMMAND} cmake ${CMAKE_OPTIONS} . -DCMAKE_INSTALL_PREFIX="${installPrefix}" + ${makePrefix} cmake ${cmakeOptions} . -DCMAKE_INSTALL_PREFIX="${installPrefix}" # ====== Configure with AutoConf/AutoMake =================================== elif [ -e bootstrap ] ; then @@ -113,25 +144,6 @@ fi -# ====== Obtain number of cores ============================================= -if [ "${CORES}" -lt 1 ] ; then - if [ "${UNAME}" == "Linux" ] ; then - CORES="$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo "1")" - elif [ "${UNAME}" == "FreeBSD" ] ; then - CORES="$(sysctl -n hw.ncpu || echo "1")" - elif [ "${UNAME}" == "NetBSD" ] || [ "${UNAME}" == "OpenBSD" ] ; then - CORES="$(/sbin/sysctl -n hw.ncpuonline || echo "1")" - elif [ "${UNAME}" == "SunOS" ] ; then - CORES="$(psrinfo -t)" - elif [ "${UNAME}" == "Darwin" ] ; then - CORES="$(sysctl -n machdep.cpu.core_count)" - else - CORES=1 - fi - echo "This system has ${CORES} cores!" -fi - - # ====== Build ============================================================== -echo "Starting build using up to ${CORES} cores ..." -${COMMAND} make -j "${CORES}" +echo "Starting build using up to ${cores} cores ..." +${makePrefix} make -j "${cores}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/ci/get-dependencies new/netperfmeter-2.0.11/ci/get-dependencies --- old/netperfmeter-2.0.10/ci/get-dependencies 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.11/ci/get-dependencies 2026-09-04 16:51:24.000000000 +0200 @@ -107,7 +107,7 @@ # ====== Check arguments ==================================================== system : str = '' runInstall : bool = False -i = 1 +i : int = 1 while i < len(sys.argv): if sys.argv[i] == '-s' or sys.argv[i] == '--system': if i + 1 < len(sys.argv): @@ -119,7 +119,7 @@ elif sys.argv[i] == '-i' or sys.argv[i] == '--install': runInstall = True elif sys.argv[i] == '-h' or sys.argv[i] == '--help': - sys.stderr.write('Usage: ' + sys.argv[0] + ' [-h|--help] [-s|--system debian|ubuntu|fedora|freebsd|auto] [-i|--install]\n') + sys.stderr.write('Usage: ' + sys.argv[0] + ' [-h|--help] [-s|--system debian|ubuntu|fedora|opensuse|alpine|freebsd|auto] [-i|--install]\n') sys.exit(0) else: sys.stderr.write('ERROR: Bad parameter ' + sys.argv[i] + '!\n') @@ -128,10 +128,12 @@ if system == '': with open("/etc/os-release") as osReleaseFile: - osRelease = { } - for line in osReleaseFile: - key, value = line.rstrip().split("=") - osRelease[key] = value.strip('"') + osRelease : dict[str,str] = { } + reConfigLine : Final[re.Pattern[str]] = re.compile(r'^[ \t]*[a-zA-Z]') + for line in osReleaseFile: + if reConfigLine.match(line): + key, value = line.rstrip().split("=") + osRelease[key] = value.strip('"') system = osRelease['ID'] # ====== Debian/Ubuntu ====================================================== @@ -139,7 +141,7 @@ if ((system == 'debian') or (system == 'ubuntu')): if os.path.exists('debian/control'): with open('debian/control', 'r', encoding='utf-8') as fp: - inside = False + inside : bool = False for line in fp: if not line: break @@ -155,9 +157,11 @@ dependencies = dependencies + extractDebDependencies(line, system) inside = True - aptCall = [ 'apt-get', 'satisfy', '-qy' ] - i=0 - for dependency in sorted(set(dependencies)): + aptCall : list[str] = [ 'apt-get', 'satisfy', '-qy' ] + + i = 0 + dependencies = sorted(set(dependencies)) + for dependency in dependencies: if i > 0: sys.stdout.write(', ') sys.stdout.write(dependency) @@ -174,9 +178,9 @@ sys.exit(1) -# ====== Fedora ============================================================= -elif system == 'fedora': - specFiles = glob.glob('rpm/*.spec') +# ====== Fedora or OpenSUSE ================================================= +elif ( (system == 'fedora') or (re.match(r'^opensuse-', system)) ): + specFiles : Final[list[str]] = glob.glob('rpm/*.spec') if len(specFiles) == 1: with open(specFiles[0], 'r', encoding='utf-8') as fp: inside = False @@ -192,24 +196,61 @@ dependencies = dependencies + extractRPMDependencies(line, system) inside = True - dnfCall = [ 'dnf', 'install', '-y' ] - i=0 - for dependency in sorted(set(dependencies)): + rpmToolCall : list[str] + if system == 'fedora': + rpmToolCall = [ 'dnf', 'install', '-y' ] + else: + rpmToolCall = [ 'zypper', 'install', '-y' ] + + i = 0 + dependencies = sorted(set(dependencies)) + for dependency in dependencies: if i > 0: sys.stdout.write(', ') sys.stdout.write(dependency) - dnfCall.append(dependency) + rpmToolCall.append(dependency) i = i + 1 sys.stdout.write('\n') if runInstall == True: - subprocess.call(dnfCall) + subprocess.call(rpmToolCall) else: sys.stderr.write('ERROR: Unable to locate RPM spec file!\n') sys.exit(1) +# ====== Alpine ============================================================ +elif system == 'alpine': + apkbuildFile : Final[str] = 'packaging/APKBUILD' + with open(apkbuildFile, 'r', encoding='utf-8') as fp: + content = fp.read() + + pattern = r"\bmakedepends=(?:\"([^\"]*)\"|'([^']*)')" + match = re.search(pattern, content, re.DOTALL) + if not match: + dependencies = [ ] + else: + # Get the captured inner string (group 1 for double quotes, group 2 for single quotes) + rawDependencies = match.group(1) if match.group(1) is not None else match.group(2) + dependencies = sorted(set(rawDependencies.split())) + + apkCall : list[str] = [ 'apk', 'add' ] + + i = 0 + dependencies = sorted(set(dependencies)) + for dependency in dependencies: + if i > 0: + sys.stdout.write(' ') + sys.stdout.write(dependency) + apkCall.append(dependency) + i = i + 1 + sys.stdout.write('\n') + + if runInstall == True: + subprocess.call(apkCall) + + # ====== FreeBSD ============================================================ elif system == 'freebsd': freeBSDMakefile = glob.glob('freebsd/*/Makefile') @@ -233,7 +274,8 @@ basename = 'glib' # May be there is a better solution here? dependencies.append(basename) - for dependency in sorted(set(dependencies)): + dependencies = sorted(set(dependencies)) + for dependency in dependencies: sys.stdout.write(dependency + ' ') sys.stdout.write('\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/debian/changelog new/netperfmeter-2.0.11/debian/changelog --- old/netperfmeter-2.0.10/debian/changelog 2026-07-31 12:49:37.000000000 +0200 +++ new/netperfmeter-2.0.11/debian/changelog 2026-09-10 11:08:09.000000000 +0200 @@ -1,3 +1,9 @@ +netperfmeter (2.0.11-1ubuntu1) unstable; urgency=medium + + * New upstream release. + + -- Thomas Dreibholz <[email protected]> Thu, 10 Sep 2026 11:08:09 +0200 + netperfmeter (2.0.10-1ubuntu1) unstable; urgency=medium * New upstream release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/debian/control new/netperfmeter-2.0.11/debian/control --- old/netperfmeter-2.0.10/debian/control 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.11/debian/control 2026-09-04 15:27:59.000000000 +0200 @@ -11,7 +11,7 @@ graphicsmagick, libbz2-dev, libsctp-dev (>= 1.0.5), - mupdf-tools + pdf2svg Standards-Version: 4.7.4 Rules-Requires-Root: no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/freebsd/netperfmeter/Makefile new/netperfmeter-2.0.11/freebsd/netperfmeter/Makefile --- old/netperfmeter-2.0.10/freebsd/netperfmeter/Makefile 2026-07-31 12:49:37.000000000 +0200 +++ new/netperfmeter-2.0.11/freebsd/netperfmeter/Makefile 2026-09-10 11:08:09.000000000 +0200 @@ -1,5 +1,5 @@ PORTNAME= netperfmeter -DISTVERSION= 2.0.10 +DISTVERSION= 2.0.11 CATEGORIES= benchmarks MASTER_SITES= https://www.nntb.no/~dreibh/netperfmeter/download/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/freebsd/netperfmeter/distinfo new/netperfmeter-2.0.11/freebsd/netperfmeter/distinfo --- old/netperfmeter-2.0.10/freebsd/netperfmeter/distinfo 2026-07-02 16:13:36.000000000 +0200 +++ new/netperfmeter-2.0.11/freebsd/netperfmeter/distinfo 2026-09-10 10:27:34.000000000 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1782920811 -SHA256 (netperfmeter-2.0.8.tar.xz) = ec720e8786d9a64c508b84b80bdd11294a69d62c9166c60ceeb718cb934e0f0b -SIZE (netperfmeter-2.0.8.tar.xz) = 1994660 +TIMESTAMP = 1785497994 +SHA256 (netperfmeter-2.0.10.tar.xz) = 2a397409779fe51a683602af6265e19708ef4d4649a2671b00add3aa69882bf4 +SIZE (netperfmeter-2.0.10.tar.xz) = 1996260 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/packaging/APKBUILD new/netperfmeter-2.0.11/packaging/APKBUILD --- old/netperfmeter-2.0.10/packaging/APKBUILD 2026-07-01 17:52:11.000000000 +0200 +++ new/netperfmeter-2.0.11/packaging/APKBUILD 2026-09-10 10:31:57.000000000 +0200 @@ -1,6 +1,6 @@ # Maintainer: Thomas Dreibholz <[email protected]> pkgname=netperfmeter -pkgver=2.0.8 +pkgver=2.0.10 pkgrel=1 pkgdesc="Network performance meter for UDP, TCP, MPTCP, SCTP, DCCP and QUIC protocols" url="https://www.nntb.no/~dreibh/netperfmeter/"; @@ -30,12 +30,13 @@ builddir="$srcdir/$pkgname-$pkgver" build() { - cmake -B build -G Ninja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -DWITH_ICONS=ON \ - -DWITH_PLOT_PROGRAMS=ON \ - -DWITH_EXAMPLE_SCRIPTS=ON \ + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \ + -DCMAKE_BUILD_TYPE=None \ + -DWITH_ICONS=ON \ + -DWITH_PLOT_PROGRAMS=ON \ + -DWITH_EXAMPLE_SCRIPTS=ON \ -DWITH_EXAMPLE_RESULTS=ON cmake --build build } @@ -129,5 +130,5 @@ } sha512sums=" -42e811236db6362ab58ab02ae43dfa099606075c779330260a9cfa0bc91c2b801036a1ca688ad3677a25791fc3c47170247cef4d5b58f1c6dd0e0f33e45c7e35 netperfmeter-2.0.8.tar.xz +2fafb9c6b00c32f8a7e0c247b459079d84a2f97aff39d9aef36a97d8792d8a542dcc148a602f178c8b7d963554954e5977f1815c3fd642a520d0305b09c3bb22 netperfmeter-2.0.10.tar.xz " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/rpm/netperfmeter.spec new/netperfmeter-2.0.11/rpm/netperfmeter.spec --- old/netperfmeter-2.0.10/rpm/netperfmeter.spec 2026-07-31 12:49:37.000000000 +0200 +++ new/netperfmeter-2.0.11/rpm/netperfmeter.spec 2026-09-10 11:08:09.000000000 +0200 @@ -1,5 +1,5 @@ Name: netperfmeter -Version: 2.0.10 +Version: 2.0.11 Release: 1 Summary: Network performance meter for the UDP, TCP, MPTCP, SCTP and DCCP protocols License: GPL-3.0-or-later @@ -54,7 +54,7 @@ %setup -q %build -%cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_ICONS=ON -DWITH_PLOT_PROGRAMS=ON -DWITH_EXAMPLE_SCRIPTS=ON -DWITH_EXAMPLE_RESULTS=ON +%cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DWITH_ICONS=ON -DWITH_PLOT_PROGRAMS=ON -DWITH_EXAMPLE_SCRIPTS=ON -DWITH_EXAMPLE_RESULTS=ON %cmake_build %install @@ -304,6 +304,8 @@ %changelog +* Thu Sep 10 2026 Thomas Dreibholz <[email protected]> - 2.0.11-1 +- New upstream release. * Fri Jul 31 2026 Thomas Dreibholz <[email protected]> - 2.0.10-1 - New upstream release. * Sat Jul 11 2026 Thomas Dreibholz <[email protected]> - 2.0.9-1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/src/CMakeLists.txt new/netperfmeter-2.0.11/src/CMakeLists.txt --- old/netperfmeter-2.0.10/src/CMakeLists.txt 2026-07-23 17:49:42.000000000 +0200 +++ new/netperfmeter-2.0.11/src/CMakeLists.txt 2026-09-10 10:29:24.000000000 +0200 @@ -96,13 +96,13 @@ IF (CMAKE_SYSTEM_NAME MATCHES "Linux") INSTALL(FILES netperfmeter.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system) - INSTALL(FILES netperfmeter.conf DESTINATION /etc) + INSTALL(FILES netperfmeter.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}) INSTALL(FILES netperfmeter-module-loader.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system) ELSEIF ( (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") OR (CMAKE_SYSTEM_NAME MATCHES "NetBSD") ) - INSTALL(PROGRAMS netperfmeter.rc DESTINATION "etc/rc.d" + INSTALL(PROGRAMS netperfmeter.rc DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/rc.d RENAME netperfmeter) - INSTALL(PROGRAMS netperfmeter-module-loader.rc DESTINATION "etc/rc.d" + INSTALL(PROGRAMS netperfmeter-module-loader.rc DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/rc.d RENAME netperfmeter-module-loader) ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/src/flow.cc new/netperfmeter-2.0.11/src/flow.cc --- old/netperfmeter-2.0.10/src/flow.cc 2026-07-27 15:50:47.000000000 +0200 +++ new/netperfmeter-2.0.11/src/flow.cc 2026-08-11 09:59:28.000000000 +0200 @@ -544,9 +544,9 @@ } #if defined(HAVE_QUIC) else if(TrafficSpec.Protocol == IPPROTO_QUIC) { - quic_config quicCnfig; - socklen_t quicCnfigLength = sizeof(quicCnfig); - if(ext_getsockopt(socketDescriptor, SOL_QUIC, QUIC_SOCKOPT_CONFIG, &quicCnfig, &quicCnfigLength) < 0) { + quic_config quicConfig; + socklen_t quicConfigLength = sizeof(quicConfig); + if(ext_getsockopt(socketDescriptor, SOL_QUIC, QUIC_SOCKOPT_CONFIG, &quicConfig, &quicConfigLength) < 0) { LOG_ERROR stdlog << format("Failed to obtain configuration (QUIC_SOCKOPT_CONFIG option) on QUIC socket %d: %s!", @@ -556,10 +556,10 @@ } const char* congestionControl = TrafficSpec.CongestionControl.c_str(); if( (strcmp(congestionControl, "reno") == 0) || (strcmp(congestionControl, "default") == 0) ) { - quicCnfig.congestion_control_algo = QUIC_CONG_ALG_RENO; + quicConfig.congestion_control_algo = QUIC_CONG_ALG_RENO; } else if(strcmp(congestionControl, "cubic") == 0) { - quicCnfig.congestion_control_algo = QUIC_CONG_ALG_CUBIC; + quicConfig.congestion_control_algo = QUIC_CONG_ALG_CUBIC; } else { LOG_ERROR @@ -568,13 +568,13 @@ LOG_END return false; } - if(ext_setsockopt(socketDescriptor, SOL_QUIC, QUIC_SOCKOPT_CONFIG, &quicCnfig, quicCnfigLength) < 0) { + if(ext_setsockopt(socketDescriptor, SOL_QUIC, QUIC_SOCKOPT_CONFIG, &quicConfig, quicConfigLength) < 0) { - LOG_ERROR + LOG_WARNING stdlog << format("Failed to set configuration (QUIC_SOCKOPT_CONFIG option) on QUIC socket %d: %s!", socketDescriptor, strerror(errno)) << "\n"; LOG_END - return false; + // return false; } } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netperfmeter-2.0.10/src/logo/CMakeLists.txt new/netperfmeter-2.0.11/src/logo/CMakeLists.txt --- old/netperfmeter-2.0.10/src/logo/CMakeLists.txt 2026-07-01 11:46:51.000000000 +0200 +++ new/netperfmeter-2.0.11/src/logo/CMakeLists.txt 2026-09-04 15:26:11.000000000 +0200 @@ -69,7 +69,7 @@ ADD_CUSTOM_TARGET(generate_${LOGO}_${iconLength}x_png ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}-${iconLength}x.png) # PNG with fixed, same width and height: - IF(NOT iconLength STREQUAL LOGO_LENGTH) + IF (NOT iconLength STREQUAL LOGO_LENGTH) ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}-${iconLength}x${iconLength}.png COMMAND ${GM} convert ${LOGO}-${iconLength}x.png -resize ${iconLength}x -background none -gravity center -extent ${iconLength}x${iconLength} ${LOGO}-${iconLength}x${iconLength}.png DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}-${iconLength}x.png) @@ -93,14 +93,28 @@ INSTALL(FILES ${LOGO}.pdf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${DIRECTORY}) # Scalable SVG icon: - ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg - COMMAND ${MUTOOL} convert - -o ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg - ${CMAKE_CURRENT_SOURCE_DIR}/${LOGO}.pdf 1 - COMMAND ${CMAKE_COMMAND} -E rename - ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}1.svg - ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${LOGO}.pdf) + IF (INKSCAPE) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg + COMMAND ${INKSCAPE} + ${CMAKE_CURRENT_SOURCE_DIR}/${LOGO}.pdf + --pdf-poppler -o ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg) + ELSEIF (PDF2SVG) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg + COMMAND ${PDF2SVG} + ${CMAKE_CURRENT_SOURCE_DIR}/${LOGO}.pdf + ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg) + ELSEIF (MUTOOL) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg + COMMAND ${MUTOOL} convert + -o ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg + ${CMAKE_CURRENT_SOURCE_DIR}/${LOGO}.pdf 1 + COMMAND ${CMAKE_COMMAND} -E rename + ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}1.svg + ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${LOGO}.pdf) + ELSE() + MESSAGE(FATAL_ERROR "No PDF to SVG conversion tool configured!") + ENDIF() ADD_CUSTOM_TARGET(generate_${LOGO}_svg ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LOGO}.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
