January 2025 - openSUSE Commits - openSUSE Mailing Lists

commit 000release-packages for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2025-01-09 15:41:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Thu Jan 9 15:41:38 2025 rev:3308 rq: version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/000release-packages/Aeon-release.changes 2025-01-09 10:27:55.985330330 +0100 +++ /work/SRC/openSUSE:Factory/.000release-packages.new.1881/Aeon-release.changes 2025-01-09 15:41:39.749378215 +0100 @@ -2 +2 @@ -Thu Jan 09 09:27:53 UTC 2025 - openSUSE <packaging(a)lists.opensuse.org> +Thu Jan 09 14:41:37 UTC 2025 - openSUSE <packaging(a)lists.opensuse.org> Kalpa-release.changes: same change MicroOS-release.changes: same change openSUSE-Addon-NonOss-release.changes: same change openSUSE-release.changes: same change stub.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Aeon-release.spec ++++++ --- /var/tmp/diff_new_pack.EB8beX/_old 2025-01-09 15:41:41.361445199 +0100 +++ /var/tmp/diff_new_pack.EB8beX/_new 2025-01-09 15:41:41.361445199 +0100 @@ -17,7 +17,7 @@ Name: Aeon-release -Version: 20250108 +Version: 20250109 Release: 0 Summary: Aeon License: GPL-2.0-or-later @@ -174,9 +174,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = Aeon -Provides: product(Aeon) = 20250108-0 +Provides: product(Aeon) = 20250109-0 Provides: product-label() = Aeon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20250108 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20250109 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(Aeon) @@ -192,7 +192,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(Aeon) = 20250108-0 +Provides: product_flavor(Aeon) = 20250109-0 Summary: Aeon%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Aeon</name> - <version>20250108</version> + <version>20250109</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:aeon:20250108</cpeid> + <cpeid>cpe:/o:opensuse:aeon:20250109</cpeid> <productline>Aeon</productline> <register> <pool> ++++++ Kalpa-release.spec ++++++ --- /var/tmp/diff_new_pack.EB8beX/_old 2025-01-09 15:41:41.385446196 +0100 +++ /var/tmp/diff_new_pack.EB8beX/_new 2025-01-09 15:41:41.385446196 +0100 @@ -17,7 +17,7 @@ Name: Kalpa-release -Version: 20250108 +Version: 20250109 Release: 0 Summary: openSUSE Kalpa License: GPL-2.0-or-later @@ -174,9 +174,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = Kalpa -Provides: product(Kalpa) = 20250108-0 +Provides: product(Kalpa) = 20250109-0 Provides: product-label() = openSUSE%20Kalpa -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20250108 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20250109 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(Kalpa) @@ -192,7 +192,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(Kalpa) = 20250108-0 +Provides: product_flavor(Kalpa) = 20250109-0 Summary: openSUSE Kalpa%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Kalpa</name> - <version>20250108</version> + <version>20250109</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:kalpa:20250108</cpeid> + <cpeid>cpe:/o:opensuse:kalpa:20250109</cpeid> <productline>Kalpa</productline> <register> <pool> ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.EB8beX/_old 2025-01-09 15:41:41.413447360 +0100 +++ /var/tmp/diff_new_pack.EB8beX/_new 2025-01-09 15:41:41.417447526 +0100 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20250108 +Version: 20250109 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -179,9 +179,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20250108-0 +Provides: product(MicroOS) = 20250109-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20250108 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20250109 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -197,7 +197,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20250108-0 +Provides: product_flavor(MicroOS) = 20250109-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -213,7 +213,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20250108-0 +Provides: product_flavor(MicroOS) = 20250109-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -278,11 +278,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20250108</version> + <version>20250109</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20250108</cpeid> + <cpeid>cpe:/o:opensuse:microos:20250109</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.EB8beX/_old 2025-01-09 15:41:41.445448689 +0100 +++ /var/tmp/diff_new_pack.EB8beX/_new 2025-01-09 15:41:41.445448689 +0100 @@ -18,7 +18,7 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss -Version: 20250108 +Version: 20250109 #!BcntSyncTag: openSUSE-Addon-NonOss Release: 0 Summary: openSUSE NonOSS Addon @@ -26,9 +26,9 @@ Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE%2DAddon%2DNonOss -Provides: product(openSUSE-Addon-NonOss) = 20250108-0 +Provides: product(openSUSE-Addon-NonOss) = 20250109-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20250108 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20250109 @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20250108</version> + <version>20250109</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20250108</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20250109</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.EB8beX/_old 2025-01-09 15:41:41.473449853 +0100 +++ /var/tmp/diff_new_pack.EB8beX/_new 2025-01-09 15:41:41.477450019 +0100 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20250108 +Version: 20250109 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -185,7 +185,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20250108-0 +Provides: product(openSUSE) = 20250109-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -199,7 +199,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20250108 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20250109 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -213,7 +213,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -228,7 +228,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -243,7 +243,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -258,7 +258,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -273,7 +273,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -288,7 +288,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -303,7 +303,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -318,7 +318,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -333,7 +333,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -348,7 +348,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -363,7 +363,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -378,7 +378,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -393,7 +393,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -408,7 +408,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -423,7 +423,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -438,7 +438,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -453,7 +453,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -468,7 +468,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -483,7 +483,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20250108-0 +Provides: product_flavor(openSUSE) = 20250109-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -566,10 +566,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20250108</version> + <version>20250109</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20250108</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20250109</cpeid> <productline>openSUSE</productline> <register> <target>openSUSE-Tumbleweed-x86_64</target>

1 0

commit s2n for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package s2n for openSUSE:Factory checked in at 2025-01-09 15:12:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s2n (Old) and /work/SRC/openSUSE:Factory/.s2n.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "s2n" Thu Jan 9 15:12:08 2025 rev:17 rq:1236137 version:1.5.10 Changes: -------- --- /work/SRC/openSUSE:Factory/s2n/s2n.changes 2024-11-21 15:19:41.744117682 +0100 +++ /work/SRC/openSUSE:Factory/.s2n.new.1881/s2n.changes 2025-01-09 15:12:55.453955321 +0100 @@ -1,0 +2,61 @@ +Tue Jan 7 10:19:36 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- Update to version 1.5.10 + * refactor(bench): remove historical benchmarks (#4940) + * fix: pem parsing detection of last cert errors (#4908) + * docs: specify s2n_blob growable conditions (#4943) + * chore(bindings): move tokio examples to dedicated folder (#4954) + * chore: fix GHA for merge-queue (#4973) + * chore(binding): release 0.3.8 (#4969) + * (chore): Installs Nix in AL2023 Buildspec (#4934) + * build(deps): bump the all-gha-updates group in /.github/workflows with 5 updates (#4961) + * feat(s2n-tls-hyper): Add support for negotiating HTTP/2 (#4924) + * tests: allow TLS1.2 with RSA-PSS certs in integ tests (#4949) + * ci: update CRT test ubuntu version to ubuntu24 (#4964) + * feat(bindings): enable application owned certs (#4937) + * ci: batch dependabot updates (#4959) + * ci(refactor): deprecate Omnibus (#4953) + * build(deps): bump actions/cache from 2.1.4 to 4.1.2 in /.github/workflows (#4928) + * build(deps): bump peaceiris/actions-gh-pages from 3 to 4 in /.github/workflows (#4921) + * build(deps): bump cross-platform-actions/action from 0.23.0 to 0.26.0 in /.github/workflows (#4951) + * build(deps): bump github/codeql-action from 2 to 3 in /.github/workflows (#4917) + * ci: add change directory to third-party-src logic (#4950) + * feat: TLS1.2 support for RSA-PSS certificates (#4927) + * feat: feature probe S2N_LIBCRYPTO_SUPPORTS_ENGINE (#4878) + * test(bindings): run unit tests under asan (#4948) + * ci(refactor): remove ASAN from Omnibus and GeneralBatch (#4946) + * ci(refactor): remove fuzz tests from Omnibus (#4945) + * refactor: add a s2n_libcrypto_is_openssl() helper function (#4930) + * fix(s2n-tls-hyper): Add proper IPv6 address formatting (#4938) + * ci: add openssl-1.0.2-fips to fuzz test (#4942) + * ci(refactor): remove Valgrind checks from omnibus and generalBatch (#4913) + * fix(bindings): address clippy issues from 1.83 (#4941) + * test: pin tests to explicit TLS 1.2/TLS 1.3 policy (#4926) + * (chore): Fixes team-label github action (#4935) + * chore: add new team member (#4939) + * upgrade cmake version to 3.9 (#4933) + * ci: add awslc-fips and openssl-1.0.2-fips to valgrind (#4912) + * chore(bindings): feature gate network testsa and relax http status assertions (#4907) + * chore: Ocsp timeout adjustment (#4866) + * build(deps): bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 in /.github/workflows (#4892) + * test: expand s2n_record_read testing to both TLS1.3 and TLS1.2 (#4903) + * test: pin optional client auth test to a TLS 1.2 policy (#4914) + * feat: add alert mappings for certificate errors (#4919) + * doc: document generating bindings with prebuilt libs2n (#4872) + * ci: Move kTLS test out of GeneralBatch (#4904) + * build(deps): bump actions/checkout from 3 to 4 in /.github/workflows (#4888) + * test(s2n-tls-hyper): matching on s2n-tls error (#4906) + * build(deps): bump nixbuild/nix-quick-install-action from 21 to 29 in /.github/workflows (#4890) + * build(deps): bump JulienKode/team-labeler-action from 0.1.1 to 1.3 in /.github/workflows (#4889) + * tests: pin tests to a numbered TLS1.2 policy (#4905) + * test: remove load system certs functionality for s2n_default_tls13_config (#4897) + * doc: add information about s2n-tls software architecture (#4868) + * ci: grant dependabot status update permissions (#4898) + * ci: fixes for cargo audit (#4895) + * test(s2n-tls-hyper): Add localhost http tests (#4838) + * test: add rust well-known-endpoint tests (#4884) + * chore: bindings release 0.3.7 (#4894) + * chore: add a cargo audit action (#4862) + * ci: add open fds valgrind check (#4851) + +------------------------------------------------------------------- Old: ---- v1.5.9.tar.gz New: ---- v1.5.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s2n.spec ++++++ --- /var/tmp/diff_new_pack.PDBA4Z/_old 2025-01-09 15:12:55.985977439 +0100 +++ /var/tmp/diff_new_pack.PDBA4Z/_new 2025-01-09 15:12:55.989977606 +0100 @@ -19,7 +19,7 @@ %define library_version 1.0.0 %define library_soversion 0unstable Name: s2n -Version: 1.5.9 +Version: 1.5.10 Release: 0 Summary: AWS implementation of the TLS/SSL protocols License: Apache-2.0 ++++++ v1.5.9.tar.gz -> v1.5.10.tar.gz ++++++ ++++ 8863 lines of diff (skipped)

1 0

commit aws-crt-cpp for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aws-crt-cpp for openSUSE:Factory checked in at 2025-01-09 15:12:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aws-crt-cpp (Old) and /work/SRC/openSUSE:Factory/.aws-crt-cpp.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aws-crt-cpp" Thu Jan 9 15:12:08 2025 rev:22 rq:1236136 version:0.29.8 Changes: -------- --- /work/SRC/openSUSE:Factory/aws-crt-cpp/aws-crt-cpp.changes 2025-01-01 23:04:32.528167071 +0100 +++ /work/SRC/openSUSE:Factory/.aws-crt-cpp.new.1881/aws-crt-cpp.changes 2025-01-09 15:12:54.533917070 +0100 @@ -1,0 +2,6 @@ +Tue Jan 7 10:22:36 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- Update to version 0.29.8 + * Update CRT dependencies by @sfod in (#692) + +------------------------------------------------------------------- Old: ---- v0.29.7.tar.gz New: ---- v0.29.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aws-crt-cpp.spec ++++++ --- /var/tmp/diff_new_pack.mUet7X/_old 2025-01-09 15:12:54.965935031 +0100 +++ /var/tmp/diff_new_pack.mUet7X/_new 2025-01-09 15:12:54.965935031 +0100 @@ -20,7 +20,7 @@ %define library_soversion 1 Name: aws-crt-cpp -Version: 0.29.7 +Version: 0.29.8 Release: 0 Summary: AWS C++ wrapper for AWS SDK C libraries License: Apache-2.0 ++++++ v0.29.7.tar.gz -> v0.29.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-crt-cpp-0.29.7/VERSION new/aws-crt-cpp-0.29.8/VERSION --- old/aws-crt-cpp-0.29.7/VERSION 2024-12-07 01:42:49.000000000 +0100 +++ new/aws-crt-cpp-0.29.8/VERSION 2024-12-19 21:42:36.000000000 +0100 @@ -1 +1 @@ -0.29.7 +0.29.8

1 0

commit aws-c-common for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aws-c-common for openSUSE:Factory checked in at 2025-01-09 15:12:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aws-c-common (Old) and /work/SRC/openSUSE:Factory/.aws-c-common.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aws-c-common" Thu Jan 9 15:12:07 2025 rev:17 rq:1236134 version:0.10.6 Changes: -------- --- /work/SRC/openSUSE:Factory/aws-c-common/aws-c-common.changes 2024-12-08 11:38:48.677811292 +0100 +++ /work/SRC/openSUSE:Factory/.aws-c-common.new.1881/aws-c-common.changes 2025-01-09 15:12:53.793886304 +0100 @@ -1,0 +2,6 @@ +Tue Jan 7 10:24:45 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- Update to version 0.10.6 + * Fix dependency build failure on old cmake versions by @sfod in (#1176) + +------------------------------------------------------------------- Old: ---- v0.10.5.tar.gz New: ---- v0.10.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aws-c-common.spec ++++++ --- /var/tmp/diff_new_pack.exVQT7/_old 2025-01-09 15:12:54.189902768 +0100 +++ /var/tmp/diff_new_pack.exVQT7/_new 2025-01-09 15:12:54.189902768 +0100 @@ -19,7 +19,7 @@ %define library_version 1.0.0 %define library_soversion 1 Name: aws-c-common -Version: 0.10.5 +Version: 0.10.6 Release: 0 Summary: Core C99 package for AWS SDK for C License: Apache-2.0 ++++++ v0.10.5.tar.gz -> v0.10.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aws-c-common-0.10.5/cmake/AwsPrebuildDependency.cmake new/aws-c-common-0.10.6/cmake/AwsPrebuildDependency.cmake --- old/aws-c-common-0.10.5/cmake/AwsPrebuildDependency.cmake 2024-12-04 01:05:05.000000000 +0100 +++ new/aws-c-common-0.10.6/cmake/AwsPrebuildDependency.cmake 2024-12-11 00:52:51.000000000 +0100 @@ -36,8 +36,8 @@ list(APPEND cmakeCommand ${cmakeOptionalVariables}) # The following variables should always be used. + list(APPEND cmakeCommand -H${AWS_PREBUILD_SOURCE_DIR}) list(APPEND cmakeCommand -B${depBinaryDir}) - list(APPEND cmakeCommand ${AWS_PREBUILD_SOURCE_DIR}) list(APPEND cmakeCommand -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) list(APPEND cmakeCommand -DCMAKE_PREFIX_PATH=${ESCAPED_PREFIX_PATH}) list(APPEND cmakeCommand -DCMAKE_INSTALL_PREFIX=${depInstallDir})

1 0

commit qt6-qtpbfimageformat for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-qtpbfimageformat for openSUSE:Factory checked in at 2025-01-09 15:11:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-qtpbfimageformat (Old) and /work/SRC/openSUSE:Factory/.qt6-qtpbfimageformat.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-qtpbfimageformat" Thu Jan 9 15:11:54 2025 rev:3 rq:1236099 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-qtpbfimageformat/qt6-qtpbfimageformat.changes 2024-10-06 17:53:18.352430806 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-qtpbfimageformat.new.1881/qt6-qtpbfimageformat.changes 2025-01-09 15:12:43.953477191 +0100 @@ -1,0 +2,7 @@ +Wed Jan 8 01:07:27 CET 2025 - tumic(a)cbox.cz + +- Update to version 4.0 + * Removed Google Protocol buffers dependency. + * Removed the related pkgconfig.patch + +------------------------------------------------------------------- Old: ---- QtPBFImagePlugin-3.2.tar.gz pkgconfig.patch New: ---- QtPBFImagePlugin-4.0.tar.gz BETA DEBUG BEGIN: Old: * Removed Google Protocol buffers dependency. * Removed the related pkgconfig.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-qtpbfimageformat.spec ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.657506461 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.657506461 +0100 @@ -19,22 +19,19 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: qt6-qtpbfimageformat -Version: 3.2 +Version: 4.0 Release: 1 Summary: Qt6 PBF Image Format Plugin License: LGPL-3.0-only Group: Development/Libraries/X11 Url: https://github.com/tumic0/QtPBFImagePlugin Source0: https://github.com/tumic0/QtPBFImagePlugin/archive/%{version}/QtPBFImagePlu… -# PATCH-FIX-OPENSUSE pkgconfig.patch - fix for broken OpenSUSE linker -Patch0: pkgconfig.patch BuildRequires: gcc-c++ BuildRequires: make %if 0%{?suse_version} BuildRequires: qt6-core-devel BuildRequires: qt6-gui-devel -BuildRequires: protobuf-devel BuildRequires: zlib-devel %else %if 0%{?fedora_version} @@ -42,16 +39,13 @@ BuildRequires: qt6-qtbase-gui BuildRequires: qt6-qtbase-devel BuildRequires: zlib-devel -BuildRequires: protobuf-lite-devel %else # Mageia BuildRequires: libqt6core-devel BuildRequires: libqt6gui-devel %ifarch x86_64 -BuildRequires: lib64protobuf-devel BuildRequires: lib64zlib-devel %else -BuildRequires: libprotobuf-devel BuildRequires: libzlib-devel %endif %endif ++++++ QtPBFImagePlugin-3.2.tar.gz -> QtPBFImagePlugin-4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.appveyor.yml new/QtPBFImagePlugin-4.0/.appveyor.yml --- old/QtPBFImagePlugin-3.2/.appveyor.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.appveyor.yml 2025-01-08 00:36:27.000000000 +0100 @@ -1,4 +1,4 @@ -version: 3.2.{build} +version: 4.0.{build} configuration: - Release @@ -7,26 +7,25 @@ - Visual Studio 2022 environment: - VCPKGDIR: C:\tools\vcpkg\installed\x64-windows-static-md + VCPKGDIR: C:\tools\vcpkg\installed\x64-windows-static-md-release matrix: - QTDIR: C:\Qt\5.15\msvc2019_64 - - QTDIR: C:\Qt\6.7\msvc2019_64 + - QTDIR: C:\Qt\6.8\msvc2022_64 install: - cmd: |- - set PATH=%QTDIR%\bin;%VCPKGDIR%\tools\protobuf;%PATH% + set PATH=%QTDIR%\bin;%PATH% call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat - vcpkg install protobuf:x64-windows-static-md - vcpkg install zlib:x64-windows-static-md + vcpkg install zlib:x64-windows-static-md-release copy /y %VCPKGDIR%\lib\zlib.lib %VCPKGDIR%\lib\zlibstatic.lib build_script: - cmd: |- - qmake PROTOBUF=%VCPKGDIR% ZLIB=%VCPKGDIR% pbfplugin.pro + qmake ZLIB=%VCPKGDIR% pbfplugin.pro nmake release artifacts: -- path: release\pbf3.dll +- path: release\pbf4.dll cache: - C:\tools\vcpkg\installed\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.github/workflows/android.yml new/QtPBFImagePlugin-4.0/.github/workflows/android.yml --- old/QtPBFImagePlugin-3.2/.github/workflows/android.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.github/workflows/android.yml 2025-01-08 00:36:27.000000000 +0100 @@ -12,10 +12,6 @@ steps: - name: Checkout uses: actions/checkout@v4 - - name: Install protobuf compiler - run: | - sudo apt-get update - sudo apt-get install protobuf-compiler - name: set up JDK 11 uses: actions/setup-java@v4 with: @@ -41,10 +37,8 @@ version: '6.4.0' target: 'android' arch: 'android_arm64_v8a' - - name: Install Android Google Protocol Buffers - run: git clone https://github.com/tumic0/android_protobuf.git - name: Configure build - run: qmake pbfplugin.pro PROTOBUF=android_protobuf + run: qmake pbfplugin.pro - name: Build project run: make -j2 - name: Upload artifacts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.github/workflows/linux.yml new/QtPBFImagePlugin-4.0/.github/workflows/linux.yml --- old/QtPBFImagePlugin-3.2/.github/workflows/linux.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.github/workflows/linux.yml 2025-01-08 00:36:27.000000000 +0100 @@ -15,7 +15,7 @@ - name: Install dependencies run: | sudo apt-get update - sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake libprotobuf-dev protobuf-compiler zlib1g-dev + sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake zlib1g-dev - name: Configure build run: qmake pbfplugin.pro - name: Build project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.github/workflows/osx.yml new/QtPBFImagePlugin-4.0/.github/workflows/osx.yml --- old/QtPBFImagePlugin-3.2/.github/workflows/osx.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.github/workflows/osx.yml 2025-01-08 00:36:27.000000000 +0100 @@ -6,36 +6,22 @@ - master jobs: - qt5: - name: QtPBFImagePlugin Qt5 build + build: + name: QtPBFImagePlugin runs-on: macos-latest steps: - - name: Set environment variables - run: echo "PATH=/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v4 - - name: Install dependencies - run: | - brew update - brew install qt@5 protobuf@21 + - name: Install Qt + uses: jurplel/install-qt-action@v4 + with: + version: '6.8.1' - name: Configure build - run: qmake PROTOBUF=/opt/homebrew/opt/protobuf@21 pbfplugin.pro - - name: Build project - run: make -j3 - - qt6: - name: QtPBFImagePlugin Qt6 build - runs-on: macos-latest - steps: - - name: Set environment variables - run: echo "PATH=/opt/homebrew/opt/qt@6/bin:/opt/homebrew/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV - - name: Checkout - uses: actions/checkout@v4 - - name: Install dependencies - run: | - brew update - brew install qt@6 protobuf@21 - - name: Configure build - run: qmake PROTOBUF=/opt/homebrew/opt/protobuf@21 pbfplugin.pro + run: qmake pbfplugin.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64" - name: Build project run: make -j3 + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + path: libpbf.dylib + name: libpbf.dylib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.gitignore new/QtPBFImagePlugin-4.0/.gitignore --- old/QtPBFImagePlugin-3.2/.gitignore 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.gitignore 2025-01-08 00:36:27.000000000 +0100 @@ -1,10 +1,6 @@ # Object files *.o -# Protobuf stuff -protobuf/vector_tile.pb.cc -protobuf/vector_tile.pb.h - # Qt stuff /.qmake.stash moc_*.cpp @@ -14,4 +10,4 @@ # lib libpbf.so -pbf.dylib +libpbf.dylib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/README.md new/QtPBFImagePlugin-4.0/README.md --- old/QtPBFImagePlugin-3.2/README.md 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/README.md 2025-01-08 00:36:27.000000000 +0100 @@ -68,41 +68,38 @@ ## Build ### Requirements * Qt5 >= 5.11 or Qt6 -* Google Protocol Buffers (protobuf-lite) * Zlib ### Build steps -#### Linux +#### Linux, OS X and Android ```shell qmake pbfplugin.pro make ``` #### Windows ```shell -qmake PROTOBUF=path/to/protobuf ZLIB=path/to/zlib pbfplugin.pro +qmake ZLIB=path/to/zlib pbfplugin.pro nmake ``` -#### OS X -```shell -qmake PROTOBUF=path/to/protobuf pbfplugin.pro -make -``` ## Install Copy the plugin to the system Qt image plugins path to make it work. You may -also set the QT_PLUGIN_PATH system variable before starting the application. For -Linux, there are RPM and DEB [packages](https://build.opensuse.org/project/show/home:tumic:QtPBFImagePlug… +also set the QT_PLUGIN_PATH system variable before starting the application. +For Linux, there are RPM and DEB [packages](https://build.opensuse.org/project/show/home:tumic:QtPBFImagePlug… for most common distros available on OBS. ## Limitations -* Only data that is part of the PBF file is displayed. External layers defined in the -style are ignored. -* Text PBF features must have a unique id (OpenMapTiles >= v3.7) for the text layout -algorithm to work properly. -* Expressions are not supported in the styles, only property functions are implemented. +* Only data that is part of the PBF file is displayed. External layers defined +in the style are ignored. +* Text PBF features must have a unique id (OpenMapTiles >= v3.7) for the text +layout algorithm to work properly. Additionally, the tile buffer must be large +enough to contain all neighboring text features overlapping to the tile bounds +(only data from the tile itself can be drawn to the resulting image). +* Expressions are not supported in the styles, only property functions are +implemented. ## Changelog -[Changelog](https://build.opensuse.org/package/view_file/home:tumic:QtPBFImagePlugin/QtPBFImagePlugin/libqt5-qtpbfimageformat.changes) +[Changelog](https://build.opensuse.org/projects/home:tumic:QtPBFImagePlugin/packages/QtPBFImagePlugin/files/qt6-qtpbfimageformat.changes) ## Status A picture is worth a thousand words. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/pbfplugin.pro new/QtPBFImagePlugin-4.0/pbfplugin.pro --- old/QtPBFImagePlugin-3.2/pbfplugin.pro 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/pbfplugin.pro 2025-01-08 00:36:27.000000000 +0100 @@ -2,13 +2,10 @@ TEMPLATE = lib CONFIG += plugin QT += gui -VERSION = 3.2 +VERSION = 4.0 -PROTOS = protobuf/vector_tile.proto -include(protobuf/vector_tile.pri) - -INCLUDEPATH += ./protobuf HEADERS += src/pbfhandler.h \ + src/data.h \ src/pbfplugin.h \ src/gzip.h \ src/pbf.h \ @@ -23,6 +20,7 @@ src/textitem.h \ src/sprites.h SOURCES += src/pbfplugin.cpp \ + src/data.cpp \ src/pbfhandler.cpp \ src/gzip.cpp \ src/pbf.cpp \ @@ -40,31 +38,24 @@ DEFINES += QT_NO_DEPRECATED_WARNINGS unix:!macx:!android { - LIBS += -lprotobuf-lite \ - -lz + LIBS += -lz target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target } win32 { - INCLUDEPATH += $$PROTOBUF/include \ - $$ZLIB/include - LIBS += $$PROTOBUF/lib/libprotobuf-lite.lib \ - $$ZLIB/lib/zlibstatic.lib + INCLUDEPATH += $$ZLIB/include + LIBS += $$ZLIB/lib/zlibstatic.lib QMAKE_TARGET_PRODUCT = QtPBFImagePlugin QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin - QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2024 Martin Tuma + QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2025 Martin Tuma } macx { - INCLUDEPATH += $$PROTOBUF/include - LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \ - -lz + LIBS += -lz } android { - INCLUDEPATH += $$PROTOBUF/include - LIBS += $$PROTOBUF/$$ANDROID_TARGET_ARCH/libprotobuf-lite.a \ - -lz + LIBS += -lz top_builddir=$$shadowed($$PWD) DESTDIR = $$top_builddir/plugins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/protobuf/vector_tile.pri new/QtPBFImagePlugin-4.0/protobuf/vector_tile.pri --- old/QtPBFImagePlugin-3.2/protobuf/vector_tile.pri 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/protobuf/vector_tile.pri 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -protobuf_decl.name = protobuf headers -protobuf_decl.input = PROTOS -protobuf_decl.output = ${QMAKE_FILE_IN_PATH}/${QMAKE_FILE_BASE}.pb.h -protobuf_decl.commands = protoc --cpp_out=${QMAKE_FILE_IN_PATH} --proto_path=${QMAKE_FILE_IN_PATH} ${QMAKE_FILE_NAME} -protobuf_decl.variable_out = HEADERS -QMAKE_EXTRA_COMPILERS += protobuf_decl - -protobuf_impl.name = protobuf sources -protobuf_impl.input = PROTOS -protobuf_impl.output = ${QMAKE_FILE_IN_PATH}/${QMAKE_FILE_BASE}.pb.cc -protobuf_impl.depends = ${QMAKE_FILE_IN_PATH}/${QMAKE_FILE_BASE}.pb.h -protobuf_impl.commands = $$escape_expand(\n) -protobuf_impl.variable_out = SOURCES -QMAKE_EXTRA_COMPILERS += protobuf_impl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/protobuf/vector_tile.proto new/QtPBFImagePlugin-4.0/protobuf/vector_tile.proto --- old/QtPBFImagePlugin-3.2/protobuf/vector_tile.proto 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/protobuf/vector_tile.proto 1970-01-01 01:00:00.000000000 +0100 @@ -1,78 +0,0 @@ -package vector_tile; - -option optimize_for = LITE_RUNTIME; - -message Tile { - - // GeomType is described in section 4.3.4 of the specification - enum GeomType { - UNKNOWN = 0; - POINT = 1; - LINESTRING = 2; - POLYGON = 3; - } - - // Variant type encoding - // The use of values is described in section 4.1 of the specification - message Value { - // Exactly one of these values must be present in a valid message - optional string string_value = 1; - optional float float_value = 2; - optional double double_value = 3; - optional int64 int_value = 4; - optional uint64 uint_value = 5; - optional sint64 sint_value = 6; - optional bool bool_value = 7; - - extensions 8 to max; - } - - // Features are described in section 4.2 of the specification - message Feature { - optional uint64 id = 1 [ default = 0 ]; - - // Tags of this feature are encoded as repeated pairs of - // integers. - // A detailed description of tags is located in sections - // 4.2 and 4.4 of the specification - repeated uint32 tags = 2 [ packed = true ]; - - // The type of geometry stored in this feature. - optional GeomType type = 3 [ default = UNKNOWN ]; - - // Contains a stream of commands and parameters (vertices). - // A detailed description on geometry encoding is located in - // section 4.3 of the specification. - repeated uint32 geometry = 4 [ packed = true ]; - } - - // Layers are described in section 4.1 of the specification - message Layer { - // Any compliant implementation must first read the version - // number encoded in this message and choose the correct - // implementation for this version number before proceeding to - // decode other parts of this message. - required uint32 version = 15 [ default = 1 ]; - - required string name = 1; - - // The actual features in this tile. - repeated Feature features = 2; - - // Dictionary encoding for keys - repeated string keys = 3; - - // Dictionary encoding for values - repeated Value values = 4; - - // Although this is an "optional" field it is required by the specification. - // See https://github.com/mapbox/vector-tile-spec/issues/47 - optional uint32 extent = 5 [ default = 4096 ]; - - extensions 16 to max; - } - - repeated Layer layers = 3; - - extensions 16 to 8191; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/data.cpp new/QtPBFImagePlugin-4.0/src/data.cpp --- old/QtPBFImagePlugin-3.2/src/data.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/QtPBFImagePlugin-4.0/src/data.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -0,0 +1,347 @@ +#include "data.h" + +#define TYPE(tag) (tag & 0x07) +#define FIELD(tag) (tag >> 3) + +#define VARINT 0 +#define I64 1 +#define LEN 2 +#define I32 5 + +struct CTX +{ + CTX(const QByteArray &ba) + : bp(ba.constData()), be(bp + ba.size()) {} + + const char *bp; + const char *be; + quint32 tag; +}; + +static inline qint64 zigzag64decode(quint64 value) +{ + return static_cast<qint64>((value >> 1u) ^ static_cast<quint64>( + -static_cast<qint64>(value & 1u))); +} + +template<typename T> +static bool varint(CTX &ctx, T &val) +{ + unsigned int shift = 0; + val = 0; + + while (ctx.bp < ctx.be) { + val |= ((quint8)*ctx.bp & 0x7F) << shift; + shift += 7; + if (!((quint8)*ctx.bp++ & 0x80)) + return true; + } + + return false; +} + +static bool length(CTX &ctx, qint32 &val) +{ + if (TYPE(ctx.tag) != LEN) + return false; + + if (!varint(ctx, val)) + return false; + + return (val >= 0); +} + +static bool str(CTX &ctx, QByteArray &val) +{ + qint32 len; + + if (!length(ctx, len)) + return false; + if (ctx.bp + len > ctx.be) + return false; + + val = QByteArray::fromRawData(ctx.bp, len); + ctx.bp += len; + + return true; +} + +static bool dbl(CTX &ctx, double &val) +{ + if (TYPE(ctx.tag) != I64) + return false; + if (ctx.bp + sizeof(val) > ctx.be) + return false; + + memcpy(&val, ctx.bp, sizeof(val)); + ctx.bp += sizeof(val); + + return true; +} + +static bool flt(CTX &ctx, float &val) +{ + if (TYPE(ctx.tag) != I32) + return false; + if (ctx.bp + sizeof(val) > ctx.be) + return false; + + memcpy(&val, ctx.bp, sizeof(val)); + ctx.bp += sizeof(val); + + return true; +} + +static bool packed(CTX &ctx, QVector<quint32> &vals) +{ + quint32 v; + + if (TYPE(ctx.tag) == LEN) { + qint32 len; + if (!varint(ctx, len) || len < 0) + return false; + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + while (ctx.bp < ee) { + if (!varint(ctx, v)) + return false; + vals.append(v); + } + return (ctx.bp == ee); + } else if (TYPE(ctx.tag) == VARINT) { + if (!varint(ctx, v)) + return false; + vals.append(v); + return true; + } else + return false; +} + +static bool skip(CTX &ctx) +{ + qint32 len = 0; + + switch (TYPE(ctx.tag)) { + case VARINT: + return varint(ctx, len); + case I64: + len = 8; + break; + case LEN: + if (!varint(ctx, len) || len < 0) + return false; + break; + case I32: + len = 4; + break; + default: + return false; + } + + if (ctx.bp + len > ctx.be) + return false; + ctx.bp += len; + + return true; +} + +static bool value(CTX &ctx, QVariant &val) +{ + QByteArray ba; + quint64 num; + double dnum; + float fnum; + qint32 len; + + if (!length(ctx, len)) + return false; + + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + + while (ctx.bp < ee) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 1: + if (!str(ctx, ba)) + return false; + val = QVariant(ba); + break; + case 2: + if (!flt(ctx, fnum)) + return false; + val = QVariant(fnum); + break; + case 3: + if (!dbl(ctx, dnum)) + return false; + val = QVariant(dnum); + break; + case 4: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(static_cast<qint64>(num)); + break; + case 5: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(num); + break; + case 6: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(zigzag64decode(num)); + break; + case 7: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(num ? true : false); + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ee); +} + +static bool feature(CTX &ctx, Data::Feature &f) +{ + qint32 len; + quint32 e; + + if (!length(ctx, len)) + return false; + + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + + while (ctx.bp < ee) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 1: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, f.id)) + return false; + break; + case 2: + if (!packed(ctx, f.tags)) + return false; + break; + case 3: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, e)) + return false; + if (e > Data::GeomType::POLYGON) + return false; + f.type = static_cast<Data::GeomType>(e); + break; + case 4: + if (!packed(ctx, f.geometry)) + return false; + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ee); +} + +static bool layer(CTX &ctx, Data::Layer &l) +{ + qint32 len; + + if (!length(ctx, len)) + return false; + + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + + while (ctx.bp < ee) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 1: + if (!str(ctx, l.name)) + return false; + break; + case 2: + l.features.append(Data::Feature()); + if (!feature(ctx, l.features.last())) + return false; + break; + case 3: + l.keys.append(QByteArray()); + if (!str(ctx, l.keys.last())) + return false; + break; + case 4: + l.values.append(QVariant()); + if (!value(ctx, l.values.last())) + return false; + break; + case 5: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, l.extent)) + return false; + break; + case 15: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, l.version)) + return false; + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ee); +} + +bool Data::load(const QByteArray &ba) +{ + CTX ctx(ba); + + while (ctx.bp < ctx.be) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 3: + _layers.append(Layer()); + if (!layer(ctx, _layers.last())) + return false; + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ctx.be); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/data.h new/QtPBFImagePlugin-4.0/src/data.h --- old/QtPBFImagePlugin-3.2/src/data.h 1970-01-01 01:00:00.000000000 +0100 +++ new/QtPBFImagePlugin-4.0/src/data.h 2025-01-08 00:36:27.000000000 +0100 @@ -0,0 +1,47 @@ +#ifndef DATA_H +#define DATA_H + +#include <QByteArray> +#include <QVector> +#include <QVariant> + +class Data +{ +public: + enum GeomType { + UNKNOWN = 0, + POINT = 1, + LINESTRING = 2, + POLYGON = 3 + }; + + struct Feature + { + Feature() : id(0), type(UNKNOWN) {} + + quint64 id; + QVector<quint32> tags; + GeomType type; + QVector<quint32> geometry; + }; + + struct Layer + { + Layer() : version(1), extent(4096) {} + + quint32 version; + QByteArray name; + QVector<Feature> features; + QVector<QByteArray> keys; + QVector<QVariant> values; + quint32 extent; + }; + + bool load(const QByteArray &ba); + const QVector<Layer> &layers() const {return _layers;} + +private: + QVector<Layer> _layers; +}; + +#endif // DATA_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/pbf.cpp new/QtPBFImagePlugin-4.0/src/pbf.cpp --- old/QtPBFImagePlugin-3.2/src/pbf.cpp 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/pbf.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -4,7 +4,6 @@ #define LINE_TO 2 #define CLOSE_PATH 7 - static inline qint32 zigzag32decode(quint32 value) { return static_cast<qint32>((value >> 1u) ^ static_cast<quint32>( @@ -16,26 +15,6 @@ return QPoint(zigzag32decode(v1), zigzag32decode(v2)); } -static QVariant value(const vector_tile::Tile_Value &val) -{ - if (val.has_bool_value()) - return QVariant(val.bool_value()); - else if (val.has_int_value()) - return QVariant((qlonglong)val.int_value()); - else if (val.has_sint_value()) - return QVariant((qlonglong)val.sint_value()); - else if (val.has_uint_value()) - return QVariant((qulonglong)val.uint_value()); - else if (val.has_float_value()) - return QVariant(val.float_value()); - else if (val.has_double_value()) - return QVariant(val.double_value()); - else if (val.has_string_value()) - return QVariant(QByteArray::fromStdString(val.string_value())); - else - return QVariant(); -} - const QVariant *PBF::Feature::value(const QByteArray &key) const { const KeyHash &keys(_layer->keys()); @@ -43,10 +22,10 @@ if (it == keys.constEnd()) return 0; - google::protobuf::uint32 index = *it; - for (int i = 0; i < _data->tags_size(); i = i + 2) - if (_data->tags(i) == index) - return &(_layer->values().at(_data->tags(i+1))); + quint32 index = *it; + for (int i = 0; i < _data->tags.size(); i = i + 2) + if (_data->tags.at(i) == index) + return &(_layer->values().at(_data->tags.at(i+1))); return 0; } @@ -56,15 +35,15 @@ QPoint cursor; QPainterPath path; - for (int i = 0; i < _data->geometry_size(); i++) { - quint32 g = _data->geometry(i); + for (int i = 0; i < _data->geometry.size(); i++) { + quint32 g = _data->geometry.at(i); unsigned cmdId = g & 0x7; unsigned cmdCount = g >> 3; if (cmdId == MOVE_TO) { for (unsigned j = 0; j < cmdCount; j++) { - QPoint offset = parameters(_data->geometry(i+1), - _data->geometry(i+2)); + QPoint offset = parameters(_data->geometry.at(i+1), + _data->geometry.at(i+2)); i += 2; cursor += offset; path.moveTo(QPointF(cursor.x() * factor.width(), @@ -72,8 +51,8 @@ } } else if (cmdId == LINE_TO) { for (unsigned j = 0; j < cmdCount; j++) { - QPoint offset = parameters(_data->geometry(i+1), - _data->geometry(i+2)); + QPoint offset = parameters(_data->geometry.at(i+1), + _data->geometry.at(i+2)); i += 2; cursor += offset; path.lineTo(QPointF(cursor.x() * factor.width(), @@ -88,27 +67,23 @@ return path; } -PBF::Layer::Layer(const vector_tile::Tile_Layer *data) : _data(data) +PBF::Layer::Layer(const Data::Layer *layer) : _data(layer) { - _keys.reserve(data->keys_size()); - for (int i = 0; i < data->keys_size(); i++) - _keys.insert(QByteArray::fromStdString(data->keys(i)), i); - _values.reserve(data->values_size()); - for (int i = 0; i < data->values_size(); i++) - _values.append(value(data->values(i))); - - _features.reserve(data->features_size()); - for (int i = 0; i < data->features_size(); i++) - _features.append(Feature(&(data->features(i)), this)); + _keys.reserve(layer->keys.size()); + for (int i = 0; i < layer->keys.size(); i++) + _keys.insert(layer->keys.at(i), i); + + _features.reserve(layer->features.size()); + for (int i = 0; i < layer->features.size(); i++) + _features.append(Feature(&(layer->features.at(i)), this)); std::sort(_features.begin(), _features.end()); } -PBF::PBF(const vector_tile::Tile &tile) +PBF::PBF(const Data &data) { - for (int i = 0; i < tile.layers_size(); i++) { - const vector_tile::Tile_Layer &layer = tile.layers(i); - _layers.insert(QByteArray::fromStdString(layer.name()), - new Layer(&layer)); + for (int i = 0; i < data.layers().size(); i++) { + const Data::Layer &layer = data.layers().at(i); + _layers.insert(layer.name, new Layer(&layer)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/pbf.h new/QtPBFImagePlugin-4.0/src/pbf.h --- old/QtPBFImagePlugin-3.2/src/pbf.h 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/pbf.h 2025-01-08 00:36:27.000000000 +0100 @@ -5,10 +5,10 @@ #include <QVector> #include <QHash> #include <QPainterPath> -#include "vector_tile.pb.h" +#include "data.h" -typedef QHash<QByteArray, google::protobuf::uint32> KeyHash; +typedef QHash<QByteArray, quint32> KeyHash; class PBF { @@ -19,17 +19,17 @@ { public: Feature() : _data(0), _layer(0) {} - Feature(const vector_tile::Tile_Feature *data, const Layer *layer) + Feature(const Data::Feature *data, const Layer *layer) : _data(data), _layer(layer) {} const QVariant *value(const QByteArray &key) const; - vector_tile::Tile_GeomType type() const {return _data->type();} + Data::GeomType type() const {return _data->type;} QPainterPath path(const QSizeF &factor) const; friend bool operator<(const Feature &f1, const Feature &f2); private: - const vector_tile::Tile_Feature *_data; + const Data::Feature *_data; const Layer *_layer; }; @@ -37,22 +37,21 @@ { public: - Layer(const vector_tile::Tile_Layer *data); + Layer(const Data::Layer *layer); const QVector<Feature> &features() const {return _features;} - const QVector<QVariant> &values() const {return _values;} + const QVector<QVariant> &values() const {return _data->values;} const KeyHash &keys() const {return _keys;} - const vector_tile::Tile_Layer *data() const {return _data;} + const Data::Layer *data() const {return _data;} private: - const vector_tile::Tile_Layer *_data; + const Data::Layer *_data; QVector<Feature> _features; - QVector<QVariant> _values; KeyHash _keys; }; - PBF(const vector_tile::Tile &tile); + PBF(const Data &data); ~PBF(); const QHash<QByteArray, Layer*> &layers() const {return _layers;} @@ -62,6 +61,6 @@ }; inline bool operator<(const PBF::Feature &f1, const PBF::Feature &f2) - {return f1._data->id() < f2._data->id();} + {return f1._data->id < f2._data->id;} #endif // PBF_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/pbfhandler.cpp new/QtPBFImagePlugin-4.0/src/pbfhandler.cpp --- old/QtPBFImagePlugin-3.2/src/pbfhandler.cpp 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/pbfhandler.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -3,6 +3,7 @@ #include <QtEndian> #include <QDebug> #include "gzip.h" +#include "data.h" #include "tile.h" #include "style.h" #include "pbfhandler.h" @@ -73,8 +74,8 @@ } } else if (isPlainPBF(magic)) ba = device()->readAll(); - vector_tile::Tile data; - if (!data.ParseFromArray(ba.constData(), ba.size())) { + Data data; + if (!data.load(ba)) { qCritical() << "Invalid PBF data"; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/style.cpp new/QtPBFImagePlugin-4.0/src/style.cpp --- old/QtPBFImagePlugin-3.2/src/style.cpp 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/style.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -14,16 +14,16 @@ #include "style.h" -static vector_tile::Tile_GeomType geometryType(const QString &str) +static Data::GeomType geometryType(const QString &str) { if (str == "Point") - return vector_tile::Tile_GeomType_POINT; + return Data::GeomType::POINT; else if (str == "LineString") - return vector_tile::Tile_GeomType_LINESTRING; + return Data::GeomType::LINESTRING; else if (str == "Polygon") - return vector_tile::Tile_GeomType_POLYGON; + return Data::GeomType::POLYGON; else - return vector_tile::Tile_GeomType_UNKNOWN; + return Data::GeomType::UNKNOWN; } static QVariant variant(const QJsonValue &val) @@ -680,15 +680,15 @@ void Style::drawLayer(const PBF::Layer &pbfLayer, const Layer &styleLayer, Tile &tile) { - if (pbfLayer.data()->version() > 2) + if (pbfLayer.data()->version > 2) return; if (!styleLayer.isVisible()) return; QSizeF factor(tile.size().width() / tile.scale().x() / - (qreal)pbfLayer.data()->extent(), tile.size().height() / tile.scale().y() - / (qreal)pbfLayer.data()->extent()); + (qreal)pbfLayer.data()->extent, tile.size().height() / tile.scale().y() + / (qreal)pbfLayer.data()->extent); tile.painter().save(); setupLayer(tile, styleLayer); ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.757510619 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.761510785 +0100 @@ -1,3 +1,9 @@ +qt5-pbf-image-plugin (4.0) stable; urgency=low + + * Removed Google Protocol buffers dependency. + + -- Martin Tuma <tumic(a)cbox.cz> Wed, 08 Jan 2025 01:10:03 +0100 + qt5-pbf-image-plugin (3.2) stable; urgency=low * Improved rendering performance. ++++++ debian.control ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.805512614 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.809512781 +0100 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Martin Tuma <tumic(a)cbox.cz> -Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, libprotobuf-dev, protobuf-compiler, zlib1g-dev +Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, zlib1g-dev Homepage: https://github.com/tumic0/QtPBFImagePlugin Package: qt5-pbf-image-plugin ++++++ qtpbfplugin.dsc ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.841514111 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.845514277 +0100 @@ -1,10 +1,10 @@ Format: 1.0 Source: qt5-pbf-image-plugin -Version: 3.2-1 +Version: 4.0-1 Binary: qt5-pbf-image-plugin Maintainer: Martin Tuma <tumic(a)cbox.cz> Architecture: any -Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, libprotobuf-dev, protobuf-compiler, zlib1g-dev +Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, zlib1g-dev Files: - 00000000000000000000000000000000 0 QtPBFImagePlugin-3.2.tar.gz + 00000000000000000000000000000000 0 QtPBFImagePlugin-4.0.tar.gz

1 0

commit cilium-cli for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cilium-cli for openSUSE:Factory checked in at 2025-01-09 15:11:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cilium-cli (Old) and /work/SRC/openSUSE:Factory/.cilium-cli.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cilium-cli" Thu Jan 9 15:11:45 2025 rev:82 rq:1236096 version:0.16.23 Changes: -------- --- /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli.changes 2024-12-11 21:09:01.432707982 +0100 +++ /work/SRC/openSUSE:Factory/.cilium-cli.new.1881/cilium-cli.changes 2025-01-09 15:12:41.781386887 +0100 @@ -1,0 +2,65 @@ +Thu Jan 09 06:40:23 UTC 2025 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.16.23: + * Minor Changes: + - cli: aws mixed nodes install fix (cilium/cilium#36336, + @viktor-kurchenko) + * Bugfixes: + - Cilium CLI fix for AWS ENI mode (cilium/cilium#36887, + @viktor-kurchenko) + - Restore the original flag semantics for + --egress-masquerade-interfaces to the same as v1.17.0-pre.2 + or earlier (cilium/cilium#36504, @viktor-kurchenko) + * CI Changes: + - Add --external-other-target parameter to cilium CLI + connectivity tests. (cilium/cilium#36080, @wedaly) + - Change client-egress-l7-tls tests to sequential because flaky + (cilium/cilium#36568, @youngnick) + - cilium-cli/connectivity: fix IPv6 feature check for 2ndary + node IPv6 (cilium/cilium#36513, @tklauser) + - cilium-cli: Add envoy log pattern in error check + (cilium/cilium#36498, @sayboras) + - Fix cilium CLI connectivity tests in IPv6-only clusters. + (cilium/cilium#36026, @wedaly) + * Misc Changes: + - chore(deps): update all-dependencies (main) + (cilium/cilium#36706, @cilium-renovate[bot]) + - chore(deps): update docker.io/library/golang:1.23.4 docker + digest to 7003184 (main) (cilium/cilium#36604, + @cilium-renovate[bot]) + - chore(deps): update docker.io/library/golang:1.23.4 docker + digest to 7ea4c9d (main) (cilium/cilium#36808, + @cilium-renovate[bot]) + - ci/connectivity: Don't apply cnp to conn-disrupt pods in + 1.15, 1.14 (cilium/cilium#36682, @jschwinger233) + - cilium-cli: skip some IPv6 connectivity tests for Cilium<1.14 + when IPsec is enabled (cilium/cilium#36664, @jschwinger233) + - Isolate node-to-node encryption tests to wireguard + (cilium/cilium#36556, @ldelossa) + - chore(deps): update all github action dependencies (minor) by + @renovate in #2887 + - Update stable release to v0.16.22 by @tklauser in #2888 + - chore(deps): update module golang.org/x/crypto to v0.31.0 + [security] by @renovate in #2889 + - chore(deps): update all github action dependencies (minor) by + @renovate in #2890 + - Dockerfile: drop syntax comment by @tklauser in #2893 + - chore(deps): update dependency kubernetes-sigs/kind to + v0.26.0 by @renovate in #2892 + - chore(deps): update dependency cilium/cilium to v1.16.5 by + @renovate in #2894 + - chore(deps): update actions/upload-artifact action to v4.5.0 + by @renovate in #2896 + - chore(deps): update module golang.org/x/net to v0.33.0 + [security] by @renovate in #2895 + - chore(deps): update golangci/golangci-lint docker tag to + v1.63.0 by @renovate in #2899 + - chore(deps): update golangci/golangci-lint docker tag to + v1.63.4 by @renovate in #2902 + - chore(deps): update helm/kind-action action to v1.12.0 by + @renovate in #2901 + - chore(deps): update softprops/action-gh-release action to + v2.2.1 by @renovate in #2905 + - Prepare for v0.16.23 release by @michi-covalent in #2903 + +------------------------------------------------------------------- Old: ---- cilium-cli-0.16.22.obscpio New: ---- cilium-cli-0.16.23.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cilium-cli.spec ++++++ --- /var/tmp/diff_new_pack.p0hO23/_old 2025-01-09 15:12:43.681465882 +0100 +++ /var/tmp/diff_new_pack.p0hO23/_new 2025-01-09 15:12:43.681465882 +0100 @@ -1,7 +1,7 @@ # # spec file for package cilium-cli # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define executable_name cilium Name: cilium-cli -Version: 0.16.22 +Version: 0.16.23 Release: 0 Summary: CLI to install, manage & troubleshoot Kubernetes clusters running Cilium License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.p0hO23/_old 2025-01-09 15:12:43.721467545 +0100 +++ /var/tmp/diff_new_pack.p0hO23/_new 2025-01-09 15:12:43.725467712 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/cilium/cilium-cli</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.16.22</param> + <param name="revision">v0.16.23</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.p0hO23/_old 2025-01-09 15:12:43.749468709 +0100 +++ /var/tmp/diff_new_pack.p0hO23/_new 2025-01-09 15:12:43.749468709 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/cilium/cilium-cli</param> - <param name="changesrevision">c52e8c38e6d6235bd8e6e961199a984275547d6f</param></service></servicedata> + <param name="changesrevision">f313219850d324b516748ff7b00a6f9fa30d34ae</param></service></servicedata> (No newline at EOF) ++++++ cilium-cli-0.16.22.obscpio -> cilium-cli-0.16.23.obscpio ++++++ /work/SRC/openSUSE:Factory/cilium-cli/cilium-cli-0.16.22.obscpio /work/SRC/openSUSE:Factory/.cilium-cli.new.1881/cilium-cli-0.16.23.obscpio differ: char 49, line 1 ++++++ cilium-cli.obsinfo ++++++ --- /var/tmp/diff_new_pack.p0hO23/_old 2025-01-09 15:12:43.793470539 +0100 +++ /var/tmp/diff_new_pack.p0hO23/_new 2025-01-09 15:12:43.797470705 +0100 @@ -1,5 +1,5 @@ name: cilium-cli -version: 0.16.22 -mtime: 1733845574 -commit: c52e8c38e6d6235bd8e6e961199a984275547d6f +version: 0.16.23 +mtime: 1736354038 +commit: f313219850d324b516748ff7b00a6f9fa30d34ae ++++++ stable.txt ++++++ --- /var/tmp/diff_new_pack.p0hO23/_old 2025-01-09 15:12:43.817471537 +0100 +++ /var/tmp/diff_new_pack.p0hO23/_new 2025-01-09 15:12:43.821471703 +0100 @@ -1,2 +1,2 @@ -v1.16.4 +v1.16.5 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/cilium-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.cilium-cli.new.1881/vendor.tar.gz differ: char 5, line 1

1 0

commit skupper for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package skupper for openSUSE:Factory checked in at 2025-01-09 15:11:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skupper (Old) and /work/SRC/openSUSE:Factory/.skupper.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skupper" Thu Jan 9 15:11:42 2025 rev:4 rq:1236091 version:1.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/skupper/skupper.changes 2024-11-05 15:41:19.394835615 +0100 +++ /work/SRC/openSUSE:Factory/.skupper.new.1881/skupper.changes 2025-01-09 15:12:28.972854989 +0100 @@ -1,0 +2,11 @@ +Thu Jan 09 06:39:58 UTC 2025 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.8.3: + * update for 1.8.3 + * remove external process log (#1865) + * Fixes internal console-auth implementation (#1833) + * Ensure podman service containers bind correct hosts (#1799) + * Update test images for ARM and OCP 3.11 (#1652) + * Add stability to TestGateway and TestBasic tests (#1766) + +------------------------------------------------------------------- Old: ---- skupper-1.8.2.obscpio New: ---- skupper-1.8.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skupper.spec ++++++ --- /var/tmp/diff_new_pack.VH5S0Z/_old 2025-01-09 15:12:31.024939992 +0100 +++ /var/tmp/diff_new_pack.VH5S0Z/_new 2025-01-09 15:12:31.064941649 +0100 @@ -1,7 +1,7 @@ # # spec file for package skupper # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: skupper -Version: 1.8.2 +Version: 1.8.3 Release: 0 Summary: Virtual Application Network, enabling rich hybrid cloud communication License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VH5S0Z/_old 2025-01-09 15:12:31.576962859 +0100 +++ /var/tmp/diff_new_pack.VH5S0Z/_new 2025-01-09 15:12:31.616964516 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/skupperproject/skupper</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">1.8.2</param> + <param name="revision">1.8.3</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.VH5S0Z/_old 2025-01-09 15:12:31.800972138 +0100 +++ /var/tmp/diff_new_pack.VH5S0Z/_new 2025-01-09 15:12:31.828973297 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/skupperproject/skupper</param> - <param name="changesrevision">149f4a5588c532d6ab1fc489b19ca24633e521e7</param></service></servicedata> + <param name="changesrevision">f9c88e4e90f0a7f916e9b5d29e8dce5d2340f78e</param></service></servicedata> (No newline at EOF) ++++++ generated.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client/generated/libpod/client/containers/container_rename_libpod_parameters.go new/client/generated/libpod/client/containers/container_rename_libpod_parameters.go --- old/client/generated/libpod/client/containers/container_rename_libpod_parameters.go 2024-11-04 21:06:38.431534035 +0100 +++ new/client/generated/libpod/client/containers/container_rename_libpod_parameters.go 2025-01-09 07:40:40.545883570 +0100 @@ -63,15 +63,15 @@ /* Name. - New name for the container + Full or partial ID or full name of the container to rename */ - QueryName string + PathName string /* Name. - Full or partial ID or full name of the container to rename + New name for the container */ - PathName string + QueryName string timeout time.Duration Context context.Context @@ -126,17 +126,6 @@ o.HTTPClient = client } -// WithQueryName adds the name to the container rename libpod params -func (o *ContainerRenameLibpodParams) WithQueryName(name string) *ContainerRenameLibpodParams { - o.SetQueryName(name) - return o -} - -// SetQueryName adds the name to the container rename libpod params -func (o *ContainerRenameLibpodParams) SetQueryName(name string) { - o.QueryName = name -} - // WithPathName adds the name to the container rename libpod params func (o *ContainerRenameLibpodParams) WithPathName(name string) *ContainerRenameLibpodParams { o.SetPathName(name) @@ -148,6 +137,17 @@ o.PathName = name } +// WithQueryName adds the name to the container rename libpod params +func (o *ContainerRenameLibpodParams) WithQueryName(name string) *ContainerRenameLibpodParams { + o.SetQueryName(name) + return o +} + +// SetQueryName adds the name to the container rename libpod params +func (o *ContainerRenameLibpodParams) SetQueryName(name string) { + o.QueryName = name +} + // WriteToRequest writes these params to a swagger request func (o *ContainerRenameLibpodParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { @@ -156,6 +156,11 @@ } var res []error + // path param name + if err := r.SetPathParam("name", o.PathName); err != nil { + return err + } + // query param name qrName := o.QueryName qName := qrName @@ -166,11 +171,6 @@ } } - // path param name - if err := r.SetPathParam("name", o.PathName); err != nil { - return err - } - if len(res) > 0 { return errors.CompositeValidationError(res...) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client/generated/libpod/client/containers/container_restore_libpod_parameters.go new/client/generated/libpod/client/containers/container_restore_libpod_parameters.go --- old/client/generated/libpod/client/containers/container_restore_libpod_parameters.go 2024-11-04 21:06:39.874846900 +0100 +++ new/client/generated/libpod/client/containers/container_restore_libpod_parameters.go 2025-01-09 07:40:40.639217090 +0100 @@ -100,15 +100,15 @@ /* Name. - the name of the container when restored from a tar. can only be used with import + the name or id of the container */ - QueryName *string + PathName string /* Name. - the name or id of the container + the name of the container when restored from a tar. can only be used with import */ - PathName string + QueryName *string /* PrintStats. @@ -241,17 +241,6 @@ o.LeaveRunning = leaveRunning } -// WithQueryName adds the name to the container restore libpod params -func (o *ContainerRestoreLibpodParams) WithQueryName(name *string) *ContainerRestoreLibpodParams { - o.SetQueryName(name) - return o -} - -// SetQueryName adds the name to the container restore libpod params -func (o *ContainerRestoreLibpodParams) SetQueryName(name *string) { - o.QueryName = name -} - // WithPathName adds the name to the container restore libpod params func (o *ContainerRestoreLibpodParams) WithPathName(name string) *ContainerRestoreLibpodParams { o.SetPathName(name) @@ -263,6 +252,17 @@ o.PathName = name } +// WithQueryName adds the name to the container restore libpod params +func (o *ContainerRestoreLibpodParams) WithQueryName(name *string) *ContainerRestoreLibpodParams { + o.SetQueryName(name) + return o +} + +// SetQueryName adds the name to the container restore libpod params +func (o *ContainerRestoreLibpodParams) SetQueryName(name *string) { + o.QueryName = name +} + // WithPrintStats adds the printStats to the container restore libpod params func (o *ContainerRestoreLibpodParams) WithPrintStats(printStats *bool) *ContainerRestoreLibpodParams { o.SetPrintStats(printStats) @@ -395,6 +395,11 @@ } } + // path param name + if err := r.SetPathParam("name", o.PathName); err != nil { + return err + } + if o.QueryName != nil { // query param name @@ -412,11 +417,6 @@ } } - // path param name - if err := r.SetPathParam("name", o.PathName); err != nil { - return err - } - if o.PrintStats != nil { // query param printStats diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client/generated/libpod/client/containers_compat/container_rename_parameters.go new/client/generated/libpod/client/containers_compat/container_rename_parameters.go --- old/client/generated/libpod/client/containers_compat/container_rename_parameters.go 2024-11-04 21:06:53.817982497 +0100 +++ new/client/generated/libpod/client/containers_compat/container_rename_parameters.go 2025-01-09 07:40:41.392551925 +0100 @@ -63,15 +63,15 @@ /* Name. - New name for the container + Full or partial ID or full name of the container to rename */ - QueryName string + PathName string /* Name. - Full or partial ID or full name of the container to rename + New name for the container */ - PathName string + QueryName string timeout time.Duration Context context.Context @@ -126,17 +126,6 @@ o.HTTPClient = client } -// WithQueryName adds the name to the container rename params -func (o *ContainerRenameParams) WithQueryName(name string) *ContainerRenameParams { - o.SetQueryName(name) - return o -} - -// SetQueryName adds the name to the container rename params -func (o *ContainerRenameParams) SetQueryName(name string) { - o.QueryName = name -} - // WithPathName adds the name to the container rename params func (o *ContainerRenameParams) WithPathName(name string) *ContainerRenameParams { o.SetPathName(name) @@ -148,6 +137,17 @@ o.PathName = name } +// WithQueryName adds the name to the container rename params +func (o *ContainerRenameParams) WithQueryName(name string) *ContainerRenameParams { + o.SetQueryName(name) + return o +} + +// SetQueryName adds the name to the container rename params +func (o *ContainerRenameParams) SetQueryName(name string) { + o.QueryName = name +} + // WriteToRequest writes these params to a swagger request func (o *ContainerRenameParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { @@ -156,6 +156,11 @@ } var res []error + // path param name + if err := r.SetPathParam("name", o.PathName); err != nil { + return err + } + // query param name qrName := o.QueryName qName := qrName @@ -166,11 +171,6 @@ } } - // path param name - if err := r.SetPathParam("name", o.PathName); err != nil { - return err - } - if len(res) > 0 { return errors.CompositeValidationError(res...) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/client/generated/libpod/models/swag_network_connect_request.go new/client/generated/libpod/models/swag_network_connect_request.go --- old/client/generated/libpod/models/swag_network_connect_request.go 2024-11-04 21:06:31.384967300 +0100 +++ new/client/generated/libpod/models/swag_network_connect_request.go 2025-01-09 07:40:40.075882632 +0100 @@ -48,6 +48,10 @@ res = append(res, err) } + if err := m.validateStaticMac(formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -75,6 +79,23 @@ return nil } +func (m *SwagNetworkConnectRequest) validateStaticMac(formats strfmt.Registry) error { + if swag.IsZero(m.StaticMac) { // not required + return nil + } + + if err := m.StaticMac.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("static_mac") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("static_mac") + } + return err + } + + return nil +} + // ContextValidate validate this swag network connect request based on the context it is used func (m *SwagNetworkConnectRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error { var res []error @@ -83,6 +104,10 @@ res = append(res, err) } + if err := m.contextValidateStaticMac(ctx, formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -105,6 +130,20 @@ } return nil +} + +func (m *SwagNetworkConnectRequest) contextValidateStaticMac(ctx context.Context, formats strfmt.Registry) error { + + if err := m.StaticMac.ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("static_mac") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("static_mac") + } + return err + } + + return nil } // MarshalBinary interface implementation ++++++ skupper-1.8.2.obscpio -> skupper-1.8.3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/cmd/flow-collector/deploy.yaml new/skupper-1.8.3/cmd/flow-collector/deploy.yaml --- old/skupper-1.8.2/cmd/flow-collector/deploy.yaml 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/cmd/flow-collector/deploy.yaml 2025-01-08 19:00:52.000000000 +0100 @@ -66,7 +66,7 @@ #type: RuntimeDefault containers: - name: skupper-flow-collector - image: quay.io/skupper/flow-collector:1.8.2 + image: quay.io/skupper/flow-collector:1.8.3 imagePullPolicy: Always securityContext: capabilities: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/cmd/flow-collector/handlers.go new/skupper-1.8.3/cmd/flow-collector/handlers.go --- old/skupper-1.8.2/cmd/flow-collector/handlers.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/cmd/flow-collector/handlers.go 2025-01-08 19:00:52.000000000 +0100 @@ -1,10 +1,14 @@ package main import ( + "bytes" "fmt" "io" "log" "net/http" + "os" + "path/filepath" + "regexp" "github.com/skupperproject/skupper/pkg/flow" ) @@ -226,3 +230,70 @@ log.Printf("COLLECTOR: rangequery proxy response write error: %s", err.Error()) } } + +func noAuth(h http.HandlerFunc) http.HandlerFunc { + return h +} + +// basicAuthHandler handles basic auth for multiple users. +type basicAuthHandler map[string]string + +func newBasicAuthHandler(root string) (basicAuthHandler, error) { + basicUsers := make(basicAuthHandler) + + // Restrict usernames to files begining with an alphanumeric character + // Omits hidden files + fileRexp := regexp.MustCompile(`^[a-zA-Z0-9].*$`) + + entries, err := os.ReadDir(root) + if err != nil { + return basicUsers, err + } + var buf bytes.Buffer + for _, entry := range entries { + if entry.IsDir() { + continue + } + username := entry.Name() + + if !fileRexp.MatchString(username) { + continue + } + path := filepath.Join(root, username) + f, err := os.Open(path) + if err != nil { + log.Printf("COLLECTOR: basic auth file open %q error: %s", path, err.Error()) + continue + } + defer f.Close() + + buf.Reset() + if _, err := io.Copy(&buf, f); err != nil { + log.Printf("COLLECTOR: basic auth file read %q error: %s", path, err.Error()) + continue + } + + basicUsers[username] = buf.String() + } + return basicUsers, nil +} + +func (h basicAuthHandler) HandlerFunc(next http.HandlerFunc) http.HandlerFunc { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + user, password, ok := r.BasicAuth() + + if ok && h.check(user, password) { + next.ServeHTTP(w, r) + return + } + w.Header().Set("WWW-Authenticate", "Basic realm=skupper") + http.Error(w, "Unauthorized", http.StatusUnauthorized) + }) +} + +func (h basicAuthHandler) check(user, given string) bool { + if required, ok := h[user]; ok { + return given == required + } + return false +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/cmd/flow-collector/handlers_test.go new/skupper-1.8.3/cmd/flow-collector/handlers_test.go --- old/skupper-1.8.2/cmd/flow-collector/handlers_test.go 1970-01-01 01:00:00.000000000 +0100 +++ new/skupper-1.8.3/cmd/flow-collector/handlers_test.go 2025-01-08 19:00:52.000000000 +0100 @@ -0,0 +1,96 @@ +package main + +import ( + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "testing" +) + +func TestBasic(t *testing.T) { + configuredUsers := map[string]string{ + "test-user": "plaintext-password", + "admin": "p@ssword!", + } + tmpDir := t.TempDir() + writeUser := func(usr, pwd string) { + userFile, err := os.Create(filepath.Join(tmpDir, usr)) + if err != nil { + t.Fatal(err) + } + defer userFile.Close() + userFile.Write([]byte(pwd)) + } + for usr, pwd := range configuredUsers { + writeUser(usr, pwd) + } + writeUser("unreadable", "test") // ensure unreadable files are gracefully skipped + os.Chmod(filepath.Join(tmpDir, "unreadable"), 0220) + + BasicAuth, err := newBasicAuthHandler(tmpDir) + if err != nil { + t.Fatal("unexpected error", err) + } + + tstSrv := httptest.NewTLSServer(BasicAuth.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { + rw.Write([]byte("OK")) + })) + defer tstSrv.Close() + client := tstSrv.Client() + assertStatusCode := func(expected int, req *http.Request) { + t.Helper() + resp, err := client.Do(req) + if err != nil { + t.Fatal(err) + } + if resp.StatusCode != expected { + t.Fatalf("expected http %d: got %d", expected, resp.StatusCode) + } + } + unauthenticated, _ := http.NewRequest(http.MethodGet, tstSrv.URL, nil) + assertStatusCode(401, unauthenticated) + + incorrectPass, _ := http.NewRequest(http.MethodGet, tstSrv.URL, nil) + incorrectPass.SetBasicAuth("test-user", "X"+configuredUsers["test-user"]) + assertStatusCode(401, incorrectPass) + + incorrectUser, _ := http.NewRequest(http.MethodGet, tstSrv.URL, nil) + incorrectUser.SetBasicAuth("test-user-x", configuredUsers["test-user"]) + assertStatusCode(401, incorrectPass) + + unreadableUser, _ := http.NewRequest(http.MethodGet, tstSrv.URL, nil) + unreadableUser.SetBasicAuth("unreadable", "test") + assertStatusCode(401, unreadableUser) + + mixedUserPass, _ := http.NewRequest(http.MethodGet, tstSrv.URL, nil) + mixedUserPass.SetBasicAuth("admin", configuredUsers["test-user"]) + assertStatusCode(401, mixedUserPass) + + for usr, pwd := range configuredUsers { + req, _ := http.NewRequest(http.MethodGet, tstSrv.URL, nil) + req.SetBasicAuth(usr, pwd) + assertStatusCode(200, req) + } +} + +func FuzzBasic(f *testing.F) { + const ( + tUser = "skupper" + tPassword = "P@ssword!" + ) + basic := basicAuthHandler{ + tUser: tPassword, + } + f.Add(tUser, tPassword) + f.Add(tPassword, tUser) + f.Add(tUser, "") + f.Add("", tPassword) + f.Fuzz(func(t *testing.T, user, password string) { + expected := user == tUser && password == tPassword + out := basic.check(user, password) + if expected != out { + t.Errorf("%q:%q does not match %q:%q", user, password, tUser, tPassword) + } + }) +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/cmd/flow-collector/main.go new/skupper-1.8.3/cmd/flow-collector/main.go --- old/skupper-1.8.2/cmd/flow-collector/main.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/cmd/flow-collector/main.go 2025-01-08 19:00:52.000000000 +0100 @@ -4,16 +4,13 @@ "context" "encoding/base64" "encoding/json" - "errors" "flag" "fmt" - "io" "log" "net/http" _ "net/http/pprof" "os" "os/signal" - "path" "strconv" "syscall" "time" @@ -55,8 +52,13 @@ AuthMode string `json:"authType"` } -var onlyOneSignalHandler = make(chan struct{}) -var shutdownSignals = []os.Signal{os.Interrupt, syscall.SIGTERM} +var ( + // authenticated made variable to be swapped out at startup + authenticated func(next http.HandlerFunc) http.HandlerFunc = noAuth + + onlyOneSignalHandler = make(chan struct{}) + shutdownSignals = []os.Signal{os.Interrupt, syscall.SIGTERM} +) func getConnectInfo(file string) (connectJson, error) { cj := connectJson{} @@ -102,46 +104,6 @@ }) } -func authenticate(dir string, user string, password string) bool { - filename := path.Join(dir, user) - file, err := os.Open(filename) - if err != nil { - if errors.Is(err, os.ErrNotExist) { - log.Printf("COLLECTOR: Failed to authenticate %s, no such user exists", user) - } else { - log.Printf("COLLECTOR: Failed to authenticate %s: %s", user, err) - } - return false - } - defer file.Close() - - bytes, err := io.ReadAll(file) - if err != nil { - log.Printf("COLLECTOR: Failed to authenticate %s: %s", user, err) - return false - } - return string(bytes) == password -} - -func authenticated(h http.HandlerFunc) http.HandlerFunc { - dir := os.Getenv("FLOW_USERS") - - if dir != "" { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - user, password, ok := r.BasicAuth() - - if ok && authenticate(dir, user, password) { - h.ServeHTTP(w, r) - } else { - w.Header().Set("WWW-Authenticate", "Basic realm=skupper") - http.Error(w, "Unauthorized", http.StatusUnauthorized) - } - }) - } else { - return h - } -} - func getOpenshiftUser(r *http.Request) UserResponse { userResponse := UserResponse{ Username: "", @@ -208,6 +170,20 @@ http.Error(w, "Unauthorized", http.StatusUnauthorized) } +func configureAuth() error { + root := os.Getenv("FLOW_USERS") + if root == "" { + return nil + } + log.Printf("COLLECTOR: Configuring basic auth handler from %q \n", root) + basic, err := newBasicAuthHandler(root) + if err != nil { + return err + } + authenticated = basic.HandlerFunc + return nil +} + func main() { flags := flag.NewFlagSet(os.Args[0], flag.ExitOnError) // if -version used, report and exit @@ -219,7 +195,6 @@ fmt.Println(version.Version) os.Exit(0) } - // Startup message log.Printf("COLLECTOR: Starting Skupper Flow collector controller version %s \n", version.Version) @@ -297,6 +272,10 @@ } } + if err := configureAuth(); err != nil { + log.Fatalf("unrecoverable error setting up authentication: %s", err) + } + tlsConfig := certs.GetTlsConfigRetriever(true, types.ControllerConfigPath+"tls.crt", types.ControllerConfigPath+"tls.key", types.ControllerConfigPath+"ca.crt") conn, err := getConnectInfo(types.ControllerConfigPath + "connect.json") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/cmd/site-controller/deploy-watch-all-ns.yaml new/skupper-1.8.3/cmd/site-controller/deploy-watch-all-ns.yaml --- old/skupper-1.8.2/cmd/site-controller/deploy-watch-all-ns.yaml 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/cmd/site-controller/deploy-watch-all-ns.yaml 2025-01-08 19:00:52.000000000 +0100 @@ -194,7 +194,7 @@ type: RuntimeDefault containers: - name: site-controller - image: quay.io/skupper/site-controller:1.8.2 + image: quay.io/skupper/site-controller:1.8.3 securityContext: capabilities: drop: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/cmd/site-controller/deploy-watch-current-ns.yaml new/skupper-1.8.3/cmd/site-controller/deploy-watch-current-ns.yaml --- old/skupper-1.8.2/cmd/site-controller/deploy-watch-current-ns.yaml 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/cmd/site-controller/deploy-watch-current-ns.yaml 2025-01-08 19:00:52.000000000 +0100 @@ -137,7 +137,7 @@ type: RuntimeDefault containers: - name: site-controller - image: quay.io/skupper/site-controller:1.8.2 + image: quay.io/skupper/site-controller:1.8.3 securityContext: capabilities: drop: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/pkg/domain/podman/service.go new/skupper-1.8.3/pkg/domain/podman/service.go --- old/skupper-1.8.2/pkg/domain/podman/service.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/pkg/domain/podman/service.go 2025-01-08 19:00:52.000000000 +0100 @@ -195,7 +195,7 @@ var svcRouterConfig *qdr.RouterConfig var svcRouterConfigStr string var configVolume *container.Volume - svcRouterConfig, svcRouterConfigStr, err = domain.CreateRouterServiceConfig(site, routerConfig, servicePodman) + svcRouterConfig, svcRouterConfigStr, err = domain.CreateRouterServiceConfig(site, routerConfig, servicePodman, servicePodman.GetContainerName()) // Creating directory inside skupper-internal volume to store config for service router configFile := path.Join(servicePodman.Address, types.TransportConfigFile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/pkg/domain/podman/service_test.go new/skupper-1.8.3/pkg/domain/podman/service_test.go --- old/skupper-1.8.2/pkg/domain/podman/service_test.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/pkg/domain/podman/service_test.go 2025-01-08 19:00:52.000000000 +0100 @@ -4,11 +4,14 @@ package podman import ( + "fmt" + "strconv" "testing" "github.com/skupperproject/skupper/api/types" "github.com/skupperproject/skupper/client/container" "github.com/skupperproject/skupper/pkg/domain" + "github.com/skupperproject/skupper/pkg/qdr" "gotest.tools/assert" ) @@ -161,3 +164,191 @@ } }) } + +func TestCreateRouterServiceConfig(t *testing.T) { + + fakeService := func(address string, ports []int, containerName string) *Service { + svc := &Service{ + ServiceCommon: &domain.ServiceCommon{ + Address: address, + Ports: ports, + Protocol: "tcp", + }, + ContainerName: containerName, + } + return svc + } + site := &Site{ + SiteCommon: &domain.SiteCommon{ + Name: "my-site-name", + Id: "my-site-id", + }, + } + parentConfig := &qdr.RouterConfig{ + LogConfig: map[string]qdr.LogConfig{ + "DEFAULT": qdr.LogConfig{ + Module: "DEFAULT", + Enable: "info+", + }, + }, + } + egressResolvers := func(service *Service) { + service.AddEgressResolver(&domain.EgressResolverHost{ + Host: "10.0.0.1", + Ports: map[int]int{8080: 8080}, + }) + service.AddEgressResolver(&domain.EgressResolverHost{ + Host: "10.0.0.2", + Ports: map[int]int{8080: 8081}, + }) + } + scenarios := []struct { + name string + service *Service + modifier func(*Service) + expError bool + }{ + { + name: "basic-service-tcp", + service: fakeService("address", []int{8080}, ""), + }, + { + name: "basic-service-tcp-custom-container", + service: fakeService("address", []int{8080}, "custom-address"), + }, + { + name: "basic-service-tcp-multiple-ports", + service: fakeService("address", []int{8080, 8081, 8082}, ""), + }, + { + name: "basic-service-http", + service: fakeService("address", []int{8080}, ""), + modifier: func(service *Service) { + service.Protocol = "http" + }, + }, + { + name: "basic-service-http2", + service: fakeService("address", []int{8080}, ""), + modifier: func(service *Service) { + service.Protocol = "http2" + }, + }, + { + name: "basic-service-tls", + service: fakeService("address", []int{8080}, ""), + modifier: func(service *Service) { + service.TlsCredentials = "my-credentials" + }, + }, + { + name: "basic-service-tcp-with-targets", + service: fakeService("address", []int{8080}, ""), + modifier: egressResolvers, + }, + { + name: "basic-service-http-with-targets", + service: fakeService("address", []int{8080}, ""), + modifier: func(service *Service) { + service.Protocol = "http" + egressResolvers(service) + }, + }, + { + name: "basic-service-http2-with-targets", + service: fakeService("address", []int{8080}, ""), + modifier: func(service *Service) { + service.Protocol = "http2" + egressResolvers(service) + }, + }, + } + for _, scenario := range scenarios { + t.Run(scenario.name, func(t *testing.T) { + if scenario.modifier != nil { + scenario.modifier(scenario.service) + } + routerConfig, routerConfigStr, err := domain.CreateRouterServiceConfig(site, parentConfig, scenario.service, scenario.service.GetContainerName()) + if scenario.expError { + assert.Assert(t, err != nil) + return + } + assert.Assert(t, err == nil) + assert.Assert(t, routerConfig != nil) + assert.Assert(t, routerConfigStr != "") + + var expectedTcpListeners int + var expectedHttpListeners int + var expectedPorts = len(scenario.service.Ports) + switch scenario.service.Protocol { + case "tcp": + expectedTcpListeners = expectedPorts + case "http": + expectedHttpListeners = expectedPorts + case "http2": + expectedHttpListeners = expectedPorts + } + assert.Equal(t, len(routerConfig.Bridges.TcpListeners), expectedTcpListeners) + assert.Equal(t, len(routerConfig.Bridges.HttpListeners), expectedHttpListeners) + + var sslProfilesExpected = 1 + if scenario.service.IsTls() { + sslProfilesExpected++ + } + assert.Equal(t, sslProfilesExpected, len(routerConfig.SslProfiles)) + + for _, port := range scenario.service.Ports { + addressIndex := fmt.Sprintf("%s:%d", scenario.service.Address, port) + if expectedTcpListeners > 0 { + tcpListener := routerConfig.Bridges.TcpListeners[addressIndex] + if scenario.service.ContainerName == "" { + assert.Equal(t, tcpListener.Host, scenario.service.Address) + } else { + assert.Equal(t, tcpListener.Host, scenario.service.ContainerName) + } + assert.Equal(t, tcpListener.Address, addressIndex) + assert.Equal(t, tcpListener.Port, strconv.Itoa(port)) + + assert.Equal(t, len(scenario.service.GetEgressResolvers()), len(routerConfig.Bridges.TcpConnectors)) + for _, egressResolver := range scenario.service.GetEgressResolvers() { + egresses, err := egressResolver.Resolve() + assert.Assert(t, err) + for _, egress := range egresses { + targetHost := egress.GetHost() + for _, targetPort := range egress.GetPorts() { + connectorName := fmt.Sprintf("%s@%s:%d:%d", scenario.service.Address, targetHost, port, targetPort) + connector, ok := routerConfig.Bridges.TcpConnectors[connectorName] + assert.Assert(t, ok) + assert.Equal(t, strconv.Itoa(targetPort), connector.Port) + } + } + } + } else { + httpListener := routerConfig.Bridges.HttpListeners[addressIndex] + if scenario.service.ContainerName == "" { + assert.Equal(t, httpListener.Host, scenario.service.Address) + } else { + assert.Equal(t, httpListener.Host, scenario.service.ContainerName) + } + assert.Equal(t, httpListener.Address, addressIndex) + assert.Equal(t, httpListener.Port, strconv.Itoa(port)) + + assert.Equal(t, len(scenario.service.GetEgressResolvers()), len(routerConfig.Bridges.HttpConnectors)) + for _, egressResolver := range scenario.service.GetEgressResolvers() { + egresses, err := egressResolver.Resolve() + assert.Assert(t, err) + for _, egress := range egresses { + targetHost := egress.GetHost() + for _, targetPort := range egress.GetPorts() { + connectorName := fmt.Sprintf("%s@%s:%d:%d", scenario.service.Address, targetHost, port, targetPort) + connector, ok := routerConfig.Bridges.HttpConnectors[connectorName] + assert.Assert(t, ok) + assert.Equal(t, strconv.Itoa(targetPort), connector.Port) + } + } + } + } + } + }) + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/pkg/domain/podman/site_test.go new/skupper-1.8.3/pkg/domain/podman/site_test.go --- old/skupper-1.8.2/pkg/domain/podman/site_test.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/pkg/domain/podman/site_test.go 2025-01-08 19:00:52.000000000 +0100 @@ -460,7 +460,7 @@ }, { ID: strings.Replace(uuid.New().String(), "-", "", -1), Name: "nginx", - Image: "docker.io/nginxinc/nginx-unprivileged:stable-alpine", + Image: "quay.io/skupper/nginx-unprivileged:stable-alpine", Labels: map[string]string{}, Networks: map[string]container.ContainerNetworkInfo{ "skupper": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/pkg/domain/service.go new/skupper-1.8.3/pkg/domain/service.go --- old/skupper-1.8.2/pkg/domain/service.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/pkg/domain/service.go 2025-01-08 19:00:52.000000000 +0100 @@ -199,7 +199,7 @@ } } -func CreateRouterServiceConfig(site Site, parentRouterConfig *qdr.RouterConfig, service Service) (*qdr.RouterConfig, string, error) { +func CreateRouterServiceConfig(site Site, parentRouterConfig *qdr.RouterConfig, service Service, serviceHostname string) (*qdr.RouterConfig, string, error) { // Create router config siteName := fmt.Sprintf("%s-%s", site.GetName(), service.GetAddress()) @@ -241,6 +241,7 @@ case "tcp": svcRouterConfig.AddTcpListener(qdr.TcpEndpoint{ Name: listenerName, + Host: serviceHostname, Port: listenerPort, Address: listenerAddr, SiteId: siteId, @@ -249,6 +250,7 @@ case "http": svcRouterConfig.AddHttpListener(qdr.HttpEndpoint{ Name: listenerName, + Host: serviceHostname, Port: listenerPort, Address: listenerAddr, SiteId: siteId, @@ -258,6 +260,7 @@ case "http2": svcRouterConfig.AddHttpListener(qdr.HttpEndpoint{ Name: listenerName, + Host: serviceHostname, Port: listenerPort, Address: listenerAddr, SiteId: siteId, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/pkg/flow/flow_mem_driver.go new/skupper-1.8.3/pkg/flow/flow_mem_driver.go --- old/skupper-1.8.2/pkg/flow/flow_mem_driver.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/pkg/flow/flow_mem_driver.go 2025-01-08 19:00:52.000000000 +0100 @@ -2804,7 +2804,6 @@ diff := uint64(time.Now().UnixNano())/uint64(time.Microsecond) - diffTime found := false if diff > wait && flow.Process == nil { - log.Printf("COLLECTOR: Associating flow %s to external process %s\n", flow.Identity, processName) for _, process := range fc.Processes { if process.Name != nil && *process.Name == processName { flow.Process = &process.Identity diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/pkg/images/images.go new/skupper-1.8.3/pkg/images/images.go --- old/skupper-1.8.2/pkg/images/images.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/pkg/images/images.go 2025-01-08 19:00:52.000000000 +0100 @@ -2,12 +2,12 @@ const ( DefaultImageRegistry string = "quay.io/skupper" - RouterImageName string = "skupper-router:2.7.2" - ServiceControllerImageName string = "service-controller:1.8.2" - ControllerPodmanImageName string = "controller-podman:1.8.2" - ConfigSyncImageName string = "config-sync:1.8.2" - FlowCollectorImageName string = "flow-collector:1.8.2" - SiteControllerImageName string = "site-controller:1.8.2" + RouterImageName string = "skupper-router:2.7.3" + ServiceControllerImageName string = "service-controller:1.8.3" + ControllerPodmanImageName string = "controller-podman:1.8.3" + ConfigSyncImageName string = "config-sync:1.8.3" + FlowCollectorImageName string = "flow-collector:1.8.3" + SiteControllerImageName string = "site-controller:1.8.3" PrometheusImageRegistry string = "quay.io/prometheus" PrometheusServerImageName string = "prometheus:v2.42.0" OauthProxyImageRegistry string = "quay.io/openshift" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/Containerfile.hey new/skupper-1.8.3/test/images/Containerfile.hey --- old/skupper-1.8.2/test/images/Containerfile.hey 1970-01-01 01:00:00.000000000 +0100 +++ new/skupper-1.8.3/test/images/Containerfile.hey 2025-01-08 19:00:52.000000000 +0100 @@ -0,0 +1,26 @@ +ARG TARGETPLATFORM + +FROM --platform=$TARGETPLATFORM golang:1.21 AS builder + +ARG TARGETOS +ARG TARGETARCH + +WORKDIR /go/src/app +RUN git clone https://github.com/rakyll/hey.git ./ +RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o hey ./hey.go + +FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9-minimal + +# The image needs to be compatible with the older entry point used +# in the previous version +RUN ln -s /app/hey /usr/bin/hey_linux_amd64 + +# Create user and group and switch to user's context +RUN microdnf -y install shadow-utils \ +&& microdnf clean all +RUN useradd --uid 10000 runner +USER 10000 + +WORKDIR /app +COPY --from=builder /go/src/app/hey . +CMD ["/app/hey"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/Containerfile.iperf3 new/skupper-1.8.3/test/images/Containerfile.iperf3 --- old/skupper-1.8.2/test/images/Containerfile.iperf3 1970-01-01 01:00:00.000000000 +0100 +++ new/skupper-1.8.3/test/images/Containerfile.iperf3 2025-01-08 19:00:52.000000000 +0100 @@ -0,0 +1,18 @@ +ARG TARGETPLATFORM + +FROM --platform=$TARGETPLATFORM quay.io/fedora/fedora-minimal + +LABEL description="A supporting test image" +LABEL maintainer="Skupper project" +LABEL origin=https://github.com/skupperproject/skupper/blob/main/test/images + +EXPOSE 5201 + +# Create user and group and switch to user's context +RUN microdnf -y install iperf3 shadow-utils \ +&& microdnf clean all +RUN useradd --uid 10000 runner +USER 10000 + +CMD [] +ENTRYPOINT ["/usr/bin/iperf3"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/Containerfile.nghttp2 new/skupper-1.8.3/test/images/Containerfile.nghttp2 --- old/skupper-1.8.2/test/images/Containerfile.nghttp2 1970-01-01 01:00:00.000000000 +0100 +++ new/skupper-1.8.3/test/images/Containerfile.nghttp2 2025-01-08 19:00:52.000000000 +0100 @@ -0,0 +1,11 @@ +ARG TARGETPLATFORM + +FROM --platform=$TARGETPLATFORM alpine:latest + +LABEL description="A supporting test image containing nghttp2 (client, server and load tester), for Skupper testing. By default, this image does not start any nghttp2 project; the user needs to overwrite CMD with the command they want" +LABEL maintainer="Skupper project" +LABEL origin=https://github.com/skupperproject/skupper/blob/main/test/images + +RUN apk add --no-cache nghttp2 + +CMD ["ls"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/Containerfile.wrk new/skupper-1.8.3/test/images/Containerfile.wrk --- old/skupper-1.8.2/test/images/Containerfile.wrk 1970-01-01 01:00:00.000000000 +0100 +++ new/skupper-1.8.3/test/images/Containerfile.wrk 2025-01-08 19:00:52.000000000 +0100 @@ -0,0 +1,17 @@ +ARG TARGETPLATFORM + +FROM --platform=$TARGETPLATFORM registry.fedoraproject.org/fedora-minimal AS build + +RUN microdnf -y install gcc git make unzip openssl-devel && microdnf -y clean all + +WORKDIR /home/root +RUN git clone https://github.com/wg/wrk.git + +WORKDIR /home/root/wrk +RUN make WITH_OPENSSL=/usr + +FROM registry.fedoraproject.org/fedora-minimal + +COPY --from=build /home/root/wrk/wrk /usr/bin/wrk + +CMD ["/usr/bin/wrk"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/Containerfile.wrk2 new/skupper-1.8.3/test/images/Containerfile.wrk2 --- old/skupper-1.8.2/test/images/Containerfile.wrk2 1970-01-01 01:00:00.000000000 +0100 +++ new/skupper-1.8.3/test/images/Containerfile.wrk2 2025-01-08 19:00:52.000000000 +0100 @@ -0,0 +1,13 @@ +ARG TARGETPLATFORM + +FROM --platform=$TARGETPLATFORM alpine:latest as builder + +RUN apk add --update alpine-sdk openssl-dev zlib-dev && apk add --no-cache git && git clone https://github.com/giltene/wrk2.git && cd wrk2 && make && mv wrk /bin/ + + +FROM alpine:latest + +RUN apk add --update libgcc openssl zlib +COPY --from=builder /bin/wrk /bin/ + +CMD ["/bin/sh"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/Dockerfile.nghttp2 new/skupper-1.8.3/test/images/Dockerfile.nghttp2 --- old/skupper-1.8.2/test/images/Dockerfile.nghttp2 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/images/Dockerfile.nghttp2 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -FROM alpine:latest - -LABEL description="A supporting test image containing nghttp2 (client, server and load tester), for Skupper testing. By default, this image does not start any nghttp2 project; the user needs to overwrite CMD with the command they want" -LABEL maintainer="Skupper project" -LABEL origin=https://github.com/skupperproject/skupper/blob/main/test/images - -RUN apk add --no-cache nghttp2 - -CMD ["ls"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/Makefile new/skupper-1.8.3/test/images/Makefile --- old/skupper-1.8.2/test/images/Makefile 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/images/Makefile 2025-01-08 19:00:52.000000000 +0100 @@ -1,30 +1,35 @@ # This make file provides three operations: # -# - Copy a list of images (hardcoded below) to a main repository (by default, -# quay.io/skupper) -# - Generate and push images to that same repository, based on Dockerfiles -# - Copy both lists of images above (external and generated) to another, -# configurable repository +# - Copy (replicate) a list of images (hardcoded below) to a main repository +# (by default, quay.io/skupper), possibly modifying and reassembling them +# - Generate and push images to that same repository, based on Containerfiles +# located on this directory +# - Copy both lists of images above (replicated and generated) to another, +# configurable repository, along with other two lists, which are generally +# used from their original locations ('other' and 'external'). # # See the README.md for the rationale of each of them. # -# The basic operation is to copy or generate-and-push a single image into +# The basic operation is to replicate or generate-and-push a single image into # the MAIN_REPO: # # make docker.io/svagi/nghttp2 +# make docker.io/nginxinc/nginx-unprivileged # make nghttp2 # -# The possible values are those listed on EXTERNAL_IMAGES and GENERATED_IMAGES. +# The possible values are those listed on REPLICATED_IMAGES, REASSEMBLED_IMAGES +# and GENERATED_IMAGES. # # You can also only build an image (and not push it). Just add _build to the # image name listed in GENERATED_IMAGES: # # make nghttp2_build # -# Alternativelly, one can build/push or copy all generated, all external, or -# all of them: +# Alternativelly, one can build/push or copy all generated, all replicated, all +# reassembled, or all of them: # -# make external_images +# make replicated_images +# make reassembled_images # make generated_images # make everything # @@ -35,9 +40,9 @@ # As with any Makefile, you can configure the execution by setting variables # on the make invocation: # -# make MAIN_REPO=quay.io/dhashimo docker.io/ssorj/quiver +# make MAIN_REPO=quay.io/dhashimo docker.io/library/redis:alpine # -# The command above will copy docker.io/ssorj/quiver into the quay repository +# The command above will copy docker.io/library/redis:alpine into the quay repository # quay.io/dhashimo, instead of the default MAIN_REPO # # make MAIN_REPO=quay.io/dhashimo everything @@ -50,15 +55,16 @@ # # make COPY_REPO=192.168.0.1:5000/internal copy # -# The command above will copy all images (external and generated, as listed -# below) from the MAIN_REPO into the 'internal' repository within the -# registry running at 192.168.0.1:5000. +# The command above will copy all images (replicated, generated, reassembled, +# external and other, as listed below) from the MAIN_REPO into the 'internal' +# repository within the registry running at 192.168.0.1:5000. # # Individual items can also be specified. For that, just add '_copy' to # their main target names: # # make COPY_REPO=192.168.0.1:5000/internal nghttp2_copy -# make COPY_REPO=192.168.0.1:5000/internal docker.io/ssorj/quiver_copy +# make COPY_REPO=192.168.0.1:5000/internal docker.io/library/redis:alpine_copy +# make COPY_REPO=192.168.0.1:5000/internal docker.io/nginxinc/nginx-unprivileged_copy # # This Makefile is intended to be executed manually, with the login of # individual users, and not by a robot account on a CI. @@ -80,32 +86,89 @@ # That is required for their use with Openshift 3.11 FORMAT_OPTIONS = --format docker TRANSFORM_OPTIONS = --format v2s2 +PLATFORM = linux/amd64,linux/arm64 # Repositories MAIN_REPO = quay.io/skupper COPY_REPO = localhost:5000/local -# This is the list of external images that will be copied to $(MAIN_REPO). If +# Set this to copy a specific tag from quay.io/skupper/skupper-tests on +# the copy operation. If you do so, include the colon - ":1.5" +SKUPPER_TESTS_IMAGE_VERSION = + +# This is the list of replicated images that will be copied to $(MAIN_REPO). If # the image specifies a tag, make sure to escape the colon with a backslash # (such as in docker.io/library/mongo\:5.0). Otherwise, you'll get an error # like `multiple target patterns. Stop.` -EXTERNAL_IMAGES := \ - docker.io/nginxinc/nginx-unprivileged \ - docker.io/ssorj/quiver \ +REPLICATED_IMAGES := \ + docker.io/library/postgres\:9.5 \ + + +# These manifest lists require special handling; they contain 'images' with +# os/arch/variant "unknown" and the following entry in LayersData.Annotations: +# +# in-toto.io/predicate-type": "https://slsa.dev/provenance/v0.2 +# +# That makes a plain skopeo copy --all --format v2s2 to fail with an error +# like the one below: +# +# copying image 8/14 from manifest list: creating an updated image manifest: Unknown media type during manifest conversion: "application/vnd.in-toto+json" +# +# (see https://github.com/containers/skopeo/issues/1874) +# +# For that reason, we need to first copy the image locally, change its +# manifest, and only then copy it to its destination. +REASSEMBLED_IMAGES := \ + docker.io/library/mongo\:5.0 \ docker.io/library/postgres \ docker.io/library/redis \ - docker.io/maistra/examples-bookinfo-productpage-v1\:0.12.0 \ - docker.io/maistra/examples-bookinfo-ratings-v1\:0.12.0 \ - docker.io/maistra/examples-bookinfo-details-v1\:0.12.0 \ - docker.io/maistra/examples-bookinfo-reviews-v3\:0.12.0 \ - docker.io/library/mongo\:5.0 \ - docker.io/nginxinc/nginx-unprivileged\:stable-alpine + docker.io/nginxinc/nginx-unprivileged \ + docker.io/nginxinc/nginx-unprivileged\:stable-alpine \ + docker.io/library/redis\:alpine \ + docker.io/istio/examples-bookinfo-productpage-v1\:1.19.1 \ + docker.io/istio/examples-bookinfo-ratings-v1\:1.19.1 \ + docker.io/istio/examples-bookinfo-details-v1\:1.19.1 \ + docker.io/istio/examples-bookinfo-reviews-v3\:1.19.1 # These are the images that are generated by this Makefile (as opposed to # created elsewhere and just copied here). To add a new image, simply create -# Dockerfile.IMAGENAME and add the IMAGENAME below. +# Containerfile.IMAGENAME and add the IMAGENAME below. GENERATED_IMAGES := \ - nghttp2 + hey \ + iperf3 \ + nghttp2 \ + wrk + +# wrk2 does not support ARM: https://github.com/giltene/wrk2/issues/104 + +# These are generated by other repositories under https://github.com/skupperproject/, +# and placed directly on quay. We list them here, so they can be part of the list of images +# to be copied to a private repo +OTHER_IMAGES := \ + quay.io/skupper/wrk2 \ + quay.io/skupper/tcp-go-echo \ + quay.io/skupper/hello-world-frontend \ + quay.io/skupper/hello-world-backend \ + quay.io/skupper/skupper-tests${SKUPPER_TESTS_IMAGE_VERSION} + +# These images are external to the project, and they are not copied into our quay; +# the tests access them with their original names, and we do not do any special +# handling on them. They are listed here just so they can be used on the copy +# operation. +EXTERNAL_IMAGES := \ + quay.io/ssorj/quiver \ + gcr.io/google-samples/microservices-demo/adservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/cartservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/checkoutservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/currencyservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/emailservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/frontend\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/loadgenerator\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/paymentservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/productcatalogservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/recommendationservice\:v0.10.1 \ + gcr.io/google-samples/microservices-demo/shippingservice\:v0.10.1 \ + registry.access.redhat.com/rhscl/postgresql-95-rhel7 # --- end of configuration --- @@ -116,7 +179,10 @@ # The copy target names, to be used with the copy operation generated_copy := $(patsubst %,%_copy,$(GENERATED_IMAGES)) -external_copy := $(patsubst %,%_copy,$(EXTERNAL_IMAGES)) +replicated_copy := $(patsubst %,%_copy,$(REPLICATED_IMAGES)) +reassembled_copy := $(patsubst %,%_copy,$(REASSEMBLED_IMAGES)) +external_copy := $(patsubst %,%_copy,$(EXTERNAL_IMAGES)) +other_copy := $(patsubst %,%_copy,$(OTHER_IMAGES)) # We don't want someone to just run `make` and start copying stuff # around, so instead the default operation is to just give some @@ -129,52 +195,118 @@ @echo Normal use, however, is to select individual targets. @echo Check Makefile contents for documentation. -# For a generated image, we simply have a Dockerfile named after it and call +# For a generated image, we simply have a Containerfile named after it and call # `podman build` on it, tagging it on the MAIN_REPO +# TODO: list Containerfiles as pre-reqs? $(generated_build): TARGET = $(patsubst %_build,%,$@) $(generated_build): - $(PODMAN) build $(FORMAT_OPTIONS) --file Dockerfile.$(TARGET) --tag $(MAIN_REPO)/$(TARGET) + # Generate $(TARGET) +# First, we need to remove any existing manifest, as the command below is additive +# (it would append builds to an existing manifest) + -$(PODMAN) manifest rm $(MAIN_REPO)/$(TARGET) + $(PODMAN) build --platform $(PLATFORM) --no-cache $(FORMAT_OPTIONS) --file Containerfile.$(TARGET) --manifest $(MAIN_REPO)/$(TARGET) -# This is generic the push target, for images built here (GENERATED_IMAGES) +# This is the generic push target, for images built here (GENERATED_IMAGES) # Each image depends on its respective _build target %: %_build - $(PODMAN) push $(MAIN_REPO)/$@ + $(PODMAN) manifest push $(MAIN_REPO)/$@ # Shortcut targets -external_images: $(EXTERNAL_IMAGES) +replicated_images: $(REPLICATED_IMAGES) +reassembled_images: $(REASSEMBLED_IMAGES) generated_images: $(GENERATED_IMAGES) -everything: external_images generated_images +# note OTHER_IMAGES and EXTERNAL_IMAGES are not part of 'everything', as these +# are already in the places where the tests get them from; they're used only +# on the copy operation +everything: replicated_images generated_images reassembled_images -# This is the main target for the external images; it copies them from their +# This is the main target for the replicated images; it copies them from their # original locations _into_ MAIN_REPO. Do not confuse this for the `copy` operation # below, that copies _from_ MAIN_REPO into COPY_REPO. # # The first line prepares a target-local TARGET variable, which contains only +# the last part of the URL (the image name proper + tag) +$(REPLICATED_IMAGES): TARGET = $(shell echo "$@" | sed s_.*/__ ) +$(REPLICATED_IMAGES): + # Copy $(TARGET) from the replicated list + $(SKOPEO) copy --all $(TRANSFORM_OPTIONS) \ + docker://$@ \ + docker://$(MAIN_REPO)/$(TARGET) + +# This is the main target for the reassembled images; it copies them from their +# original locations to a temporary directory, modifies the manifest.json and then +# copies them _into_ MAIN_REPO. +# +# The first line prepares a target-local TARGET variable, which contains only # the last part of the URL -$(EXTERNAL_IMAGES): TARGET = $(shell echo "$@" | sed s_.*/__ ) -$(EXTERNAL_IMAGES): - $(SKOPEO) copy $(TRANSFORM_OPTIONS) \ +$(REASSEMBLED_IMAGES): TARGET = $(shell echo "$@" | sed s_.*/__ ) +$(REASSEMBLED_IMAGES): REASSEMBLE_TMPDIR ::= /tmp/$(shell mktemp -d image-reassembly-XXX ) +$(REASSEMBLED_IMAGES): + # Reassemble $(TARGET) + $(SKOPEO) copy --all \ docker://$@ \ + dir://$(REASSEMBLE_TMPDIR) + + ls $(REASSEMBLE_TMPDIR) + + jq \ + '(.manifests[] | select (.platform.os == "unknown")) |= del (.) | del (..|nulls)' \ + $(REASSEMBLE_TMPDIR)/manifest.json > $(REASSEMBLE_TMPDIR)/manifest.json.new + + mv $(REASSEMBLE_TMPDIR)/manifest.json.new $(REASSEMBLE_TMPDIR)/manifest.json + + $(SKOPEO) copy --all $(TRANSFORM_OPTIONS) \ + dir://$(REASSEMBLE_TMPDIR) \ docker://$(MAIN_REPO)/$(TARGET) + rm -rf $(REASSEMBLE_TMPDIR) + # # Copy operation # -copy: $(generated_copy) $(external_copy) +copy: $(generated_copy) $(replicated_copy) $(reassembled_copy) $(external_copy) $(other_copy) -# The targets for external and generated images are basically the same; the +# The targets for replicated and generated images are basically the same; the # only difference is the way the original/main target needs to be manipulated # to generate the image name+tag (saved in the target-local variable TARGET). $(generated_copy): TARGET = $(patsubst %_copy,%,$@) $(generated_copy): - $(SKOPEO) copy $(TRANSFORM_OPTIONS) \ + # copy $(TARGET) from generated list + $(SKOPEO) copy --all $(TRANSFORM_OPTIONS) \ docker://$(MAIN_REPO)/$(TARGET) \ docker://$(COPY_REPO)/$(TARGET) -# Remove _copy, but also everything till the last / -$(external_copy): TARGET = $(shell echo "$@" | sed -e "s/_copy$$//" -e 's_.*/__' ) -$(external_copy): - $(SKOPEO) copy $(TRANSFORM_OPTIONS) \ +# Remove _copy, but also everything till the last "/" (registry and prefix), +# as we'll use MAIN_REPO and COPY_REPO, instead. +$(replicated_copy): TARGET = $(shell echo "$@" | sed -e "s/_copy$$//" -e 's_.*/__' ) +$(replicated_copy): + # copy $(TARGET) from the replicated list + $(SKOPEO) copy --all $(TRANSFORM_OPTIONS) \ docker://$(MAIN_REPO)/$(TARGET) \ docker://$(COPY_REPO)/$(TARGET) + +$(reassembled_copy): TARGET = $(shell echo "$@" | sed -e "s/_copy$$//" -e 's_.*/__' ) +$(reassembled_copy): + # copy $(TARGET) from the reassembled list + $(SKOPEO) copy --all $(TRANSFORM_OPTIONS) \ + docker://$(MAIN_REPO)/$(TARGET) \ + docker://$(COPY_REPO)/$(TARGET) + +# OTHER_IMAGES reside on quay.io/skupper, but are not originally generated or +# copied by this Makefile; still, when doing the copy operation, we can set them +# to be read from a different MAIN_REPO +$(other_copy): TARGET = $(shell echo "$@" | sed -e "s/_copy$$//" -e 's_.*/__' ) +$(other_copy): + # copy $(TARGET) from the other list + $(SKOPEO) copy --all $(TRANSFORM_OPTIONS) \ + docker://$(MAIN_REPO)/$(TARGET) \ + docker://$(COPY_REPO)/$(TARGET) + +# Here, the copy is from the original registry +$(external_copy): TARGET = $(patsubst %_copy,%,$@) +$(external_copy): + # copy $(TARGET) from the external list + $(SKOPEO) copy --all $(TRANSFORM_OPTIONS) \ + docker://$(TARGET) \ + docker://$(COPY_REPO)/$(TARGET) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/images/README.md new/skupper-1.8.3/test/images/README.md --- old/skupper-1.8.2/test/images/README.md 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/images/README.md 2025-01-08 19:00:52.000000000 +0100 @@ -1,4 +1,4 @@ -# Images for external dependencies +# Images for external test dependencies The Makefile on this directory allows for the manipulation of container images pertaining to external test dependencies, such as Mongo or quiver. @@ -9,7 +9,7 @@ The second operation was created in response to an image used by our tests that stopped getting updates, while the actual project continued to evolve. It -builds images from Dockerfile and pushes them into our Quay repo. +builds images from Containerfiles and pushes them into our Quay repo. Finally, the third one also allows for the running of tests on disconnected clusters, which cannot access the original locations of these dependencies to @@ -26,6 +26,10 @@ contained on the Makefile. Skupper images (such as the router or controller) are not copied by this operation. +Note also that it is not a simple copy. As Skupper can run on some older +Kubernetes that do not support the OCI format, there are some transformations +done during the copy as well. + See the Makefile contents for information on how to execute the different operations. @@ -33,5 +37,5 @@ # skupper-test image Note that the `skupper-test` image used by Skupper integration is part of -Skupper's own test code, so it's build by the main Makefile at ../.., and not +Skupper's own test code, so it's built by the main Makefile at ../.., and not here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/acceptance/custom/basic/basic.go new/skupper-1.8.3/test/integration/acceptance/custom/basic/basic.go --- old/skupper-1.8.2/test/integration/acceptance/custom/basic/basic.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/acceptance/custom/basic/basic.go 2025-01-08 19:00:52.000000000 +0100 @@ -76,9 +76,21 @@ const secretFile = "/tmp/public_basic_1_secret.yaml" if tokenType == "claim" { - err = pub1Cluster.VanClient.TokenClaimCreateFile(ctx, types.DefaultVanName, []byte(createOptsPublic.Password), 15*time.Minute, 1, secretFile) + err = utils.RetryError(3*time.Second, 5, func() error { + err := pub1Cluster.VanClient.TokenClaimCreateFile(ctx, types.DefaultVanName, []byte(createOptsPublic.Password), 15*time.Minute, 1, secretFile) + if err == nil { + return nil + } + return err + }) } else { - err = pub1Cluster.VanClient.ConnectorTokenCreateFile(ctx, types.DefaultVanName, secretFile) + err = utils.RetryError(3*time.Second, 5, func() error { + err := pub1Cluster.VanClient.ConnectorTokenCreateFile(ctx, types.DefaultVanName, secretFile) + if err == nil { + return nil + } + return err + }) } assert.Assert(t, err) @@ -232,6 +244,7 @@ skip: base.MultipleClusters(), skipReason: SkipReasonIngressNone, testSync: true, + tokenType: "claim", createOptsPublic: types.SiteConfigSpec{ SkupperName: "", RouterMode: string(types.TransportModeInterior), @@ -297,9 +310,10 @@ }, }, { - id: "interiors-ingress-default", - doc: "Connecting two interiors with ingress=default (route if available or loadbalancer)", - testSync: false, + id: "interiors-ingress-default", + doc: "Connecting two interiors with ingress=default (route if available or loadbalancer)", + testSync: false, + tokenType: "claim", createOptsPublic: types.SiteConfigSpec{ SkupperName: "", RouterMode: string(types.TransportModeInterior), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/examples/custom/hipstershop/hipstershop.go new/skupper-1.8.3/test/integration/examples/custom/hipstershop/hipstershop.go --- old/skupper-1.8.2/test/integration/examples/custom/hipstershop/hipstershop.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/examples/custom/hipstershop/hipstershop.go 2025-01-08 19:00:52.000000000 +0100 @@ -10,6 +10,7 @@ "github.com/skupperproject/skupper/api/types" "github.com/skupperproject/skupper/pkg/utils" + "github.com/skupperproject/skupper/test/utils/arch" "github.com/skupperproject/skupper/test/utils/base" "github.com/skupperproject/skupper/test/utils/constants" "github.com/skupperproject/skupper/test/utils/k8s" @@ -50,6 +51,11 @@ prv1, err := testRunner.GetPrivateContext(1) assert.Assert(t, err) + // Hipstershop is currently supported only on amd64 + // + // https://github.com/GoogleCloudPlatform/microservices-demo/issues/622#issuec… + assert.Assert(t, arch.Skip(t, pub1, pub2, prv1)) + // creating namespaces assert.Assert(t, pub1.CreateNamespace()) assert.Assert(t, pub2.CreateNamespace()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/examples/http/http.go new/skupper-1.8.3/test/integration/examples/http/http.go --- old/skupper-1.8.2/test/integration/examples/http/http.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/examples/http/http.go 2025-01-08 19:00:52.000000000 +0100 @@ -643,7 +643,7 @@ { Name: "h1heybase", Image: "quay.io/skupper/hey", - Command: []string{"hey_linux_amd64"}, + Command: []string{"/app/hey"}, ImagePullPolicy: apiv1.PullAlways, }, }, @@ -809,7 +809,7 @@ } } -func runTests(t *testing.T, r base.ClusterTestRunner) { +func runTests(t *testing.T, r *base.ClusterTestRunnerBase) { pubCluster1, err := r.GetPublicContext(1) assert.Assert(t, err) @@ -891,7 +891,7 @@ runHeyTestTable(t, pubCluster1) } -func setup(ctx context.Context, t *testing.T, r base.ClusterTestRunner) { +func setup(ctx context.Context, t *testing.T, r *base.ClusterTestRunnerBase) { prv1Cluster, err := r.GetPrivateContext(1) assert.Assert(t, err) @@ -1003,13 +1003,18 @@ } -func Run(ctx context.Context, t *testing.T, r base.ClusterTestRunner) { +func Run(ctx context.Context, t *testing.T, r *base.ClusterTestRunnerBase) { defer tearDown(ctx, r) + defer func() { + if t.Failed() { + r.DumpTestInfo("TestHttp") + } + }() setup(ctx, t, r) runTests(t, r) } -func tearDown(ctx context.Context, r base.ClusterTestRunner) { +func tearDown(ctx context.Context, r *base.ClusterTestRunnerBase) { prv1Cluster, _ := r.GetPrivateContext(1) // Deleting Skupper services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/examples/tcp_echo/tcp_echo.go new/skupper-1.8.3/test/integration/examples/tcp_echo/tcp_echo.go --- old/skupper-1.8.2/test/integration/examples/tcp_echo/tcp_echo.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/examples/tcp_echo/tcp_echo.go 2025-01-08 19:00:52.000000000 +0100 @@ -177,13 +177,17 @@ endTime = time.Now().Add(constants.ImagePullingAndResourceCreationTimeout) job, err := k8s.WaitForJob(pub1Cluster.Namespace, pub1Cluster.VanClient.KubeClient, jobName, endTime.Sub(time.Now())) + if err != nil { + pub1Cluster.KubectlExec("logs job/" + jobName) + } assert.Assert(t, err) - pub1Cluster.KubectlExec("logs job/" + jobName) k8s.AssertJob(t, job) job, err = k8s.WaitForJob(prv1Cluster.Namespace, prv1Cluster.VanClient.KubeClient, jobName, endTime.Sub(time.Now())) + if err != nil { + prv1Cluster.KubectlExec("logs job/" + jobName) + } assert.Assert(t, err) - prv1Cluster.KubectlExec("logs job/" + jobName) k8s.AssertJob(t, job) netcatJobName := fmt.Sprintf("netcat-%s", svc.Address) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/performance/amqp_test.go new/skupper-1.8.3/test/integration/performance/amqp_test.go --- old/skupper-1.8.2/test/integration/performance/amqp_test.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/performance/amqp_test.go 2025-01-08 19:00:52.000000000 +0100 @@ -14,6 +14,7 @@ "testing" "time" + "github.com/skupperproject/skupper/pkg/images" "github.com/skupperproject/skupper/test/integration/performance/common" "github.com/skupperproject/skupper/test/utils/base" "github.com/skupperproject/skupper/test/utils/k8s" @@ -222,7 +223,7 @@ func getAmqpDeployment() *appsv1.Deployment { dep, _ := k8s.NewDeployment("amqp-server", "", k8s.DeploymentOpts{ - Image: "quay.io/skupper/skupper-router:2.6.1", + Image: images.GetRouterImageName(), Labels: map[string]string{"app": "amqp-server"}, }) return dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/performance/common/perfrunner.go new/skupper-1.8.3/test/integration/performance/common/perfrunner.go --- old/skupper-1.8.2/test/integration/performance/common/perfrunner.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/performance/common/perfrunner.go 2025-01-08 19:00:52.000000000 +0100 @@ -11,6 +11,7 @@ "github.com/skupperproject/skupper/api/types" "github.com/skupperproject/skupper/pkg/kube" "github.com/skupperproject/skupper/pkg/utils" + "github.com/skupperproject/skupper/test/utils/arch" "github.com/skupperproject/skupper/test/utils/base" "github.com/skupperproject/skupper/test/utils/constants" "github.com/skupperproject/skupper/test/utils/k8s" @@ -69,6 +70,18 @@ } for _, job := range app.Client.Jobs { + if job.Job.Labels["type"] == "wrk2" { + // wrk2 is not available for arm64 + // https://github.com/giltene/wrk2/issues/104 + err, skip := arch.Check(clientCluster) + if skip { + logger.Printf("! Skipping job %q: %v", job.Name, err) + continue + } + if err != nil { + return err + } + } resultInfo := resultInfo{job: job} stepLog.Printf("- Running client job %s at %s", job.Name, clientCluster.Namespace) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/performance/common/setup.go new/skupper-1.8.3/test/integration/performance/common/setup.go --- old/skupper-1.8.2/test/integration/performance/common/setup.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/performance/common/setup.go 2025-01-08 19:00:52.000000000 +0100 @@ -22,6 +22,7 @@ "github.com/skupperproject/skupper/pkg/kube" pkgutils "github.com/skupperproject/skupper/pkg/utils" "github.com/skupperproject/skupper/test/utils" + "github.com/skupperproject/skupper/test/utils/arch" "github.com/skupperproject/skupper/test/utils/base" "github.com/skupperproject/skupper/test/utils/constants" v1 "k8s.io/api/core/v1" @@ -37,6 +38,13 @@ debug bool ) +// Tests do not have access to common.testRunner, so they can call this +// function to check on cluster architectures, and skip accordingly. +func CheckArch(t *testing.T) error { + err := arch.Skip(t, testRunner.ClusterContexts...) + return err +} + func DebugMode() bool { return debug } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/performance/http_test.go new/skupper-1.8.3/test/integration/performance/http_test.go --- old/skupper-1.8.2/test/integration/performance/http_test.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/performance/http_test.go 2025-01-08 19:00:52.000000000 +0100 @@ -324,7 +324,7 @@ for _, clients := range settings.clients { // wrk job jobWrkName := fmt.Sprintf("%s-wrk-clients-%d", jobPrefix, clients) - labelsWrk := map[string]string{"job": jobWrkName} + labelsWrk := map[string]string{"job": jobWrkName, "type": "wrk"} job := &batchv1.Job{ ObjectMeta: metav1.ObjectMeta{Name: jobWrkName, Labels: labelsWrk}, Spec: batchv1.JobSpec{ @@ -355,7 +355,7 @@ log.Printf("rate is required for wrk2 - setting to (default) %d", wrk2Rate) } jobWrk2Name := fmt.Sprintf("%s-wrk2-rate-%d-clients-%d", jobPrefix, wrk2Rate, clients) - labelsWrk2 := map[string]string{"job": jobWrk2Name} + labelsWrk2 := map[string]string{"job": jobWrk2Name, "type": "wrk2"} job = &batchv1.Job{ ObjectMeta: metav1.ObjectMeta{Name: jobWrk2Name, Labels: labelsWrk2}, Spec: batchv1.JobSpec{ @@ -374,6 +374,7 @@ }, }, } + jobs = append(jobs, common.JobInfo{ Name: jobWrk2Name, Clients: clients, @@ -382,7 +383,7 @@ // hey job jobHeyName := fmt.Sprintf("%s-hey-clients-%d", jobPrefix, clients) - labelsHey := map[string]string{"job": jobHeyName} + labelsHey := map[string]string{"job": jobHeyName, "type": "hey"} heyArgs := []string{"-z", strconv.Itoa(settings.duration) + "s", "-c", strconv.Itoa(clients)} if settings.rate > 0 { heyArgs = append(heyArgs, "-q", strconv.Itoa(settings.rate)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/integration/performance/postgres_test.go new/skupper-1.8.3/test/integration/performance/postgres_test.go --- old/skupper-1.8.2/test/integration/performance/postgres_test.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/integration/performance/postgres_test.go 2025-01-08 19:00:52.000000000 +0100 @@ -45,6 +45,10 @@ } func TestPostgres(t *testing.T) { + // TestPostgres is currently not functional for ARM + // https://github.com/skupperproject/skupper/issues/1650 + common.CheckArch(t) + settings := parsePostgresSettings() p := &PostgresTest{ Name: "postgres", @@ -61,6 +65,7 @@ LatencyUnit: common.LatencyUnitMs, } assert.Assert(t, common.RunPerformanceTest(p)) + } func (p *PostgresTest) App() common.PerformanceApp { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/utils/arch/k8s.go new/skupper-1.8.3/test/utils/arch/k8s.go --- old/skupper-1.8.2/test/utils/arch/k8s.go 1970-01-01 01:00:00.000000000 +0100 +++ new/skupper-1.8.3/test/utils/arch/k8s.go 2025-01-08 19:00:52.000000000 +0100 @@ -0,0 +1,55 @@ +package arch + +import ( + "context" + "fmt" + "testing" + "time" + + "github.com/skupperproject/skupper/test/utils/base" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// If the target clusters are found to contain any non-amd64 nodes, return true. +// +// Notice that only the cluster is checked to be amd64; if the VM needs checked, +// use build flags or some other technique. +// +// Usage: check first skip; only check err if skip is false. If skip is true, error +// will be non-nil, with information on why skipping +// +// TODO: make it more granular, allow for hibrid clusters? +// TODO: allow for list of accepted archs? +func Check(clusters ...*base.ClusterContext) (err error, skip bool) { + + ctx, cancel := context.WithTimeout(context.Background(), time.Minute*10) + defer cancel() + + for _, c := range clusters { + list, err := c.VanClient.KubeClient.CoreV1().Nodes().List(ctx, v1.ListOptions{}) + if err != nil { + return err, false + } + for _, node := range list.Items { + arch := node.Labels["beta.kubernetes.io/arch"] + if arch != "amd64" { + return fmt.Errorf( + "at least one cluster node is not amd64 -- skipping (%s at %s is %q)", + node.Name, + c.VanClient.RestConfig.Host, + arch, + ), true + } + } + } + return nil, false +} + +// Calls arch.Check, and skip the test as needed +func Skip(t *testing.T, clusters ...*base.ClusterContext) error { + err, skip := Check(clusters...) + if skip { + t.Skipf("%v", err) + } + return err +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/utils/k8s/job.go new/skupper-1.8.3/test/utils/k8s/job.go --- old/skupper-1.8.2/test/utils/k8s/job.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/utils/k8s/job.go 2025-01-08 19:00:52.000000000 +0100 @@ -175,19 +175,29 @@ case <-timeoutCh: return nil, fmt.Errorf("Timeout: Job is still active: %s", jobName) case <-tick: - job, _ := jobsClient.Get(context.TODO(), jobName, metav1.GetOptions{}) + job, err := jobsClient.Get(context.TODO(), jobName, metav1.GetOptions{}) + + if err != nil { + return nil, err // Handle the error + } if job.Status.Active > 0 { fmt.Println("Job is still active") } else if len(job.Status.Conditions) > 0 { - if job.Status.Conditions[0].Type == batchv1.JobComplete { - fmt.Println("Job Successful!") - return job, nil - } else if job.Status.Conditions[0].Type == batchv1.JobFailed { - statusJson, _ := json.Marshal(job.Status) - fmt.Printf("Job failed?, status = %v\n", string(statusJson)) - return job, fmt.Errorf("Job failed. Status: %s", string(statusJson)) + for _, condition := range job.Status.Conditions { + switch condition.Type { + case batchv1.JobComplete: + fmt.Println("Job Successful!") + return job, nil + case batchv1.JobFailed: + statusJson, _ := json.Marshal(job.Status) + fmt.Printf("Job failed?, status = %v\n", string(statusJson)) + return job, fmt.Errorf("Job failed. Status: %s", string(statusJson)) + } } + // No terminal condition detected above + statusJson, _ := json.Marshal(job.Status) + fmt.Printf("Job is not active, but it is neither successful nor failed. Status:\n%v\n", string(statusJson)) } else { fmt.Println("Waiting on job condition") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skupper-1.8.2/test/utils/tools/curl.go new/skupper-1.8.3/test/utils/tools/curl.go --- old/skupper-1.8.2/test/utils/tools/curl.go 2024-11-04 12:08:20.000000000 +0100 +++ new/skupper-1.8.3/test/utils/tools/curl.go 2025-01-08 19:00:52.000000000 +0100 @@ -204,7 +204,7 @@ }, Spec: v1.PodSpec{ Containers: []v1.Container{ - {Name: "curl", Image: "curlimages/curl", Command: strings.Split("tail -f /dev/null", " ")}, + {Name: "curl", Image: "quay.io/curl/curl", Command: strings.Split("tail -f /dev/null", " ")}, }, RestartPolicy: v1.RestartPolicyAlways, TerminationGracePeriodSeconds: &terminationPeriodSecs, ++++++ skupper.obsinfo ++++++ --- /var/tmp/diff_new_pack.VH5S0Z/_old 2025-01-09 15:12:33.301034319 +0100 +++ /var/tmp/diff_new_pack.VH5S0Z/_new 2025-01-09 15:12:33.301034319 +0100 @@ -1,5 +1,5 @@ name: skupper -version: 1.8.2 -mtime: 1730718500 -commit: 149f4a5588c532d6ab1fc489b19ca24633e521e7 +version: 1.8.3 +mtime: 1736359252 +commit: f9c88e4e90f0a7f916e9b5d29e8dce5d2340f78e ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/skupper/vendor.tar.gz /work/SRC/openSUSE:Factory/.skupper.new.1881/vendor.tar.gz differ: char 12, line 1

1 0

commit apko for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apko for openSUSE:Factory checked in at 2025-01-09 15:11:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apko (Old) and /work/SRC/openSUSE:Factory/.apko.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apko" Thu Jan 9 15:11:40 2025 rev:32 rq:1236094 version:0.22.6 Changes: -------- --- /work/SRC/openSUSE:Factory/apko/apko.changes 2025-01-07 20:54:28.851546674 +0100 +++ /work/SRC/openSUSE:Factory/.apko.new.1881/apko.changes 2025-01-09 15:12:24.264659963 +0100 @@ -1,0 +2,12 @@ +Thu Jan 09 06:40:49 UTC 2025 - opensuse_buildservice(a)ojkastl.de + +- Update to version 0.22.6: + * Base32-encode etag values (#1470) + * build(deps): bump docker/setup-qemu-action from 3.2.0 to 3.3.0 + (#1469) + * Add the extra flags to `build-minirootfs` (#1467) + * Fix logging output of user.GID (#1466) + * build(deps): bump google.golang.org/api from 0.214.0 to 0.215.0 + (#1465) + +------------------------------------------------------------------- Old: ---- apko-0.22.5.obscpio New: ---- apko-0.22.6.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apko.spec ++++++ --- /var/tmp/diff_new_pack.0YtJLi/_old 2025-01-09 15:12:26.352746457 +0100 +++ /var/tmp/diff_new_pack.0YtJLi/_new 2025-01-09 15:12:26.368747120 +0100 @@ -17,7 +17,7 @@ Name: apko -Version: 0.22.5 +Version: 0.22.6 Release: 0 Summary: Build OCI images from APK packages directly without Dockerfile License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.0YtJLi/_old 2025-01-09 15:12:26.572755570 +0100 +++ /var/tmp/diff_new_pack.0YtJLi/_new 2025-01-09 15:12:26.600756731 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/chainguard-dev/apko</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.22.5</param> + <param name="revision">v0.22.6</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.0YtJLi/_old 2025-01-09 15:12:26.724761867 +0100 +++ /var/tmp/diff_new_pack.0YtJLi/_new 2025-01-09 15:12:26.752763027 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/chainguard-dev/apko</param> - <param name="changesrevision">20bf90264a9720492d623322989284b938601a5d</param></service></servicedata> + <param name="changesrevision">995ee5a40608591b2c4d2e7893abdffeca93f6ff</param></service></servicedata> (No newline at EOF) ++++++ apko-0.22.5.obscpio -> apko-0.22.6.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/.github/workflows/build-samples.yml new/apko-0.22.6/.github/workflows/build-samples.yml --- old/apko-0.22.5/.github/workflows/build-samples.yml 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/.github/workflows/build-samples.yml 2025-01-09 00:03:56.000000000 +0100 @@ -31,7 +31,7 @@ go-version-file: 'go.mod' check-latest: true - name: Setup QEMU - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 + uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0 - run: | make apko ./apko build ./examples/nginx.yaml nginx:build /tmp/nginx-${{ matrix.arch }}.tar --arch ${{ matrix.arch }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/go.mod new/apko-0.22.6/go.mod --- old/apko-0.22.5/go.mod 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/go.mod 2025-01-09 00:03:56.000000000 +0100 @@ -31,7 +31,7 @@ golang.org/x/sync v0.10.0 golang.org/x/sys v0.29.0 golang.org/x/time v0.9.0 - google.golang.org/api v0.214.0 + google.golang.org/api v0.215.0 gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/apimachinery v0.32.0 @@ -95,7 +95,7 @@ github.com/google/s2a-go v0.1.8 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect - github.com/googleapis/gax-go/v2 v2.14.0 // indirect + github.com/googleapis/gax-go/v2 v2.14.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect @@ -158,10 +158,10 @@ golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/term v0.27.0 // indirect golang.org/x/text v0.21.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect google.golang.org/grpc v1.69.0 // indirect - google.golang.org/protobuf v1.36.0 // indirect + google.golang.org/protobuf v1.36.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gotest.tools/v3 v3.5.1 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/go.sum new/apko-0.22.6/go.sum --- old/apko-0.22.5/go.sum 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/go.sum 2025-01-09 00:03:56.000000000 +0100 @@ -176,8 +176,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw= github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= -github.com/googleapis/gax-go/v2 v2.14.0 h1:f+jMrjBPl+DL9nI4IQzLUxMq7XrAqFYB7hBPqMNIe8o= -github.com/googleapis/gax-go/v2 v2.14.0/go.mod h1:lhBCnjdLrWRaPvLWhmc8IS24m9mr07qSYnHncrgo+zk= +github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q= +github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 h1:JYghRBlGCZyCF2wNUJ8W0cwaQdtpcssJ4CgC406g+WU= @@ -494,17 +494,17 @@ 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/api v0.214.0 h1:h2Gkq07OYi6kusGOaT/9rnNljuXmqPnaig7WGPmKbwA= -google.golang.org/api v0.214.0/go.mod h1:bYPpLG8AyeMWwDU6NXoB00xC0DFkikVvd5MfwoxjLqE= +google.golang.org/api v0.215.0 h1:jdYF4qnyczlEz2ReWIsosNLDuzXyvFHJtI5gcr0J7t0= +google.golang.org/api v0.215.0/go.mod h1:fta3CVtuJYOEdugLNWm6WodzOS8KdFckABwN4I40hzY= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 h1:pgr/4QbFyktUv9CtQ/Fq4gzEE6/Xs7iCXbktaGzLHbQ= -google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697/go.mod h1:+D9ySVjN8nY8YCVjc5O7PZDIdZporIDY3KaGfJunh88= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= +google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q= +google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA= google.golang.org/grpc v1.18.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= @@ -513,8 +513,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.69.0 h1:quSiOM1GJPmPH5XtU+BCoVXcDVJJAzNcoyfC2cCjGkI= google.golang.org/grpc v1.69.0/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= -google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= -google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/internal/cli/build-minirootfs.go new/apko-0.22.6/internal/cli/build-minirootfs.go --- old/apko-0.22.5/internal/cli/build-minirootfs.go 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/internal/cli/build-minirootfs.go 2025-01-09 00:03:56.000000000 +0100 @@ -34,6 +34,10 @@ var buildArch string var sbomPath string var ignoreSignatures bool + var extraKeys []string + var extraBuildRepos []string + var extraRuntimeRepos []string + var extraPackages []string cmd := &cobra.Command{ Use: "build-minirootfs", @@ -44,6 +48,10 @@ RunE: func(cmd *cobra.Command, args []string) error { return BuildMinirootFSCmd(cmd.Context(), build.WithConfig(args[0], []string{}), + build.WithExtraKeys(extraKeys), + build.WithExtraBuildRepos(extraBuildRepos), + build.WithExtraRuntimeRepos(extraRuntimeRepos), + build.WithExtraPackages(extraPackages), build.WithTarball(args[1]), build.WithBuildDate(buildDate), build.WithSBOM(sbomPath), @@ -57,6 +65,10 @@ cmd.Flags().StringVar(&buildArch, "build-arch", runtime.GOARCH, "architecture to build for -- default is Go runtime architecture") cmd.Flags().StringVar(&sbomPath, "sbom-path", "", "generate an SBOM") cmd.Flags().BoolVar(&ignoreSignatures, "ignore-signatures", false, "ignore repository signature verification") + cmd.Flags().StringSliceVarP(&extraKeys, "keyring-append", "k", []string{}, "path to extra keys to include in the keyring") + cmd.Flags().StringSliceVarP(&extraBuildRepos, "build-repository-append", "b", []string{}, "path to extra repositories to include") + cmd.Flags().StringSliceVarP(&extraRuntimeRepos, "repository-append", "r", []string{}, "path to extra repositories to include") + cmd.Flags().StringSliceVarP(&extraPackages, "package-append", "p", []string{}, "extra packages to include") return cmd } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/pkg/apk/apk/cache.go new/apko-0.22.6/pkg/apk/apk/cache.go --- old/apko-0.22.5/pkg/apk/apk/cache.go 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/pkg/apk/apk/cache.go 2025-01-09 00:03:56.000000000 +0100 @@ -16,6 +16,7 @@ import ( "context" + "encoding/base32" "fmt" "io" "net/http" @@ -331,6 +332,11 @@ } // When we get etags, they appear to be quoted. etag := strings.Trim(remoteEtag[0], `"`) + + // To ensure these things are safe filenames, base32 encode them. + // (Avoiding base64 due to case sensitive filesystems.) + etag = base32.StdEncoding.EncodeToString([]byte(etag)) + return etag, etag != "" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/pkg/apk/apk/repo_test.go new/apko-0.22.6/pkg/apk/apk/repo_test.go --- old/apko-0.22.5/pkg/apk/apk/repo_test.go 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/pkg/apk/apk/repo_test.go 2025-01-09 00:03:56.000000000 +0100 @@ -16,6 +16,7 @@ import ( "context" + "encoding/base32" "fmt" "io/fs" "net/http" @@ -192,7 +193,7 @@ require.NoErrorf(t, err, "unable to get indexes") require.Greater(t, len(indexes), 0, "no indexes found") // check that the contents are the same - index1, err := os.ReadFile(filepath.Join(repoDir, "APKINDEX", "an-etag.tar.gz")) + index1, err := os.ReadFile(filepath.Join(repoDir, "APKINDEX", base32.StdEncoding.EncodeToString([]byte("an-etag"))+".tar.gz")) require.NoError(t, err, "unable to read cache index file") index2, err := os.ReadFile(filepath.Join(testPrimaryPkgDir, indexFilename)) require.NoError(t, err, "unable to read previous index file") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/pkg/build/types/image_configuration.go new/apko-0.22.6/pkg/build/types/image_configuration.go --- old/apko-0.22.5/pkg/build/types/image_configuration.go 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/pkg/build/types/image_configuration.go 2025-01-09 00:03:56.000000000 +0100 @@ -258,7 +258,7 @@ log.Infof(" runas: %s", ic.Accounts.RunAs) log.Infof(" users:") for _, u := range ic.Accounts.Users { - log.Infof(" - uid=%d(%s) gid=%d", u.UID, u.UserName, u.GID) + log.Infof(" - uid=%d(%s) gid=%d", u.UID, u.UserName, gidToInt(u.GID)) } log.Infof(" groups:") for _, g := range ic.Accounts.Groups { @@ -272,3 +272,10 @@ } } } + +func gidToInt(gid GID) uint32 { + if gid == nil { + return 0 + } + return *gid +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/pkg/build/types/image_configuration_test.go new/apko-0.22.6/pkg/build/types/image_configuration_test.go --- old/apko-0.22.5/pkg/build/types/image_configuration_test.go 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/pkg/build/types/image_configuration_test.go 2025-01-09 00:03:56.000000000 +0100 @@ -60,6 +60,9 @@ require.Equal(t, "/not/home", ic.Accounts.Users[0].HomeDir) require.Equal(t, "/home/user", ic.Accounts.Users[1].HomeDir) + + // Ensure this does not cause panic when users[1].gid is empty (defaulting to 0) + ic.Summarize(ctx) } func TestMergeInto(t *testing.T) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apko-0.22.5/pkg/build/types/testdata/users.apko.yaml new/apko-0.22.6/pkg/build/types/testdata/users.apko.yaml --- old/apko-0.22.5/pkg/build/types/testdata/users.apko.yaml 2025-01-07 00:34:42.000000000 +0100 +++ new/apko-0.22.6/pkg/build/types/testdata/users.apko.yaml 2025-01-09 00:03:56.000000000 +0100 @@ -12,6 +12,5 @@ uid: 2 homedir: "/not/home" username: "something-else" - - gid: 2 - uid: 3 + - uid: 3 username: "user" ++++++ apko.obsinfo ++++++ --- /var/tmp/diff_new_pack.0YtJLi/_old 2025-01-09 15:12:28.336828643 +0100 +++ /var/tmp/diff_new_pack.0YtJLi/_new 2025-01-09 15:12:28.388830797 +0100 @@ -1,5 +1,5 @@ name: apko -version: 0.22.5 -mtime: 1736206482 -commit: 20bf90264a9720492d623322989284b938601a5d +version: 0.22.6 +mtime: 1736377436 +commit: 995ee5a40608591b2c4d2e7893abdffeca93f6ff ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/apko/vendor.tar.gz /work/SRC/openSUSE:Factory/.apko.new.1881/vendor.tar.gz differ: char 5, line 1

1 0

commit incus for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package incus for openSUSE:Factory checked in at 2025-01-09 15:11:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/incus (Old) and /work/SRC/openSUSE:Factory/.incus.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "incus" Thu Jan 9 15:11:39 2025 rev:3 rq:1236063 version:6.8 Changes: -------- --- /work/SRC/openSUSE:Factory/incus/incus.changes 2024-12-15 12:39:37.656302548 +0100 +++ /work/SRC/openSUSE:Factory/.incus.new.1881/incus.changes 2025-01-09 15:12:22.832600643 +0100 @@ -1,0 +2,5 @@ +Wed Jan 8 11:25:54 UTC 2025 - Aleksa Sarai <asarai(a)suse.com> + +- Add missing Requires for OCI support. bsc#1234300 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ incus.spec ++++++ --- /var/tmp/diff_new_pack.WoPJgJ/_old 2025-01-09 15:12:23.456626491 +0100 +++ /var/tmp/diff_new_pack.WoPJgJ/_new 2025-01-09 15:12:23.460626658 +0100 @@ -1,7 +1,7 @@ # # spec file for package incus # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -118,6 +118,10 @@ Requires: qemu-arm >= 6.0 %endif %endif +# Needed for OCI support. +Requires: skopeo +Requires: umoci +# Helper tools for admins. Recommends: %{name}-tools # Storage backends -- we don't recommend ZFS since it's not *technically* a # blessed configuration.

1 0

commit ghc-cryptohash-sha256 for openSUSE:Factory
by Source-Sync 09 Jan '25

09 Jan '25

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-cryptohash-sha256 for openSUSE:Factory checked in at 2025-01-09 15:11:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-cryptohash-sha256 (Old) and /work/SRC/openSUSE:Factory/.ghc-cryptohash-sha256.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-cryptohash-sha256" Thu Jan 9 15:11:37 2025 rev:22 rq:1236059 version:0.11.102.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-cryptohash-sha256/ghc-cryptohash-sha256.changes 2024-07-22 17:16:58.554822221 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-cryptohash-sha256.new.1881/ghc-cryptohash-sha256.changes 2025-01-09 15:12:21.592549276 +0100 @@ -1,0 +2,6 @@ +Wed Jan 1 19:53:11 UTC 2025 - Peter Simons <psimons(a)suse.com> + +- Update cryptohash-sha256 to version 0.11.102.1 revision 6. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-cryptohash-sha256.spec ++++++ --- /var/tmp/diff_new_pack.NAeVZi/_old 2025-01-09 15:12:22.056568497 +0100 +++ /var/tmp/diff_new_pack.NAeVZi/_new 2025-01-09 15:12:22.060568663 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-cryptohash-sha256 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/5.cabal… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/6.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof ++++++ cryptohash-sha256.cabal ++++++ --- /var/tmp/diff_new_pack.NAeVZi/_old 2025-01-09 15:12:22.096570154 +0100 +++ /var/tmp/diff_new_pack.NAeVZi/_new 2025-01-09 15:12:22.100570320 +0100 @@ -1,7 +1,7 @@ cabal-version: 2.0 name: cryptohash-sha256 version: 0.11.102.1 -x-revision: 5 +x-revision: 6 synopsis: Fast, pure and practical SHA-256 implementation description: { @@ -51,9 +51,10 @@ build-type: Simple tested-with: + GHC == 9.12.1 GHC == 9.10.1 - GHC == 9.8.2 - GHC == 9.6.5 + GHC == 9.8.4 + GHC == 9.6.6 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -62,7 +63,6 @@ GHC == 8.6.5 GHC == 8.4.4 GHC == 8.2.2 - GHC == 8.0.2 extra-source-files: cbits/hs_sha256.h changelog.md @@ -86,7 +86,7 @@ ghc-options: -Wall - build-depends: base >= 4.5 && < 4.21 + build-depends: base >= 4.5 && < 5 exposed-modules: Crypto.Hash.SHA256

1 0