July 2024 - openSUSE Commits - openSUSE Mailing Lists

commit 000release-packages for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

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 2024-07-26 19:14:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Fri Jul 26 19:14:57 2024 rev:3016 rq: version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/000release-packages/Aeon-release.changes 2024-07-26 16:41:26.584371989 +0200 +++ /work/SRC/openSUSE:Factory/.000release-packages.new.1882/Aeon-release.changes 2024-07-26 19:14:58.870755897 +0200 @@ -2 +2 @@ -Fri Jul 26 14:41:23 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org> +Fri Jul 26 17:14:55 UTC 2024 - 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: ------------------ Kalpa-release.spec: same change MicroOS-release.spec: same change openSUSE-Addon-NonOss-release.spec: same change openSUSE-release.spec: same change stub.spec: same change ++++++ weakremovers.inc ++++++ --- /var/tmp/diff_new_pack.EaROEq/_old 2024-07-26 19:15:01.474860671 +0200 +++ /var/tmp/diff_new_pack.EaROEq/_new 2024-07-26 19:15:01.494861475 +0200 @@ -18399,7 +18399,6 @@ Provides: weakremover(libwlroots0) Provides: weakremover(libwlroots1) Provides: weakremover(libwlroots10) -Provides: weakremover(libwlroots12) Provides: weakremover(libwlroots2) Provides: weakremover(libwlroots3) Provides: weakremover(libwlroots4)

1 0

commit patterns-aeon for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package patterns-aeon for openSUSE:Factory checked in at 2024-07-26 17:25:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-aeon (Old) and /work/SRC/openSUSE:Factory/.patterns-aeon.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-aeon" Fri Jul 26 17:25:34 2024 rev:13 rq:1189810 version:5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-aeon/patterns-aeon.changes 2024-07-22 17:18:40.946902833 +0200 +++ /work/SRC/openSUSE:Factory/.patterns-aeon.new.1882/patterns-aeon.changes 2024-07-26 17:25:34.526789142 +0200 @@ -1,0 +2,5 @@ +Tue Jul 23 09:03:23 UTC 2024 - Richard Brown <rbrown(a)suse.com> + +- Restore tpm2.0-abrmd, needed by tpm2_getcap + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-aeon.spec ++++++ --- /var/tmp/diff_new_pack.Fp9C1g/_old 2024-07-26 17:25:35.010808588 +0200 +++ /var/tmp/diff_new_pack.Fp9C1g/_new 2024-07-26 17:25:35.014808748 +0200 @@ -365,6 +365,7 @@ Requires: podman # bug#1211835 - TPM2.0 support +Requires: tpm2.0-abrmd Requires: tpm2-0-tss Requires: tpm2.0-tools

1 0

commit patterns-tik for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package patterns-tik for openSUSE:Factory checked in at 2024-07-26 17:25:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-tik (Old) and /work/SRC/openSUSE:Factory/.patterns-tik.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patterns-tik" Fri Jul 26 17:25:32 2024 rev:6 rq:1189809 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-tik/patterns-tik.changes 2024-07-22 17:18:40.290876659 +0200 +++ /work/SRC/openSUSE:Factory/.patterns-tik.new.1882/patterns-tik.changes 2024-07-26 17:25:33.578751053 +0200 @@ -1,0 +2,5 @@ +Tue Jul 23 09:02:43 UTC 2024 - Richard Brown <rbrown(a)suse.com> + +- Restore tpm2.0-abrmd, needed by tpm2_getcap + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-tik.spec ++++++ --- /var/tmp/diff_new_pack.H5KVxV/_old 2024-07-26 17:25:34.322780945 +0200 +++ /var/tmp/diff_new_pack.H5KVxV/_new 2024-07-26 17:25:34.326781106 +0200 @@ -364,6 +364,7 @@ Requires: podman # bug#1211835 - TPM2.0 support +Requires: tpm2.0-abrmd Requires: tpm2-0-tss Requires: tpm2.0-tools

1 0

commit 000release-packages for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

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 2024-07-26 16:41:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Fri Jul 26 16:41:24 2024 rev:3015 rq: version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/000release-packages/Aeon-release.changes 2024-07-25 19:16:48.044144606 +0200 +++ /work/SRC/openSUSE:Factory/.000release-packages.new.1882/Aeon-release.changes 2024-07-26 16:41:26.584371989 +0200 @@ -2 +2 @@ -Thu Jul 25 17:16:45 UTC 2024 - openSUSE <packaging(a)lists.opensuse.org> +Fri Jul 26 14:41:23 UTC 2024 - 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.tf1r4H/_old 2024-07-26 16:41:28.588452702 +0200 +++ /var/tmp/diff_new_pack.tf1r4H/_new 2024-07-26 16:41:28.592452863 +0200 @@ -17,7 +17,7 @@ Name: Aeon-release -Version: 20240725 +Version: 20240726 Release: 0 Summary: openSUSE Aeon License: GPL-2.0-or-later @@ -174,9 +174,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = Aeon -Provides: product(Aeon) = 20240725-0 +Provides: product(Aeon) = 20240726-0 Provides: product-label() = openSUSE%20Aeon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20240725 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aaeon%3A20240726 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) = 20240725-0 +Provides: product_flavor(Aeon) = 20240726-0 Summary: openSUSE Aeon%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Aeon</name> - <version>20240725</version> + <version>20240726</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:aeon:20240725</cpeid> + <cpeid>cpe:/o:opensuse:aeon:20240726</cpeid> <productline>Aeon</productline> <register> <pool> ++++++ Kalpa-release.spec ++++++ --- /var/tmp/diff_new_pack.tf1r4H/_old 2024-07-26 16:41:28.628454313 +0200 +++ /var/tmp/diff_new_pack.tf1r4H/_new 2024-07-26 16:41:28.632454474 +0200 @@ -17,7 +17,7 @@ Name: Kalpa-release -Version: 20240725 +Version: 20240726 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) = 20240725-0 +Provides: product(Kalpa) = 20240726-0 Provides: product-label() = openSUSE%20Kalpa -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20240725 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Akalpa%3A20240726 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) = 20240725-0 +Provides: product_flavor(Kalpa) = 20240726-0 Summary: openSUSE Kalpa%{?betaversion: %{betaversion}} %description appliance @@ -257,11 +257,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>Kalpa</name> - <version>20240725</version> + <version>20240726</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:kalpa:20240725</cpeid> + <cpeid>cpe:/o:opensuse:kalpa:20240726</cpeid> <productline>Kalpa</productline> <register> <pool> ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.tf1r4H/_old 2024-07-26 16:41:28.672456085 +0200 +++ /var/tmp/diff_new_pack.tf1r4H/_new 2024-07-26 16:41:28.672456085 +0200 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20240725 +Version: 20240726 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) = 20240725-0 +Provides: product(MicroOS) = 20240726-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20240725 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20240726 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) = 20240725-0 +Provides: product_flavor(MicroOS) = 20240726-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) = 20240725-0 +Provides: product_flavor(MicroOS) = 20240726-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -278,11 +278,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20240725</version> + <version>20240726</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20240725</cpeid> + <cpeid>cpe:/o:opensuse:microos:20240726</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.tf1r4H/_old 2024-07-26 16:41:28.720458019 +0200 +++ /var/tmp/diff_new_pack.tf1r4H/_new 2024-07-26 16:41:28.720458019 +0200 @@ -18,7 +18,7 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss -Version: 20240725 +Version: 20240726 #!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) = 20240725-0 +Provides: product(openSUSE-Addon-NonOss) = 20240726-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20240725 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20240726 @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20240725</version> + <version>20240726</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20240725</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20240726</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.tf1r4H/_old 2024-07-26 16:41:28.764459790 +0200 +++ /var/tmp/diff_new_pack.tf1r4H/_new 2024-07-26 16:41:28.764459790 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20240725 +Version: 20240726 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) = 20240725-0 +Provides: product(openSUSE) = 20240726-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%3A20240725 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20240726 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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-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) = 20240725-0 +Provides: product_flavor(openSUSE) = 20240726-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -566,10 +566,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20240725</version> + <version>20240726</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20240725</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20240726</cpeid> <productline>openSUSE</productline> <register> <target>openSUSE-Tumbleweed-x86_64</target>

1 0

commit golang-github-lusitaniae-apache_exporter for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package golang-github-lusitaniae-apache_exporter for openSUSE:Factory checked in at 2024-07-26 16:18:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/golang-github-lusitaniae-apache_exporter (Old) and /work/SRC/openSUSE:Factory/.golang-github-lusitaniae-apache_exporter.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "golang-github-lusitaniae-apache_exporter" Fri Jul 26 16:18:30 2024 rev:14 rq:1189799 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/golang-github-lusitaniae-apache_exporter/golang-github-lusitaniae-apache_exporter.changes 2023-11-27 22:44:20.811985355 +0100 +++ /work/SRC/openSUSE:Factory/.golang-github-lusitaniae-apache_exporter.new.1882/golang-github-lusitaniae-apache_exporter.changes 2024-07-26 16:18:31.861024315 +0200 @@ -1,0 +2,31 @@ +Mon Jul 8 07:30:16 UTC 2024 - Witek Bedyk <witold.bedyk(a)suse.com> + +- Migrate from `disabled` to `manual` source service type +- Drop BuildRequires: golang-packaging +- Upgrade to version 1.0.8 (bsc#1227341) + * Update prometheus/client_golang to version 1.19.1 + * Update x/net to version 0.23.0 +- Upgrade to version 1.0.7 + * Update protobuf to version 1.33.0 + * Update prometheus/client_golang to version 1.19.0 + * Update prometheus/common to version 0.46.0 + * Standardize landing page +- Upgrade to version 1.0.6 + * Update prometheus/exporter-toolkit to version 0.11.0 + * Update prometheus/client_golang to version 1.18.0 + * Add User-Agent header +- Upgrade to version 1.0.4 + * Update x/crypto to version 0.17.0 + * Update alecthomas/kingpin/v2 to version 2.4.0 + * Update prometheus/common to version 0.45.0 +- Upgrade to version 1.0.3 + * Update prometheus/client_golang to version 1.17.0 + * Update x/net 0.17.0 +- Upgrade to version 1.0.2 + * Fix security bug in x/net dependency (CVE-2023-3978) +- Upgrade to version 1.0.1 + * Update prometheus/exporter-toolkit to version 0.10.0 + * Update prometheus/common to version 0.44.0 + * Update prometheus/client_golang to version 1.16.0 + +------------------------------------------------------------------- Old: ---- apache_exporter-1.0.0.obscpio New: ---- apache_exporter-1.0.8.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ golang-github-lusitaniae-apache_exporter.spec ++++++ --- /var/tmp/diff_new_pack.k7kHus/_old 2024-07-26 16:18:33.733099652 +0200 +++ /var/tmp/diff_new_pack.k7kHus/_new 2024-07-26 16:18:33.733099652 +0200 @@ -1,7 +1,7 @@ # # spec file for package golang-github-lusitaniae-apache_exporter # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2019 João Cavalheiro <jcavalheiro(a)suse.com> # # All modifications and additions to the file contributed by third parties @@ -51,7 +51,7 @@ %define serviceuser prometheus Name: golang-github-lusitaniae-apache_exporter -Version: 1.0.0 +Version: 1.0.8 Release: 0 Summary: Apache Exporter for Prometheus License: MIT @@ -63,7 +63,6 @@ Source3: apparmor-usr.bin.%{targetname} BuildRequires: fdupes BuildRequires: golang-github-prometheus-promu -BuildRequires: golang-packaging %if 0%{?rhel} BuildRequires: golang >= 1.18 Requires(pre): shadow-utils @@ -90,8 +89,7 @@ %autosetup -a1 -n %{upstreamname}-%{version} %build -%goprep %{githubrepo} -GOPATH=%{_builddir}/go promu build +GOPATH=%{_builddir}/go promu build -v %install install -D -m 0755 %{_builddir}/%{upstreamname}-%{version}/%{upstreamname}-%{version} %{buildroot}/%{_bindir}/%{targetname} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.k7kHus/_old 2024-07-26 16:18:33.777101422 +0200 +++ /var/tmp/diff_new_pack.k7kHus/_new 2024-07-26 16:18:33.781101583 +0200 @@ -1,10 +1,10 @@ <services> - <service name="obs_scm" mode="disabled"> + <service name="obs_scm" mode="manual"> <param name="url">https://github.com/Lusitaniae/apache_exporter</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">v1.0.0</param> + <param name="revision">v1.0.8</param> <param name="versionrewrite-pattern">v(.*)</param> </service> <service name="tar" mode="buildtime"/> @@ -12,11 +12,11 @@ <param name="file">*.tar</param> <param name="compression">gz</param> </service> - <service name="set_version" mode="disabled"> + <service name="set_version" mode="manual"> <param name="basename">apache_exporter</param> </service> - <service name="go_modules" mode="disabled"> - <param name="archive">apache_exporter-1.0.0.obscpio</param> + <service name="go_modules" mode="manual"> + <param name="archive">apache_exporter-1.0.8.obscpio</param> </service> </services> ++++++ apache_exporter-1.0.0.obscpio -> apache_exporter-1.0.8.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/.github/dependabot.yml new/apache_exporter-1.0.8/.github/dependabot.yml --- old/apache_exporter-1.0.0/.github/dependabot.yml 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/.github/dependabot.yml 2024-06-26 16:48:04.000000000 +0200 @@ -3,4 +3,8 @@ - package-ecosystem: "gomod" directory: "/" schedule: - interval: "monthly" + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/.github/workflows/ci.yml new/apache_exporter-1.0.8/.github/workflows/ci.yml --- old/apache_exporter-1.0.0/.github/workflows/ci.yml 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/.github/workflows/ci.yml 2024-06-26 16:48:04.000000000 +0200 @@ -10,10 +10,10 @@ # Whenever the Go version is updated here, .promu.yml # should also be updated. container: - image: quay.io/prometheus/golang-builder:1.19-base + image: quay.io/prometheus/golang-builder:1.22-base steps: - - uses: actions/checkout@v3 - - uses: prometheus/promci(a)v0.0.2 + - uses: actions/checkout@v4 + - uses: prometheus/promci(a)v0.1.0 - uses: ./.github/promci/actions/setup_environment - run: make @@ -24,8 +24,8 @@ matrix: thread: [ 0, 1, 2 ] steps: - - uses: actions/checkout@v3 - - uses: prometheus/promci(a)v0.0.2 + - uses: actions/checkout@v4 + - uses: prometheus/promci(a)v0.1.0 - uses: ./.github/promci/actions/build with: parallelism: 3 @@ -36,15 +36,16 @@ runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: - go-version: '<1.19' + go-version: '<1.22' - name: Lint - uses: golangci/golangci-lint-action(a)v3.2.0 + uses: golangci/golangci-lint-action(a)v6.0.1 with: - version: v1.51.1 + # Keep in sync with Makefile.common + version: v1.56.2 # modified from the original as this repo still using master, insteead of main publish_master: @@ -53,8 +54,8 @@ needs: [test, build] if: github.event_name == 'push' && github.event.ref == 'refs/heads/master' steps: - - uses: actions/checkout@v3 - - uses: prometheus/promci(a)v0.0.2 + - uses: actions/checkout@v4 + - uses: prometheus/promci(a)v0.1.0 - uses: ./.github/promci/actions/publish_main with: docker_hub_organization: lusotycoon @@ -70,8 +71,8 @@ needs: [test, build] if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') steps: - - uses: actions/checkout@v3 - - uses: prometheus/promci(a)v0.0.2 + - uses: actions/checkout@v4 + - uses: prometheus/promci(a)v0.1.0 - uses: ./.github/promci/actions/publish_release with: docker_hub_organization: lusotycoon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/.promu.yml new/apache_exporter-1.0.8/.promu.yml --- old/apache_exporter-1.0.0/.promu.yml 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/.promu.yml 2024-06-26 16:48:04.000000000 +0200 @@ -1,7 +1,7 @@ go: # Whenever the Go version is updated here, - # .circle/config.yml should also be updated. - version: 1.19 + # .github/workflows/ci.yml should also be updated. + version: 1.22 # cgo: false repository: path: github.com/Lusitaniae/apache_exporter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/CHANGELOG.md new/apache_exporter-1.0.8/CHANGELOG.md --- old/apache_exporter-1.0.0/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100 +++ new/apache_exporter-1.0.8/CHANGELOG.md 2024-06-26 16:48:04.000000000 +0200 @@ -0,0 +1,7 @@ +# 1.0.6 / 2024-01-30 + +* [FEATURE] Add UserAgent header + +## 1.0.5 / 2023-12-22 + +* [BUGFIX] Add required changelog #182 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/Makefile new/apache_exporter-1.0.8/Makefile --- old/apache_exporter-1.0.0/Makefile 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/Makefile 2024-06-26 16:48:04.000000000 +0200 @@ -19,7 +19,7 @@ include Makefile.common -PROMETHEUS_VERSION=2.39.1 +PROMETHEUS_VERSION=2.50.1 PROMTOOL ?= /tmp/prometheus-$(PROMETHEUS_VERSION).linux-amd64/promtool .PHONY: checkmetrics diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/Makefile.common new/apache_exporter-1.0.8/Makefile.common --- old/apache_exporter-1.0.0/Makefile.common 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/Makefile.common 2024-06-26 16:48:04.000000000 +0200 @@ -83,7 +83,8 @@ GOLANGCI_LINT := GOLANGCI_LINT_OPTS ?= -GOLANGCI_LINT_VERSION ?= v1.51.1 +# Keep in sync .github/workflows/ci.yaml +GOLANGCI_LINT_VERSION ?= v1.56.2 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64. # windows isn't included here because of the path separator being different. ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/VERSION new/apache_exporter-1.0.8/VERSION --- old/apache_exporter-1.0.0/VERSION 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/VERSION 2024-06-26 16:48:04.000000000 +0200 @@ -1 +1 @@ -1.0.0 +1.0.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/apache_exporter.go new/apache_exporter-1.0.8/apache_exporter.go --- old/apache_exporter-1.0.0/apache_exporter.go 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/apache_exporter.go 2024-06-26 16:48:04.000000000 +0200 @@ -76,15 +76,24 @@ }() http.Handle(*metricsEndpoint, promhttp.Handler()) - http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - _, _ = w.Write([]byte(`<html> - <head><title>Apache Exporter</title></head> - <body> - <h1>Apache Exporter</h1> - <p><a href='` + *metricsEndpoint + `'>Metrics</a></p> - </body> - </html>`)) - }) + + landingConfig := web.LandingConfig{ + Name: "Apache Exporter", + Description: "Prometheus exporter for Apache HTTP server metrics", + Version: version.Info(), + Links: []web.LandingLinks{ + { + Address: *metricsEndpoint, + Text: "Metrics", + }, + }, + } + landingPage, err := web.NewLandingPage(landingConfig) + if err != nil { + level.Error(logger).Log("err", err) + os.Exit(1) + } + http.Handle("/", landingPage) server := &http.Server{} if err := web.ListenAndServe(server, toolkitFlags, logger); err != nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/collector/collector.go new/apache_exporter-1.0.8/collector/collector.go --- old/apache_exporter-1.0.0/collector/collector.go 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/collector/collector.go 2024-06-26 16:48:04.000000000 +0200 @@ -8,10 +8,13 @@ package collector import ( + "bufio" + "bytes" "crypto/tls" "fmt" "io" "net/http" + "regexp" "strconv" "strings" "sync" @@ -19,18 +22,26 @@ "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/common/version" ) const ( namespace = "apache" ) +var ( + // Regular expressions for matching proxy balancer status lines. + reProxyBalName = regexp.MustCompile(`ProxyBalancer\[\d+\]Name`) + reProxyBalWorker = regexp.MustCompile(`ProxyBalancer\[\d+\]Worker\[\d+\](\S+)`) +) + type Exporter struct { URI string hostOverride string customHeaders map[string]string mutex sync.Mutex client *http.Client + userAgent string up *prometheus.Desc scrapeFailures prometheus.Counter @@ -197,6 +208,7 @@ TLSClientConfig: &tls.Config{InsecureSkipVerify: config.Insecure}, }, }, + userAgent: fmt.Sprintf("Prometheus-Apache-Exporter/%s", version.Version), } } @@ -227,7 +239,6 @@ // Split colon separated string into two fields func splitkv(s string) (string, string) { - if len(s) == 0 { return s, s } @@ -272,36 +283,37 @@ } func (e *Exporter) collect(ch chan<- prometheus.Metric) error { - req, err := http.NewRequest("GET", e.URI, nil) + req, err := http.NewRequest(http.MethodGet, e.URI, nil) + if err != nil { + return fmt.Errorf("error building scraping request: %w", err) + } + if e.hostOverride != "" { req.Host = e.hostOverride } - if err != nil { - return fmt.Errorf("error building scraping request: %v", err) - } + for k, v := range e.customHeaders { req.Header.Add(k, v) } + + req.Header.Set("User-Agent", e.userAgent) resp, err := e.client.Do(req) if err != nil { ch <- prometheus.MustNewConstMetric(e.up, prometheus.GaugeValue, 0) - return fmt.Errorf("error scraping apache: %v", err) + return fmt.Errorf("error scraping Apache: %w", err) } ch <- prometheus.MustNewConstMetric(e.up, prometheus.GaugeValue, 1) data, err := io.ReadAll(resp.Body) resp.Body.Close() - if resp.StatusCode != 200 { + if resp.StatusCode != http.StatusOK { if err != nil { data = []byte(err.Error()) } return fmt.Errorf("status %s (%d): %s", resp.Status, resp.StatusCode, data) } - lines := strings.Split(string(data), "\n") - connectionInfo := false - //connectionInfo := false version := "UNKNOWN" mpm := "UNKNOWN" balancerName := "UNKNOWN" @@ -312,28 +324,26 @@ e.proxyBalancerStatus.Reset() e.proxyBalancerBusy.Reset() - for _, l := range lines { - key, v := splitkv(l) + scanner := bufio.NewScanner(bytes.NewReader(data)) + + for scanner.Scan() { + key, v := splitkv(scanner.Text()) if err != nil { continue } switch { case key == "ServerVersion": - var tmpstr string - var vparts []string - version = v - tmpstr = strings.Split(v, "/")[1] + tmpstr := strings.Split(v, "/")[1] tmpstr = strings.Split(tmpstr, " ")[0] - vparts = strings.Split(tmpstr, ".") - tmpstr = vparts[0] + "." + fmt.Sprintf("%02s", vparts[1]) + fmt.Sprintf("%03s", vparts[2]) + vparts := strings.Split(tmpstr, ".") + tmpstr = fmt.Sprintf("%s.%02s%03s", vparts[0], vparts[1], vparts[2]) val, err := strconv.ParseFloat(tmpstr, 64) if err != nil { return err } - ch <- prometheus.MustNewConstMetric(e.apacheVersion, prometheus.GaugeValue, val) case key == "ServerMPM": mpm = v @@ -342,56 +352,48 @@ if err != nil { return err } - e.generation.WithLabelValues("config").Set(val) case key == "ParentServerMPMGeneration": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.generation.WithLabelValues("mpm").Set(val) case key == "Load1": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.load.WithLabelValues("1min").Set(val) case key == "Load5": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.load.WithLabelValues("5min").Set(val) case key == "Load15": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.load.WithLabelValues("15min").Set(val) case key == "Total Accesses": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - ch <- prometheus.MustNewConstMetric(e.accessesTotal, prometheus.CounterValue, val) case key == "Total kBytes": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - ch <- prometheus.MustNewConstMetric(e.kBytesTotal, prometheus.CounterValue, val) case key == "Total Duration": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - ch <- prometheus.MustNewConstMetric(e.durationTotal, prometheus.CounterValue, val) case key == "CPUUser": val, err := strconv.ParseFloat(v, 64) @@ -430,49 +432,42 @@ if err != nil { return err } - e.cpuload.Set(val) case key == "Uptime": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - ch <- prometheus.MustNewConstMetric(e.uptime, prometheus.CounterValue, val) case key == "BusyWorkers": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.workers.WithLabelValues("busy").Set(val) case key == "IdleWorkers": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.workers.WithLabelValues("idle").Set(val) case key == "Processes": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.processes.WithLabelValues("all").Set(val) case key == "Stopping": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.processes.WithLabelValues("stopping").Set(val) case key == "ConnsTotal": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } - e.connections.WithLabelValues("total").Set(val) connectionInfo = true case key == "ConnsAsyncWriting": @@ -480,7 +475,6 @@ if err != nil { return err } - e.connections.WithLabelValues("writing").Set(val) connectionInfo = true case key == "ConnsAsyncKeepAlive": @@ -500,40 +494,40 @@ case key == "Scoreboard": e.updateScoreboard(v) e.scoreboard.Collect(ch) + //ProxyBalancer[0]Name: balancer://sid2021 //ProxyBalancer[0]Worker[0]Name: https://z-app-01:9143 //ProxyBalancer[0]Worker[0]Status: Init Ok //ProxyBalancer[0]Worker[0]Elected: 5808 //... - case strings.HasPrefix(key, "ProxyBalancer["): - switch { - case strings.HasSuffix(key, "]Name"): - if strings.Contains(key, "]Worker[") { - workerName = v - } else { - balancerName = v - } - case strings.HasSuffix(key, "]Status"): + case reProxyBalName.MatchString(key): + balancerName = v + case reProxyBalWorker.MatchString(key): + key := reProxyBalWorker.FindStringSubmatch(key)[1] + switch key { + case "Name": + workerName = v + case "Status": e.proxyBalancerStatus.WithLabelValues(balancerName, workerName, v).Set(1) - case strings.HasSuffix(key, "]Elected"): + case "Elected": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } ch <- prometheus.MustNewConstMetric(e.proxyBalancerElected, prometheus.CounterValue, val, balancerName, workerName) - case strings.HasSuffix(key, "]Busy"): + case "Busy": val, err := strconv.ParseFloat(v, 64) if err != nil { return err } e.proxyBalancerBusy.WithLabelValues(balancerName, workerName).Set(val) - case strings.HasSuffix(key, "]Sent"): + case "Sent": val, err := strconv.ParseFloat(strings.TrimRight(v, "kK"), 64) if err != nil { return err } ch <- prometheus.MustNewConstMetric(e.proxyBalancerReqSize, prometheus.CounterValue, val, balancerName, workerName) - case strings.HasSuffix(key, "]Rcvd"): + case "Rcvd": val, err := strconv.ParseFloat(strings.TrimRight(v, "kK"), 64) if err != nil { return err @@ -571,9 +565,8 @@ e.mutex.Lock() // To protect metrics from concurrent collects. defer e.mutex.Unlock() if err := e.collect(ch); err != nil { - level.Error(e.logger).Log("msg", "Error scraping apache:", "err", err) + level.Error(e.logger).Log("msg", "Error scraping Apache:", "err", err) e.scrapeFailures.Inc() e.scrapeFailures.Collect(ch) } - return } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/go.mod new/apache_exporter-1.0.8/go.mod --- old/apache_exporter-1.0.0/go.mod 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/go.mod 2024-06-26 16:48:04.000000000 +0200 @@ -3,11 +3,11 @@ go 1.19 require ( - github.com/alecthomas/kingpin/v2 v2.3.2 + github.com/alecthomas/kingpin/v2 v2.4.0 github.com/go-kit/log v0.2.1 - github.com/prometheus/client_golang v1.15.0 - github.com/prometheus/common v0.42.0 - github.com/prometheus/exporter-toolkit v0.9.1 + github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/common v0.48.0 + github.com/prometheus/exporter-toolkit v0.11.0 ) require ( @@ -18,20 +18,17 @@ github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/jpillora/backoff v1.0.0 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect - golang.org/x/crypto v0.7.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/oauth2 v0.6.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.23.0 // indirect + golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/sync v0.5.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/text v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/apache_exporter-1.0.0/go.sum new/apache_exporter-1.0.8/go.sum --- old/apache_exporter-1.0.0/go.sum 2023-06-26 11:05:04.000000000 +0200 +++ new/apache_exporter-1.0.8/go.sum 2024-06-26 16:48:04.000000000 +0200 @@ -1,5 +1,5 @@ -github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU= -github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= +github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY= +github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -8,7 +8,6 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= @@ -16,68 +15,61 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM= -github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= -github.com/prometheus/exporter-toolkit v0.9.1 h1:cNkC01riqiOS+kh3zdnNwRsbe/Blh0WwK3ij5rPJ9Sw= -github.com/prometheus/exporter-toolkit v0.9.1/go.mod h1:iFlTmFISCix0vyuyBmm0UqOUCTao9+RsAsKJP3YM9ec= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g= +github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= -golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= +golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++++++ apache_exporter.obsinfo ++++++ --- /var/tmp/diff_new_pack.k7kHus/_old 2024-07-26 16:18:33.885105768 +0200 +++ /var/tmp/diff_new_pack.k7kHus/_new 2024-07-26 16:18:33.889105930 +0200 @@ -1,5 +1,5 @@ name: apache_exporter -version: 1.0.0 -mtime: 1687770304 -commit: 1e6c01ae15e65e7fc3114311098e9ce724629dce +version: 1.0.8 +mtime: 1719413284 +commit: 887a69584e567f5f94de6b2f8bfde023ba7e697a ++++++ vendor.tar.gz ++++++ ++++ 55603 lines of diff (skipped)

1 0

commit fzf for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fzf for openSUSE:Factory checked in at 2024-07-26 16:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fzf (Old) and /work/SRC/openSUSE:Factory/.fzf.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fzf" Fri Jul 26 16:16:24 2024 rev:56 rq:1189776 version:0.54.2 Changes: -------- --- /work/SRC/openSUSE:Factory/fzf/fzf.changes 2024-07-22 17:19:30.884907761 +0200 +++ /work/SRC/openSUSE:Factory/.fzf.new.1882/fzf.changes 2024-07-26 16:16:44.560706288 +0200 @@ -1,0 +2,6 @@ +Fri Jul 26 10:29:49 UTC 2024 - Matej Cepl <mcepl(a)cepl.eu> + +- Update to 0.54.2: + * Fixed incorrect syntax highlighting of truncated multi-line entries + +------------------------------------------------------------------- Old: ---- fzf-0.54.1.tar.gz New: ---- fzf-0.54.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fzf.spec ++++++ --- /var/tmp/diff_new_pack.j9Bt3x/_old 2024-07-26 16:16:45.596747982 +0200 +++ /var/tmp/diff_new_pack.j9Bt3x/_new 2024-07-26 16:16:45.596747982 +0200 @@ -18,7 +18,7 @@ %global _lto_cflags %{nil} Name: fzf -Version: 0.54.1 +Version: 0.54.2 Release: 0 Summary: A command-line fuzzy finder License: MIT ++++++ fzf-0.54.1.tar.gz -> fzf-0.54.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/.goreleaser.yml new/fzf-0.54.2/.goreleaser.yml --- old/fzf-0.54.1/.goreleaser.yml 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/.goreleaser.yml 2024-07-26 10:44:09.000000000 +0200 @@ -1,4 +1,5 @@ --- +version: 2 project_name: fzf before: @@ -6,60 +7,9 @@ - go mod download builds: - - id: fzf-macos - binary: fzf - goos: - - darwin - goarch: - - amd64 - flags: - - -trimpath - ldflags: - - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}" - hooks: - post: | - sh -c ' - cat > /tmp/fzf-gon-amd64.hcl << EOF - source = ["./dist/fzf-macos_darwin_amd64_v1/fzf"] - bundle_id = "junegunn.fzf" - sign { - application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)" - } - zip { - output_path = "./dist/fzf-{{ .Version }}-darwin_amd64.zip" - } - EOF - gon /tmp/fzf-gon-amd64.hcl - ' - - - id: fzf-macos-arm - binary: fzf - goos: - - darwin - goarch: - - arm64 - flags: - - -trimpath - ldflags: - - "-s -w -X main.version={{ .Version }} -X main.revision={{ .ShortCommit }}" - hooks: - post: | - sh -c ' - cat > /tmp/fzf-gon-arm64.hcl << EOF - source = ["./dist/fzf-macos-arm_darwin_arm64/fzf"] - bundle_id = "junegunn.fzf" - sign { - application_identity = "Developer ID Application: Junegunn Choi (Y254DRW44Z)" - } - zip { - output_path = "./dist/fzf-{{ .Version }}-darwin_arm64.zip" - } - EOF - gon /tmp/fzf-gon-arm64.hcl - ' - - id: fzf goos: + - darwin - linux - windows - freebsd @@ -89,6 +39,42 @@ - goos: openbsd goarch: arm64 +# .goreleaser.yaml +notarize: + macos: + - # Whether this configuration is enabled or not. + # + # Default: false. + # Templates: allowed. + enabled: "{{ not .IsSnapshot }}" + + # Before notarizing, we need to sign the binary. + # This blocks defines the configuration for doing so. + sign: + # The .p12 certificate file path or its base64'd contents. + certificate: "{{.Env.MACOS_SIGN_P12}}" + + # The password to be used to open the certificate. + password: "{{.Env.MACOS_SIGN_PASSWORD}}" + + # Then, we notarize the binaries. + notarize: + # The issuer ID. + # Its the UUID you see when creating the App Store Connect key. + issuer_id: "{{.Env.MACOS_NOTARY_ISSUER_ID}}" + + # Key ID. + # You can see it in the list of App Store Connect Keys. + # It will also be in the ApiKey filename. + key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}" + + # The .p8 key file path or its base64'd contents. + key: "{{.Env.MACOS_NOTARY_KEY}}" + + # Whether to wait for the notarization to finish. + # Not recommended, as it could take a really long time. + wait: true + archives: - name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" builds: @@ -100,18 +86,12 @@ files: - non-existent* -checksum: - extra_files: - - glob: ./dist/fzf-*darwin*.zip - release: github: owner: junegunn name: fzf prerelease: auto name_template: '{{ .Version }}' - extra_files: - - glob: ./dist/fzf-*darwin*.zip snapshot: name_template: "{{ .Version }}-devel" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/CHANGELOG.md new/fzf-0.54.2/CHANGELOG.md --- old/fzf-0.54.1/CHANGELOG.md 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/CHANGELOG.md 2024-07-26 10:44:09.000000000 +0200 @@ -1,6 +1,16 @@ CHANGELOG ========= +0.54.2 +------ +- Fixed incorrect syntax highlighting of truncated multi-line entries +- Updated GoReleaser to 2.1.0 to simplify notarization of macOS binaries + - macOS archives will be in `tar.gz` format instead of `zip` format since we no longer notarize the zip files but binaries +- (Windows) Reverted a mintty fix in 0.54.0 + - As a result, mouse may not work on mintty in fullscreen mode. However, fzf will correctly read non-ASCII input in fullscreen mode (`--no-height`). + - fzf unfortunately cannot read non-ASCII input when not in fullscreen mode on Windows. So if you need to input non-ASCII characters, add `--no-height` to your `$FZF_DEFAULT_OPTS`. + - Any help in fixing this issue will be appreciated (#3799, #3847). + 0.54.1 ------ - Updated [fastwalk](https://github.com/charlievieth/fastwalk) dependency for built-in directory walker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/README.md new/fzf-0.54.2/README.md --- old/fzf-0.54.1/README.md 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/README.md 2024-07-26 10:44:09.000000000 +0200 @@ -44,7 +44,7 @@ If you'd like to sponsor this project, please visit https://github.com/sponsors/junegunn. -<a href="https://github.com/miyanokomiya"><img src="https://github.com/miyanokomiya.png" width="60px" alt="miyanokomiya" /></a><a href="https://github.com/jonhoo"><img src="https://github.com/jonhoo.png" width="60px" alt="Jon Gjengset" /></a><a href="https://github.com/AceofSpades5757"><img src="https://github.com/AceofSpades5757.png" width="60px" alt="Kyle L. Davis" /></a><a href="https://github.com/Frederick888"><img src="https://github.com/Frederick888.png" width="60px" alt="Frederick Zhang" /></a><a href="https://github.com/moritzdietz"><img src="https://github.com/moritzdietz.png" width="60px" alt="Moritz Dietz" /></a><a href="https://github.com/mikker"><img src="https://github.com/mikker.png" width="60px" alt="Mikkel Malmberg" /></a><a href="https://github.com/pldubouilh"><img src="https://github.com/pldubouilh.png" width="60px" alt="Pierre Dubouilh" /></a><a href="https://github.com/rcorre"><img src="https://github.com/rcorre.png" width="60px" alt="Ryan Roden -Corrent" /></a><a href="https://github.com/blissdev"><img src="https://github.com/blissdev.png" width="60px" alt="Jordan Arentsen" /></a><a href="https://github.com/mislav"><img src="https://github.com/mislav.png" width="60px" alt="Mislav Marohnić" /></a><a href="https://github.com/aexvir"><img src="https://github.com/aexvir.png" width="60px" alt="Alex Viscreanu" /></a><a href="https://github.com/dbalatero"><img src="https://github.com/dbalatero.png" width="60px" alt="David Balatero" /></a><a href="https://github.com/comatory"><img src="https://github.com/comatory.png" width="60px" alt="Ondrej Synacek" /></a><a href="https://github.com/moobar"><img src="https://github.com/moobar.png" width="60px" alt="" /></a><a href="https://github.com/majjoha"><img src="https://github.com/majjoha.png" width="60px" alt="Mathias Jean Johansen" /></a><a href="https://github.com/benelan"><img src="https://github.com/benelan.png" width="60px" alt="Ben Elan" /></a><a href="https://github.com/pawelduda "><img src="https://github.com/pawelduda.png" width="60px" alt="Paweł Duda" /></a><a href="https://github.com/slezica"><img src="https://github.com/slezica.png" width="60px" alt="Santiago Lezica" /></a><a href="https://github.com/pbwn"><img src="https://github.com/pbwn.png" width="60px" alt="" /></a><a href="https://github.com/timgluz"><img src="https://github.com/timgluz.png" width="60px" alt="Timo Sulg" /></a><a href="https://github.com/pyrho"><img src="https://github.com/pyrho.png" width="60px" alt="Damien Rajon" /></a><a href="https://github.com/ArtBIT"><img src="https://github.com/ArtBIT.png" width="60px" alt="ArtBIT" /></a><a href="https://github.com/da-moon"><img src="https://github.com/da-moon.png" width="60px" alt="" /></a><a href="https://github.com/hovissimo"><img src="https://github.com/hovissimo.png" width="60px" alt="Hovis" /></a><a href="https://github.com/dariusjonda"><img src="https://github.com/dariusjonda.png" width="60px" alt="Darius Jonda" /></a><a href="https: //github.com/cristiand391"><img src="https://github.com/cristiand391.png" width="60px" alt="Cristian Dominguez" /></a><a href="https://github.com/eliangcs"><img src="https://github.com/eliangcs.png" width="60px" alt="Chang-Hung Liang" /></a><a href="https://github.com/asphaltbuffet"><img src="https://github.com/asphaltbuffet.png" width="60px" alt="Ben Lechlitner" /></a><a href="https://github.com/yash1th"><img src="https://github.com/yash1th.png" width="60px" alt="yash" /></a><a href="https://github.com/looshch"><img src="https://github.com/looshch.png" width="60px" alt="george looshch" /></a><a href="https://github.com/kg8m"><img src="https://github.com/kg8m.png" width="60px" alt="Takumi KAGIYAMA" /></a><a href="https://github.com/polm"><img src="https://github.com/polm.png" width="60px" alt="Paul O'Leary McCann" /></a><a href="https://github.com/rbeeger"><img src="https://github.com/rbeeger.png" width="60px" alt="Robert Beeger" /></a><a href="https://github.com/veebch"><img src="h ttps://github.com/veebch.png" width="60px" alt="VEEB Projects" /></a><a href="https://github.com/yowayb"><img src="https://github.com/yowayb.png" width="60px" alt="Yoway Buorn" /></a><a href="https://github.com/scalisi"><img src="https://github.com/scalisi.png" width="60px" alt="Josh Scalisi" /></a><a href="https://github.com/alecbcs"><img src="https://github.com/alecbcs.png" width="60px" alt="Alec Scott" /></a><a href="https://github.com/thnxdev"><img src="https://github.com/thnxdev.png" width="60px" alt="thanks.dev" /></a><a href="https://github.com/artursapek"><img src="https://github.com/artursapek.png" width="60px" alt="Artur Sapek" /></a><a href="https://github.com/ramnes"><img src="https://github.com/ramnes.png" width="60px" alt="Guillaume Gelin" /></a><a href="https://github.com/jyc"><img src="https://github.com/jyc.png" width="60px" alt="" /></a><a href="https://github.com/mrcnski"><img src="https://github.com/mrcnski.png" width="60px" alt="Marcin S." /></a><a href="https:/ /github.com/roblevy"><img src="https://github.com/roblevy.png" width="60px" alt="Rob Levy" /></a><a href="https://github.com/glozow"><img src="https://github.com/glozow.png" width="60px" alt="Gloria Zhao" /></a><a href="https://github.com/wjt"><img src="https://github.com/wjt.png" width="60px" alt="Will Thompson" /></a><a href="https://github.com/toupeira"><img src="https://github.com/toupeira.png" width="60px" alt="Markus Koller" /></a><a href="https://github.com/rkpatel33"><img src="https://github.com/rkpatel33.png" width="60px" alt="" /></a><a href="https://github.com/jamesob"><img src="https://github.com/jamesob.png" width="60px" alt="James O'Beirne" /></a><a href="https://github.com/jlebray"><img src="https://github.com/jlebray.png" width="60px" alt="Johan Le Bray" /></a><a href="https://github.com/panosl1"><img src="https://github.com/panosl1.png" width="60px" alt="Panos Lampropoulos" /></a><a href="https://github.com/bespinian"><img src="https://github.com/bespinian.png" widt h="60px" alt="bespinian" /></a><a href="https://github.com/mirzahilmi"><img src="https://github.com/mirzahilmi.png" width="60px" alt="Mirza Hilmi Shodiq" /></a> +<a href="https://github.com/miyanokomiya"><img src="https://github.com/miyanokomiya.png" width="60px" alt="miyanokomiya" /></a><a href="https://github.com/jonhoo"><img src="https://github.com/jonhoo.png" width="60px" alt="Jon Gjengset" /></a><a href="https://github.com/AceofSpades5757"><img src="https://github.com/AceofSpades5757.png" width="60px" alt="Kyle L. Davis" /></a><a href="https://github.com/Frederick888"><img src="https://github.com/Frederick888.png" width="60px" alt="Frederick Zhang" /></a><a href="https://github.com/moritzdietz"><img src="https://github.com/moritzdietz.png" width="60px" alt="Moritz Dietz" /></a><a href="https://github.com/mikker"><img src="https://github.com/mikker.png" width="60px" alt="Mikkel Malmberg" /></a><a href="https://github.com/pldubouilh"><img src="https://github.com/pldubouilh.png" width="60px" alt="Pierre Dubouilh" /></a><a href="https://github.com/rcorre"><img src="https://github.com/rcorre.png" width="60px" alt="Ryan Roden -Corrent" /></a><a href="https://github.com/blissdev"><img src="https://github.com/blissdev.png" width="60px" alt="Jordan Arentsen" /></a><a href="https://github.com/mislav"><img src="https://github.com/mislav.png" width="60px" alt="Mislav Marohnić" /></a><a href="https://github.com/aexvir"><img src="https://github.com/aexvir.png" width="60px" alt="Alex Viscreanu" /></a><a href="https://github.com/dbalatero"><img src="https://github.com/dbalatero.png" width="60px" alt="David Balatero" /></a><a href="https://github.com/moobar"><img src="https://github.com/moobar.png" width="60px" alt="" /></a><a href="https://github.com/majjoha"><img src="https://github.com/majjoha.png" width="60px" alt="Mathias Jean Johansen" /></a><a href="https://github.com/benelan"><img src="https://github.com/benelan.png" width="60px" alt="Ben Elan" /></a><a href="https://github.com/pawelduda"><img src="https://github.com/pawelduda.png" width="60px" alt="Paweł Duda" /></a><a href="https://github.com/slezica">< img src="https://github.com/slezica.png" width="60px" alt="Santiago Lezica" /></a><a href="https://github.com/pbwn"><img src="https://github.com/pbwn.png" width="60px" alt="" /></a><a href="https://github.com/timgluz"><img src="https://github.com/timgluz.png" width="60px" alt="Timo Sulg" /></a><a href="https://github.com/pyrho"><img src="https://github.com/pyrho.png" width="60px" alt="Damien Rajon" /></a><a href="https://github.com/ArtBIT"><img src="https://github.com/ArtBIT.png" width="60px" alt="ArtBIT" /></a><a href="https://github.com/da-moon"><img src="https://github.com/da-moon.png" width="60px" alt="" /></a><a href="https://github.com/hovissimo"><img src="https://github.com/hovissimo.png" width="60px" alt="Hovis" /></a><a href="https://github.com/dariusjonda"><img src="https://github.com/dariusjonda.png" width="60px" alt="Darius Jonda" /></a><a href="https://github.com/cristiand391"><img src="https://github.com/cristiand391.png" width="60px" alt="Cristian Dominguez" /></a><a href="https://github.com/eliangcs"><img src="https://github.com/eliangcs.png" width="60px" alt="Chang-Hung Liang" /></a><a href="https://github.com/asphaltbuffet"><img src="https://github.com/asphaltbuffet.png" width="60px" alt="Ben Lechlitner" /></a><a href="https://github.com/yash1th"><img src="https://github.com/yash1th.png" width="60px" alt="yash" /></a><a href="https://github.com/looshch"><img src="https://github.com/looshch.png" width="60px" alt="george looshch" /></a><a href="https://github.com/kg8m"><img src="https://github.com/kg8m.png" width="60px" alt="Takumi KAGIYAMA" /></a><a href="https://github.com/polm"><img src="https://github.com/polm.png" width="60px" alt="Paul O'Leary McCann" /></a><a href="https://github.com/rbeeger"><img src="https://github.com/rbeeger.png" width="60px" alt="Robert Beeger" /></a><a href="https://github.com/veebch"><img src="https://github.com/veebch.png" width="60px" alt="VEEB Projects" /></a><a href="https://github.com/yowayb"><img src="https: //github.com/yowayb.png" width="60px" alt="Yoway Buorn" /></a><a href="https://github.com/scalisi"><img src="https://github.com/scalisi.png" width="60px" alt="Josh Scalisi" /></a><a href="https://github.com/alecbcs"><img src="https://github.com/alecbcs.png" width="60px" alt="Alec Scott" /></a><a href="https://github.com/the-shank"><img src="https://github.com/the-shank.png" width="60px" alt="theshank" /></a><a href="https://github.com/thnxdev"><img src="https://github.com/thnxdev.png" width="60px" alt="thanks.dev" /></a><a href="https://github.com/artursapek"><img src="https://github.com/artursapek.png" width="60px" alt="Artur Sapek" /></a><a href="https://github.com/ramnes"><img src="https://github.com/ramnes.png" width="60px" alt="Guillaume Gelin" /></a><a href="https://github.com/jyc"><img src="https://github.com/jyc.png" width="60px" alt="" /></a><a href="https://github.com/mrcnski"><img src="https://github.com/mrcnski.png" width="60px" alt="Marcin S." /></a><a href="https://git hub.com/roblevy"><img src="https://github.com/roblevy.png" width="60px" alt="Rob Levy" /></a><a href="https://github.com/glozow"><img src="https://github.com/glozow.png" width="60px" alt="Gloria Zhao" /></a><a href="https://github.com/wjt"><img src="https://github.com/wjt.png" width="60px" alt="Will Thompson" /></a><a href="https://github.com/toupeira"><img src="https://github.com/toupeira.png" width="60px" alt="Markus Koller" /></a><a href="https://github.com/rkpatel33"><img src="https://github.com/rkpatel33.png" width="60px" alt="" /></a><a href="https://github.com/jamesob"><img src="https://github.com/jamesob.png" width="60px" alt="James O'Beirne" /></a><a href="https://github.com/jlebray"><img src="https://github.com/jlebray.png" width="60px" alt="Johan Le Bray" /></a><a href="https://github.com/panosl1"><img src="https://github.com/panosl1.png" width="60px" alt="Panos Lampropoulos" /></a><a href="https://github.com/bespinian"><img src="https://github.com/bespinian.png" width="6 0px" alt="bespinian" /></a><a href="https://github.com/xordspar0"><img src="https://github.com/xordspar0.png" width="60px" alt="Jordan Christiansen" /></a> Table of Contents ----------------- @@ -141,7 +141,7 @@ > To set up shell integration (key bindings and fuzzy completion), > see [the instructions below](#setting-up-shell-integration). -[![Packaging status](https://repology.org/badge/vertical-allrepos/fzf.svg)](https://repo… +[![Packaging status](https://repology.org/badge/vertical-allrepos/fzf.svg?columns=3)](ht… ### Windows packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/install new/fzf-0.54.2/install --- old/fzf-0.54.1/install 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/install 2024-07-26 10:44:09.000000000 +0200 @@ -2,7 +2,7 @@ set -u -version=0.54.1 +version=0.54.2 auto_completion= key_bindings= update_config=2 @@ -168,8 +168,8 @@ binary_available=1 binary_error="" case "$archi" in - Darwin\ arm64) download fzf-$version-darwin_arm64.zip ;; - Darwin\ x86_64) download fzf-$version-darwin_amd64.zip ;; + Darwin\ arm64) download fzf-$version-darwin_arm64.tar.gz ;; + Darwin\ x86_64) download fzf-$version-darwin_amd64.tar.gz ;; Linux\ armv5*) download fzf-$version-linux_armv5.tar.gz ;; Linux\ armv6*) download fzf-$version-linux_armv6.tar.gz ;; Linux\ armv7*) download fzf-$version-linux_armv7.tar.gz ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/install.ps1 new/fzf-0.54.2/install.ps1 --- old/fzf-0.54.1/install.ps1 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/install.ps1 2024-07-26 10:44:09.000000000 +0200 @@ -1,4 +1,4 @@ -$version="0.54.1" +$version="0.54.2" $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/man/man1/fzf-tmux.1 new/fzf-0.54.2/man/man1/fzf-tmux.1 --- old/fzf-0.54.1/man/man1/fzf-tmux.1 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/man/man1/fzf-tmux.1 2024-07-26 10:44:09.000000000 +0200 @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf\-tmux 1 "Jul 2024" "fzf 0.54.1" "fzf\-tmux - open fzf in tmux split pane" +.TH fzf\-tmux 1 "Jul 2024" "fzf 0.54.2" "fzf\-tmux - open fzf in tmux split pane" .SH NAME fzf\-tmux - open fzf in tmux split pane diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/man/man1/fzf.1 new/fzf-0.54.2/man/man1/fzf.1 --- old/fzf-0.54.1/man/man1/fzf.1 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/man/man1/fzf.1 2024-07-26 10:44:09.000000000 +0200 @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .. -.TH fzf 1 "Jul 2024" "fzf 0.54.1" "fzf - a command-line fuzzy finder" +.TH fzf 1 "Jul 2024" "fzf 0.54.2" "fzf - a command-line fuzzy finder" .SH NAME fzf - a command-line fuzzy finder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fzf-0.54.1/src/terminal.go new/fzf-0.54.2/src/terminal.go --- old/fzf-0.54.1/src/terminal.go 2024-07-19 10:10:49.000000000 +0200 +++ new/fzf-0.54.2/src/terminal.go 2024-07-26 10:44:09.000000000 +0200 @@ -728,7 +728,7 @@ } } if fullscreen { - if !tui.IsLightRendererSupported() { + if tui.HasFullscreenRenderer() { renderer = tui.NewFullscreenRenderer(opts.Theme, opts.Black, opts.Mouse) } else { renderer, err = tui.NewLightRenderer(ttyin, opts.Theme, opts.Black, opts.Mouse, opts.Tabstop, opts.ClearOnExit, @@ -2275,6 +2275,7 @@ finalLineNum := lineNum topCutoff := false + skipLines := 0 wrapped := false if t.multiLine || t.wrap { // Cut off the upper lines in the 'default' layout @@ -2287,7 +2288,7 @@ wrapped = true } - lines = lines[len(lines)-maxLines:] + skipLines = len(lines) - maxLines topCutoff = true } } @@ -2323,6 +2324,10 @@ } } from += len(line) + if lineOffset < skipLines { + continue + } + actualLineOffset := lineOffset - skipLines var maxe int for _, offset := range offsets { @@ -2333,7 +2338,7 @@ actualLineNum := lineNum if t.layout == layoutDefault { - actualLineNum = (lineNum - lineOffset) + (numItemLines - lineOffset) - 1 + actualLineNum = (lineNum - actualLineOffset) + (numItemLines - actualLineOffset) - 1 } t.move(actualLineNum, 0, forceRedraw) @@ -2348,13 +2353,13 @@ marker = markerTop } } else { - if lineOffset == 0 { // First line + if actualLineOffset == 0 { // First line if topCutoff { marker = markerMiddle } else { marker = markerTop } - } else if lineOffset == numItemLines-1 { // Last line + } else if actualLineOffset == numItemLines-1 { // Last line if topCutoff || !overflow { marker = markerBottom } else { ++++++ vendor.tar.zst ++++++

1 0

commit rekor for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rekor for openSUSE:Factory checked in at 2024-07-26 16:16:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rekor (Old) and /work/SRC/openSUSE:Factory/.rekor.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rekor" Fri Jul 26 16:16:23 2024 rev:22 rq:1189775 version:1.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/rekor/rekor.changes 2024-02-05 22:02:53.678689888 +0100 +++ /work/SRC/openSUSE:Factory/.rekor.new.1882/rekor.changes 2024-07-26 16:16:43.224652523 +0200 @@ -1,0 +2,21 @@ +Fri Jul 26 12:01:47 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 1.3.6: + * New Features + - Add support for IEEE P1363 encoded ECDSA signatures + - Add index performance script (#2042) + - Add support for ed25519ph user keys in hashedrekord (#1945) + - Add metrics for index insertion (#2015) + - Add TLS support for Redis Client implementation (#1998) + * Bug Fixes + - fix typo in remoteIp and set full name for trace field + +------------------------------------------------------------------- +Fri Jul 26 12:00:14 UTC 2024 - Johannes Kastl <opensuse_buildservice(a)ojkastl.de> + +- refactor spec file +- switch to using obs_scm to generate the source obscpio archive + * this way we do no longer need to hardcode the commit hash + * and the tarball was never verified anyway + +------------------------------------------------------------------- Old: ---- rekor-1.3.5.tar.gz New: ---- _servicedata rekor-1.3.6.obscpio rekor.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rekor.spec ++++++ --- /var/tmp/diff_new_pack.KWBbAs/_old 2024-07-26 16:16:44.100687776 +0200 +++ /var/tmp/diff_new_pack.KWBbAs/_new 2024-07-26 16:16:44.100687776 +0200 @@ -19,13 +19,12 @@ %define apps cli server Name: rekor -Version: 1.3.5 +Version: 1.3.6 Release: 0 -%define revision 488eb9782d8d95c83ac70bfb2f5049928504127e Summary: Supply Chain Transparency Log License: Apache-2.0 URL: https://github.com/sigstore/rekor -Source: https://github.com/sigstore/rekor/archive/refs/tags/v%{version}.tar.gz#/%{n… +Source: %{name}-%{version}.tar.gz Source1: vendor.tar.zst Source2: rekor-zypper-verify.sh BuildRequires: golang-packaging @@ -43,13 +42,27 @@ %autosetup -p1 -a1 %build +COMMIT_HASH="$(sed -n 's/commit: $.*$/\1/p' %_sourcedir/%{name}.obsinfo)" + DATE_FMT="+%%Y-%%m-%%dT%%H:%%M:%%SZ" BUILD_DATE=$(date -u -d "@${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u "${DATE_FMT}") -for app in %{apps} ; do -CLI_PKG=sigs.k8s.io/release-utils/version -CLI_LDFLAGS="-X ${CLI_PKG}.gitVersion=%{version} -X ${CLI_PKG}.gitCommit=%{revision} -X ${CLI_PKG}.gitTreeState=release -X ${CLI_PKG}.buildDate=${BUILD_DATE}" -go build -mod=vendor -trimpath -buildmode=pie -ldflags "${CLI_LDFLAGS}" ./cmd/rekor-${app} -./rekor-${app} version + +for app in %{apps} +do + CLI_PKG=sigs.k8s.io/release-utils/version + CLI_LDFLAGS="-X ${CLI_PKG}.gitVersion=%{version} -X ${CLI_PKG}.gitCommit=%{COMMIT_HASH} -X ${CLI_PKG}.gitTreeState=release -X ${CLI_PKG}.buildDate=${BUILD_DATE}" + + go build \ + -mod=vendor \ + -trimpath \ + -buildmode=pie \ + -ldflags "${CLI_LDFLAGS}" ./cmd/rekor-${app} +done + +%check +for app in %{apps} +do + ./rekor-${app} version | grep %{version} done %install ++++++ _service ++++++ --- /var/tmp/diff_new_pack.KWBbAs/_old 2024-07-26 16:16:44.136689225 +0200 +++ /var/tmp/diff_new_pack.KWBbAs/_new 2024-07-26 16:16:44.140689386 +0200 @@ -1,6 +1,24 @@ <services> + <service name="obs_scm" mode="manual"> + <param name="url">https://github.com/sigstore/rekor</param> + <param name="scm">git</param> + <param name="exclude">.git</param> + <param name="revision">v1.3.6</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="changesgenerate">enable</param> + <param name="versionrewrite-pattern">v(.*)</param> + </service> + <service name="set_version" mode="manual"> + </service> <service name="go_modules" mode="manual"> <param name="compression">zst</param> </service> +  + <service name="tar" mode="buildtime"> + </service> + <service name="recompress" mode="buildtime"> + <param name="file">*.tar</param> + <param name="compression">gz</param> + </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/sigstore/rekor</param> <param name="changesrevision">a6788566cd62facb0fb0450e9d2c2867f551e37c</param></service></servicedata> (No newline at EOF) ++++++ rekor.obsinfo ++++++ name: rekor version: 1.3.6 mtime: 1712031396 commit: a6788566cd62facb0fb0450e9d2c2867f551e37c ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/rekor/vendor.tar.zst /work/SRC/openSUSE:Factory/.rekor.new.1882/vendor.tar.zst differ: char 5, line 1

1 0

commit suse-build-key for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package suse-build-key for openSUSE:Factory checked in at 2024-07-26 16:16:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/suse-build-key (Old) and /work/SRC/openSUSE:Factory/.suse-build-key.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "suse-build-key" Fri Jul 26 16:16:12 2024 rev:45 rq:1189743 version:12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/suse-build-key/suse-build-key.changes 2024-07-18 19:20:21.908745231 +0200 +++ /work/SRC/openSUSE:Factory/.suse-build-key.new.1882/suse-build-key.changes 2024-07-26 16:16:35.792353429 +0200 @@ -1,0 +2,5 @@ +Fri Jul 19 08:47:17 UTC 2024 - Marcus Meissner <meissner(a)suse.com> + +- make the per-project inclusion optional, default off. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suse-build-key.spec ++++++ --- /var/tmp/diff_new_pack.HFt4iF/_old 2024-07-26 16:16:36.824394961 +0200 +++ /var/tmp/diff_new_pack.HFt4iF/_new 2024-07-26 16:16:36.824394961 +0200 @@ -17,6 +17,7 @@ # needspubkeyforbuild +%bcond_with build_key_include_prjkey Name: suse-build-key BuildRequires: gpg @@ -119,6 +120,16 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{keydir} + +%if %{with build_key_include_prjkey} +if [ -e "%_sourcedir/_pubkey" ]; then + name="$(sh %{SOURCE1000} %_sourcedir/_pubkey).asc" + if [ ! -e "%_sourcedir/$name" ]; then + install -D -m 644 %_sourcedir/_pubkey %{buildroot}%keydir/"$name" + fi +fi +%endif + for i in %sources; do case "$i" in */gpg-pubkey-*.asc|*/*ptf*.asc) @@ -127,12 +138,6 @@ esac done -if [ -e "%_sourcedir/_pubkey" ]; then - name="$(sh %{SOURCE1000} %_sourcedir/_pubkey).asc" - if [ ! -e "%_sourcedir/$name" ]; then - install -D -m 644 %_sourcedir/_pubkey %{buildroot}%keydir/"$name" - fi -fi %if 0%{?suse_version} && 0%{?suse_version} < 1120 install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg

1 0

commit python-nltk for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-nltk for openSUSE:Factory checked in at 2024-07-26 16:16:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nltk (Old) and /work/SRC/openSUSE:Factory/.python-nltk.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-nltk" Fri Jul 26 16:16:05 2024 rev:17 rq:1189727 version:3.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-nltk/python-nltk.changes 2024-07-04 16:25:22.072097966 +0200 +++ /work/SRC/openSUSE:Factory/.python-nltk.new.1882/python-nltk.changes 2024-07-26 16:16:30.880155750 +0200 @@ -1,0 +2,8 @@ +Fri Jul 26 07:14:33 UTC 2024 - Daniel Garcia <daniel.garcia(a)suse.com> + +- Add CVE-2024-39705.patch upstream patch to fix unsafe pickle usage. + (CVE-2024-39705, gh#nltk/nltk#3266, bsc#1227174). +- Drop CVE-2024-39705-disable-download.patch as it's not needed + anymore. + +------------------------------------------------------------------- Old: ---- CVE-2024-39705-disable-download.patch New: ---- CVE-2024-39705.patch BETA DEBUG BEGIN: Old: (CVE-2024-39705, gh#nltk/nltk#3266, bsc#1227174). - Drop CVE-2024-39705-disable-download.patch as it's not needed anymore. BETA DEBUG END: BETA DEBUG BEGIN: New: - Add CVE-2024-39705.patch upstream patch to fix unsafe pickle usage. (CVE-2024-39705, gh#nltk/nltk#3266, bsc#1227174). BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nltk.spec ++++++ --- /var/tmp/diff_new_pack.G8VrHs/_old 2024-07-26 16:16:35.236331053 +0200 +++ /var/tmp/diff_new_pack.G8VrHs/_new 2024-07-26 16:16:35.252331697 +0200 @@ -63,9 +63,8 @@ Patch0: skip-networked-test.patch # PATCH-FIX-UPSTREAM nltk-pr3207-py312.patch gh#nltk/nltk#3207 Patch1: nltk-pr3207-py312.patch -# PATCH-FIX-UPSTREAM CVE-2024-39705-disable-download.patch bsc#1227174 mcepl(a)suse.com -# this patch makes things totally awesome -Patch2: CVE-2024-39705-disable-download.patch +# PATCH-FIX-UPSTREAM CVE-2024-39705.patch bsc#1227174 gh#nltk/nltk#3290 +Patch2: CVE-2024-39705.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} ++++++ CVE-2024-39705-disable-download.patch -> CVE-2024-39705.patch ++++++ --- /work/SRC/openSUSE:Factory/python-nltk/CVE-2024-39705-disable-download.patch 2024-07-04 16:25:21.136063781 +0200 +++ /work/SRC/openSUSE:Factory/.python-nltk.new.1882/CVE-2024-39705.patch 2024-07-26 16:16:30.856154784 +0200 @@ -1,104 +1,38 @@ +From a12d0a6a8cdba58d5e4e5f92ac62bb80fc26c624 Mon Sep 17 00:00:00 2001 +From: Eric Kafe <kafe.eric(a)gmail.com> +Date: Tue, 23 Jul 2024 09:09:09 +0200 +Subject: [PATCH] Prevent data.load from unpickling classes or functions + --- - nltk/app/chartparser_app.py | 13 +++++++++++++ - nltk/corpus/reader/util.py | 2 ++ - nltk/data.py | 2 ++ - nltk/parse/transitionparser.py | 2 ++ - nltk/tbl/demo.py | 4 +++- - 5 files changed, 22 insertions(+), 1 deletion(-) + nltk/data.py | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) ---- a/nltk/app/chartparser_app.py -+++ b/nltk/app/chartparser_app.py -@@ -800,6 +800,10 @@ class ChartComparer: - showerror("Error Saving Chart", f"Unable to open file: {filename!r}\n{e}") - - def load_chart_dialog(self, *args): -+ showerror("Security Error", -+ "Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") -+ return - filename = askopenfilename( - filetypes=self.CHART_FILE_TYPES, defaultextension=".pickle" - ) -@@ -811,6 +815,8 @@ class ChartComparer: - showerror("Error Loading Chart", f"Unable to open file: {filename!r}\n{e}") - - def load_chart(self, filename): -+ raise RuntimeError("Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") - with open(filename, "rb") as infile: - chart = pickle.load(infile) - name = os.path.basename(filename) -@@ -2268,6 +2274,10 @@ class ChartParserApp: - if not filename: - return - try: -+ showerror("Security Error", -+ "Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") -+ return - with open(filename, "rb") as infile: - chart = pickle.load(infile) - self._chart = chart -@@ -2306,6 +2316,9 @@ class ChartParserApp: - return - try: - if filename.endswith(".pickle"): -+ showerror("Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") -+ return - with open(filename, "rb") as infile: - grammar = pickle.load(infile) - else: ---- a/nltk/corpus/reader/util.py -+++ b/nltk/corpus/reader/util.py -@@ -521,6 +521,8 @@ class PickleCorpusView(StreamBackedCorpu - - def read_block(self, stream): - result = [] -+ raise RuntimeError("Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") - for i in range(self.BLOCK_SIZE): - try: - result.append(pickle.load(stream)) +diff --git a/nltk/data.py b/nltk/data.py +index cc9229b0a2..fb242721c5 100644 --- a/nltk/data.py +++ b/nltk/data.py -@@ -752,6 +752,8 @@ def load( +@@ -658,6 +658,15 @@ def retrieve(resource_url, filename=None, verbose=True): + } + + ++def restricted_pickle_load(string): ++ """ ++ Prevents any class or function from loading. ++ """ ++ from nltk.app.wordnet_app import RestrictedUnpickler ++ ++ return RestrictedUnpickler(BytesIO(string)).load() ++ ++ + def load( + resource_url, + format="auto", +@@ -751,7 +760,7 @@ def load( if format == "raw": resource_val = opened_resource.read() elif format == "pickle": -+ raise RuntimeError("Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") - resource_val = pickle.load(opened_resource) +- resource_val = pickle.load(opened_resource) ++ resource_val = restricted_pickle_load(opened_resource.read()) elif format == "json": import json ---- a/nltk/parse/transitionparser.py -+++ b/nltk/parse/transitionparser.py -@@ -553,6 +553,8 @@ class TransitionParser(ParserI): - """ - result = [] - # First load the model -+ raise RuntimeError("Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") - model = pickle.load(open(modelFile, "rb")) - operation = Transition(self._algorithm) ---- a/nltk/tbl/demo.py -+++ b/nltk/tbl/demo.py -@@ -253,6 +253,8 @@ def postag( - ) - ) - with open(cache_baseline_tagger) as print_rules: -+ raise RuntimeError("Due to gh#nltk/nltk#3266, deserializing from " + -+ "a pickle is forbidden.") - baseline_tagger = pickle.load(print_rules) - print(f"Reloaded pickled tagger from {cache_baseline_tagger}") - else: -@@ -327,7 +329,7 @@ def postag( - with open(serialize_output) as print_rules: - brill_tagger_reloaded = pickle.load(print_rules) - print(f"Reloaded pickled tagger from {serialize_output}") -- taggedtest_reloaded = brill_tagger.tag_sents(testing_data) -+ taggedtest_reloaded = brill_tagger_reloaded.tag_sents(testing_data) - if taggedtest == taggedtest_reloaded: - print("Reloaded tagger tried on test set, results identical") - else:

1 0

commit chafa for openSUSE:Factory
by Source-Sync 26 Jul '24

26 Jul '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package chafa for openSUSE:Factory checked in at 2024-07-26 16:16:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chafa (Old) and /work/SRC/openSUSE:Factory/.chafa.new.1882 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chafa" Fri Jul 26 16:16:00 2024 rev:22 rq:1189703 version:1.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/chafa/chafa.changes 2024-06-18 22:52:22.863671610 +0200 +++ /work/SRC/openSUSE:Factory/.chafa.new.1882/chafa.changes 2024-07-26 16:16:26.875994613 +0200 @@ -1,0 +2,9 @@ +Fri Jul 26 05:54:17 UTC 2024 - Michael Vetter <mvetter(a)suse.com> + +- Update to 1.14.2: + * #203 Chafa 1.14.1 fails to build on i686 + * #205 Symbols mode not working since 1.14.1 + * #206 Crash when importing more than 32767 glyphs + * Fix erroneous base64 encoding of final byte in some circumstances + +------------------------------------------------------------------- Old: ---- chafa-1.14.1.tar.xz New: ---- chafa-1.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chafa.spec ++++++ --- /var/tmp/diff_new_pack.BOke2T/_old 2024-07-26 16:16:27.556021979 +0200 +++ /var/tmp/diff_new_pack.BOke2T/_new 2024-07-26 16:16:27.560022140 +0200 @@ -17,7 +17,7 @@ Name: chafa -Version: 1.14.1 +Version: 1.14.2 Release: 0 Summary: Image-to-text converter for terminal License: LGPL-3.0-or-later ++++++ chafa-1.14.1.tar.xz -> chafa-1.14.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/Makefile.in new/chafa-1.14.2/Makefile.in --- old/chafa-1.14.1/Makefile.in 2024-06-17 21:52:54.000000000 +0200 +++ new/chafa-1.14.2/Makefile.in 2024-07-26 01:12:03.000000000 +0200 @@ -190,8 +190,8 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/chafa.pc.in \ $(srcdir)/config.h.in AUTHORS COPYING COPYING.LESSER NEWS \ - README TODO ar-lib compile config.guess config.sub install-sh \ - ltmain.sh missing + README TODO ar-lib compile config.guess config.sub depcomp \ + install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/NEWS new/chafa-1.14.2/NEWS --- old/chafa-1.14.1/NEWS 2024-06-17 06:12:02.000000000 +0200 +++ new/chafa-1.14.2/NEWS 2024-07-26 01:11:51.000000000 +0200 @@ -1,6 +1,19 @@ Chafa releases ============== +1.14.2 (2024-07-26) +------------------- + +This is a bugfix release. github#205 is particularly serious, since it affects +many users on distributions that build with LTO enabled. + +* Bug fixes: + github#203 Chafa 1.14.1 fails to build on i686 (reported by @tranzystorekk). + github#205 Symbols mode not working since 1.14.1 (reported by Folke + Lemaitre). + github#206 Crash when importing more than 32767 glyphs (reported by @stgiga). + [unfiled] Fix erroneous base64 encoding of final byte in some circumstances. + 1.14.1 (2024-06-17) ------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/chafa/Makefile.am new/chafa-1.14.2/chafa/Makefile.am --- old/chafa-1.14.1/chafa/Makefile.am 2024-06-17 06:12:02.000000000 +0200 +++ new/chafa-1.14.2/chafa/Makefile.am 2024-07-26 01:11:51.000000000 +0200 @@ -9,7 +9,7 @@ noinst_HEADERS = libchafa_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -DCHAFA_COMPILATION -libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -no-undefined -version-info 9:1:9 +libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -no-undefined -version-info 9:2:9 libchafa_la_LIBADD = $(GLIB_LIBS) internal/libchafa-internal.la -lm libchafa_la_SOURCES = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/chafa/Makefile.in new/chafa-1.14.2/chafa/Makefile.in --- old/chafa-1.14.1/chafa/Makefile.in 2024-06-17 21:52:54.000000000 +0200 +++ new/chafa-1.14.2/chafa/Makefile.in 2024-07-26 01:12:03.000000000 +0200 @@ -449,7 +449,7 @@ # produce documentation. noinst_HEADERS = chafa-term-seq-doc.h chafa-term-seq-doc-in.h libchafa_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -DCHAFA_COMPILATION -libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -no-undefined -version-info 9:1:9 +libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -no-undefined -version-info 9:2:9 libchafa_la_LIBADD = $(GLIB_LIBS) internal/libchafa-internal.la -lm libchafa_la_SOURCES = \ chafa-canvas.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/chafa/chafa-symbol-map.c new/chafa-1.14.2/chafa/chafa-symbol-map.c --- old/chafa-1.14.1/chafa/chafa-symbol-map.c 2024-04-10 09:44:02.000000000 +0200 +++ new/chafa-1.14.2/chafa/chafa-symbol-map.c 2024-07-26 01:11:51.000000000 +0200 @@ -1802,6 +1802,9 @@ { Glyph2 *glyph2; + if (g_hash_table_size (symbol_map->glyphs2) >= G_MAXINT - 1) + return; + glyph2 = g_new (Glyph2, 1); glyph2->c = code_point; glyph_to_bitmap_wide (width, height, rowstride, pixel_format, pixels, @@ -1812,6 +1815,9 @@ { Glyph *glyph; + if (g_hash_table_size (symbol_map->glyphs) >= G_MAXINT - 1) + return; + glyph = g_new (Glyph, 1); glyph->c = code_point; glyph->bitmap = glyph_to_bitmap (width, height, rowstride, pixel_format, pixels); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/chafa/internal/chafa-avx2.c new/chafa-1.14.2/chafa/internal/chafa-avx2.c --- old/chafa-1.14.1/chafa/internal/chafa-avx2.c 2024-06-17 21:49:04.000000000 +0200 +++ new/chafa-1.14.2/chafa/internal/chafa-avx2.c 2024-07-10 22:27:44.000000000 +0200 @@ -21,9 +21,21 @@ #include <emmintrin.h> #include <immintrin.h> +#include <smmintrin.h> #include "chafa.h" #include "internal/chafa-private.h" +/* _mm_extract_epi64() (pextrq) is not available in 32-bit mode. Work around + * it. This needs to be a macro, as the compiler expects an integer constant + * for n. */ +#if defined __x86_64__ && !defined __ILP32__ +# define extract_128_epi64(i, n) _mm_extract_epi64 ((i), (n)) +#else +# define extract_128_epi64(i, n) \ + ((((guint64) _mm_extract_epi32 ((i), (n) * 2 + 1)) << 32) \ + | _mm_extract_epi32 ((i), (n) * 2)) +#endif + gint calc_error_avx2 (const ChafaPixel *pixels, const ChafaColorPair *color_pair, const guint32 *sym_mask_u32) @@ -78,6 +90,7 @@ __m256i accum_bg = { 0 }; __m128i accum_fg_128; __m128i accum_bg_128; + guint64 accums_u64 [2]; gint i; for (i = 0; i < CHAFA_SYMBOL_N_PIXELS / 4; i++) @@ -95,15 +108,17 @@ accum_bg_128 = _mm_add_epi16 (_mm256_extracti128_si256 (accum_bg, 0), _mm256_extracti128_si256 (accum_bg, 1)); - ((guint64 *) accums_out) [0] = - (guint64) _mm_extract_epi64 (accum_bg_128, 0) - + (guint64) _mm_extract_epi64 (accum_bg_128, 1); + accums_u64 [0] = + extract_128_epi64 (accum_bg_128, 0) + + extract_128_epi64 (accum_bg_128, 1); accum_fg_128 = _mm_add_epi16 (_mm256_extracti128_si256 (accum_fg, 0), _mm256_extracti128_si256 (accum_fg, 1)); - ((guint64 *) accums_out) [1] = - (guint64) _mm_extract_epi64 (accum_fg_128, 0) - + (guint64) _mm_extract_epi64 (accum_fg_128, 1); + accums_u64 [1] = + extract_128_epi64 (accum_fg_128, 0) + + extract_128_epi64 (accum_fg_128, 1); + + memcpy (accums_out, accums_u64, 2 * sizeof (guint64)); } /* 32768 divided by index. Divide by zero is defined as zero. */ @@ -137,11 +152,14 @@ chafa_color_accum_div_scalar_avx2 (ChafaColorAccum *accum, guint16 divisor) { __m128i accum_128, divisor_128; + guint64 accum_u64; /* Not using _mm_loadu_si64() here because it's not available on * older versions of GCC. The opcode is the same. */ accum_128 = _mm_loadl_epi64 ((const __m128i *) accum); divisor_128 = _mm_set1_epi16 (invdiv16 [divisor]); accum_128 = _mm_mulhrs_epi16 (accum_128, divisor_128); - *((guint64 *) accum) = _mm_extract_epi64 (accum_128, 0); + + accum_u64 = extract_128_epi64 (accum_128, 0); + memcpy (accum, &accum_u64, sizeof (guint64)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/chafa/internal/chafa-base64.c new/chafa-1.14.2/chafa/internal/chafa-base64.c --- old/chafa-1.14.1/chafa/internal/chafa-base64.c 2023-09-30 17:17:16.000000000 +0200 +++ new/chafa-1.14.2/chafa/internal/chafa-base64.c 2024-07-07 18:50:59.000000000 +0200 @@ -107,7 +107,9 @@ { g_string_append_c (gs_out, base64_dict [base64->buf [0] >> 2]); g_string_append_c (gs_out, base64_dict [((base64->buf [0] << 4) | (base64->buf [1] >> 4)) & 0x3f]); - g_string_append_c (gs_out, base64_dict [base64->buf [1] & 0x0f]); + g_string_append_c (gs_out, base64_dict [(base64->buf [1] << 2) & 0x3c]); g_string_append_c (gs_out, '='); } + + base64->buf_len = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/chafa/internal/chafa-private.h new/chafa-1.14.2/chafa/internal/chafa-private.h --- old/chafa-1.14.1/chafa/internal/chafa-private.h 2024-06-17 06:11:44.000000000 +0200 +++ new/chafa-1.14.2/chafa/internal/chafa-private.h 2024-07-26 01:11:51.000000000 +0200 @@ -84,7 +84,7 @@ typedef struct { - gint16 symbol_index; + gint symbol_index; guint8 hamming_distance; guint8 is_inverted; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/configure new/chafa-1.14.2/configure --- old/chafa-1.14.1/configure 2024-06-17 21:52:55.000000000 +0200 +++ new/chafa-1.14.2/configure 2024-07-26 01:12:04.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for chafa 1.14.1. +# Generated by GNU Autoconf 2.72 for chafa 1.14.2. # # Report bugs to <hpj(a)hpjansson.org>. # @@ -614,8 +614,8 @@ # Identity of this package. PACKAGE_NAME='chafa' PACKAGE_TARNAME='chafa' -PACKAGE_VERSION='1.14.1' -PACKAGE_STRING='chafa 1.14.1' +PACKAGE_VERSION='1.14.2' +PACKAGE_STRING='chafa 1.14.2' PACKAGE_BUGREPORT='hpj(a)hpjansson.org' PACKAGE_URL='' @@ -1470,7 +1470,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures chafa 1.14.1 to adapt to many kinds of systems. +'configure' configures chafa 1.14.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1541,7 +1541,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of chafa 1.14.1:";; + short | recursive ) echo "Configuration of chafa 1.14.2:";; esac cat <<\_ACEOF @@ -1698,7 +1698,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -chafa configure 1.14.1 +chafa configure 1.14.2 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -1961,7 +1961,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by chafa $as_me 1.14.1, which was +It was created by chafa $as_me 1.14.2, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -3255,7 +3255,7 @@ # Define the identity of the package. PACKAGE='chafa' - VERSION='1.14.1' + VERSION='1.14.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3367,8 +3367,8 @@ CHAFA_MAJOR_VERSION=1 CHAFA_MINOR_VERSION=14 -CHAFA_MICRO_VERSION=1 -CHAFA_VERSION=1.14.1 +CHAFA_MICRO_VERSION=2 +CHAFA_VERSION=1.14.2 @@ -3382,7 +3382,7 @@ printf "%s\n" "#define CHAFA_MINOR_VERSION 14" >>confdefs.h -printf "%s\n" "#define CHAFA_MICRO_VERSION 1" >>confdefs.h +printf "%s\n" "#define CHAFA_MICRO_VERSION 2" >>confdefs.h printf "%s\n" "#define CHAFA_VERSION \"$CHAFA_VERSION\"" >>confdefs.h @@ -17921,7 +17921,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by chafa $as_me 1.14.1, which was +This file was extended by chafa $as_me 1.14.2, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17989,7 +17989,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -chafa config.status 1.14.1 +chafa config.status 1.14.2 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/configure.ac new/chafa-1.14.2/configure.ac --- old/chafa-1.14.1/configure.ac 2024-06-17 06:12:02.000000000 +0200 +++ new/chafa-1.14.2/configure.ac 2024-07-26 01:11:51.000000000 +0200 @@ -6,7 +6,7 @@ m4_define([chafa_major_version], [1]) m4_define([chafa_minor_version], [14]) -m4_define([chafa_micro_version], [1]) +m4_define([chafa_micro_version], [2]) m4_define([chafa_version], [chafa_major_version.chafa_minor_version.chafa_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/docs/chafa.1 new/chafa-1.14.2/docs/chafa.1 --- old/chafa-1.14.1/docs/chafa.1 2024-06-17 21:53:09.000000000 +0200 +++ new/chafa-1.14.2/docs/chafa.1 2024-07-13 22:41:42.000000000 +0200 @@ -2,7 +2,7 @@ .\" Title: chafa .\" Author: Hans Petter Jansson .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 06/17/2024 +.\" Date: 07/13/2024 .\" Manual: User Commands .\" Source: chafa .\" Language: English diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.14.1/docs/html/index.html new/chafa-1.14.2/docs/html/index.html --- old/chafa-1.14.1/docs/html/index.html 2024-06-17 21:53:15.000000000 +0200 +++ new/chafa-1.14.2/docs/html/index.html 2024-07-26 01:12:16.000000000 +0200 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Chafa Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - For Chafa version 1.14.1 + For Chafa version 1.14.2 . The latest version of this documentation can be found online at <a class="ulink" href="https://hpjansson.org/chafa/ref/index.html" target="_top">https://hpjansson.org/chafa/ref/</a>.

1 0