June 2024 - openSUSE Commits - openSUSE Mailing Lists

commit vsgImGui for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vsgImGui for openSUSE:Factory checked in at 2024-06-03 17:41:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vsgImGui (Old) and /work/SRC/openSUSE:Factory/.vsgImGui.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vsgImGui" Mon Jun 3 17:41:41 2024 rev:3 rq:1177953 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vsgImGui/vsgImGui.changes 2024-01-08 23:45:29.070796748 +0100 +++ /work/SRC/openSUSE:Factory/.vsgImGui.new.24587/vsgImGui.changes 2024-06-03 17:41:50.911455374 +0200 @@ -1,0 +2,8 @@ +Mon May 27 13:31:24 UTC 2024 - Ralf Habacker <ralf.habacker(a)freenet.de> + +- Update to version 0.3.0 + * Always pass events to ImGui to solve keyRelease issues + * Updated ImGui to v1 90 1 + * VS warning fixes + +------------------------------------------------------------------- Old: ---- vsgImGui-0.2.0.tar.xz New: ---- vsgImGui-0.3.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vsgImGui.spec ++++++ --- /var/tmp/diff_new_pack.Cx1ubS/_old 2024-06-03 17:41:51.643483211 +0200 +++ /var/tmp/diff_new_pack.Cx1ubS/_new 2024-06-03 17:41:51.643483211 +0200 @@ -19,7 +19,7 @@ %define _vsg_so_nr 0 Name: vsgImGui -Version: 0.2.0 +Version: 0.3.0 Release: 0 Summary: 3D graphics toolkit License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Cx1ubS/_old 2024-06-03 17:41:51.671484276 +0200 +++ /var/tmp/diff_new_pack.Cx1ubS/_new 2024-06-03 17:41:51.675484428 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/vsg-dev/vsgImGui.git</param> - <param name="revision">v0.2.0</param> + <param name="revision">v0.3.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="package-meta">no</param> ++++++ vsgImGui-0.2.0.tar.xz -> vsgImGui-0.3.0.tar.xz ++++++ ++++ 24320 lines of diff (skipped)

1 0

commit deepin-editor for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-editor for openSUSE:Factory checked in at 2024-06-03 17:41:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-editor (Old) and /work/SRC/openSUSE:Factory/.deepin-editor.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-editor" Mon Jun 3 17:41:38 2024 rev:11 rq:1177958 version:5.10.40 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-editor/deepin-editor.changes 2022-11-24 12:26:01.966366479 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-editor.new.24587/deepin-editor.changes 2024-06-03 17:41:50.135425864 +0200 @@ -1,0 +2,5 @@ +Fri May 31 14:21:09 UTC 2024 - Hillwood Yang <hillwood(a)opensuse.org> + +- Add fix-build-on-icu-75.patch, icu 75 needs c++17 + +------------------------------------------------------------------- New: ---- fix-build-on-icu-75.patch BETA DEBUG BEGIN: New: - Add fix-build-on-icu-75.patch, icu 75 needs c++17 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-editor.spec ++++++ --- /var/tmp/diff_new_pack.VycIUV/_old 2024-06-03 17:41:50.751449290 +0200 +++ /var/tmp/diff_new_pack.VycIUV/_new 2024-06-03 17:41:50.751449290 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-editor # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,8 @@ Group: Productivity/Text/Editors URL: https://github.com/linuxdeepin/deepin-editor Source0: https://github.com/linuxdeepin/deepin-editor/archive/%{version}/%{name}-%{v… +# PATCH-FIX-UPSTRAEM fix-build-on-icu-75.patch hillwood(a)opensuse.org - ICU 75 needs c++17 +Patch1: fix-build-on-icu-75.patch %ifarch ppc ppc64 ppc64le s390 s390x BuildRequires: deepin-desktop-base %else ++++++ fix-build-on-icu-75.patch ++++++ diff -Nur deepin-editor-5.10.40/CMakeLists.txt deepin-editor-5.10.40-new/CMakeLists.txt --- deepin-editor-5.10.40/CMakeLists.txt 2022-11-17 09:40:48.000000000 +0800 +++ deepin-editor-5.10.40-new/CMakeLists.txt 2024-05-31 22:18:37.208783434 +0800 @@ -7,7 +7,7 @@ project(deepin-editor) #set(CMAKE_VERBOSE_MAKEFILE ON) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON)

1 0

commit mkosi for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkosi for openSUSE:Factory checked in at 2024-06-03 17:41:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkosi (Old) and /work/SRC/openSUSE:Factory/.mkosi.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkosi" Mon Jun 3 17:41:36 2024 rev:15 rq:1177944 version:22 Changes: -------- --- /work/SRC/openSUSE:Factory/mkosi/mkosi.changes 2024-03-27 20:42:56.121933795 +0100 +++ /work/SRC/openSUSE:Factory/.mkosi.new.24587/mkosi.changes 2024-06-03 17:41:47.727334292 +0200 @@ -1,0 +2,5 @@ +Mon May 27 15:50:17 UTC 2024 - Alberto Planas Dominguez <aplanas(a)suse.com> + +- Add opensuse-dont-install-distribution-release-by-default.patch + +------------------------------------------------------------------- New: ---- opensuse-dont-install-distribution-release-by-default.patch BETA DEBUG BEGIN: New: - Add opensuse-dont-install-distribution-release-by-default.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkosi.spec ++++++ --- /var/tmp/diff_new_pack.DbXQRj/_old 2024-06-03 17:41:48.195352089 +0200 +++ /var/tmp/diff_new_pack.DbXQRj/_new 2024-06-03 17:41:48.195352089 +0200 @@ -26,6 +26,8 @@ Group: System/Management URL: https://github.com/systemd/mkosi Source: https://github.com/systemd/mkosi/archive/v%{version}.tar.gz#/%{name}-%{vers… +# PATCH-FIX-UPSTREAM https://github.com/systemd/mkosi/pull/2606 +Patch0: opensuse-dont-install-distribution-release-by-default.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module wheel} @@ -60,7 +62,7 @@ supported (not plain MBR/BIOS). %prep -%setup -q +%autosetup -p1 %build tools/make-man-page.sh ++++++ opensuse-dont-install-distribution-release-by-default.patch ++++++ From 6cbf5cc1375525f71819416dfae8206ff3c4e1ea Mon Sep 17 00:00:00 2001 From: Daan De Meyer <daan.j.demeyer(a)gmail.com> Date: Mon, 8 Apr 2024 13:40:35 +0200 Subject: [PATCH] opensuse: Don't install distribution-release by default distribution-release is a virtual package that is satisfied by multiple packages. By installing it by default in the first transaction we can't override it anymore later. Let's fix the issue by not explicitly installing distribution-release. To make sure openSUSE-release is pulled in by default to satisfy distribution-release, we install patterns-base-minimal_base which has a Suggests dependency on openSUSE-release. --- mkosi.conf.d/20-opensuse.conf | 1 + mkosi/distributions/opensuse.py | 2 +- mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf | 2 ++ mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) Index: mkosi-22/mkosi.conf.d/20-opensuse.conf =================================================================== --- mkosi-22.orig/mkosi.conf.d/20-opensuse.conf +++ mkosi-22/mkosi.conf.d/20-opensuse.conf @@ -34,6 +34,7 @@ Packages= openssh-server openssl ovmf + patterns-base-minimal_base perf pesign python3-pefile Index: mkosi-22/mkosi/distributions/opensuse.py =================================================================== --- mkosi-22.orig/mkosi/distributions/opensuse.py +++ mkosi-22/mkosi/distributions/opensuse.py @@ -69,7 +69,7 @@ class Installer(DistributionInstaller): @classmethod def install(cls, context: Context) -> None: - cls.install_packages(context, ["filesystem", "distribution-release"], apivfs=False) + cls.install_packages(context, ["filesystem"], apivfs=False) @classmethod def install_packages(cls, context: Context, packages: Sequence[str], apivfs: bool = True) -> None: Index: mkosi-22/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf =================================================================== --- mkosi-22.orig/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf +++ mkosi-22/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf @@ -5,6 +5,8 @@ Distribution=opensuse [Content] Packages= + patterns-base-minimal_base + # Various libraries that are dlopen'ed by systemd libfido2-1 tpm2-0-tss Index: mkosi-22/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf =================================================================== --- mkosi-22.orig/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf +++ mkosi-22/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf @@ -16,6 +16,7 @@ Packages= grub2 openssh-clients ovmf + patterns-base-minimal_base pesign policycoreutils python3-pefile

1 0

commit haproxy for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2024-06-03 17:41:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haproxy" Mon Jun 3 17:41:34 2024 rev:143 rq:1177941 version:3.0.0+git0.5590ada47 Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2024-05-30 15:35:04.949996929 +0200 +++ /work/SRC/openSUSE:Factory/.haproxy.new.24587/haproxy.changes 2024-06-03 17:41:44.919227508 +0200 @@ -1,0 +2,6 @@ +Fri May 31 12:07:48 UTC 2024 - Marcus Rueckert <mrueckert(a)suse.de> + +- AppArmor: allow haproxy to read the files needed for the + "p post_mortem" support + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usr.sbin.haproxy.apparmor ++++++ --- /var/tmp/diff_new_pack.WGmz3T/_old 2024-06-03 17:41:45.783260365 +0200 +++ /var/tmp/diff_new_pack.WGmz3T/_new 2024-06-03 17:41:45.787260517 +0200 @@ -38,7 +38,20 @@ /{,var/}run/haproxy/pid rw, /{,var/}run/haproxy/master.sock* rwlk, + # This is for the additional debug output in haproxy >= 2.9 + # can be accessed with "p post_mortem" in gdb /sys/devices/system/node/ r, + /sys/devices/system/node/*/cpumap r, + /sys/devices/system/cpu/online r, + /sys/class/dmi/id/sys_vendor r, + /sys/class/dmi/id/product_family r, + /sys/class/dmi/id/product_name r, + /sys/class/dmi/id/board_vendor r, + /sys/firmware/devicetree/base/model r, + /sys/class/dmi/id/board_name r, + /proc/2/status r, + /proc/cpuinfo r, + # end of debug.c files # Site-specific additions and overrides. See local/README for details. #include if exists <local/haproxy>

1 0

commit python-Flask-Security-Too for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Flask-Security-Too for openSUSE:Factory checked in at 2024-06-03 17:41:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Flask-Security-Too (Old) and /work/SRC/openSUSE:Factory/.python-Flask-Security-Too.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Flask-Security-Too" Mon Jun 3 17:41:31 2024 rev:23 rq:1177933 version:5.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Flask-Security-Too/python-Flask-Security-Too.changes 2024-02-13 22:42:25.864377645 +0100 +++ /work/SRC/openSUSE:Factory/.python-Flask-Security-Too.new.24587/python-Flask-Security-Too.changes 2024-06-03 17:41:40.323052730 +0200 @@ -1,0 +2,75 @@ +Fri May 31 12:12:17 UTC 2024 - Antonio Larrosa <alarrosa(a)suse.com> + +- Update to 5.4.3: + + Fixes + * Regression - some templates no longer getting correct config + * CSRF not properly ignored for application forms using + :py SECURITY_CSRF_PROTECT_MECHANISMS. + * Improve jp translations + * Regression - datetime_factory should still be an attribute + * :py SECURITY_RETURN_GENERIC_RESPONSES hide email + validation/syntax errors. + +- Update to 5.4.2: + + Fixes + * OpenAPI spec missing. + * Doc fixes + * Update ES/IT translations + +- Update to 5.4.0 & 5.4.1: + + Features and improvements: + * Work with Flask[async]. view decorators and signals support + async handlers. + * CI support for python 3.12 + * Work with py_webauthn 2.0 (and only 2.0+) + * Improve (and simplify) Two-Factor setup. See below for + backwards compatability issues and new functionality. + * Improve oauth debugging support. Handle next propagation in a + more general way. + * Make AnonymousUser (Flask-Login) optional and deprecated. + * Remove undocumented and untested looking in session for + possible 'next' redirect location. + * No longer rely on Flask-Login.unauthorized callback. See + below for implications. + * Changes to default unauthorized handler - remove use of + referrer header (see below) and document precise behavior. + * The authentication_token format has changed - adding + per-token expiry time and future session ID. Old tokens are + still accepted. + + Docs and Chores + * Improve method translations for unified signin and two + factor. Remove support for Flask-Babelex. + * Chore - stop setting all config as attributes. + init_app(**kwargs) can only set forms, flags, and utility + classes (see below for compatibility concerns). + * Update Spanish and Italian translations. + * Improve translations for two-factor method selection. + * Improve German translations. + * Remove deprecation of AUTO_LOGIN_AFTER_CONFIRM - it has a + reasonable use case. + * Update message extraction - note that the + CONFIRM_REGISTRATION message was changed to improve + readability. + + Fixes + * us-signin magic link should use fs_uniquifier (not email). + * Improve open-redirect vulnerability mitigation. (see below) + * user_datastore.create_user has side effects on mutable + inputs. (NoRePercussions) + * The long deprecated _unauthorized_callback/handler has been + removed. + * Oauth re-used POST_LOGIN_VIEW which caused confusion. See + below for the new configuration and implications. + * Improve CSRF documentation and testing. Fix bug where a CSRF + failure could return an HTML page even if the request was + JSON. + * Register with JSON and authentication token failed CSRF. + * Fix 2 issues with CSRF configuration. + * It was possible that if SECURITY_EMAIL_VALIDATOR_ARGS were + set that deliverability would be checked even for login. + + Backwards Compatibility Concerns + Please read the full changelog at + https://github.com/Flask-Middleware/flask-security/blob/master/CHANGES.rst#… +- Drop patch that's already included by upstream: + * support-python-312.patch + +------------------------------------------------------------------- Old: ---- Flask-Security-Too-5.3.3.tar.gz support-python-312.patch New: ---- Flask-Security-Too-5.4.3.tar.gz BETA DEBUG BEGIN: Old:- Drop patch that's already included by upstream: * support-python-312.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Flask-Security-Too.spec ++++++ --- /var/tmp/diff_new_pack.umikXE/_old 2024-06-03 17:41:41.055080567 +0200 +++ /var/tmp/diff_new_pack.umikXE/_new 2024-06-03 17:41:41.055080567 +0200 @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-Flask-Security-Too -Version: 5.3.3 +Version: 5.4.3 Release: 0 Summary: Security for Flask apps License: MIT @@ -27,8 +27,6 @@ Patch0: no-mongodb.patch # PATCH-FIX-OPENSUSE Use pyqrcodeng, we do not ship qrcode in OpenSUSE. Patch1: use-pyqrcodeng.patch -# PATCH-FIX-UPSTREAM Based on gh#Flask-Middleware/flask-security#900 -Patch2: support-python-312.patch BuildRequires: %{python_module Authlib} BuildRequires: %{python_module Babel >= 2.10.0} BuildRequires: %{python_module Flask >= 2.3.2} @@ -37,7 +35,7 @@ BuildRequires: %{python_module Flask-Mailman >= 0.3.0} BuildRequires: %{python_module Flask-Principal >= 0.4.0} BuildRequires: %{python_module Flask-SQLAlchemy >= 3.0.3} -BuildRequires: %{python_module Flask-WTF >= 1.1.1} +BuildRequires: %{python_module Flask-WTF >= 1.1.2} BuildRequires: %{python_module MarkupSafe >= 2.1.0} BuildRequires: %{python_module PyQRCode >= 1.2} BuildRequires: %{python_module SQLAlchemy} @@ -49,8 +47,8 @@ BuildRequires: %{python_module bleach >= 6.0.0} BuildRequires: %{python_module cachetools >= 3.1.0} BuildRequires: %{python_module cryptography >= 40.0.2} -BuildRequires: %{python_module dateutil} BuildRequires: %{python_module email-validator >= 2.0} +BuildRequires: %{python_module freezegun} BuildRequires: %{python_module importlib_resources >= 5.10.0} BuildRequires: %{python_module itsdangerous >= 1.1.0} BuildRequires: %{python_module passlib >= 1.7.4} @@ -61,6 +59,7 @@ BuildRequires: %{python_module pytest >= 6.2.5} BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module webauthn >= 2.0.0} BuildRequires: %{python_module wheel} BuildRequires: %{python_module zxcvbn >= 4.4.28} BuildRequires: fdupes @@ -69,7 +68,7 @@ Requires: python-Flask-Babel >= 3.1.0 Requires: python-Flask-Login >= 0.6.2 Requires: python-Flask-Principal >= 0.4.0 -Requires: python-Flask-WTF >= 1.1.1 +Requires: python-Flask-WTF >= 1.1.2 Requires: python-MarkupSafe >= 2.1.0 Requires: python-WTForms >= 3.0.0 Requires: python-Werkzeug >= 2.3.3 @@ -80,6 +79,7 @@ Requires: python-importlib_resources >= 5.10.0 Requires: python-itsdangerous >= 1.1.0 Requires: python-passlib >= 1.7.4 +Requires: python-webauthn >= 2.0.0 Recommends: python-PyQRCode >= 1.2 Recommends: python-SQLAlchemy Recommends: python-zxcvbn >= 4.4.28 ++++++ Flask-Security-Too-5.3.3.tar.gz -> Flask-Security-Too-5.4.3.tar.gz ++++++ ++++ 34550 lines of diff (skipped)

1 0

commit lazarus for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lazarus for openSUSE:Factory checked in at 2024-06-03 17:41:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lazarus (Old) and /work/SRC/openSUSE:Factory/.lazarus.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lazarus" Mon Jun 3 17:41:28 2024 rev:26 rq:1177940 version:3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/lazarus/lazarus.changes 2024-05-15 21:28:09.908998201 +0200 +++ /work/SRC/openSUSE:Factory/.lazarus.new.24587/lazarus.changes 2024-06-03 17:41:38.566985952 +0200 @@ -1,0 +2,9 @@ +Fri May 31 10:04:48 UTC 2024 - PragmaticLinux <info(a)pragmaticlinux.com> + +- Update to 3.4 + * This is a bugfix release for which no seperate release notes were + published. The previous release notes still apply: + https://wiki.freepascal.org/Lazarus_3.0_release_notes +- Removed lazarus-libqt6_fix.patch because this is fixed in Lazarus 3.4. + +------------------------------------------------------------------- Old: ---- lazarus-3.2-0.tar.gz lazarus-libqt6_fix.patch New: ---- lazarus-3.4-0.tar.gz BETA DEBUG BEGIN: Old: https://wiki.freepascal.org/Lazarus_3.0_release_notes - Removed lazarus-libqt6_fix.patch because this is fixed in Lazarus 3.4. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lazarus.spec ++++++ --- /var/tmp/diff_new_pack.RDlR90/_old 2024-06-03 17:41:39.851034781 +0200 +++ /var/tmp/diff_new_pack.RDlR90/_new 2024-06-03 17:41:39.851034781 +0200 @@ -19,7 +19,7 @@ %define qt5_sover 1 %define qt6_sover 6 Name: lazarus -Version: 3.2 +Version: 3.4 Release: 0 # Please note that the LGPL is modified and this is not multi-licensed, but each component has a separate license chosen. Summary: FreePascal RAD IDE and Component Library @@ -34,8 +34,6 @@ Patch0: %{name}-Makefile_patch.diff # PATCH-FIX-OPENSUSE lazarus.desktop.patch -- Fix desktop file Patch1: lazarus.desktop.patch -# PATCH-FIX-OPENSUSE lazarus-libqt6_fix.patch -- Fix libqt6pas per upstream issue #40901 -Patch2: lazarus-libqt6_fix.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: fpc >= 3.0.0 ++++++ lazarus-3.2-0.tar.gz -> lazarus-3.4-0.tar.gz ++++++ /work/SRC/openSUSE:Factory/lazarus/lazarus-3.2-0.tar.gz /work/SRC/openSUSE:Factory/.lazarus.new.24587/lazarus-3.4-0.tar.gz differ: char 12, line 1

1 0

commit kbom for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kbom for openSUSE:Factory checked in at 2024-06-03 17:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbom (Old) and /work/SRC/openSUSE:Factory/.kbom.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbom" Mon Jun 3 17:41:26 2024 rev:3 rq:1178033 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbom/kbom.changes 2023-12-21 23:40:02.545668159 +0100 +++ /work/SRC/openSUSE:Factory/.kbom.new.24587/kbom.changes 2024-06-03 17:41:36.038889816 +0200 @@ -1,0 +2,21 @@ +Sat Jun 01 09:14:22 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.3.0: + * Change prefix in taxonomy and cyclondx + +------------------------------------------------------------------- +Fri May 31 12:33:05 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.2.6: + * Bump schema version and format + * Bump dependencies + * Migrate kbom from ksoclabs to rad-security + * Update module github.com/google/uuid to v1.5.0 + * Update kubernetes packages to v0.29.0 + +------------------------------------------------------------------- +Thu Apr 18 08:01:51 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de> + +- do not strip aka remove -s -w ldflags + +------------------------------------------------------------------- Old: ---- kbom-0.2.5.obscpio New: ---- kbom-0.3.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbom.spec ++++++ --- /var/tmp/diff_new_pack.z1GSqR/_old 2024-06-03 17:41:37.074929214 +0200 +++ /var/tmp/diff_new_pack.z1GSqR/_new 2024-06-03 17:41:37.074929214 +0200 @@ -1,7 +1,7 @@ # # spec file for package kbom # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,21 +19,25 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: kbom -Version: 0.2.5 +Version: 0.3.0 Release: 0 Summary: Kubernetes Bill of Materials License: Apache-2.0 -URL: https://github.com/ksoclabs/kbom +URL: https://github.com/rad-security/kbom Source: kbom-%{version}.tar.gz Source1: vendor.tar.gz -BuildRequires: go >= 1.20 +BuildRequires: go >= 1.22 %description -The Kubernetes Bill of Materials (KBOM) standard provides insight into container orchestration tools widely used across the industry. +The Kubernetes Bill of Materials (KBOM) standard provides insight into +container orchestration tools widely used across the industry. -As a first draft, we have created a rough specification which should fall in line with other Bill of Materials (BOM) standards. +As a first draft, we have created a rough specification which should fall in +line with other Bill of Materials (BOM) standards. -The KBOM project provides an initial specification in JSON and has been constructed for extensibilty across various cloud service providers (CSPs) as well as DIY Kubernetes. +The KBOM project provides an initial specification in JSON and has been +constructed for extensibilty across various cloud service providers (CSPs) as +well as DIY Kubernetes. %package -n %{name}-bash-completion Summary: Bash Completion for %{name} @@ -75,11 +79,11 @@ go build \ -mod=vendor \ -buildmode=pie \ - -ldflags="-s -w \ - -X github.com/ksoclabs/kbom/internal/config.AppName=kbom \ - -X github.com/ksoclabs/kbom/internal/config.AppVersion=v%{version} \ - -X github.com/ksoclabs/kbom/internal/config.BuildTime=$BUILD_DATE\ - -X github.com/ksoclabs/kbom/internal/config.LastCommitHash=v%{version}" \ + -ldflags=" \ + -X github.com/rad-security/kbom/internal/config.AppName=kbom \ + -X github.com/rad-security/kbom/internal/config.AppVersion=v%{version} \ + -X github.com/rad-security/kbom/internal/config.BuildTime=$BUILD_DATE\ + -X github.com/rad-security/kbom/internal/config.LastCommitHash=v%{version}" \ -o bin/kbom . %install ++++++ _service ++++++ --- /var/tmp/diff_new_pack.z1GSqR/_old 2024-06-03 17:41:37.102930279 +0200 +++ /var/tmp/diff_new_pack.z1GSqR/_new 2024-06-03 17:41:37.106930431 +0200 @@ -1,21 +1,22 @@ <services> <service name="obs_scm" mode="manual"> - <param name="url">https://github.com/ksoclabs/kbom</param> + <param name="url">https://github.com/rad-security/kbom</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.2.5</param> + <param name="revision">v0.3.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> </service> <service name="set_version" mode="manual"> </service> - <service name="tar" mode="buildtime"/> + <service name="go_modules" mode="manual"> + </service> + <service name="tar" mode="buildtime"> + </service> <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> <param name="compression">gz</param> </service> - <service name="go_modules" mode="manual"> - </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.z1GSqR/_old 2024-06-03 17:41:37.138931648 +0200 +++ /var/tmp/diff_new_pack.z1GSqR/_new 2024-06-03 17:41:37.142931800 +0200 @@ -1,6 +1,8 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ksoclabs/kbom</param> - <param name="changesrevision">5873ff285776c931b4158b76c91074620589d16f</param></service></servicedata> + <param name="changesrevision">5873ff285776c931b4158b76c91074620589d16f</param></service><service name="tar_scm"> + <param name="url">https://github.com/rad-security/kbom</param> + <param name="changesrevision">c34494fddc3f2af8fb3f087a6f32112dc453debf</param></service></servicedata> (No newline at EOF) ++++++ kbom-0.2.5.obscpio -> kbom-0.3.0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/.github/ISSUE_TEMPLATE/config.yml new/kbom-0.3.0/.github/ISSUE_TEMPLATE/config.yml --- old/kbom-0.2.5/.github/ISSUE_TEMPLATE/config.yml 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/.github/ISSUE_TEMPLATE/config.yml 2024-05-31 15:17:22.000000000 +0200 @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - name: Ask a question - url: https://github.com/ksoclabs/kbom/discussions + url: https://github.com/rad-security/kbom/discussions about: Please ask and answer questions here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/.github/workflows/golangci-lint.yml new/kbom-0.3.0/.github/workflows/golangci-lint.yml --- old/kbom-0.2.5/.github/workflows/golangci-lint.yml 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/.github/workflows/golangci-lint.yml 2024-05-31 15:17:22.000000000 +0200 @@ -16,12 +16,12 @@ - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' check-latest: true # https://github.com/actions/setup-go#check-latest-version cache: true # https://github.com/actions/setup-go#caching-dependency-files-and-build-outp… - name: golangci-lint - uses: golangci/golangci-lint-action(a)v3.7.0 + uses: golangci/golangci-lint-action@v6 with: - version: v1.54.2 + version: v1.59.0 args: --timeout=5m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/.golangci.yml new/kbom-0.3.0/.golangci.yml --- old/kbom-0.2.5/.golangci.yml 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/.golangci.yml 2024-05-31 15:17:22.000000000 +0200 @@ -22,7 +22,7 @@ gocyclo: min-complexity: 15 goimports: - local-prefixes: github.com/ksoc-private + local-prefixes: github.com/rad-security golint: min-confidence: 0 lll: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/.goreleaser.yml new/kbom-0.3.0/.goreleaser.yml --- old/kbom-0.2.5/.goreleaser.yml 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/.goreleaser.yml 2024-05-31 15:17:22.000000000 +0200 @@ -11,7 +11,7 @@ - glob: ./bom.json github: name: kbom - owner: ksoclabs + owner: rad-security discussion_category_name: Announcements builds: @@ -21,15 +21,15 @@ - linux - windows goarch: - - 386 + - "386" - amd64 - arm - arm64 goarm: - - 7 + - "7" ignore: - goos: darwin - goarch: 386 + goarch: "386" ldflags: - -X "{{.Env.CFG_PACKAGE_NAME}}.AppName=kbom" - -X "{{.Env.CFG_PACKAGE_NAME}}.AppVersion={{.Env.VERSION}}" @@ -72,9 +72,9 @@ brews: - repository: - owner: ksoclabs + owner: rad-security name: homebrew-kbom - homepage: "https://github.com/ksoclabs/kbom" + homepage: "https://github.com/rad-security/kbom" description: "The Kubernetes Bill of Materials (KBOM) standard provides insight into container orchestration tools widely used across the industry." license: "Apache 2" test: | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/CODEOWNERS new/kbom-0.3.0/CODEOWNERS --- old/kbom-0.2.5/CODEOWNERS 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/CODEOWNERS 2024-05-31 15:17:22.000000000 +0200 @@ -1 +1 @@ -* @ksoclabs/engineering +* @rad-security/engineering diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/CONTRIBUTING.md new/kbom-0.3.0/CONTRIBUTING.md --- old/kbom-0.2.5/CONTRIBUTING.md 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/CONTRIBUTING.md 2024-05-31 15:17:22.000000000 +0200 @@ -1,6 +1,6 @@ # Contributing -KBOM is [Apache 2.0 licensed](https://github.com/ksoclabs/kbom/blob/main/LICENSE) and +KBOM is [Apache 2.0 licensed](https://github.com/rad-security/kbom/blob/main/LICENSE) and accepts contributions via GitHub pull requests. This document outlines some of the conventions on to make it easier to get your contribution accepted. @@ -28,7 +28,7 @@ ## Communications -To discuss ideas and specifications we use [GitHub Discussions](https://github.com/ksoclabs/kbom/discussions). +To discuss ideas and specifications we use [GitHub Discussions](https://github.com/rad-security/kbom/discussions). ## How to run the KBOM generator in local environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/Makefile new/kbom-0.3.0/Makefile --- old/kbom-0.2.5/Makefile 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/Makefile 2024-05-31 15:17:22.000000000 +0200 @@ -1,6 +1,6 @@ APP_NAME := kbom GCR_ORG := ksoc-public -GITHUB_ORG := ksoclabs +GITHUB_ORG := rad-security GIT_REPO ?= github.com/$(GITHUB_ORG)/$(APP_NAME) VERSION := $(shell SEP="-" bash scripts/version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/README.md new/kbom-0.3.0/README.md --- old/kbom-0.2.5/README.md 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/README.md 2024-05-31 15:17:22.000000000 +0200 @@ -1,8 +1,8 @@ # KBOM - Kubernetes Bill of Materials -![GitHub release (latest by date)](https://img.shields.io/github/v/release/ksoclabs/kbom) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/rad-security/kbom) ![Hex.pm](https://img.shields.io/hexpm/l/apa) -[![Go Report Card](https://goreportcard.com/badge/github.com/ksoclabs/kbom)](https://gor… +[![Go Report Card](https://goreportcard.com/badge/github.com/rad-security/kbom)](https:/… [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/7273/badge… The Kubernetes Bill of Materials (KBOM) standard provides insight into container orchestration tools widely used across the industry. @@ -16,7 +16,7 @@ ### Installation ```sh -brew install ksoclabs/homebrew-kbom/kbom +brew install rad-security/homebrew-kbom/kbom ``` or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/SECURITY.md new/kbom-0.3.0/SECURITY.md --- old/kbom-0.2.5/SECURITY.md 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/SECURITY.md 2024-05-31 15:17:22.000000000 +0200 @@ -8,4 +8,4 @@ ## Reporting a Vulnerability -If you are aware of a vulnverability please feel free to disclose it responsibly [here](https://github.com/ksoclabs/kbom/security/advisories/new). +If you are aware of a vulnverability please feel free to disclose it responsibly [here](https://github.com/rad-security/kbom/security/advisories/new). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/build/package/Dockerfile.gorelease new/kbom-0.3.0/build/package/Dockerfile.gorelease --- old/kbom-0.2.5/build/package/Dockerfile.gorelease 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/build/package/Dockerfile.gorelease 2024-05-31 15:17:22.000000000 +0200 @@ -1,4 +1,4 @@ -FROM alpine:3.19.0 +FROM alpine:3.20.0 RUN mkdir /app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/cyclonexdx.go new/kbom-0.3.0/cmd/cyclonexdx.go --- old/kbom-0.2.5/cmd/cyclonexdx.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/cyclonexdx.go 2024-05-31 15:17:22.000000000 +0200 @@ -8,13 +8,14 @@ "github.com/CycloneDX/cyclonedx-go" "github.com/google/uuid" - "github.com/ksoclabs/kbom/internal/model" "github.com/mitchellh/hashstructure/v2" + + "github.com/rad-security/kbom/internal/model" ) const ( CdxPrefix = "cdx:" - KSOCPrefix = "ksoc:kbom:" + RADPrefix = "rad:kbom:" K8sComponentType = "k8s:component:type" K8sComponentName = "k8s:component:name" @@ -50,28 +51,28 @@ Value: kbom.Cluster.Name, }, { - Name: KSOCPrefix + "k8s:cluster:nodes", + Name: RADPrefix + "k8s:cluster:nodes", Value: fmt.Sprintf("%d", kbom.Cluster.NodesCount), }, } if kbom.Cluster.Location.Name != "" && kbom.Cluster.Location.Name != "unknown" { clusterProperties = append(clusterProperties, cyclonedx.Property{ - Name: KSOCPrefix + "k8s:cluster:location:name", + Name: RADPrefix + "k8s:cluster:location:name", Value: kbom.Cluster.Location.Name, }) } if kbom.Cluster.Location.Region != "" { clusterProperties = append(clusterProperties, cyclonedx.Property{ - Name: KSOCPrefix + "k8s:cluster:location:region", + Name: RADPrefix + "k8s:cluster:location:region", Value: kbom.Cluster.Location.Region, }) } if kbom.Cluster.Location.Zone != "" { clusterProperties = append(clusterProperties, cyclonedx.Property{ - Name: KSOCPrefix + "k8s:cluster:location:zone", + Name: RADPrefix + "k8s:cluster:location:zone", Value: kbom.Cluster.Location.Zone, }) } @@ -103,79 +104,79 @@ Value: n.Name, }, { - Name: KSOCPrefix + "k8s:node:osImage", + Name: RADPrefix + "k8s:node:osImage", Value: n.OsImage, }, { - Name: KSOCPrefix + "k8s:node:arch", + Name: RADPrefix + "k8s:node:arch", Value: n.Architecture, }, { - Name: KSOCPrefix + "k8s:node:kernel", + Name: RADPrefix + "k8s:node:kernel", Value: n.KernelVersion, }, { - Name: KSOCPrefix + "k8s:node:bootId", + Name: RADPrefix + "k8s:node:bootId", Value: n.BootID, }, { - Name: KSOCPrefix + "k8s:node:type", + Name: RADPrefix + "k8s:node:type", Value: n.Type, }, { - Name: KSOCPrefix + "k8s:node:operatingSystem", + Name: RADPrefix + "k8s:node:operatingSystem", Value: n.OperatingSystem, }, { - Name: KSOCPrefix + "k8s:node:machineId", + Name: RADPrefix + "k8s:node:machineId", Value: n.MachineID, }, { - Name: KSOCPrefix + "k8s:node:hostname", + Name: RADPrefix + "k8s:node:hostname", Value: n.Hostname, }, { - Name: KSOCPrefix + "k8s:node:containerRuntimeVersion", + Name: RADPrefix + "k8s:node:containerRuntimeVersion", Value: n.ContainerRuntimeVersion, }, { - Name: KSOCPrefix + "k8s:node:kubeletVersion", + Name: RADPrefix + "k8s:node:kubeletVersion", Value: n.KubeletVersion, }, { - Name: KSOCPrefix + "k8s:node:kubeProxyVersion", + Name: RADPrefix + "k8s:node:kubeProxyVersion", Value: n.KubeProxyVersion, }, { - Name: KSOCPrefix + "k8s:node:capacity:cpu", + Name: RADPrefix + "k8s:node:capacity:cpu", Value: n.Capacity.CPU, }, { - Name: KSOCPrefix + "k8s:node:capacity:memory", + Name: RADPrefix + "k8s:node:capacity:memory", Value: n.Capacity.Memory, }, { - Name: KSOCPrefix + "k8s:node:capacity:pods", + Name: RADPrefix + "k8s:node:capacity:pods", Value: n.Capacity.Pods, }, { - Name: KSOCPrefix + "k8s:node:capacity:ephemeralStorage", + Name: RADPrefix + "k8s:node:capacity:ephemeralStorage", Value: n.Capacity.EphemeralStorage, }, { - Name: KSOCPrefix + "k8s:node:allocatable:cpu", + Name: RADPrefix + "k8s:node:allocatable:cpu", Value: n.Allocatable.CPU, }, { - Name: KSOCPrefix + "k8s:node:allocatable:memory", + Name: RADPrefix + "k8s:node:allocatable:memory", Value: n.Allocatable.Memory, }, { - Name: KSOCPrefix + "k8s:node:allocatable:pods", + Name: RADPrefix + "k8s:node:allocatable:pods", Value: n.Allocatable.Pods, }, { - Name: KSOCPrefix + "k8s:node:allocatable:ephemeralStorage", + Name: RADPrefix + "k8s:node:allocatable:ephemeralStorage", Value: n.Allocatable.EphemeralStorage, }, }, @@ -201,19 +202,19 @@ Value: img.Name, }, { - Name: KSOCPrefix + "pkg:type", + Name: RADPrefix + "pkg:type", Value: "oci", }, { - Name: KSOCPrefix + "pkg:name", + Name: RADPrefix + "pkg:name", Value: img.Name, }, { - Name: KSOCPrefix + "pkg:version", + Name: RADPrefix + "pkg:version", Value: img.Version, }, { - Name: KSOCPrefix + "pkg:digest", + Name: RADPrefix + "pkg:digest", Value: img.Digest, }, }, @@ -238,14 +239,14 @@ Value: res.Name, }, { - Name: KSOCPrefix + "k8s:component:apiVersion", + Name: RADPrefix + "k8s:component:apiVersion", Value: resList.APIVersion, }, } if resList.Namespaced { properties = append(properties, cyclonedx.Property{ - Name: KSOCPrefix + "k8s:component:namespace", + Name: RADPrefix + "k8s:component:namespace", Value: res.Namespace, }) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/generate.go new/kbom-0.3.0/cmd/generate.go --- old/kbom-0.2.5/cmd/generate.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/generate.go 2024-05-31 15:17:22.000000000 +0200 @@ -15,16 +15,16 @@ "github.com/spf13/cobra" "gopkg.in/yaml.v3" - "github.com/ksoclabs/kbom/internal/config" - "github.com/ksoclabs/kbom/internal/kube" - "github.com/ksoclabs/kbom/internal/model" - "github.com/ksoclabs/kbom/internal/utils" + "github.com/rad-security/kbom/internal/config" + "github.com/rad-security/kbom/internal/kube" + "github.com/rad-security/kbom/internal/model" + "github.com/rad-security/kbom/internal/utils" ) const ( - KSOCCompany = "KSOC Labs" - BOMFormat = "ksoc" - SpecVersion = "0.2" + Company = "RAD Security" + BOMFormat = "rad" + SpecVersion = "0.3" StdOutput = "stdout" FileOutput = "file" @@ -108,7 +108,7 @@ SpecVersion: SpecVersion, GeneratedAt: generatedAt, GeneratedBy: model.Tool{ - Vendor: KSOCCompany, + Vendor: Company, BuildTime: config.BuildTime, Name: config.AppName, Version: config.AppVersion, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/generate_test.go new/kbom-0.3.0/cmd/generate_test.go --- old/kbom-0.2.5/cmd/generate_test.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/generate_test.go 2024-05-31 15:17:22.000000000 +0200 @@ -8,9 +8,10 @@ "testing" "time" - "github.com/ksoclabs/kbom/internal/kube" - "github.com/ksoclabs/kbom/internal/model" "github.com/stretchr/testify/assert" + + "github.com/rad-security/kbom/internal/kube" + "github.com/rad-security/kbom/internal/model" ) func TestGenerateKBOM(t *testing.T) { @@ -348,11 +349,11 @@ var expectedOutJSON = `{ "id": "00000001", - "bom_format": "ksoc", - "spec_version": "0.2", + "bom_format": "rad", + "spec_version": "0.3", "generated_at": "2023-04-26T10:00:00Z", "generated_by": { - "vendor": "KSOC Labs", + "vendor": "RAD Security", "name": "unknown", "build_time": "unknown", "version": "unknown", @@ -479,11 +480,11 @@ } ` var expectedOutYAML = `id: "00000001" -bomformat: ksoc -specversion: "0.2" +bomformat: rad +specversion: "0.3" generatedat: 2023-04-26T10:00:00Z generatedby: - vendor: KSOC Labs + vendor: RAD Security name: unknown buildtime: unknown version: unknown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/root.go new/kbom-0.3.0/cmd/root.go --- old/kbom-0.2.5/cmd/root.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/root.go 2024-05-31 15:17:22.000000000 +0200 @@ -13,11 +13,11 @@ "github.com/spf13/viper" "golang.org/x/term" - "github.com/ksoclabs/kbom/internal/utils" + "github.com/rad-security/kbom/internal/utils" ) const ( - confDir = ".config/ksoc" + confDir = ".config/rad" ) var ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/schema.go new/kbom-0.3.0/cmd/schema.go --- old/kbom-0.2.5/cmd/schema.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/schema.go 2024-05-31 15:17:22.000000000 +0200 @@ -4,8 +4,9 @@ "encoding/json" "github.com/invopop/jsonschema" - "github.com/ksoclabs/kbom/internal/model" "github.com/spf13/cobra" + + "github.com/rad-security/kbom/internal/model" ) var schemaCmd = &cobra.Command{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/schema_test.go new/kbom-0.3.0/cmd/schema_test.go --- old/kbom-0.2.5/cmd/schema_test.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/schema_test.go 2024-05-31 15:17:22.000000000 +0200 @@ -31,7 +31,7 @@ var expectedSchema = `{ "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "https://github.com/ksoclabs/kbom/internal/model/kbom", + "$id": "https://github.com/rad-security/kbom/internal/model/kbom", "$ref": "#/$defs/KBOM", "$defs": { "Capacity": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/version.go new/kbom-0.3.0/cmd/version.go --- old/kbom-0.2.5/cmd/version.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/version.go 2024-05-31 15:17:22.000000000 +0200 @@ -3,8 +3,9 @@ import ( "fmt" - "github.com/ksoclabs/kbom/internal/config" "github.com/spf13/cobra" + + "github.com/rad-security/kbom/internal/config" ) var versionCmd = &cobra.Command{ @@ -18,7 +19,7 @@ fmt.Fprintf(out, "%s version %s\n", config.AppName, config.AppVersion) fmt.Fprintf(out, "build date: %s\n", config.BuildTime) fmt.Fprintf(out, "commit: %s\n\n", config.LastCommitHash) - fmt.Fprintln(out, "https://github.com/ksoclabs/kbom") + fmt.Fprintln(out, "https://github.com/rad-security/kbom") return nil } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/cmd/version_test.go new/kbom-0.3.0/cmd/version_test.go --- old/kbom-0.2.5/cmd/version_test.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/cmd/version_test.go 2024-05-31 15:17:22.000000000 +0200 @@ -4,8 +4,9 @@ "bytes" "testing" - "github.com/ksoclabs/kbom/internal/config" "github.com/stretchr/testify/assert" + + "github.com/rad-security/kbom/internal/config" ) func TestVersion(t *testing.T) { @@ -27,5 +28,5 @@ build date: 2021-01-01T00:00:00Z commit: 1234567890 -https://github.com/ksoclabs/kbom +https://github.com/rad-security/kbom ` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/docs/taxonomy.md new/kbom-0.3.0/docs/taxonomy.md --- old/kbom-0.2.5/docs/taxonomy.md 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/docs/taxonomy.md 2024-05-31 15:17:22.000000000 +0200 @@ -1,53 +1,53 @@ -# Custom KSOC KBOM Taxonomy +# Custom RAD KBOM Taxonomy -This is the KSOC KBOM CycloneDX property namespace and name taxonomy. All of the namespaces are prefixed with `ksoc:kbom:`. +This is the RAD KBOM CycloneDX property namespace and name taxonomy. All of the namespaces are prefixed with `rad:kbom:`. Following Taxonomy is used by the `KBOM` tool as extension to: [https://github.com/CycloneDX/cyclonedx-property-taxonomy](https://github.co…. -## `ksoc:kbom:k8s:component` Namespace Taxonomy +## `rad:kbom:k8s:component` Namespace Taxonomy | Namespace | Description | | ------------------------------------ | ----------------------------------------------------------------- | -| `ksoc:kbom:k8s:component:apiVersion` | API Version of the Kubernetes component. | -| `ksoc:kbom:k8s:component:namespace` | Namespace of the Kubernetes component. | +| `rad:kbom:k8s:component:apiVersion` | API Version of the Kubernetes component. | +| `rad:kbom:k8s:component:namespace` | Namespace of the Kubernetes component. | -## `ksoc:kbom:k8s:cluster` Namespace Taxonomy +## `rad:kbom:k8s:cluster` Namespace Taxonomy | Property | Description | | ----------------------------------------- | ------------------------------ | -| `ksoc:kbom:k8s:cluster:location:name` | Name of the location. | -| `ksoc:kbom:k8s:cluster:location:region` | Region of the cluster. | -| `ksoc:kbom:k8s:cluster:location:zone` | Zone where cluster is located. | +| `rad:kbom:k8s:cluster:location:name` | Name of the location. | +| `rad:kbom:k8s:cluster:location:region` | Region of the cluster. | +| `rad:kbom:k8s:cluster:location:zone` | Zone where cluster is located. | -## `ksoc:kbom:k8s:node` Namespace Taxonomy +## `rad:kbom:k8s:node` Namespace Taxonomy | Property | Description | | -------------------------------------------------- | ------------------------------------ | -| `ksoc:kbom:k8s:node:osImage` | Node's operating system image | -| `ksoc:kbom:k8s:node:arch` | Node's architecture | -| `ksoc:kbom:k8s:node:kernel` | Node's kernel version | -| `ksoc:kbom:k8s:node:bootId` | Node's Boot identifier | -| `ksoc:kbom:k8s:node:type` | Node's type | -| `ksoc:kbom:k8s:node:operatingSystem` | Node's operating system | -| `ksoc:kbom:k8s:node:machineId` | Node's machine identifier | -| `ksoc:kbom:k8s:node:hostname` | Node's hostname | -| `ksoc:kbom:k8s:node:containerRuntimeVersion` | Node's container runtime version | -| `ksoc:kbom:k8s:node:kubeletVersion` | Node's kubelet version | -| `ksoc:kbom:k8s:node:kubeProxyVersion` | Node's kube proxy version | -| `ksoc:kbom:k8s:node:capacity:cpu` | Node's CPU capacity | -| `ksoc:kbom:k8s:node:capacity:memory` | Node's Memory capacity | -| `ksoc:kbom:k8s:node:capacity:pods` | Node's Pods capacity | -| `ksoc:kbom:k8s:node:capacity:ephemeralStorage` | Node's ephemeral storage capacity | -| `ksoc:kbom:k8s:node:allocatable:cpu` | Node's allocatable CPU | -| `ksoc:kbom:k8s:node:allocatable:memory` | Node's allocatable Memory | -| `ksoc:kbom:k8s:node:allocatable:pods` | Node's allocatable Pods | -| `ksoc:kbom:k8s:node:allocatable:ephemeralStorage` | Node's allocatable ephemeral storage | +| `rad:kbom:k8s:node:osImage` | Node's operating system image | +| `rad:kbom:k8s:node:arch` | Node's architecture | +| `rad:kbom:k8s:node:kernel` | Node's kernel version | +| `rad:kbom:k8s:node:bootId` | Node's Boot identifier | +| `rad:kbom:k8s:node:type` | Node's type | +| `rad:kbom:k8s:node:operatingSystem` | Node's operating system | +| `rad:kbom:k8s:node:machineId` | Node's machine identifier | +| `rad:kbom:k8s:node:hostname` | Node's hostname | +| `rad:kbom:k8s:node:containerRuntimeVersion` | Node's container runtime version | +| `rad:kbom:k8s:node:kubeletVersion` | Node's kubelet version | +| `rad:kbom:k8s:node:kubeProxyVersion` | Node's kube proxy version | +| `rad:kbom:k8s:node:capacity:cpu` | Node's CPU capacity | +| `rad:kbom:k8s:node:capacity:memory` | Node's Memory capacity | +| `rad:kbom:k8s:node:capacity:pods` | Node's Pods capacity | +| `rad:kbom:k8s:node:capacity:ephemeralStorage` | Node's ephemeral storage capacity | +| `rad:kbom:k8s:node:allocatable:cpu` | Node's allocatable CPU | +| `rad:kbom:k8s:node:allocatable:memory` | Node's allocatable Memory | +| `rad:kbom:k8s:node:allocatable:pods` | Node's allocatable Pods | +| `rad:kbom:k8s:node:allocatable:ephemeralStorage` | Node's allocatable ephemeral storage | -## `ksoc:kbom:pkg` Namespace Taxonomy +## `rad:kbom:pkg` Namespace Taxonomy | Property | Description | | --------------------------------- | -------------------------------------------------- | -| `ksoc:kbom:pkg:type` | Type of the package. | -| `ksoc:kbom:pkg:name` | Name of the package. | -| `ksoc:kbom:pkg:version` | Version of the package. | -| `ksoc:kbom:pkg:digest` | Digest of the package. | +| `rad:kbom:pkg:type` | Type of the package. | +| `rad:kbom:pkg:name` | Name of the package. | +| `rad:kbom:pkg:version` | Version of the package. | +| `rad:kbom:pkg:digest` | Digest of the package. | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/go.mod new/kbom-0.3.0/go.mod --- old/kbom-0.2.5/go.mod 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/go.mod 2024-05-31 15:17:22.000000000 +0200 @@ -1,23 +1,25 @@ -module github.com/ksoclabs/kbom +module github.com/rad-security/kbom -go 1.21 +go 1.22.0 + +toolchain go1.22.3 require ( github.com/CycloneDX/cyclonedx-go v0.7.2 github.com/Masterminds/semver v1.5.0 - github.com/distribution/reference v0.5.0 - github.com/google/uuid v1.5.0 + github.com/distribution/reference v0.6.0 + github.com/google/uuid v1.6.0 github.com/invopop/jsonschema v0.12.0 github.com/mitchellh/hashstructure/v2 v2.0.2 - github.com/rs/zerolog v1.31.0 + github.com/rs/zerolog v1.33.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 - github.com/stretchr/testify v1.8.4 - golang.org/x/term v0.15.0 + github.com/stretchr/testify v1.9.0 + golang.org/x/term v0.20.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.29.0 - k8s.io/apimachinery v0.29.0 + k8s.io/apimachinery v0.30.1 k8s.io/client-go v0.29.0 ) @@ -27,14 +29,13 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.3.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect - github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/imdario/mergo v0.3.6 // indirect @@ -62,18 +63,18 @@ go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/net v0.19.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/oauth2 v0.15.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect + k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/go.sum new/kbom-0.3.0/go.sum --- old/kbom-0.2.5/go.sum 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/go.sum 2024-05-31 15:17:22.000000000 +0200 @@ -15,21 +15,16 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= -github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= -github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= @@ -42,24 +37,20 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= @@ -101,10 +92,10 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= -github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= -github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= -github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= +github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= +github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE= +github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= @@ -116,8 +107,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= @@ -133,8 +124,6 @@ github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.18.0 h1:pN6W1ub/G4OfnM+NR9p7xP9R6TltLUzp5JG9yZD3Qg0= -github.com/spf13/viper v1.18.0/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -144,8 +133,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo= @@ -176,8 +166,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -189,10 +179,10 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -204,18 +194,16 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= +golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -229,34 +217,20 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.4 h1:8ZBrLjwosLl/NYgv1P7EQLqoO8MGQApnbgH8tu3BMzY= -k8s.io/api v0.28.4/go.mod h1:axWTGrY88s/5YE+JSt4uUi6NMM+gur1en2REMR7IRj0= k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= -k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8= -k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg= -k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= -k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= -k8s.io/client-go v0.28.4 h1:Np5ocjlZcTrkyRJ3+T3PkXDpe4UpatQxj85+xjaD2wY= -k8s.io/client-go v0.28.4/go.mod h1:0VDZFpgoZfelyP5Wqu0/r/TRYcLYuJ2U1KEeoaPa1N4= +k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U= +k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= -k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/internal/kube/kube.go new/kbom-0.3.0/internal/kube/kube.go --- old/kbom-0.2.5/internal/kube/kube.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/internal/kube/kube.go 2024-05-31 15:17:22.000000000 +0200 @@ -19,7 +19,7 @@ "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/ksoclabs/kbom/internal/model" + "github.com/rad-security/kbom/internal/model" ) type K8sClient interface { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbom-0.2.5/main.go new/kbom-0.3.0/main.go --- old/kbom-0.2.5/main.go 2023-12-20 23:48:48.000000000 +0100 +++ new/kbom-0.3.0/main.go 2024-05-31 15:17:22.000000000 +0200 @@ -1,6 +1,6 @@ package main -import "github.com/ksoclabs/kbom/cmd" +import "github.com/rad-security/kbom/cmd" func main() { cmd.Execute() ++++++ kbom.obsinfo ++++++ --- /var/tmp/diff_new_pack.z1GSqR/_old 2024-06-03 17:41:37.250935907 +0200 +++ /var/tmp/diff_new_pack.z1GSqR/_new 2024-06-03 17:41:37.254936059 +0200 @@ -1,5 +1,5 @@ name: kbom -version: 0.2.5 -mtime: 1703112528 -commit: 5873ff285776c931b4158b76c91074620589d16f +version: 0.3.0 +mtime: 1717161442 +commit: c34494fddc3f2af8fb3f087a6f32112dc453debf ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/kbom/vendor.tar.gz /work/SRC/openSUSE:Factory/.kbom.new.24587/vendor.tar.gz differ: char 5, line 1

1 0

commit kyverno for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kyverno for openSUSE:Factory checked in at 2024-06-03 17:41:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kyverno (Old) and /work/SRC/openSUSE:Factory/.kyverno.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kyverno" Mon Jun 3 17:41:21 2024 rev:35 rq:1177934 version:1.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kyverno/kyverno.changes 2024-05-24 19:52:10.279770994 +0200 +++ /work/SRC/openSUSE:Factory/.kyverno.new.24587/kyverno.changes 2024-06-03 17:41:33.838806155 +0200 @@ -1,0 +2,12 @@ +Fri May 31 12:29:57 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.12.3: + * feat: add aggregation workers flag (#10331) (#10343) + * fix: remove unused parameters (#10327) (#10329) + * feat: add cleanup cronjobs for (cluster)ephemeralreports + (#10325) (#10334) + * feat: add a cleanup cronjob to delete urs (#10249) (#10326) + * feat: add support for background scanning of existing resource + in image verification (#10287) (#10311) + +------------------------------------------------------------------- Old: ---- kyverno-1.12.2.obscpio New: ---- kyverno-1.12.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kyverno.spec ++++++ --- /var/tmp/diff_new_pack.lfUTN2/_old 2024-06-03 17:41:35.390865175 +0200 +++ /var/tmp/diff_new_pack.lfUTN2/_new 2024-06-03 17:41:35.390865175 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: kyverno -Version: 1.12.2 +Version: 1.12.3 Release: 0 Summary: CLI and kubectl plugin for Kyverno License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lfUTN2/_old 2024-06-03 17:41:35.418866239 +0200 +++ /var/tmp/diff_new_pack.lfUTN2/_new 2024-06-03 17:41:35.422866391 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/kyverno/kyverno</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.12.2</param> + <param name="revision">v1.12.3</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.lfUTN2/_old 2024-06-03 17:41:35.438867000 +0200 +++ /var/tmp/diff_new_pack.lfUTN2/_new 2024-06-03 17:41:35.442867152 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/kyverno/kyverno</param> - <param name="changesrevision">36051a7af4cf6f4a1a1585a58ecbcfd6e2d62c93</param></service></servicedata> + <param name="changesrevision">46293db866d6b741c109f8eeba202b5aa4c191b6</param></service></servicedata> (No newline at EOF) ++++++ kyverno-1.12.2.obscpio -> kyverno-1.12.3.obscpio ++++++ /work/SRC/openSUSE:Factory/kyverno/kyverno-1.12.2.obscpio /work/SRC/openSUSE:Factory/.kyverno.new.24587/kyverno-1.12.3.obscpio differ: char 49, line 1 ++++++ kyverno.obsinfo ++++++ --- /var/tmp/diff_new_pack.lfUTN2/_old 2024-06-03 17:41:35.478868521 +0200 +++ /var/tmp/diff_new_pack.lfUTN2/_new 2024-06-03 17:41:35.478868521 +0200 @@ -1,5 +1,5 @@ name: kyverno -version: 1.12.2 -mtime: 1716477082 -commit: 36051a7af4cf6f4a1a1585a58ecbcfd6e2d62c93 +version: 1.12.3 +mtime: 1717127642 +commit: 46293db866d6b741c109f8eeba202b5aa4c191b6 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/kyverno/vendor.tar.gz /work/SRC/openSUSE:Factory/.kyverno.new.24587/vendor.tar.gz differ: char 5, line 1

1 0

commit rzsz for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rzsz for openSUSE:Factory checked in at 2024-06-03 17:41:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rzsz (Old) and /work/SRC/openSUSE:Factory/.rzsz.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rzsz" Mon Jun 3 17:41:20 2024 rev:8 rq:1177927 version:0.12.21~rc Changes: -------- --- /work/SRC/openSUSE:Factory/rzsz/rzsz.changes 2024-02-21 17:59:00.716934705 +0100 +++ /work/SRC/openSUSE:Factory/.rzsz.new.24587/rzsz.changes 2024-06-03 17:41:29.670650947 +0200 @@ -1,0 +2,6 @@ +Mon May 27 11:22:53 UTC 2024 - Benoît Monin <benoit.monin(a)gmx.fr> + +- add gettext-runtime as buid requirement: + needed for the call to msgfmt during the build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rzsz.spec ++++++ --- /var/tmp/diff_new_pack.xVm1X3/_old 2024-06-03 17:41:32.094739833 +0200 +++ /var/tmp/diff_new_pack.xVm1X3/_new 2024-06-03 17:41:32.114740594 +0200 @@ -37,6 +37,7 @@ Patch10: lrzsz-0.12.21rc-drop-po-intl.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: gettext-runtime Provides: lrzsz %description

1 0

commit aws-c-mqtt for openSUSE:Factory
by Source-Sync 03 Jun '24

03 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aws-c-mqtt for openSUSE:Factory checked in at 2024-06-03 17:41:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aws-c-mqtt (Old) and /work/SRC/openSUSE:Factory/.aws-c-mqtt.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aws-c-mqtt" Mon Jun 3 17:41:17 2024 rev:4 rq:1177910 version:0.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/aws-c-mqtt/aws-c-mqtt.changes 2024-05-22 21:32:24.333822366 +0200 +++ /work/SRC/openSUSE:Factory/.aws-c-mqtt.new.24587/aws-c-mqtt.changes 2024-06-03 17:41:26.746543659 +0200 @@ -1,0 +2,7 @@ +Fri May 31 10:44:17 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- Update to version 0.10.4 + * Refactor MQTT5 ping timeout by @bretambrose in (#361) + * Disabled keep alive by @bretambrose in (#363) + +------------------------------------------------------------------- Old: ---- v0.10.3.tar.gz New: ---- v0.10.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aws-c-mqtt.spec ++++++ --- /var/tmp/diff_new_pack.DcLekm/_old 2024-06-03 17:41:27.354565968 +0200 +++ /var/tmp/diff_new_pack.DcLekm/_new 2024-06-03 17:41:27.358566114 +0200 @@ -18,7 +18,7 @@ %global library_version 1_0_0 Name: aws-c-mqtt -Version: 0.10.3 +Version: 0.10.4 Release: 0 Summary: AWS C99 implementation of the MQTT 3.1.1 specification License: Apache-2.0 ++++++ v0.10.3.tar.gz -> v0.10.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.3/include/aws/mqtt/private/v5/mqtt5_options_storage.h new/aws-c-mqtt-0.10.4/include/aws/mqtt/private/v5/mqtt5_options_storage.h --- old/aws-c-mqtt-0.10.3/include/aws/mqtt/private/v5/mqtt5_options_storage.h 2024-02-29 17:06:37.000000000 +0100 +++ new/aws-c-mqtt-0.10.4/include/aws/mqtt/private/v5/mqtt5_options_storage.h 2024-03-26 23:12:31.000000000 +0100 @@ -337,10 +337,6 @@ const struct aws_mqtt5_client_options_storage *options_storage, enum aws_log_level level); -AWS_MQTT_API bool aws_mqtt5_client_keep_alive_options_are_valid( - uint16_t keep_alive_interval_seconds, - uint32_t ping_timeout_ms); - AWS_EXTERN_C_END #endif /* AWS_MQTT_MQTT5_OPERATION_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.3/source/v5/mqtt5_client.c new/aws-c-mqtt-0.10.4/source/v5/mqtt5_client.c --- old/aws-c-mqtt-0.10.3/source/v5/mqtt5_client.c 2024-02-29 17:06:37.000000000 +0100 +++ new/aws-c-mqtt-0.10.4/source/v5/mqtt5_client.c 2024-03-26 23:12:31.000000000 +0100 @@ -1069,7 +1069,11 @@ uint64_t keep_alive_interval_nanos = aws_timestamp_convert(keep_alive_seconds, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_NANOS, NULL); - client->next_ping_time = aws_add_u64_saturating(now, keep_alive_interval_nanos); + if (keep_alive_interval_nanos == 0) { + client->next_ping_time = UINT64_MAX; + } else { + client->next_ping_time = aws_add_u64_saturating(now, keep_alive_interval_nanos); + } AWS_LOGF_DEBUG( AWS_LS_MQTT5_CLIENT, "id=%p: next PINGREQ scheduled for time %" PRIu64, (void *)client, client->next_ping_time); @@ -2940,7 +2944,20 @@ uint64_t now = client->vtable->get_current_time_fn(); uint64_t ping_timeout_nanos = aws_timestamp_convert(client->config->ping_timeout_ms, AWS_TIMESTAMP_MILLIS, AWS_TIMESTAMP_NANOS, NULL); - client->next_ping_timeout_time = aws_add_u64_saturating(now, ping_timeout_nanos); + uint64_t half_keep_alive_nanos = + aws_timestamp_convert( + client->negotiated_settings.server_keep_alive, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_NANOS, NULL) / + 2; + + uint64_t connection_ping_timeout = ping_timeout_nanos; + if (connection_ping_timeout == 0 || connection_ping_timeout > half_keep_alive_nanos) { + connection_ping_timeout = half_keep_alive_nanos; + } + + AWS_LOGF_DEBUG( + AWS_LS_MQTT5_CLIENT, "id=%p: dynamic ping timeout: %" PRIu64 " ns", (void *)client, connection_ping_timeout); + + client->next_ping_timeout_time = aws_add_u64_saturating(now, connection_ping_timeout); } static int s_apply_throughput_flow_control(struct aws_mqtt5_client *client) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.3/source/v5/mqtt5_options_storage.c new/aws-c-mqtt-0.10.4/source/v5/mqtt5_options_storage.c --- old/aws-c-mqtt-0.10.3/source/v5/mqtt5_options_storage.c 2024-02-29 17:06:37.000000000 +0100 +++ new/aws-c-mqtt-0.10.4/source/v5/mqtt5_options_storage.c 2024-03-26 23:12:31.000000000 +0100 @@ -3308,26 +3308,6 @@ return pingreq_op; } -bool aws_mqtt5_client_keep_alive_options_are_valid(uint16_t keep_alive_interval_seconds, uint32_t ping_timeout_ms) { - /* The client will not behave properly if ping timeout is not significantly shorter than the keep alive interval */ - if (keep_alive_interval_seconds > 0) { - uint64_t keep_alive_ms = - aws_timestamp_convert(keep_alive_interval_seconds, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_MILLIS, NULL); - uint64_t one_second_ms = aws_timestamp_convert(1, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_MILLIS, NULL); - - if (ping_timeout_ms == 0) { - ping_timeout_ms = AWS_MQTT5_CLIENT_DEFAULT_PING_TIMEOUT_MS; - } - - if ((uint64_t)ping_timeout_ms + one_second_ms > keep_alive_ms) { - AWS_LOGF_ERROR(AWS_LS_MQTT5_GENERAL, "keep alive interval is too small relative to ping timeout interval"); - return false; - } - } - - return true; -} - /********************************************************************************************************************* * Client storage options ********************************************************************************************************************/ @@ -3387,17 +3367,10 @@ if (aws_mqtt5_packet_connect_view_validate(options->connect_options)) { AWS_LOGF_ERROR(AWS_LS_MQTT5_GENERAL, "invalid CONNECT options in mqtt5 client configuration"); - /* connect validation failure will have already rasied the appropriate error */ + /* connect validation failure will have already raised the appropriate error */ return AWS_OP_ERR; } - /* The client will not behave properly if ping timeout is not significantly shorter than the keep alive interval */ - if (!aws_mqtt5_client_keep_alive_options_are_valid( - options->connect_options->keep_alive_interval_seconds, options->ping_timeout_ms)) { - AWS_LOGF_ERROR(AWS_LS_MQTT5_GENERAL, "keep alive interval is too small relative to ping timeout interval"); - return aws_raise_error(AWS_ERROR_MQTT5_CLIENT_OPTIONS_VALIDATION); - } - if (options->topic_aliasing_options != NULL) { if (!aws_mqtt5_outbound_topic_alias_behavior_type_validate( options->topic_aliasing_options->outbound_topic_alias_behavior)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.3/source/v5/mqtt5_to_mqtt3_adapter.c new/aws-c-mqtt-0.10.4/source/v5/mqtt5_to_mqtt3_adapter.c --- old/aws-c-mqtt-0.10.3/source/v5/mqtt5_to_mqtt3_adapter.c 2024-02-29 17:06:37.000000000 +0100 +++ new/aws-c-mqtt-0.10.4/source/v5/mqtt5_to_mqtt3_adapter.c 2024-03-26 23:12:31.000000000 +0100 @@ -309,16 +309,6 @@ } } - /* The client will not behave properly if ping timeout is not significantly shorter than the keep alive interval */ - if (!aws_mqtt5_client_keep_alive_options_are_valid( - connection_options->keep_alive_time_secs, connection_options->ping_timeout_ms)) { - AWS_LOGF_ERROR( - AWS_LS_MQTT5_TO_MQTT3_ADAPTER, - "id=%p: mqtt3-to-5-adapter - keep alive interval is too small relative to ping timeout interval", - (void *)adapter); - return aws_raise_error(AWS_ERROR_MQTT5_CLIENT_OPTIONS_VALIDATION); - } - return AWS_OP_SUCCESS; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.3/tests/CMakeLists.txt new/aws-c-mqtt-0.10.4/tests/CMakeLists.txt --- old/aws-c-mqtt-0.10.3/tests/CMakeLists.txt 2024-02-29 17:06:37.000000000 +0100 +++ new/aws-c-mqtt-0.10.4/tests/CMakeLists.txt 2024-03-26 23:12:31.000000000 +0100 @@ -244,7 +244,6 @@ add_test_case(mqtt5_client_options_validation_failure_no_publish_received) add_test_case(mqtt5_client_options_validation_failure_invalid_socket_options) add_test_case(mqtt5_client_options_validation_failure_invalid_connect) -add_test_case(mqtt5_client_options_validation_failure_invalid_keep_alive) add_test_case(mqtt5_client_options_validation_failure_invalid_port) add_test_case(mqtt5_operation_subscribe_connection_settings_validation_failure_exceeds_maximum_packet_size) add_test_case(mqtt5_operation_unsubscribe_connection_settings_validation_failure_exceeds_maximum_packet_size) @@ -330,6 +329,8 @@ add_test_case(mqtt5_client_sub_pub_unsub_qos1) add_test_case(mqtt5_client_ping_sequence) add_test_case(mqtt5_client_ping_timeout) +add_test_case(mqtt5_client_ping_timeout_with_keep_alive_conflict) +add_test_case(mqtt5_client_disabled_keep_alive) add_test_case(mqtt5_client_reconnect_failure_backoff) add_test_case(mqtt5_client_reconnect_backoff_insufficient_reset) add_test_case(mqtt5_client_reconnect_backoff_sufficient_reset) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.3/tests/v5/mqtt5_client_tests.c new/aws-c-mqtt-0.10.4/tests/v5/mqtt5_client_tests.c --- old/aws-c-mqtt-0.10.3/tests/v5/mqtt5_client_tests.c 2024-02-29 17:06:37.000000000 +0100 +++ new/aws-c-mqtt-0.10.4/tests/v5/mqtt5_client_tests.c 2024-03-26 23:12:31.000000000 +0100 @@ -986,10 +986,7 @@ struct aws_mqtt5_client_mock_test_fixture *test_fixture; }; -static bool s_received_at_least_n_pingreqs(void *arg) { - struct aws_mqtt5_client_test_wait_for_n_context *ping_context = arg; - struct aws_mqtt5_client_mock_test_fixture *test_fixture = ping_context->test_fixture; - +static size_t s_count_pingreqs(struct aws_mqtt5_client_mock_test_fixture *test_fixture) { size_t ping_count = 0; size_t packet_count = aws_array_list_length(&test_fixture->server_received_packets); for (size_t i = 0; i < packet_count; ++i) { @@ -1001,6 +998,15 @@ } } + return ping_count; +} + +static bool s_received_at_least_n_pingreqs(void *arg) { + struct aws_mqtt5_client_test_wait_for_n_context *ping_context = arg; + struct aws_mqtt5_client_mock_test_fixture *test_fixture = ping_context->test_fixture; + + size_t ping_count = s_count_pingreqs(test_fixture); + return ping_count >= ping_context->required_event_count; } @@ -1217,7 +1223,9 @@ #define TIMEOUT_TEST_PING_INTERVAL_MS ((uint64_t)10000) -static int s_verify_ping_timeout_interval(struct aws_mqtt5_client_mock_test_fixture *test_context) { +static int s_verify_ping_timeout_interval( + struct aws_mqtt5_client_mock_test_fixture *test_context, + uint64_t expected_connected_time_ms) { aws_mutex_lock(&test_context->lock); uint64_t connected_time = 0; @@ -1242,8 +1250,6 @@ uint64_t connected_interval_ms = aws_timestamp_convert(disconnected_time - connected_time, AWS_TIMESTAMP_NANOS, AWS_TIMESTAMP_MILLIS, NULL); - uint64_t expected_connected_time_ms = - TIMEOUT_TEST_PING_INTERVAL_MS + (uint64_t)test_context->client->config->ping_timeout_ms; ASSERT_TRUE(s_is_within_percentage_of(expected_connected_time_ms, connected_interval_ms, .3)); @@ -1310,7 +1316,9 @@ ASSERT_SUCCESS( s_verify_simple_lifecycle_event_sequence(&test_context, expected_events, AWS_ARRAY_SIZE(expected_events))); - ASSERT_SUCCESS(s_verify_ping_timeout_interval(&test_context)); + uint64_t expected_connected_time_ms = + TIMEOUT_TEST_PING_INTERVAL_MS + (uint64_t)test_context.client->config->ping_timeout_ms; + ASSERT_SUCCESS(s_verify_ping_timeout_interval(&test_context, expected_connected_time_ms)); enum aws_mqtt5_client_state expected_states[] = { AWS_MCS_CONNECTING, @@ -1329,6 +1337,147 @@ AWS_TEST_CASE(mqtt5_client_ping_timeout, s_mqtt5_client_ping_timeout_fn) +/* + * A variant of the basic ping timeout test that uses a timeout that is larger than the keep alive. Previously, + * we forbid this because taken literally, it leads to broken behavior. We now clamp the ping timeout dynamically + * based on the connection's established keep alive. + */ +static int s_mqtt5_client_ping_timeout_with_keep_alive_conflict_fn(struct aws_allocator *allocator, void *ctx) { + (void)ctx; + + aws_mqtt_library_init(allocator); + + struct mqtt5_client_test_options test_options; + aws_mqtt5_client_test_init_default_options(&test_options); + + /* fast keep alive in order keep tests reasonably short */ + uint16_t keep_alive_seconds = + (uint16_t)aws_timestamp_convert(TIMEOUT_TEST_PING_INTERVAL_MS, AWS_TIMESTAMP_MILLIS, AWS_TIMESTAMP_SECS, NULL); + test_options.connect_options.keep_alive_interval_seconds = keep_alive_seconds; + + /* don't respond to PINGREQs */ + test_options.server_function_table.packet_handlers[AWS_MQTT5_PT_PINGREQ] = NULL; + + /* ping timeout slower than keep alive */ + test_options.client_options.ping_timeout_ms = 2 * TIMEOUT_TEST_PING_INTERVAL_MS; + + struct aws_mqtt5_client_mqtt5_mock_test_fixture_options test_fixture_options = { + .client_options = &test_options.client_options, + .server_function_table = &test_options.server_function_table, + }; + + struct aws_mqtt5_client_mock_test_fixture test_context; + ASSERT_SUCCESS(aws_mqtt5_client_mock_test_fixture_init(&test_context, allocator, &test_fixture_options)); + + struct aws_mqtt5_client *client = test_context.client; + ASSERT_SUCCESS(aws_mqtt5_client_start(client)); + + aws_wait_for_connected_lifecycle_event(&test_context); + s_wait_for_disconnection_lifecycle_event(&test_context); + + ASSERT_SUCCESS(aws_mqtt5_client_stop(client, NULL, NULL)); + + aws_wait_for_stopped_lifecycle_event(&test_context); + + struct aws_mqtt5_client_lifecycle_event expected_events[] = { + { + .event_type = AWS_MQTT5_CLET_ATTEMPTING_CONNECT, + }, + { + .event_type = AWS_MQTT5_CLET_CONNECTION_SUCCESS, + }, + { + .event_type = AWS_MQTT5_CLET_DISCONNECTION, + .error_code = AWS_ERROR_MQTT5_PING_RESPONSE_TIMEOUT, + }, + { + .event_type = AWS_MQTT5_CLET_STOPPED, + }, + }; + ASSERT_SUCCESS( + s_verify_simple_lifecycle_event_sequence(&test_context, expected_events, AWS_ARRAY_SIZE(expected_events))); + + uint64_t expected_connected_time_ms = 3 * TIMEOUT_TEST_PING_INTERVAL_MS / 2; + ASSERT_SUCCESS(s_verify_ping_timeout_interval(&test_context, expected_connected_time_ms)); + + enum aws_mqtt5_client_state expected_states[] = { + AWS_MCS_CONNECTING, + AWS_MCS_MQTT_CONNECT, + AWS_MCS_CONNECTED, + AWS_MCS_CLEAN_DISCONNECT, + AWS_MCS_CHANNEL_SHUTDOWN, + }; + ASSERT_SUCCESS(aws_verify_client_state_sequence(&test_context, expected_states, AWS_ARRAY_SIZE(expected_states))); + + aws_mqtt5_client_mock_test_fixture_clean_up(&test_context); + aws_mqtt_library_clean_up(); + + return AWS_OP_SUCCESS; +} + +AWS_TEST_CASE( + mqtt5_client_ping_timeout_with_keep_alive_conflict, + s_mqtt5_client_ping_timeout_with_keep_alive_conflict_fn) + +/* + * Set up a zero keep alive and verify no pings get sent over an interval of time. + */ +static int s_mqtt5_client_disabled_keep_alive_fn(struct aws_allocator *allocator, void *ctx) { + (void)ctx; + + aws_mqtt_library_init(allocator); + + struct mqtt5_client_test_options test_options; + aws_mqtt5_client_test_init_default_options(&test_options); + + /* no keep alive at all */ + test_options.connect_options.keep_alive_interval_seconds = 0; + + struct aws_mqtt5_client_mqtt5_mock_test_fixture_options test_fixture_options = { + .client_options = &test_options.client_options, + .server_function_table = &test_options.server_function_table, + }; + + struct aws_mqtt5_client_mock_test_fixture test_context; + ASSERT_SUCCESS(aws_mqtt5_client_mock_test_fixture_init(&test_context, allocator, &test_fixture_options)); + + struct aws_mqtt5_client *client = test_context.client; + ASSERT_SUCCESS(aws_mqtt5_client_start(client)); + + aws_wait_for_connected_lifecycle_event(&test_context); + + uint16_t negotiated_keep_alive = 65535; + aws_mutex_lock(&test_context.lock); + size_t event_count = aws_array_list_length(&test_context.lifecycle_events); + struct aws_mqtt5_lifecycle_event_record *record = NULL; + aws_array_list_get_at(&test_context.lifecycle_events, &record, event_count - 1); + ASSERT_TRUE(AWS_MQTT5_CLET_CONNECTION_SUCCESS == record->event.event_type); + negotiated_keep_alive = record->settings_storage.server_keep_alive; + aws_mutex_unlock(&test_context.lock); + + ASSERT_INT_EQUALS(0, negotiated_keep_alive); + + // zzz + aws_thread_current_sleep(aws_timestamp_convert(5, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_NANOS, NULL)); + + ASSERT_SUCCESS(aws_mqtt5_client_stop(client, NULL, NULL)); + + aws_wait_for_stopped_lifecycle_event(&test_context); + + // verify the mock server did not get any PINGREQs + aws_mutex_lock(&test_context.lock); + size_t pingreq_count = s_count_pingreqs(&test_context); + aws_mutex_unlock(&test_context.lock); + ASSERT_INT_EQUALS(0, pingreq_count); + + aws_mqtt5_client_mock_test_fixture_clean_up(&test_context); + aws_mqtt_library_clean_up(); + + return AWS_OP_SUCCESS; +} + +AWS_TEST_CASE(mqtt5_client_disabled_keep_alive, s_mqtt5_client_disabled_keep_alive_fn) + struct aws_lifecycle_event_wait_context { enum aws_mqtt5_client_lifecycle_event_type type; size_t count; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-mqtt-0.10.3/tests/v5/mqtt5_operation_validation_failure_tests.c new/aws-c-mqtt-0.10.4/tests/v5/mqtt5_operation_validation_failure_tests.c --- old/aws-c-mqtt-0.10.3/tests/v5/mqtt5_operation_validation_failure_tests.c 2024-02-29 17:06:37.000000000 +0100 +++ new/aws-c-mqtt-0.10.4/tests/v5/mqtt5_operation_validation_failure_tests.c 2024-03-26 23:12:31.000000000 +0100 @@ -1170,20 +1170,6 @@ AWS_CLIENT_CREATION_VALIDATION_FAILURE(invalid_connect, s_good_client_options, s_make_invalid_connect_client_options) -static struct aws_mqtt5_packet_connect_view s_short_keep_alive_connect_view = { - .keep_alive_interval_seconds = 20, -}; - -static void s_make_invalid_keep_alive_client_options(struct aws_mqtt5_client_options *options) { - options->connect_options = &s_short_keep_alive_connect_view; - options->ping_timeout_ms = 30000; -} - -AWS_CLIENT_CREATION_VALIDATION_FAILURE( - invalid_keep_alive, - s_good_client_options, - s_make_invalid_keep_alive_client_options) - static void s_make_invalid_port_client_options(struct aws_mqtt5_client_options *options) { options->port = 0xFFFFFFFF; }

1 0