diff --git a/packages/0/000product/.files b/packages/0/000product/.files index 327e2b2..8ac31fe 100644 Binary files a/packages/0/000product/.files and b/packages/0/000product/.files differ diff --git a/packages/0/000product/.rev b/packages/0/000product/.rev index 614ca3c..f12e956 100644 --- a/packages/0/000product/.rev +++ b/packages/0/000product/.rev @@ -24554,4 +24554,11 @@ staging-bot Automatic update + + f65076b3af46b23e16fa5eb92ebdef20 + unknown + + staging-bot + Automatic update + diff --git a/packages/0/000product/.servicemark b/packages/0/000product/.servicemark index 85290d9..3bf9148 100644 --- a/packages/0/000product/.servicemark +++ b/packages/0/000product/.servicemark @@ -1 +1 @@ -69ea4b446e5bb6a9548ff4595f8299ac +88b13fa62dc558dc14f81649689d3b45 diff --git a/packages/0/000product/MicroOS-dvd5-dvd-x86_64.kiwi b/packages/0/000product/MicroOS-dvd5-dvd-x86_64.kiwi index ce3fdaa..569409c 100644 --- a/packages/0/000product/MicroOS-dvd5-dvd-x86_64.kiwi +++ b/packages/0/000product/MicroOS-dvd5-dvd-x86_64.kiwi @@ -1,4 +1,4 @@ - + The SUSE Team build@opensuse.org @@ -35,11 +35,11 @@ true -x -2 openSUSE - 20230211 + 20230212 11 - cpe:/o:opensuse:microos:20230211,openSUSE MicroOS + cpe:/o:opensuse:microos:20230212,openSUSE MicroOS en_US - obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20230211/x86_64 + obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20230212/x86_64 openSUSE /usr/share/kiwi/modules/plugins/tumbleweed /usr/share/kiwi/modules/plugins/tumbleweed diff --git a/packages/0/000product/MicroOS.product b/packages/0/000product/MicroOS.product index cba929e..9602379 100644 --- a/packages/0/000product/MicroOS.product +++ b/packages/0/000product/MicroOS.product @@ -6,7 +6,7 @@ MicroOS MicroOS-release - 20230211 + 20230212 0 MicroOS diff --git a/packages/0/000product/dvd.group b/packages/0/000product/dvd.group index 84e9e50..5a8e8bc 100644 --- a/packages/0/000product/dvd.group +++ b/packages/0/000product/dvd.group @@ -508,6 +508,8 @@ + + @@ -3003,8 +3005,6 @@ - - diff --git a/packages/0/000product/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/packages/0/000product/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi index afa7d23..17f3c4c 100644 --- a/packages/0/000product/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi +++ b/packages/0/000product/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi @@ -1,4 +1,4 @@ - + The SUSE Team build@opensuse.org @@ -36,11 +36,11 @@ true -x -2 openSUSE - 20230211 + 20230212 11 - cpe:/o:opensuse:opensuse-addon-nonoss:20230211,openSUSE NonOSS Addon + cpe:/o:opensuse:opensuse-addon-nonoss:20230212,openSUSE NonOSS Addon af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu - obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20230211/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20230211/x86_64 + obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20230212/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20230212/x86_64 openSUSE /usr/share/kiwi/modules/plugins/tumbleweed /usr/share/kiwi/modules/plugins/tumbleweed diff --git a/packages/0/000product/openSUSE-Addon-NonOss.product b/packages/0/000product/openSUSE-Addon-NonOss.product index e63902b..720c1dd 100644 --- a/packages/0/000product/openSUSE-Addon-NonOss.product +++ b/packages/0/000product/openSUSE-Addon-NonOss.product @@ -4,7 +4,7 @@ openSUSE openSUSE-Addon-NonOss - 20230211 + 20230212 0 openSUSE NonOSS Addon non oss addon diff --git a/packages/0/000product/openSUSE-cd-mini-i586.kiwi b/packages/0/000product/openSUSE-cd-mini-i586.kiwi index b48caab..d7507e8 100644 --- a/packages/0/000product/openSUSE-cd-mini-i586.kiwi +++ b/packages/0/000product/openSUSE-cd-mini-i586.kiwi @@ -1,4 +1,4 @@ - + The SUSE Team build@opensuse.org @@ -32,11 +32,11 @@ true -x -2 openSUSE - 20230211 + 20230212 11 - cpe:/o:opensuse:opensuse:20230211,openSUSE Tumbleweed + cpe:/o:opensuse:opensuse:20230212,openSUSE Tumbleweed cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW - obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230211/i586 + obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230212/i586 openSUSE /usr/share/kiwi/modules/plugins/tumbleweed /usr/share/kiwi/modules/plugins/tumbleweed diff --git a/packages/0/000product/openSUSE-cd-mini-x86_64.kiwi b/packages/0/000product/openSUSE-cd-mini-x86_64.kiwi index f938aa5..5a8345b 100644 --- a/packages/0/000product/openSUSE-cd-mini-x86_64.kiwi +++ b/packages/0/000product/openSUSE-cd-mini-x86_64.kiwi @@ -1,4 +1,4 @@ - + The SUSE Team build@opensuse.org @@ -35,11 +35,11 @@ true -x -2 openSUSE - 20230211 + 20230212 11 - cpe:/o:opensuse:opensuse:20230211,openSUSE Tumbleweed + cpe:/o:opensuse:opensuse:20230212,openSUSE Tumbleweed cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW - obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230211/x86_64 + obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230212/x86_64 openSUSE /usr/share/kiwi/modules/plugins/tumbleweed /usr/share/kiwi/modules/plugins/tumbleweed diff --git a/packages/0/000product/openSUSE-dvd5-dvd-i586.kiwi b/packages/0/000product/openSUSE-dvd5-dvd-i586.kiwi index 25de102..8cbbef9 100644 --- a/packages/0/000product/openSUSE-dvd5-dvd-i586.kiwi +++ b/packages/0/000product/openSUSE-dvd5-dvd-i586.kiwi @@ -1,4 +1,4 @@ - + The SUSE Team build@opensuse.org @@ -32,11 +32,11 @@ true -x -2 openSUSE - 20230211 + 20230212 11 - cpe:/o:opensuse:opensuse:20230211,openSUSE Tumbleweed + cpe:/o:opensuse:opensuse:20230212,openSUSE Tumbleweed cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW - obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230211/i586 + obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230212/i586 openSUSE /usr/share/kiwi/modules/plugins/tumbleweed /usr/share/kiwi/modules/plugins/tumbleweed @@ -500,6 +500,8 @@ + + @@ -3049,8 +3051,6 @@ - - diff --git a/packages/0/000product/openSUSE-dvd5-dvd-x86_64.kiwi b/packages/0/000product/openSUSE-dvd5-dvd-x86_64.kiwi index 09bf39a..ac71bbc 100644 --- a/packages/0/000product/openSUSE-dvd5-dvd-x86_64.kiwi +++ b/packages/0/000product/openSUSE-dvd5-dvd-x86_64.kiwi @@ -1,4 +1,4 @@ - + The SUSE Team build@opensuse.org @@ -35,11 +35,11 @@ true -x -2 openSUSE - 20230211 + 20230212 11 - cpe:/o:opensuse:opensuse:20230211,openSUSE Tumbleweed + cpe:/o:opensuse:opensuse:20230212,openSUSE Tumbleweed cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW - obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230211/x86_64 + obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230212/x86_64 openSUSE /usr/share/kiwi/modules/plugins/tumbleweed /usr/share/kiwi/modules/plugins/tumbleweed @@ -523,6 +523,8 @@ + + @@ -3258,8 +3260,6 @@ - - diff --git a/packages/0/000product/openSUSE-ftp-ftp-i586_x86_64.kiwi b/packages/0/000product/openSUSE-ftp-ftp-i586_x86_64.kiwi index 2bcc1dc..df970c2 100644 --- a/packages/0/000product/openSUSE-ftp-ftp-i586_x86_64.kiwi +++ b/packages/0/000product/openSUSE-ftp-ftp-i586_x86_64.kiwi @@ -1,4 +1,4 @@ - + The SUSE Team build@opensuse.org @@ -24,7 +24,7 @@ openSUSE ftp true - openSUSE-20230211-i586-x86_64 + openSUSE-20230212-i586-x86_64 true / $DISTNAME-$FLAVOR @@ -36,11 +36,11 @@ true -x -2 openSUSE - 20230211 + 20230212 11 - cpe:/o:opensuse:opensuse:20230211,openSUSE Tumbleweed + cpe:/o:opensuse:opensuse:20230212,openSUSE Tumbleweed cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW - obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230211/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230211/x86_64 + obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230212/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20230212/x86_64 openSUSE 2 /usr/share/kiwi/modules/plugins/tumbleweed diff --git a/packages/0/000product/openSUSE.product b/packages/0/000product/openSUSE.product index e6a2c6d..4c52cb6 100644 --- a/packages/0/000product/openSUSE.product +++ b/packages/0/000product/openSUSE.product @@ -4,7 +4,7 @@ openSUSE openSUSE - 20230211 + 20230212 0 openSUSE diff --git a/packages/0/000product/unsorted.yml b/packages/0/000product/unsorted.yml index f945198..8932326 100644 --- a/packages/0/000product/unsorted.yml +++ b/packages/0/000product/unsorted.yml @@ -4271,8 +4271,6 @@ unsorted: - gajim-lang - gajim-plugin-omemo - galaxis - - galculator - - galculator-lang - galene - galera-4 - galera-4-wsrep-provider @@ -14321,7 +14319,7 @@ unsorted: - librrd8 - librsb-devel - librsb0 - - librssguard-4_2_5 + - librssguard-4_3_2 - librssguard-devel - librsvg-2-2-32bit: [x86_64] - librsvg-devel @@ -19386,6 +19384,8 @@ unsorted: - packETH - packETH-cli - package-translations + - package-update-indicator + - package-update-indicator-lang - packagekitqt5-devel - packagekitqt6-devel - packit diff --git a/packages/0/000release-packages/.files b/packages/0/000release-packages/.files index c6aabb7..1f58049 100644 Binary files a/packages/0/000release-packages/.files and b/packages/0/000release-packages/.files differ diff --git a/packages/0/000release-packages/.rev b/packages/0/000release-packages/.rev index 731aff5..b1f4941 100644 --- a/packages/0/000release-packages/.rev +++ b/packages/0/000release-packages/.rev @@ -14742,4 +14742,18 @@ staging-bot Automatic update + + 505b8fffe7e419dcf7f75740c146f657 + unknown + + staging-bot + Automatic update + + + fa4466b8033a53145bbb464d2896fdcc + unknown + + staging-bot + Automatic update + diff --git a/packages/0/000release-packages/.servicemark b/packages/0/000release-packages/.servicemark index 9b205e8..a789fa3 100644 --- a/packages/0/000release-packages/.servicemark +++ b/packages/0/000release-packages/.servicemark @@ -1 +1 @@ -eef04ca5cbaf7680507f692eb829519a +916bc52325a03502439a868de5b51a1f diff --git a/packages/0/000release-packages/MicroOS-release.spec b/packages/0/000release-packages/MicroOS-release.spec index 2ff47d5..c681e5f 100644 --- a/packages/0/000release-packages/MicroOS-release.spec +++ b/packages/0/000release-packages/MicroOS-release.spec @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20230211 +Version: 20230212 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -176,9 +176,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 %arm %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20230211-0 +Provides: product(MicroOS) = 20230212-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230211 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20230212 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) @@ -194,7 +194,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20230211-0 +Provides: product_flavor(MicroOS) = 20230212-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -210,7 +210,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20230211-0 +Provides: product_flavor(MicroOS) = 20230212-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -274,11 +274,11 @@ cat >%{buildroot}%{_sysconfdir}/products.d/MicroOS.prod << EOF openSUSE MicroOS - 20230211 + 20230212 0 %{_target_cpu} - cpe:/o:opensuse:microos:20230211 + cpe:/o:opensuse:microos:20230212 MicroOS diff --git a/packages/0/000release-packages/openSUSE-Addon-NonOss-release.spec b/packages/0/000release-packages/openSUSE-Addon-NonOss-release.spec index af44192..24cca2e 100644 --- a/packages/0/000release-packages/openSUSE-Addon-NonOss-release.spec +++ b/packages/0/000release-packages/openSUSE-Addon-NonOss-release.spec @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20230211) +# spec file for package openSUSE-Addon-NonOss-release (Version 20230212) # # Copyright (c) 2023 openSUSE. # @@ -16,7 +16,7 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20230211 +Version: 20230212 Release: 0 License: BSD-3-Clause Group: System/Fhs @@ -24,9 +24,9 @@ Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE%2DAddon%2DNonOss -Provides: product(openSUSE-Addon-NonOss) = 20230211-0 +Provides: product(openSUSE-Addon-NonOss) = 20230212-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230211 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20230212 AutoReqProv: on @@ -49,10 +49,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE-Addon-NonOss.prod << EOF openSUSE openSUSE-Addon-NonOss - 20230211 + 20230212 0 %{_target_cpu} - cpe:/o:opensuse:opensuse-addon-nonoss:20230211 + cpe:/o:opensuse:opensuse-addon-nonoss:20230212 diff --git a/packages/0/000release-packages/openSUSE-release.spec b/packages/0/000release-packages/openSUSE-release.spec index 6c29699..2cb7d33 100644 --- a/packages/0/000release-packages/openSUSE-release.spec +++ b/packages/0/000release-packages/openSUSE-release.spec @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20230211 +Version: 20230212 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -185,7 +185,7 @@ Provides: weakremover(openssl-debuginfo) %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20230211-0 +Provides: product(openSUSE) = 20230212-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -199,7 +199,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Dppc64le Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230211 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20230212 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 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -228,7 +228,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -243,7 +243,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -258,7 +258,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -273,7 +273,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -288,7 +288,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -303,7 +303,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -318,7 +318,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -333,7 +333,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -348,7 +348,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -363,7 +363,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -378,7 +378,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -393,7 +393,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -408,7 +408,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -423,7 +423,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -438,7 +438,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -453,7 +453,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -468,7 +468,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -483,7 +483,7 @@ License: BSD-3-Clause Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20230211-0 +Provides: product_flavor(openSUSE) = 20230212-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -562,10 +562,10 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF openSUSE openSUSE - 20230211 + 20230212 0 %{_target_cpu} - cpe:/o:opensuse:opensuse:20230211 + cpe:/o:opensuse:opensuse:20230212 openSUSE diff --git a/packages/0/000release-packages/weakremovers.inc b/packages/0/000release-packages/weakremovers.inc index a816319..9db927a 100644 --- a/packages/0/000release-packages/weakremovers.inc +++ b/packages/0/000release-packages/weakremovers.inc @@ -11593,6 +11593,7 @@ Provides: weakremover(librssguard-4_2_0) Provides: weakremover(librssguard-4_2_1) Provides: weakremover(librssguard-4_2_2) Provides: weakremover(librssguard-4_2_3) +Provides: weakremover(librssguard-4_2_5) Provides: weakremover(librsvg-lang) Provides: weakremover(librtmidi4) Provides: weakremover(librtmidi5) diff --git a/packages/_/_project/_attribute b/packages/_/_project/_attribute index 5a6f10f..d9bd0bb 100644 --- a/packages/_/_project/_attribute +++ b/packages/_/_project/_attribute @@ -73,7 +73,7 @@ boo#1204604: '20221109' boo#1204605: '20221022' boo#1204629: '20221024' - boo#1204833: '20230210' + boo#1204833: '20230211' boo#1205020: '20221104' boo#1205032: '20221110' boo#1205312: '20221113' @@ -101,13 +101,14 @@ boo#1207384: '20230211' boo#1207385: '20230211' boo#1207386: '20230211' - boo#1207390: '20230210' + boo#1207390: '20230211' boo#1207509: '20230126' boo#1207524: '20230125' boo#1207567: '20230125' boo#1207892: '20230211' boo#1207940: '20230211' boo#1207988: '20230207' + boo#1208170: '20230211' boo#12345: '20221004' boo#978027: '20230210' bsc#1161276: '20221027' @@ -211,11 +212,11 @@ poo#122557: '20230118' poo#122776: '20230110' poo#122809: '20230111' - poo#122926: '20230210' + poo#122926: '20230211' poo#123127: '20230211' poo#123577: '20230124' poo#123637: '20230126' - poo#123739: '20230210' + poo#123739: '20230211' poo#123763: '20230206' poo#123855: '20230131' poo#123918: '20230205' @@ -268,7 +269,7 @@ rebuildpacs-leafs = branding-openSUSE PackageKit-branding-openSUSE xfce4-brandin s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20230211 + 20230212 arch: x86_64 @@ -567,9 +568,9 @@ test_subproject: ToTest set_snapshot_number: True - failed: '20230211' -published: '20230210' -publishing: '20230210' + failed: '' +published: '20230211' +publishing: '20230211' testing: '20230211' diff --git a/packages/_/_project/_staging_workflow b/packages/_/_project/_staging_workflow index 2653ed7..30ce5e5 100644 --- a/packages/_/_project/_staging_workflow +++ b/packages/_/_project/_staging_workflow @@ -19,29 +19,17 @@ - - - - + + + - - - - - - - - - - - diff --git a/packages/a/ansible-lint/.files b/packages/a/ansible-lint/.files index 746808f..2f0c724 100644 Binary files a/packages/a/ansible-lint/.files and b/packages/a/ansible-lint/.files differ diff --git a/packages/a/ansible-lint/.rev b/packages/a/ansible-lint/.rev index ec7f084..c894730 100644 --- a/packages/a/ansible-lint/.rev +++ b/packages/a/ansible-lint/.rev @@ -137,4 +137,12 @@ Fixes the failing builds for ansible-lint (see SR#1006256) 1063491 + + a6a67a63c420919aff39df8b957d06dd + 6.12.2 + + dimstar_suse + + 1064482 + diff --git a/packages/a/ansible-lint/.servicemark b/packages/a/ansible-lint/.servicemark index f25410c..bbb7c75 100644 --- a/packages/a/ansible-lint/.servicemark +++ b/packages/a/ansible-lint/.servicemark @@ -1 +1 @@ -ab56f16fbd896574c5fc70e2c2fd9720 +4fcccae6f93af7e599614f9ab6eb1b8a diff --git a/packages/a/ansible-lint/ansible-lint-6.12.1.tar.gz b/packages/a/ansible-lint/ansible-lint-6.12.1.tar.gz deleted file mode 120000 index 0971f3a..0000000 --- a/packages/a/ansible-lint/ansible-lint-6.12.1.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeic3vusfpysipixzayntlsekzvbl6q3upv3ss6wpdwdgt64n4zpb3m \ No newline at end of file diff --git a/packages/a/ansible-lint/ansible-lint-6.12.2.tar.gz b/packages/a/ansible-lint/ansible-lint-6.12.2.tar.gz new file mode 120000 index 0000000..e9dd4c2 --- /dev/null +++ b/packages/a/ansible-lint/ansible-lint-6.12.2.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeibdfd2c5nr7w3mcqcv36qnyhpxmgchrznx6wbvw7mfcsmgk5zcydq \ No newline at end of file diff --git a/packages/a/ansible-lint/ansible-lint.changes b/packages/a/ansible-lint/ansible-lint.changes index d6271f7..50b051e 100644 --- a/packages/a/ansible-lint/ansible-lint.changes +++ b/packages/a/ansible-lint/ansible-lint.changes @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Sun Feb 12 07:15:09 UTC 2023 - Johannes Kastl + +- update to 6.12.2: + * Bugfixes + - Use XDG_CACHE_HOME instead of XDG_CONFIG_CACHE (#3009) @gangefors + - Adding galaxy[tag] check for required tags (#3006) @alisonlhart + - Fix playbook/rulebook detection (#3005) @apatard + - Improved documentation building (#3007) @ssbarnea + - Rename meta-unsupported-ansible to meta-runtime and correct its logic (#3000) @alisonlhart + - Avoid stack trace caused by bad filename matching pattern (#3001) @ssbarnea + - Embed ansible_compat in linter (#2994) @ssbarnea + - Bump cryptography to 39.0.1 (#2996) @ssbarnea + - Keep jinja2 leading spaces (#2993) @ssbarnea + - Add schema[moves] messages for moved plugins (#2992) @ssbarnea + - Updated galaxy rule imports and improved code coverage (#2985) @ajinkyau + +------------------------------------------------------------------- Sat Feb 4 12:29:03 UTC 2023 - Johannes Kastl - update to 6.12.1: diff --git a/packages/a/ansible-lint/ansible-lint.spec b/packages/a/ansible-lint/ansible-lint.spec index 300f39c..beba063 100644 --- a/packages/a/ansible-lint/ansible-lint.spec +++ b/packages/a/ansible-lint/ansible-lint.spec @@ -31,7 +31,7 @@ %global lib_name ansiblelint %{?python_enable_dependency_generator} Name: ansible-lint -Version: 6.12.1 +Version: 6.12.2 Release: 0%{?dist} Summary: Best practices checker for Ansible License: MIT diff --git a/packages/b/blasphemer/.files b/packages/b/blasphemer/.files index 1769183..9fdb3a5 100644 Binary files a/packages/b/blasphemer/.files and b/packages/b/blasphemer/.files differ diff --git a/packages/b/blasphemer/.rev b/packages/b/blasphemer/.rev index 7dbac0e..9aedb41 100644 --- a/packages/b/blasphemer/.rev +++ b/packages/b/blasphemer/.rev @@ -28,4 +28,12 @@ 935500 + + d0bf07936eb2b477733748f7579195ee + 0.1.8 + + dimstar_suse + + 1064694 + diff --git a/packages/b/blasphemer/blasphdm-0.1.8.zip b/packages/b/blasphemer/blasphdm-0.1.8.zip new file mode 120000 index 0000000..d44a2ce --- /dev/null +++ b/packages/b/blasphemer/blasphdm-0.1.8.zip @@ -0,0 +1 @@ +/ipfs/bafybeih7kxetq5c6p6egcc33ayuc2velmcpxpxsckeheaqicl2w5d2l7zy \ No newline at end of file diff --git a/packages/b/blasphemer/blasphem-0.1.7.zip b/packages/b/blasphemer/blasphem-0.1.7.zip deleted file mode 120000 index d21ade6..0000000 --- a/packages/b/blasphemer/blasphem-0.1.7.zip +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeig2yx5usgsj3ja242vr7qcirjle5xss73vyangxwztszobszinjoq \ No newline at end of file diff --git a/packages/b/blasphemer/blasphem-0.1.8.zip b/packages/b/blasphemer/blasphem-0.1.8.zip new file mode 120000 index 0000000..b9523ab --- /dev/null +++ b/packages/b/blasphemer/blasphem-0.1.8.zip @@ -0,0 +1 @@ +/ipfs/bafybeibgceaii5jii7ji3pzjpaxmt3uybv3fgteh2ttgc4hz3kmu4svem4 \ No newline at end of file diff --git a/packages/b/blasphemer/blasphemer.changes b/packages/b/blasphemer/blasphemer.changes index 040fcae..f86bca6 100644 --- a/packages/b/blasphemer/blasphemer.changes +++ b/packages/b/blasphemer/blasphemer.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Sun Feb 12 14:09:34 UTC 2023 - Jan Engelhardt + +- Update to release 0.1.8 + * Added Ghoul (Mummy), replacing the previous deer demon. + * Added Harpy (Imp), replacing the previous lost soul. + * Added Ogre (Maulotaurus). + * Added Morphed Eye (Chicken). + * Added Unknown (Lich), replacing Freedoom's cacodemon. + * Textures: added archways variations +- Added Deathmatch maps + +------------------------------------------------------------------- Sun Oct 31 10:03:03 UTC 2021 - Matthias Mailänder - Update to version 0.1.7 diff --git a/packages/b/blasphemer/blasphemer.spec b/packages/b/blasphemer/blasphemer.spec index 3784bc6..a6258e3 100644 --- a/packages/b/blasphemer/blasphemer.spec +++ b/packages/b/blasphemer/blasphemer.spec @@ -1,7 +1,7 @@ # # spec file for package blasphemer # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: blasphemer -Version: 0.1.7 +Version: 0.1.8 Release: 0 Summary: Replacement game files for Heretic game engines License: BSD-3-Clause Group: Amusements/Games/3D/Shoot URL: https://github.com/Blasphemer -#Old Url: https://code.google.com/archive/p/blasphemer/ Source: https://github.com/Blasphemer/blasphemer/releases/download/v%{version}/blasphem-%{version}.zip +Source2: https://github.com/Blasphemer/blasphemer/releases/download/v%{version}/blasphdm-%{version}.zip BuildArch: noarch BuildRequires: unzip @@ -33,16 +33,16 @@ Blasphemer aims to create a free content package for the Heretic engine, with a theme of metal-inspired dark fantasy. %prep -%setup -q -c %{name}-%{version} +%setup -Tcq -a0 -a2 %build # Game data files. Nothing to build! %install -install -Dpm0644 blasphem-%{version}.wad %{buildroot}%{_datadir}/doom/blasphem.wad +mkdir -p "%{buildroot}/%{_datadir}/doom" +cp -av *.wad "%{buildroot}/%{_datadir}/doom/" %files -%dir %{_datadir}/doom/ -%{_datadir}/doom/blasphem.wad +%{_datadir}/doom/ %changelog diff --git a/packages/d/dagger/.files b/packages/d/dagger/.files index a34c4f2..1840dca 100644 Binary files a/packages/d/dagger/.files and b/packages/d/dagger/.files differ diff --git a/packages/d/dagger/.rev b/packages/d/dagger/.rev index fc40ef2..2210fd4 100644 --- a/packages/d/dagger/.rev +++ b/packages/d/dagger/.rev @@ -215,4 +215,12 @@ 1061472 + + 0a7f539fda3ec4676cff40751d32444f + 0.3.12 + + dimstar_suse + + 1064470 + diff --git a/packages/d/dagger/.servicemark b/packages/d/dagger/.servicemark index e53a6ed..bf1f10b 100644 --- a/packages/d/dagger/.servicemark +++ b/packages/d/dagger/.servicemark @@ -1 +1 @@ -d8d409de6509d3142232d1157603f5c0 +83b4774447037648a9979d2667908db4 diff --git a/packages/d/dagger/_service b/packages/d/dagger/_service index 4b246ab..435bba5 100644 --- a/packages/d/dagger/_service +++ b/packages/d/dagger/_service @@ -3,7 +3,7 @@ https://github.com/dagger/dagger git .git - v0.3.10 + v0.3.12 @PARENT_TAG@ enable v(.*) @@ -17,6 +17,6 @@ gz - dagger-0.3.10.tar.gz + dagger-0.3.12.tar.gz diff --git a/packages/d/dagger/_servicedata b/packages/d/dagger/_servicedata index 86c6505..827e5bb 100644 --- a/packages/d/dagger/_servicedata +++ b/packages/d/dagger/_servicedata @@ -1,4 +1,4 @@ https://github.com/dagger/dagger - 51e04bd219bcd10cf4b08e24f9fa49d85da81fea \ No newline at end of file + e647a6f82310c2cce367c343aed7b999b04916cb \ No newline at end of file diff --git a/packages/d/dagger/dagger-0.3.10.tar.gz b/packages/d/dagger/dagger-0.3.10.tar.gz deleted file mode 120000 index c1787c7..0000000 --- a/packages/d/dagger/dagger-0.3.10.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeie4xukckbjeu6xdb6tg4fohxrfwi27dsyq2iqbpcgfjw5nwibchu4 \ No newline at end of file diff --git a/packages/d/dagger/dagger-0.3.12.tar.gz b/packages/d/dagger/dagger-0.3.12.tar.gz new file mode 120000 index 0000000..d6d6d71 --- /dev/null +++ b/packages/d/dagger/dagger-0.3.12.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeifb7dbf52zagsvzzfkiez7g6xjpvyrgqxg5u5kjcgodhbtlxgorwy \ No newline at end of file diff --git a/packages/d/dagger/dagger.changes b/packages/d/dagger/dagger.changes index d0dbbdc..71a3b1f 100644 --- a/packages/d/dagger/dagger.changes +++ b/packages/d/dagger/dagger.changes @@ -1,4 +1,49 @@ ------------------------------------------------------------------- +Fri Feb 10 06:25:05 UTC 2023 - kastl@b1-systems.de + +- Update to version 0.3.12: + * build(deps-dev): bump pytest-subprocess in /sdk/python (#4482) + * feat: implements registry auth on container (#4502) + * feat: implement cache sharing mode + add GraphQL enum type (#4437) + * Fix TestDirectoryWithTimestamps for non-ext4 filesystems (#4548) + * build(deps): bump typescript from 4.9.4 to 4.9.5 in /website (#4495) + * build(deps): bump sass from 1.57.1 to 1.58.0 in /website (#4510) + * build(deps): bump @docusaurus/preset-classic in /website (#4536) + * docs: Fix Rust,PHP syntax highlight and API response in GraphQL docs (#4533) + * build(deps): bump @docusaurus/theme-mermaid in /website (#4530) + * build(deps): bump @docusaurus/core from 2.3.0 to 2.3.1 in /website (#4529) + * build(deps-dev): bump @typescript-eslint/parser in /sdk/nodejs (#4494) + * Fix cache key examples in Go and Python SDKs (#4446) + * chore: fallback to existing engine with docker (#4489) + * This commit updates the sed command line in the (#4525) + * docs: Added platform clarification in Google Cloud + GitHub guide (#4526) + * docs: Updated quickstart example repository URL (#4527) + * add entrypoint to engine image (#4521) + * ci: Pass engine test job if otel-collector fails (#4512) + * build(deps-dev): bump @typescript-eslint/eslint-plugin in /sdk/nodejs (#4496) + * Generate strictly typed scalars to improve type safety (#4503) + * ci: Improve how we handle cached vertices (#4498) + * Adds minor fixes to quickstart (#4506) + * Add quickstart fixes (#4500) + * build(deps-dev): bump typescript from 4.9.4 to 4.9.5 in /sdk/nodejs (#4492) + * This commit upgrades Docusaurus to 2.3.0 and corrects (#4497) + * docs: Added quickstart guide (#4391) + * fix: Merge container from env vars with existing env vars (#4455) + * refactor: group common funcs into upper interface (#4415) + * build(deps-dev): bump eslint from 8.32.0 to 8.33.0 in /sdk/nodejs (#4481) + * website: remove amplitude (#4433) + * ci: Upload journal.log & comment.md as artifacts (#4487) + * engine: fix workdir verification on Windows (#4486) + * Fix session error handling (#4421) + * Remove PR comments for engine tests (#4478) + * build(deps): bump @docusaurus/theme-mermaid in /website (#4475) + * website: fix code tags css in dark mode (#4468) + * build(deps-dev): bump @typescript-eslint/eslint-plugin in /sdk/nodejs (#4430) + * ci: Collect traces & logs from pipeline runs and publish to Loki & Tempo (#4340) + * Fixed Node.js multibuild example (#4452) + * Fix container use in nodejs get started guide. (#4462) + +------------------------------------------------------------------- Fri Jan 27 06:08:27 UTC 2023 - kastl@b1-systems.de - Update to version 0.3.10: diff --git a/packages/d/dagger/dagger.spec b/packages/d/dagger/dagger.spec index 495c160..56e138b 100644 --- a/packages/d/dagger/dagger.spec +++ b/packages/d/dagger/dagger.spec @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: dagger -Version: 0.3.10 +Version: 0.3.12 Release: 0 Summary: A portable devkit for CI/CD pipelines License: GPL-3.0-only diff --git a/packages/d/dagger/vendor.tar.gz b/packages/d/dagger/vendor.tar.gz index df967f1..188ef74 120000 --- a/packages/d/dagger/vendor.tar.gz +++ b/packages/d/dagger/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeicqztqdyyi66ytdfm3js4ekime23wgktfgrnk3qoyhtckdbs7kec4 \ No newline at end of file +/ipfs/bafybeiac6tovct344n3o3x5js2f2qxvw2xjm756vnenzxszdtgdlswbqke \ No newline at end of file diff --git a/packages/g/gh/.files b/packages/g/gh/.files index 0ee4a47..bd3e1a9 100644 Binary files a/packages/g/gh/.files and b/packages/g/gh/.files differ diff --git a/packages/g/gh/.rev b/packages/g/gh/.rev index a21606a..2a0d731 100644 --- a/packages/g/gh/.rev +++ b/packages/g/gh/.rev @@ -279,4 +279,12 @@ Switched to tar_scm to pass auto review. 1062177 + + e3b825805148c7094e3e06547e4a524b + 2.23.0 + + dimstar_suse + + 1064494 + diff --git a/packages/g/gh/.servicemark b/packages/g/gh/.servicemark index 6868ebf..d35ede8 100644 --- a/packages/g/gh/.servicemark +++ b/packages/g/gh/.servicemark @@ -1 +1 @@ -37c5fc135a901ecf5a2ab025170f6dc0 +0e4952398a1029531843b31f7965a0f7 diff --git a/packages/g/gh/_service b/packages/g/gh/_service index 652b6e9..6036126 100644 --- a/packages/g/gh/_service +++ b/packages/g/gh/_service @@ -3,7 +3,7 @@ https://github.com/cli/cli git .git - v2.22.1 + v2.23.0 @PARENT_TAG@ disable v(.*) @@ -16,6 +16,6 @@ gz - cli-2.22.1.tar.gz + cli-2.23.0.tar.gz diff --git a/packages/g/gh/cli-2.22.1.tar.gz b/packages/g/gh/cli-2.22.1.tar.gz deleted file mode 120000 index bf02a09..0000000 --- a/packages/g/gh/cli-2.22.1.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiampfp26uqsl6iu2jpzgq22itwa2sppjf7swwh4t4o63przd3ycva \ No newline at end of file diff --git a/packages/g/gh/cli-2.23.0.tar.gz b/packages/g/gh/cli-2.23.0.tar.gz new file mode 120000 index 0000000..8e6897d --- /dev/null +++ b/packages/g/gh/cli-2.23.0.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeifwxjbghrpbwozwd4kbyycinyijm5e2kznii45hvkthzpcvv4r6pi \ No newline at end of file diff --git a/packages/g/gh/gh.changes b/packages/g/gh/gh.changes index 5ac2ccb..16773ed 100644 --- a/packages/g/gh/gh.changes +++ b/packages/g/gh/gh.changes @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Wed Feb 8 09:25:56 UTC 2023 - Pavel Dostál + +- Update to 2.23.0 + https://github.com/cli/cli/releases/tag/v2.23.0 + What's New + * repo fork: Add --default-branch-only flag by @jsoref in #6983 + * repo edit: Add visibility warning by @tuananhlai and @samcoe in #6980 + What's Changed + * secret set: Fix setting Codespaces user secrets by @joshmgross in #6923 + * secret set: Fix setting Dependabot org secrets by @samcoe in #6941 + * secret set: Fix multiline values when reading from .env file by @mislav in #6932 + * run: Fix integer overflow error when more than 255 run attempts by @samcoe in #6935 + * extension browse: Improve usability and accessibility by @vilmibm in #6584 + * issue/pr edit: Fix adding/removing projects using flags by @samcoe in #6955 + * codespace delete: Default to authenticated user by @luanzeba in #6944 + * codespace create: Default to using current repo by @rneatherway in #6596 + * repo set-default: Fix interactive mode not showing all remotes by @despreston in #6969 + * GH_DEBUG: Fix API logging corrupting response bodies by @mislav in #6976 + * Avoid implicitly fetching when adding a new git remote by @mislav in #6990 + * Sanitize ANSII control characters returned from the server by @samcoe in #6916, #6956 + * Disable gh update checker in our precompiled binaries by @mislav in #6977 + * Disallow update checker delaying the gh process by @mislav in #6978 + * Bump github.com/cli/oauth from 1.0.0 to 1.0.1 by @dependabot in #6948 + * Bump microsoft/setup-msbuild from 1.1.3 to 1.3.1 by @dependabot in #6973 + +------------------------------------------------------------------- Mon Jan 30 06:57:46 UTC 2023 - Pavel Dostál - Update to 2.22.1 diff --git a/packages/g/gh/gh.spec b/packages/g/gh/gh.spec index 505d7a2..ea9e493 100644 --- a/packages/g/gh/gh.spec +++ b/packages/g/gh/gh.spec @@ -19,7 +19,7 @@ %define goflags "-buildmode=pie -trimpath -mod=vendor -modcacherw" %define sname cli Name: gh -Version: 2.22.1 +Version: 2.23.0 Release: 0 Summary: The official CLI for GitHub License: MIT diff --git a/packages/g/gh/vendor.tar.gz b/packages/g/gh/vendor.tar.gz index 293ba2b..246dd5b 120000 --- a/packages/g/gh/vendor.tar.gz +++ b/packages/g/gh/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeig7jrlyw2okpbvfnwuhuotfsq7j736qb63vcs7hvahth3xwsyyxuq \ No newline at end of file +/ipfs/bafybeihzenhnsxdguilryzuerekjk5koz2v7vhy5xqmodwotkszxhpiiba \ No newline at end of file diff --git a/packages/g/glab/.files b/packages/g/glab/.files index f65034d..a299207 100644 Binary files a/packages/g/glab/.files and b/packages/g/glab/.files differ diff --git a/packages/g/glab/.rev b/packages/g/glab/.rev index 513eb16..4bb0483 100644 --- a/packages/g/glab/.rev +++ b/packages/g/glab/.rev @@ -23,4 +23,12 @@ 945471 + + 42d4f9bc316a93394d0ee64a52a8ae9a + 1.25.3 + + dimstar_suse + + 1064493 + diff --git a/packages/g/glab/.servicemark b/packages/g/glab/.servicemark index f623d09..6430548 100644 --- a/packages/g/glab/.servicemark +++ b/packages/g/glab/.servicemark @@ -1 +1 @@ -8efceaf43b91ab2ae8f85f3488b4e4cb +a41ae8b3a4f714bbe994a8b441825c90 diff --git a/packages/g/glab/_service b/packages/g/glab/_service index 4df1d2c..5396892 100644 --- a/packages/g/glab/_service +++ b/packages/g/glab/_service @@ -1,8 +1,8 @@ - https://github.com/profclems/glab.git + https://gitlab.com/gitlab-org/cli.git git - v1.22.0 + v1.25.3 @PARENT_TAG@ v(.*) glab @@ -11,7 +11,10 @@ *.tar - xz + gz + + glab-1.25.3.tar.gz + diff --git a/packages/g/glab/_servicedata b/packages/g/glab/_servicedata index 13126bd..df3ed74 100644 --- a/packages/g/glab/_servicedata +++ b/packages/g/glab/_servicedata @@ -1,4 +1,6 @@ https://github.com/profclems/glab.git - 612ff864276e848c4cfdef187b5f16f5c52f3c25 \ No newline at end of file + 612ff864276e848c4cfdef187b5f16f5c52f3c25 + https://gitlab.com/gitlab-org/cli.git + 7ab3ef14820c565a9430fa0da58a491048699638 \ No newline at end of file diff --git a/packages/g/glab/glab-1.22.0.tar.xz b/packages/g/glab/glab-1.22.0.tar.xz deleted file mode 120000 index 1ac7393..0000000 --- a/packages/g/glab/glab-1.22.0.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeic44xbque322p33574rovssc3s3h3gxfickpjedm37umkobglbhv4 \ No newline at end of file diff --git a/packages/g/glab/glab-1.25.3.tar.gz b/packages/g/glab/glab-1.25.3.tar.gz new file mode 120000 index 0000000..7f27230 --- /dev/null +++ b/packages/g/glab/glab-1.25.3.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeifxnxxetjtskcdzqn2ac4wxgm3y3wmn3eybpi73nuq22k63gonfhq \ No newline at end of file diff --git a/packages/g/glab/glab-vendor.tar.xz b/packages/g/glab/glab-vendor.tar.xz deleted file mode 120000 index af2cf13..0000000 --- a/packages/g/glab/glab-vendor.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeidlkftqq3hebxofedls6fp7r7ihvn72ftocoujvbrxunpjxojtrtq \ No newline at end of file diff --git a/packages/g/glab/glab.changes b/packages/g/glab/glab.changes index 7b3f14d..f622b16 100644 --- a/packages/g/glab/glab.changes +++ b/packages/g/glab/glab.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Feb 07 14:07:31 UTC 2023 - pdostal@suse.com + +- Update to version 1.25.3: + * Update .gitlab-ci.yml file + * Update .gitlab-ci.yml file + * chore: better omit test and chores from changelog + * fix: Adding git name/email for homebrew + * docs: update installation instructions for windows + * test(project): add missing project tests + * fix(project): fixes issue with filtering with starred and membership + * fix(mr): Fixed EOF error when todo is called multiple times + +------------------------------------------------------------------- Tue Jan 11 02:28:38 UTC 2022 - Orville Q. Song - Update to version 1.22.0: diff --git a/packages/g/glab/glab.spec b/packages/g/glab/glab.spec index 575a37d..d8726e4 100644 --- a/packages/g/glab/glab.spec +++ b/packages/g/glab/glab.spec @@ -1,7 +1,7 @@ # # spec file for package glab # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2021-2022 Orville Q. Song # # All modifications and additions to the file contributed by third parties @@ -27,14 +27,14 @@ %global import_path %{provider_prefix}/%{repo} Name: glab -Version: 1.22.0 +Version: 1.25.3 Release: 0 Summary: An open-source GitLab command line tool License: MIT Group: Development/Tools/Other URL: https://github.com/profclems/glab -Source0: %{name}-%{version}.tar.xz -Source1: %{name}-vendor.tar.xz +Source0: %{name}-%{version}.tar.gz +Source1: vendor.tar.gz BuildRequires: %{python_module Sphinx} BuildRequires: golang-packaging BuildRequires: golang(API) >= 1.16 diff --git a/packages/g/glab/vendor.tar.gz b/packages/g/glab/vendor.tar.gz new file mode 120000 index 0000000..a1e77d9 --- /dev/null +++ b/packages/g/glab/vendor.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeigegffmxzeqcigiem3xokhmyooxdfilnfk4m7hiavs36kwc4rxm7i \ No newline at end of file diff --git a/packages/g/gnuhealth-client/.files b/packages/g/gnuhealth-client/.files index 381e2d9..eed1351 100644 Binary files a/packages/g/gnuhealth-client/.files and b/packages/g/gnuhealth-client/.files differ diff --git a/packages/g/gnuhealth-client/.rev b/packages/g/gnuhealth-client/.rev index 04eaebd..341ae1c 100644 --- a/packages/g/gnuhealth-client/.rev +++ b/packages/g/gnuhealth-client/.rev @@ -201,4 +201,72 @@ bugfix version 1043011 + + 5a2fc555a5c9097dfeb9eda4cf28ba36 + 4.2.0 + + dimstar_suse + - verion 4.2.0 + * Instance and connection information visible at the GTK client title + * Add GNUHEalth scalable icon - svg - for desktop menu and panel entries + * see Changelog for full description + * separate gnuhalth-client.desktop file removed +- version 4.0.1 + * various bug fixes, see changelog + * plugins adapted and renamed for 4.0 + +- version 4.0.0 + * based on Tryton 6.0 + * for details see CHANGELOG +- add upstream signing key and verify source signature +- python_dependency_generator removed (misses dependencies....) +- version 3.8.1 + spec-file updated to use new python macros +- remove __pycache__ from plugins (boo#1178453) +- version 3.6.9 + various bugfixes (including boo#1170553) +- version 3.6.8 + * Removed the deprecated App Menu in favor of the Menu Bar. + * Migrate from obsolete Table to Grid + * Fix the footer + * Include accelerator for preferences (ctrl+shift+p) and fix + accelerator for shortcuts (ctrl+shift+F1) + * Avoid maximizing application at startup + * Remove unused fast tabbing option from menu + * Allow setting the GH command line on the bottom again (cli_position = + bottom). By default is top. +- version 3.6.6 + * Fix bug #57682: GTK Client - CLI is activated when pressing Shift+Z + * Add GNU Health shortcuts to the help window +- update frl plugin to 3.6.1 +- version 3.6.5: Fix variable name to values +- version 3.6.4 #57371 Error when assigning a health professional on the work schedule +- version 3.6.3 - various performance improvements +- version 3.6.2 - various bugfixes +- version 3.6.0 +- camera.diff added + plugins changed from *latest* to version 3.4.x +- plugin_frl updated to version 3.4.1 +- version 3.4.4 - Security fix boo#1131707 +- link to python2-GooCalendar (remains python2) boo#1131096 +- Version 3.4.3 + * Fix bug #55458: Command line gets activated with shift Z + * many bugfixes from tryton client +- version 3.4.2 with many bugfixes +- New client for the GNU Health 3.4 series based on Tryton 4.6 series + * Enhanced support for Calendar and WebDAV system + * Native client has a command line interface + * Over 30 new commands for the main daily tasks + * Enhanced GNU Health camera plugin, including zoom + * gnuhealth_crypto.patch replaced by plugin + * Activity Log window on the client + * SYSINFO command to retrieve the information about client and server + * Customize the banner on the client +- Bugfix Release 3.2.6 +- Add emptly build phase to silence rpmlint +- Drop python-rsvg require, the code does not include it +- GNU Health client - initial version 3.2.5 + + 1064690 + diff --git a/packages/g/gnuhealth-client/.servicemark b/packages/g/gnuhealth-client/.servicemark index b4ecd24..7a3b41b 100644 --- a/packages/g/gnuhealth-client/.servicemark +++ b/packages/g/gnuhealth-client/.servicemark @@ -1 +1 @@ -adb3e4087a971e8c4e9ec7cb3f6ce406 +e7c841a6386a09b1cafce8f873c7a41b diff --git a/packages/g/gnuhealth-client/gnuhealth-client-4.0.2.tar.gz b/packages/g/gnuhealth-client/gnuhealth-client-4.0.2.tar.gz deleted file mode 120000 index aa4d95b..0000000 --- a/packages/g/gnuhealth-client/gnuhealth-client-4.0.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeifsxckqfctmtzibqkk4tfanikantuubei7ydcwywtncok26zqiqla \ No newline at end of file diff --git a/packages/g/gnuhealth-client/gnuhealth-client-4.0.2.tar.gz.sig b/packages/g/gnuhealth-client/gnuhealth-client-4.0.2.tar.gz.sig deleted file mode 100644 index a80e932..0000000 Binary files a/packages/g/gnuhealth-client/gnuhealth-client-4.0.2.tar.gz.sig and /dev/null differ diff --git a/packages/g/gnuhealth-client/gnuhealth-client-4.2.0.tar.gz b/packages/g/gnuhealth-client/gnuhealth-client-4.2.0.tar.gz new file mode 120000 index 0000000..15bb73f --- /dev/null +++ b/packages/g/gnuhealth-client/gnuhealth-client-4.2.0.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeicxg7d623ufhnxc3rtijrzvr3zdrueygi4uzeht2ct5dh2iapeef4 \ No newline at end of file diff --git a/packages/g/gnuhealth-client/gnuhealth-client-4.2.0.tar.gz.sig b/packages/g/gnuhealth-client/gnuhealth-client-4.2.0.tar.gz.sig new file mode 100644 index 0000000..9abc287 Binary files /dev/null and b/packages/g/gnuhealth-client/gnuhealth-client-4.2.0.tar.gz.sig differ diff --git a/packages/g/gnuhealth-client/gnuhealth-client.changes b/packages/g/gnuhealth-client/gnuhealth-client.changes index 95b55a3..3e6fd91 100644 --- a/packages/g/gnuhealth-client/gnuhealth-client.changes +++ b/packages/g/gnuhealth-client/gnuhealth-client.changes @@ -1,21 +1,11 @@ ------------------------------------------------------------------- -Wed Dec 14 22:37:03 UTC 2022 - Axel Braun +Sun Feb 12 13:42:59 UTC 2023 - Axel Braun -- version 4.0.2 - * Fix bug #63518: TypeError: unhashable type: 'dict' - * bug #62849: Top Diseases report crashes on DemoServer - * Implement REUSE Initiative on GTK Client. - * Apply various Tryton client patches - -------------------------------------------------------------------- -Wed Oct 12 10:48:25 UTC 2022 - Axel Braun - -- explicit dependency on pydot and graphviz removed (maintainer error) - -------------------------------------------------------------------- -Tue Oct 11 14:20:00 UTC 2022 - Axel Braun - -- explicit dependency on pydot and graphviz added +- verion 4.2.0 + * Instance and connection information visible at the GTK client title + * Add GNUHEalth scalable icon - svg - for desktop menu and panel entries + * see Changelog for full description + * separate gnuhalth-client.desktop file removed ------------------------------------------------------------------- Thu Jun 16 19:58:10 UTC 2022 - Axel Braun diff --git a/packages/g/gnuhealth-client/gnuhealth-client.desktop b/packages/g/gnuhealth-client/gnuhealth-client.desktop deleted file mode 100644 index 7196ced..0000000 --- a/packages/g/gnuhealth-client/gnuhealth-client.desktop +++ /dev/null @@ -1,30 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=GNU Health -GenericName=GNU Health client -GenericName[ca_ES]=Client per l'aplicació GNU Health -GenericName[de]=Client für die GNU Health Applikationsplattform -GenericName[es_AR]=Cliente para la aplicación GNU Health -GenericName[es_EC]=Cliente para la aplicación GNU Health -GenericName[es_ES]=Cliente para la aplicación GNU Health -GenericName[es_CO]=Cliente para la Aplicación GNU Health -GenericName[fr]=Client de la plate-forme applicative GNU Health -GenericName[ru]=Клиент для платформы приложений GNU Health -GenericName[sl]=Odjemalec za GNU Health programsko platformo -Comment=Access GNU Health server -Comment[de]=Verbindet zu einem GNU Health Server -Comment[es_AR]=Acceso al servidor GNU Health -Comment[es_EC]=Acceso al servidor GNU Health -Comment[ca_ES]=Accés al servidor GNU Health -Comment[es_ES]=Acceso al servidor GNU Health -Comment[es_CO]=Acceso al servidor GNU Health -Comment[fr]=Accéder au serveur GNU Health -Comment[ru]=Подключение к серверу GNU Health -Comment[sl]=Dostop do GNU Health strežnika -Keywords=Healthcare;Medicine;Bioinformatics;Management;Enterprise;ERP;Framework;Client; -Exec=gnuhealth-client %u -Icon=gnuhealth -Terminal=false -MimeType=application/tryton; -Categories=Office;Finance; diff --git a/packages/g/gnuhealth-client/gnuhealth-client.spec b/packages/g/gnuhealth-client/gnuhealth-client.spec index 2c64d1c..b51ad2b 100644 --- a/packages/g/gnuhealth-client/gnuhealth-client.spec +++ b/packages/g/gnuhealth-client/gnuhealth-client.spec @@ -17,21 +17,21 @@ # -%define majorver 4.0 +%define majorver 4.2 Name: gnuhealth-client -Version: %{majorver}.2 +Version: %{majorver}.0 Release: 0 Summary: The client of the GNU Health Hospital system License: GPL-3.0-only Group: Productivity/Office/Management URL: http://health.gnu.org/ Source: https://ftp.gnu.org/pub/gnu/health/%{name}-%{version}.tar.gz -##Source: %{name}-%{version}.tar.gz -##urce1: %{name}-plugins-%{version}.tar.gz +## Source: %{name}-%{version}.tar.gz +## urce1: %{name}-plugins-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_camera-latest.tar.gz Source2: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_crypto-latest.tar.gz Source3: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_frl-latest.tar.gz -Source4: %{name}.desktop + Source5: https://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz.sig Source6: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring @@ -72,7 +72,6 @@ The client of the GNU Health Hospital application %prep %setup -q -### cp %{SOURCE4} . pwd cd gnuhealth/plugins diff --git a/packages/g/gnuhealth-client/gnuhealth_plugin_camera-latest.tar.gz b/packages/g/gnuhealth-client/gnuhealth_plugin_camera-latest.tar.gz index 2373c9b..e40dacc 120000 --- a/packages/g/gnuhealth-client/gnuhealth_plugin_camera-latest.tar.gz +++ b/packages/g/gnuhealth-client/gnuhealth_plugin_camera-latest.tar.gz @@ -1 +1 @@ -/ipfs/bafkreihrtd5pwtcoeyyn3ac5w7rypzkdjzxeoai7epafaeydgbn4c2rbva \ No newline at end of file +/ipfs/bafkreifh4bi2xqc4fbmj655npz7zplct66ima5sdkeuikv6za5cotc6szq \ No newline at end of file diff --git a/packages/g/gnuhealth-client/gnuhealth_plugin_crypto-latest.tar.gz b/packages/g/gnuhealth-client/gnuhealth_plugin_crypto-latest.tar.gz index 1fc0d80..fb746cf 120000 --- a/packages/g/gnuhealth-client/gnuhealth_plugin_crypto-latest.tar.gz +++ b/packages/g/gnuhealth-client/gnuhealth_plugin_crypto-latest.tar.gz @@ -1 +1 @@ -/ipfs/bafkreihlj4vqu4vxrsiqlseysndvnnltwmlbrxtb3q4d5swo2go4yavjdy \ No newline at end of file +/ipfs/bafkreial362hwouifiof2sgutzr6f536ebucs5ekiauc26jic322ojeetu \ No newline at end of file diff --git a/packages/g/gnuhealth-client/gnuhealth_plugin_frl-latest.tar.gz b/packages/g/gnuhealth-client/gnuhealth_plugin_frl-latest.tar.gz index 4fed961..1ef6ccd 120000 --- a/packages/g/gnuhealth-client/gnuhealth_plugin_frl-latest.tar.gz +++ b/packages/g/gnuhealth-client/gnuhealth_plugin_frl-latest.tar.gz @@ -1 +1 @@ -/ipfs/bafkreiax2tj2j2gmoptx5gfkuogqholmsnuh767uefxdptoymz5jefkfum \ No newline at end of file +/ipfs/bafkreifjj5iqg5t6ewjlwnaw2eegd4sochfvvqg2ikuu27gfta7pciagg4 \ No newline at end of file diff --git a/packages/g/gnuhealth/.files b/packages/g/gnuhealth/.files index ed97fd8..c58f408 100644 Binary files a/packages/g/gnuhealth/.files and b/packages/g/gnuhealth/.files differ diff --git a/packages/g/gnuhealth/.rev b/packages/g/gnuhealth/.rev index b11979a..eaeb03a 100644 --- a/packages/g/gnuhealth/.rev +++ b/packages/g/gnuhealth/.rev @@ -491,4 +491,12 @@ bugfix version 1057157 + + 6088180bb022b956487f22b36f8513e3 + 4.2.0 + + dimstar_suse + + 1064677 + diff --git a/packages/g/gnuhealth/.servicemark b/packages/g/gnuhealth/.servicemark index a1b0cf1..2f7dd1b 100644 --- a/packages/g/gnuhealth/.servicemark +++ b/packages/g/gnuhealth/.servicemark @@ -1 +1 @@ -831fe143b4e83e4fd290972462be56c4 +ec7dda0035140d0b89edbf1e75ab6e49 diff --git a/packages/g/gnuhealth/gnuhealth-4.0.5.tar.gz b/packages/g/gnuhealth/gnuhealth-4.0.5.tar.gz deleted file mode 120000 index 32b6163..0000000 --- a/packages/g/gnuhealth/gnuhealth-4.0.5.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeic3raqmymwabsnscbslther4xi7eiye5ktfngson6s3vk44jwaomm \ No newline at end of file diff --git a/packages/g/gnuhealth/gnuhealth-4.0.5.tar.gz.sig b/packages/g/gnuhealth/gnuhealth-4.0.5.tar.gz.sig deleted file mode 100644 index 8326329..0000000 Binary files a/packages/g/gnuhealth/gnuhealth-4.0.5.tar.gz.sig and /dev/null differ diff --git a/packages/g/gnuhealth/gnuhealth-4.2.0.tar.gz b/packages/g/gnuhealth/gnuhealth-4.2.0.tar.gz new file mode 120000 index 0000000..c571255 --- /dev/null +++ b/packages/g/gnuhealth/gnuhealth-4.2.0.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeif2uvilnppaoltbbz4hqc2vs4m3rme3vxya7vyjsqjdnh5ymvggoi \ No newline at end of file diff --git a/packages/g/gnuhealth/gnuhealth-4.2.0.tar.gz.sig b/packages/g/gnuhealth/gnuhealth-4.2.0.tar.gz.sig new file mode 100644 index 0000000..d863655 Binary files /dev/null and b/packages/g/gnuhealth/gnuhealth-4.2.0.tar.gz.sig differ diff --git a/packages/g/gnuhealth/gnuhealth.changes b/packages/g/gnuhealth/gnuhealth.changes index 6537bfb..db009a5 100644 --- a/packages/g/gnuhealth/gnuhealth.changes +++ b/packages/g/gnuhealth/gnuhealth.changes @@ -1,15 +1,24 @@ ------------------------------------------------------------------- -Mon Jan 9 19:36:41 UTC 2023 - Axel Braun - -- Version 4.0.5 - * health_crypto: Fix bug #63558: Fault: 'NoneType' object has no attribute 'name' - * Fix bug #63557: Missing view architecture for ('calendar.category', None, 'tree') - * Fix bug #63533: Model 'gnuhealth.pol' is missing a default access - * Fix bug #63532: health_caldav misses requiremnt vobject in setup.py - * Fix bug #63517: Fault: 'webdav' is not in list - * Fix bug #62777: The term health prof used for both initiating and signing professional in patient evaluation - * Fix bug #62634: Missing Spanish Translations - +Sun Feb 12 13:38:44 UTC 2023 - Axel Braun + +- version 4.2.0 + * Enhanced Medical Imaging functionality and ergonomics. + * Introduced GNU Health "Focus on" section on patient main form. + * Surgery package has been vastly revised and enhanced in collaboration + with our colleagues from Cirugia Solidaria + * Enhanced Insurance and billing functionality. + * The Vital Record System (VRS) can now issue reports on birth and + death certificates. + * Demographics can now accept entering estimate age / DoB. + * Health services has now the functionality of "grouping" all the tests + from a single order - lab and medical imaging. + * Improved Patient encounter / evaluation. + * Weblate translations holds 35 languages + * On the technical side, we have improved unit testing on each package, + speedup load times on large datafiles and using python-sql for most + queries. + * GNU Health is now REUSE (Free Software Foundation Europe) compliant. + ------------------------------------------------------------------- Thu Jun 16 15:37:00 UTC 2022 - Axel Braun diff --git a/packages/g/gnuhealth/gnuhealth.spec b/packages/g/gnuhealth/gnuhealth.spec index a10aa8f..e3ef883 100644 --- a/packages/g/gnuhealth/gnuhealth.spec +++ b/packages/g/gnuhealth/gnuhealth.spec @@ -1,7 +1,7 @@ # # spec file for package gnuhealth # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2014-2023 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties @@ -17,15 +17,15 @@ # -%bcond_with tests 0 +%bcond_with tests 1 %define skip_python2 1 %define t_version %(rpm -q --qf '%%{VERSION}' trytond) -%define majorver 4.0 +%define majorver 4.2 Name: gnuhealth -Version: %{majorver}.5 +Version: %{majorver}.0 Release: 0 URL: https://health.gnu.org Summary: A Health and Hospital Information System @@ -143,10 +143,10 @@ mkdir -p -m 755 %{buildroot}%{_bindir} install -p -m 755 gnuhealth-control %{buildroot}%{_bindir}/gnuhealth-control install -p -m 755 %{S:5} %{buildroot}%{_bindir}/openSUSE-gnuhealth-setup install -p -m 755 %{S:6} %{buildroot}%{_bindir}/gnuhealth -install -p -m 755 scripts/demo/install_demo_database.sh %{buildroot}%{_bindir}/install_demo_database.sh +install -p -m 755 scripts/demodb/install_demo_database.sh %{buildroot}%{_bindir}/install_demo_database.sh #delete empty demo directory -rm -rf scripts/demo +rm -rf scripts/demodb mkdir -p %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service @@ -155,12 +155,12 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-webdav@.service mkdir -p %{buildroot}%{_sysconfdir}/tryton #remove double license file: -rm backend/fhir/client/COPYING +## rm backend/fhir/client/COPYING #Move FHIR server to examples directory mkdir -p -m 755 %{buildroot}%{_docdir}/%{name}/examples/ -mv backend/fhir* %{buildroot}%{_docdir}/%{name}/examples/. -rmdir backend +mv doc/* %{buildroot}%{_docdir}/%{name}/examples/. +rmdir doc %python_expand %fdupes %{buildroot}%{$python_sitelib} @@ -220,10 +220,10 @@ EOF %{_bindir}/install_demo_database.sh %{_unitdir}/%{name}.service %{_unitdir}/%{name}-webdav@.service -%doc README Changelog gnuhealth-setup version gnuhealthrc GNUHealth.README.openSUSE scripts/* config/* doc/* +%doc README.rst Changelog gnuhealth-setup version gnuhealthrc GNUHealth.README.openSUSE scripts/* config/* %{_docdir}/%{name}/examples* %dir %{_sysconfdir}/tryton -%license COPYING +%license COPYING LICENSES/* %exclude %{python3_sitelib}/%{name}_orthanc* %exclude %{python3_sitelib}/trytond/modules/health_orthanc* %{python3_sitelib}/* diff --git a/packages/g/gnuhealth/shebang.diff b/packages/g/gnuhealth/shebang.diff index 55d1099..7f685e1 100644 --- a/packages/g/gnuhealth/shebang.diff +++ b/packages/g/gnuhealth/shebang.diff @@ -1,477 +1,618 @@ -diff -U 3 -dHrN -- a/backend/fhir/client/fhir.py b/backend/fhir/client/fhir.py ---- a/backend/fhir/client/fhir.py 2022-01-10 12:54:29.000000000 +0100 -+++ b/backend/fhir/client/fhir.py 2022-06-16 17:53:22.160972105 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - ############################################################################## +diff -U 3 -dHrN -- a/doc/samples/interfaces/demographics/patient_uploader.py b/doc/samples/interfaces/demographics/patient_uploader.py +--- a/doc/samples/interfaces/demographics/patient_uploader.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/doc/samples/interfaces/demographics/patient_uploader.py 2023-02-01 11:11:15.398276981 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario + # +diff -U 3 -dHrN -- a/doc/samples/interfaces/federation/gh_queue_manager.py b/doc/samples/interfaces/federation/gh_queue_manager.py +--- a/doc/samples/interfaces/federation/gh_queue_manager.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/doc/samples/interfaces/federation/gh_queue_manager.py 2023-02-01 11:11:15.398276981 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario + # +diff -U 3 -dHrN -- a/doc/samples/interfaces/lab/gnuhealth_csv_lab_interface.py b/doc/samples/interfaces/lab/gnuhealth_csv_lab_interface.py +--- a/doc/samples/interfaces/lab/gnuhealth_csv_lab_interface.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/doc/samples/interfaces/lab/gnuhealth_csv_lab_interface.py 2023-02-01 11:11:15.402276971 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario + # +diff -U 3 -dHrN -- a/doc/samples/interfaces/products/gnuhealth_product_uploader.py b/doc/samples/interfaces/products/gnuhealth_product_uploader.py +--- a/doc/samples/interfaces/products/gnuhealth_product_uploader.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/doc/samples/interfaces/products/gnuhealth_product_uploader.py 2023-02-01 11:11:15.402276971 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario # -diff -U 3 -dHrN -- a/backend/fhir/client/setup.py b/backend/fhir/client/setup.py ---- a/backend/fhir/client/setup.py 2022-06-14 13:50:24.000000000 +0200 -+++ b/backend/fhir/client/setup.py 2022-06-16 17:53:22.168972114 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2014-2017 Luis Falcon - # Copyright (C) 2014-2017 GNU Solidario diff -U 3 -dHrN -- a/health/setup.py b/health/setup.py ---- a/health/setup.py 2022-06-14 13:50:24.000000000 +0200 -+++ b/health/setup.py 2022-06-16 17:53:22.944972976 +0200 -@@ -1,4 +1,4 @@ +--- a/health/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health/setup.py 2023-02-01 11:11:15.422276914 +0100 +@@ -12,7 +12,7 @@ + # HEALTH package # + # setup.py: Setuptools file # + ######################################################################### -#!/usr/bin/env python +#!/usr/bin/python3 - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario - # Copyright (C) 2011 Cédric Krier + + from setuptools import setup + import re diff -U 3 -dHrN -- a/health_archives/setup.py b/health_archives/setup.py ---- a/health_archives/setup.py 2022-06-14 13:50:24.000000000 +0200 -+++ b/health_archives/setup.py 2022-06-16 17:53:22.964972998 +0200 -@@ -1,4 +1,4 @@ +--- a/health_archives/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_archives/setup.py 2023-02-01 11:11:15.434276879 +0100 +@@ -12,7 +12,7 @@ + # HEALTH ARCHIVES package # + # setup.py: Setuptools file # + ######################################################################### -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2008-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + + from setuptools import setup + import re diff -U 3 -dHrN -- a/health_caldav/setup.py b/health_caldav/setup.py ---- a/health_caldav/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_caldav/setup.py 2022-06-16 17:53:23.008973047 +0200 +--- a/health_caldav/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_caldav/setup.py 2023-02-01 11:11:15.446276845 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - from setuptools import setup - import re -diff -U 3 -dHrN -- a/health_caldav/tests/scenario_calendar.py b/health_caldav/tests/scenario_calendar.py ---- a/health_caldav/tests/scenario_calendar.py 2022-01-10 12:54:31.000000000 +0100 -+++ b/health_caldav/tests/scenario_calendar.py 2022-06-16 17:53:22.976973011 +0200 + # SPDX-FileCopyrightText: 2009-2013 Bertrand Chenal + # SPDX-FileCopyrightText: 2009-2016 B2CK +diff -U 3 -dHrN -- a/health_caldav/tests/scenario_health_caldav.py b/health_caldav/tests/scenario_health_caldav.py +--- a/health_caldav/tests/scenario_health_caldav.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_caldav/tests/scenario_health_caldav.py 2023-02-01 11:11:15.450276833 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # This file is part of Tryton. The COPYRIGHT file at the top level of - # this repository contains the full copyright notices and license terms. - from argparse import ArgumentParser + + # SPDX-FileCopyrightText: 2009-2013 Bertrand Chenal + # SPDX-FileCopyrightText: 2009-2016 B2CK diff -U 3 -dHrN -- a/health_calendar/setup.py b/health_calendar/setup.py ---- a/health_calendar/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_calendar/setup.py 2022-06-16 17:53:23.048973092 +0200 +--- a/health_calendar/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_calendar/setup.py 2023-02-01 11:11:15.458276810 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier - + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario + # diff -U 3 -dHrN -- a/health_contact_tracing/setup.py b/health_contact_tracing/setup.py ---- a/health_contact_tracing/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_contact_tracing/setup.py 2022-06-16 17:53:23.060973104 +0200 +--- a/health_contact_tracing/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_contact_tracing/setup.py 2023-02-01 11:11:15.466276788 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2008-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario + # SPDX-FileCopyrightText: 2011 Cédric Krier diff -U 3 -dHrN -- a/health_crypto/setup.py b/health_crypto/setup.py ---- a/health_crypto/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_crypto/setup.py 2022-06-16 17:53:23.068973113 +0200 +--- a/health_crypto/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_crypto/setup.py 2023-02-01 11:11:15.478276753 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2008-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_crypto_lab/setup.py b/health_crypto_lab/setup.py ---- a/health_crypto_lab/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_crypto_lab/setup.py 2022-06-16 17:53:23.076973122 +0200 +--- a/health_crypto_lab/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_crypto_lab/setup.py 2023-02-01 11:11:15.490276719 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_dentistry/setup.py b/health_dentistry/setup.py ---- a/health_dentistry/setup.py 2022-06-14 13:56:57.000000000 +0200 -+++ b/health_dentistry/setup.py 2022-06-16 17:53:23.092973140 +0200 +--- a/health_dentistry/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_dentistry/setup.py 2023-02-01 11:11:15.510276662 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_disability/setup.py b/health_disability/setup.py ---- a/health_disability/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_disability/setup.py 2022-06-16 17:53:23.096973145 +0200 +--- a/health_disability/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_disability/setup.py 2023-02-01 11:11:15.526276617 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_ems/setup.py b/health_ems/setup.py ---- a/health_ems/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_ems/setup.py 2022-06-16 17:53:23.100973149 +0200 +--- a/health_ems/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ems/setup.py 2023-02-01 11:11:15.534276594 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_federation/setup.py b/health_federation/setup.py ---- a/health_federation/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_federation/setup.py 2022-06-16 17:53:23.108973158 +0200 +--- a/health_federation/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_federation/setup.py 2023-02-01 11:11:15.546276560 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_genetics/setup.py b/health_genetics/setup.py ---- a/health_genetics/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_genetics/setup.py 2022-06-16 17:53:23.116973166 +0200 +--- a/health_genetics/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_genetics/setup.py 2023-02-01 11:11:15.550276548 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_genetics_uniprot/setup.py b/health_genetics_uniprot/setup.py ---- a/health_genetics_uniprot/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_genetics_uniprot/setup.py 2022-06-16 17:53:23.120973171 +0200 +--- a/health_genetics_uniprot/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_genetics_uniprot/setup.py 2023-02-01 11:11:15.558276526 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_gyneco/setup.py b/health_gyneco/setup.py ---- a/health_gyneco/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_gyneco/setup.py 2022-06-16 17:53:23.124973175 +0200 +--- a/health_gyneco/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_gyneco/setup.py 2023-02-01 11:11:15.566276503 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_history/setup.py b/health_history/setup.py ---- a/health_history/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_history/setup.py 2022-06-16 17:53:23.132973184 +0200 +--- a/health_history/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_history/setup.py 2023-02-01 11:11:15.578276469 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_icd10/setup.py b/health_icd10/setup.py ---- a/health_icd10/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_icd10/setup.py 2022-06-16 17:53:23.144973198 +0200 +--- a/health_icd10/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_icd10/setup.py 2023-02-01 11:11:15.594276423 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_icd10pcs/setup.py b/health_icd10pcs/setup.py ---- a/health_icd10pcs/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_icd10pcs/setup.py 2022-06-16 17:53:23.148973202 +0200 +--- a/health_icd10pcs/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_icd10pcs/setup.py 2023-02-01 11:11:15.602276399 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_icd11/setup.py b/health_icd11/setup.py ---- a/health_icd11/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_icd11/setup.py 2022-06-16 17:53:23.152973207 +0200 +--- a/health_icd11/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_icd11/setup.py 2023-02-01 11:11:15.606276389 +0100 @@ -1,4 +1,4 @@ --#!/usr/bin/env python3 +-#!/usr/bin/env python +#!/usr/bin/python3 - # Copyright (C) 2020 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_icd9procs/setup.py b/health_icd9procs/setup.py ---- a/health_icd9procs/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_icd9procs/setup.py 2022-06-16 17:53:23.136973189 +0200 +--- a/health_icd9procs/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_icd9procs/setup.py 2023-02-01 11:11:15.582276456 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_icpm/setup.py b/health_icpm/setup.py ---- a/health_icpm/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_icpm/setup.py 2022-06-16 17:53:23.160973216 +0200 +--- a/health_icpm/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_icpm/setup.py 2023-02-01 11:11:15.614276366 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_icu/health_icu.py b/health_icu/health_icu.py +--- a/health_icu/health_icu.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_icu/health_icu.py 2023-02-01 11:11:15.622276342 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_icu/setup.py b/health_icu/setup.py ---- a/health_icu/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_icu/setup.py 2022-06-16 17:53:23.164973220 +0200 +--- a/health_icu/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_icu/setup.py 2023-02-01 11:11:15.622276342 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_imaging/health_imaging.py b/health_imaging/health_imaging.py +--- a/health_imaging/health_imaging.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_imaging/health_imaging.py 2023-02-01 11:11:15.626276332 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_imaging/setup.py b/health_imaging/setup.py ---- a/health_imaging/setup.py 2022-06-14 13:50:27.000000000 +0200 -+++ b/health_imaging/setup.py 2022-06-16 17:53:23.176973233 +0200 +--- a/health_imaging/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_imaging/setup.py 2023-02-01 11:11:15.630276320 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_inpatient/health_inpatient.py b/health_inpatient/health_inpatient.py +--- a/health_inpatient/health_inpatient.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_inpatient/health_inpatient.py 2023-02-01 11:11:15.638276298 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_inpatient/setup.py b/health_inpatient/setup.py ---- a/health_inpatient/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_inpatient/setup.py 2022-06-16 17:53:23.184973242 +0200 +--- a/health_inpatient/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_inpatient/setup.py 2023-02-01 11:11:15.642276285 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_inpatient_calendar/setup.py b/health_inpatient_calendar/setup.py ---- a/health_inpatient_calendar/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_inpatient_calendar/setup.py 2022-06-16 17:53:23.192973251 +0200 +--- a/health_inpatient_calendar/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_inpatient_calendar/setup.py 2023-02-01 11:11:15.654276252 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario + # SPDX-FileCopyrightText: 2011 Cédric Krier diff -U 3 -dHrN -- a/health_insurance/setup.py b/health_insurance/setup.py ---- a/health_insurance/setup.py 2022-06-14 13:50:25.000000000 +0200 -+++ b/health_insurance/setup.py 2022-06-16 17:53:23.200973260 +0200 +--- a/health_insurance/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_insurance/setup.py 2023-02-01 11:11:15.662276228 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_iss/setup.py b/health_iss/setup.py ---- a/health_iss/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_iss/setup.py 2022-06-16 17:53:23.204973264 +0200 +--- a/health_iss/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_iss/setup.py 2023-02-01 11:11:15.670276206 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_lab/health_lab.py b/health_lab/health_lab.py +--- a/health_lab/health_lab.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_lab/health_lab.py 2023-02-01 11:11:15.678276183 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_lab/setup.py b/health_lab/setup.py ---- a/health_lab/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_lab/setup.py 2022-06-16 17:53:23.216973278 +0200 +--- a/health_lab/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_lab/setup.py 2023-02-01 11:11:15.678276183 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_lifestyle/health_lifestyle.py b/health_lifestyle/health_lifestyle.py +--- a/health_lifestyle/health_lifestyle.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_lifestyle/health_lifestyle.py 2023-02-01 11:11:15.686276161 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_lifestyle/setup.py b/health_lifestyle/setup.py ---- a/health_lifestyle/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_lifestyle/setup.py 2022-06-16 17:53:23.220973282 +0200 +--- a/health_lifestyle/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_lifestyle/setup.py 2023-02-01 11:11:15.690276149 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_mdg6/health_mdg6.py b/health_mdg6/health_mdg6.py +--- a/health_mdg6/health_mdg6.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_mdg6/health_mdg6.py 2023-02-01 11:11:15.694276138 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_mdg6/setup.py b/health_mdg6/setup.py ---- a/health_mdg6/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_mdg6/setup.py 2022-06-16 17:53:23.224973287 +0200 +--- a/health_mdg6/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_mdg6/setup.py 2023-02-01 11:11:15.694276138 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_ntd/health_ntd.py b/health_ntd/health_ntd.py +--- a/health_ntd/health_ntd.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ntd/health_ntd.py 2023-02-01 11:11:15.702276114 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_ntd/setup.py b/health_ntd/setup.py ---- a/health_ntd/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_ntd/setup.py 2022-06-16 17:53:23.232973296 +0200 +--- a/health_ntd/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ntd/setup.py 2023-02-01 11:11:15.702276114 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_ntd_chagas/health_ntd_chagas.py b/health_ntd_chagas/health_ntd_chagas.py +--- a/health_ntd_chagas/health_ntd_chagas.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ntd_chagas/health_ntd_chagas.py 2023-02-01 11:11:15.706276104 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_ntd_chagas/setup.py b/health_ntd_chagas/setup.py ---- a/health_ntd_chagas/setup.py 2022-06-14 13:50:27.000000000 +0200 -+++ b/health_ntd_chagas/setup.py 2022-06-16 17:53:23.236973300 +0200 +--- a/health_ntd_chagas/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ntd_chagas/setup.py 2023-02-01 11:11:15.710276092 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_ntd_dengue/health_ntd_dengue.py b/health_ntd_dengue/health_ntd_dengue.py +--- a/health_ntd_dengue/health_ntd_dengue.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ntd_dengue/health_ntd_dengue.py 2023-02-01 11:11:15.714276080 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_ntd_dengue/setup.py b/health_ntd_dengue/setup.py ---- a/health_ntd_dengue/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_ntd_dengue/setup.py 2022-06-16 17:53:23.240973304 +0200 +--- a/health_ntd_dengue/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ntd_dengue/setup.py 2023-02-01 11:11:15.718276069 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_nursing/health_nursing.py b/health_nursing/health_nursing.py +--- a/health_nursing/health_nursing.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_nursing/health_nursing.py 2023-02-01 11:11:15.722276057 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_nursing/setup.py b/health_nursing/setup.py ---- a/health_nursing/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_nursing/setup.py 2022-06-16 17:53:23.248973313 +0200 +--- a/health_nursing/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_nursing/setup.py 2023-02-01 11:11:15.726276047 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_ophthalmology/health_ophthalmology.py b/health_ophthalmology/health_ophthalmology.py +--- a/health_ophthalmology/health_ophthalmology.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ophthalmology/health_ophthalmology.py 2023-02-01 11:11:15.730276035 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_ophthalmology/setup.py b/health_ophthalmology/setup.py ---- a/health_ophthalmology/setup.py 2022-06-14 13:50:27.000000000 +0200 -+++ b/health_ophthalmology/setup.py 2022-06-16 17:53:23.256973322 +0200 +--- a/health_ophthalmology/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_ophthalmology/setup.py 2023-02-01 11:11:15.730276035 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_orthanc/setup.py b/health_orthanc/setup.py ---- a/health_orthanc/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_orthanc/setup.py 2022-06-16 17:53:23.260973326 +0200 +--- a/health_orthanc/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_orthanc/setup.py 2023-02-01 11:11:15.738276012 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011-2022 GNU Solidario + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_pediatrics/setup.py b/health_pediatrics/setup.py ---- a/health_pediatrics/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_pediatrics/setup.py 2022-06-16 17:53:23.268973335 +0200 +--- a/health_pediatrics/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_pediatrics/setup.py 2023-02-01 11:11:15.746275990 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_pediatrics_growth_charts/setup.py b/health_pediatrics_growth_charts/setup.py ---- a/health_pediatrics_growth_charts/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_pediatrics_growth_charts/setup.py 2022-06-16 17:53:23.272973340 +0200 +--- a/health_pediatrics_growth_charts/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_pediatrics_growth_charts/setup.py 2023-02-01 11:11:15.754275966 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_pediatrics_growth_charts_who/setup.py b/health_pediatrics_growth_charts_who/setup.py ---- a/health_pediatrics_growth_charts_who/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_pediatrics_growth_charts_who/setup.py 2022-06-16 17:53:23.280973349 +0200 +--- a/health_pediatrics_growth_charts_who/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_pediatrics_growth_charts_who/setup.py 2023-02-01 11:11:15.762275943 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_profile/setup.py b/health_profile/setup.py ---- a/health_profile/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_profile/setup.py 2022-06-16 17:53:23.288973358 +0200 +--- a/health_profile/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_profile/setup.py 2023-02-01 11:11:15.766275933 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_qrcodes/setup.py b/health_qrcodes/setup.py ---- a/health_qrcodes/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_qrcodes/setup.py 2022-06-16 17:53:23.292973362 +0200 +--- a/health_qrcodes/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_qrcodes/setup.py 2023-02-01 11:11:15.774275909 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_reporting/setup.py b/health_reporting/setup.py ---- a/health_reporting/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_reporting/setup.py 2022-06-16 17:53:23.304973375 +0200 +--- a/health_reporting/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_reporting/setup.py 2023-02-01 11:11:15.782275886 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_services/setup.py b/health_services/setup.py ---- a/health_services/setup.py 2022-06-14 13:50:27.000000000 +0200 -+++ b/health_services/setup.py 2022-06-16 17:53:23.312973384 +0200 +--- a/health_services/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_services/setup.py 2023-02-01 11:11:15.798275841 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_services_imaging/setup.py b/health_services_imaging/setup.py ---- a/health_services_imaging/setup.py 2022-06-14 13:50:27.000000000 +0200 -+++ b/health_services_imaging/setup.py 2022-06-16 17:53:23.320973393 +0200 +--- a/health_services_imaging/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_services_imaging/setup.py 2023-02-01 11:11:15.806275819 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_services_lab/setup.py b/health_services_lab/setup.py ---- a/health_services_lab/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_services_lab/setup.py 2022-06-16 17:53:23.332973406 +0200 +--- a/health_services_lab/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_services_lab/setup.py 2023-02-01 11:11:15.814275795 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_socioeconomics/setup.py b/health_socioeconomics/setup.py ---- a/health_socioeconomics/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_socioeconomics/setup.py 2022-06-16 17:53:23.336973411 +0200 +--- a/health_socioeconomics/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_socioeconomics/setup.py 2023-02-01 11:11:15.822275772 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_stock/setup.py b/health_stock/setup.py ---- a/health_stock/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_stock/setup.py 2022-06-16 17:53:23.340973415 +0200 +--- a/health_stock/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_stock/setup.py 2023-02-01 11:11:15.830275750 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_surgery/health_surgery.py b/health_surgery/health_surgery.py +--- a/health_surgery/health_surgery.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_surgery/health_surgery.py 2023-02-01 11:11:15.838275727 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_surgery/__init__.py b/health_surgery/__init__.py +--- a/health_surgery/__init__.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_surgery/__init__.py 2023-02-01 11:11:15.838275727 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_surgery/setup.py b/health_surgery/setup.py ---- a/health_surgery/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_surgery/setup.py 2022-06-16 17:53:23.356973433 +0200 +--- a/health_surgery/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_surgery/setup.py 2023-02-01 11:11:15.842275715 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff -U 3 -dHrN -- a/health_webdav3_server/setup.py b/health_webdav3_server/setup.py ---- a/health_webdav3_server/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_webdav3_server/setup.py 2022-06-16 17:53:23.356973433 +0200 +--- a/health_webdav3_server/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_webdav3_server/setup.py 2023-02-01 11:11:15.850275693 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # Copyright (C) 2017-2022 Luis Falcon - # Copyright (C) 2017-2022 GNU Solidario - # Copyright (C) 2012-2017 Cédric Krier -diff -U 3 -dHrN -- a/health_who_essential_medicines/setup.py b/health_who_essential_medicines/setup.py ---- a/health_who_essential_medicines/setup.py 2022-06-14 13:50:26.000000000 +0200 -+++ b/health_who_essential_medicines/setup.py 2022-06-16 17:53:23.368973446 +0200 + # SPDX-FileCopyrightText: 2017-2023 Luis Falcón + # SPDX-FileCopyrightText: 2017-2023 GNU Solidario + # SPDX-FileCopyrightText: 2012-2017 Cédric Krier +diff -U 3 -dHrN -- a/health_who_essential_medicines/__init__.py b/health_who_essential_medicines/__init__.py +--- a/health_who_essential_medicines/__init__.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_who_essential_medicines/__init__.py 2023-02-01 11:11:15.858275670 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2011-2022 Luis Falcon - # Copyright (C) 2011 Cédric Krier -diff -U 3 -dHrN -- a/scripts/upgrade/2.0/pre.py b/scripts/upgrade/2.0/pre.py ---- a/scripts/upgrade/2.0/pre.py 2022-01-10 12:54:31.000000000 +0100 -+++ b/scripts/upgrade/2.0/pre.py 2022-06-16 17:53:23.372973451 +0200 + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario +diff -U 3 -dHrN -- a/health_who_essential_medicines/setup.py b/health_who_essential_medicines/setup.py +--- a/health_who_essential_medicines/setup.py 2023-01-27 12:48:58.000000000 +0100 ++++ b/health_who_essential_medicines/setup.py 2023-02-01 11:11:15.858275670 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - ############################################################################## - # + + # SPDX-FileCopyrightText: 2008-2023 Luis Falcón + # SPDX-FileCopyrightText: 2011-2023 GNU Solidario diff --git a/packages/g/gstreamer-plugins-bad/.files b/packages/g/gstreamer-plugins-bad/.files index 7c00c8d..64f3843 100644 Binary files a/packages/g/gstreamer-plugins-bad/.files and b/packages/g/gstreamer-plugins-bad/.files differ diff --git a/packages/g/gstreamer-plugins-bad/.rev b/packages/g/gstreamer-plugins-bad/.rev index 9d91117..b92c965 100644 --- a/packages/g/gstreamer-plugins-bad/.rev +++ b/packages/g/gstreamer-plugins-bad/.rev @@ -1221,4 +1221,12 @@ 1063386 + + e752f5ae716c7b6f36a38788ea8b8260 + 1.22.0 + + dimstar_suse + + 1064326 + diff --git a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes index c73e50c..e40a7be 100644 --- a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes +++ b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 7 13:02:51 UTC 2023 - Bjørn Lie + +- Stop building openh264 by default even on 3'rd party + buildservices, do this via bcond. Codec now available via a + special repo. + +------------------------------------------------------------------- Sun Feb 5 13:20:14 UTC 2023 - Bjørn Lie - Enable zxing again, now that the updated version have landed. diff --git a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec index f7363c1..2636f53 100644 --- a/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec +++ b/packages/g/gstreamer-plugins-bad/gstreamer-plugins-bad.spec @@ -23,6 +23,7 @@ %define gst_branch 1.0 %bcond_with faac %bcond_with faad +%bcond_with openh264 %if 0%{?is_opensuse} || 0%{?sle_version} >= 150400 %bcond_without avtp @@ -221,7 +222,9 @@ BuildRequires: pkgconfig(libde265) >= 0.9 BuildRequires: pkgconfig(libmodplug) BuildRequires: pkgconfig(libopenaptx) == 0.2.0 BuildRequires: pkgconfig(librtmp) +%if %{with openh264} BuildRequires: pkgconfig(openh264) >= 1.3.0 +%endif BuildRequires: pkgconfig(vo-aacenc) >= 0.1.0 BuildRequires: pkgconfig(vo-amrwbenc) >= 0.1.0 BuildRequires: pkgconfig(x265) @@ -742,8 +745,6 @@ export PYTHON=%{_bindir}/python3 -Dvoaacenc=disabled \ -Dx265=disabled \ -Dopenaptx=disabled \ -%else - -Dopenh264=enabled \ %endif -Dgpl=enabled \ %if %{without avtp} @@ -758,6 +759,9 @@ export PYTHON=%{_bindir}/python3 %if %{without fdk_aac} -Dfdkaac=disabled \ %endif +%if %{without openh264} + -Dopenh264=disabled \ +%endif -Ddirectfb=disabled \ -Ddoc=disabled \ -Dexamples=disabled \ @@ -1167,18 +1171,17 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/gstreamer-%{gst_branch}/libgstvoamrwbenc.so %{_libdir}/gstreamer-%{gst_branch}/libgstvoaacenc.so %{_libdir}/gstreamer-%{gst_branch}/libgstdtsdec.so - %if %{with faac} %{_libdir}/gstreamer-%{gst_branch}/libgstfaac.so %endif - %if %{with faad} %{_libdir}/gstreamer-%{gst_branch}/libgstfaad.so %endif - %{_libdir}/gstreamer-%{gst_branch}/libgstde265.so %{_libdir}/gstreamer-%{gst_branch}/libgstmodplug.so +%if %{with openh264} %{_libdir}/gstreamer-%{gst_branch}/libgstopenh264.so +%endif %{_libdir}/gstreamer-%{gst_branch}/libgstrtmp.so %{_libdir}/gstreamer-%{gst_branch}/libgstsiren.so %{_libdir}/gstreamer-%{gst_branch}/libgstx265.so diff --git a/packages/k/k9s/.files b/packages/k/k9s/.files index adfb459..e4ed33f 100644 Binary files a/packages/k/k9s/.files and b/packages/k/k9s/.files differ diff --git a/packages/k/k9s/.rev b/packages/k/k9s/.rev index c254f85..35627a3 100644 --- a/packages/k/k9s/.rev +++ b/packages/k/k9s/.rev @@ -226,4 +226,12 @@ 1062576 + + 379cef2d99407890286938a1137bd854 + 0.27.3 + + dimstar_suse + + 1064688 + diff --git a/packages/k/k9s/.servicemark b/packages/k/k9s/.servicemark index 7441ca9..d1bad35 100644 --- a/packages/k/k9s/.servicemark +++ b/packages/k/k9s/.servicemark @@ -1 +1 @@ -3e11579f76dd221b632bf4236c0b5913 +df9936739e7c98700617a320f99b6a82 diff --git a/packages/k/k9s/_service b/packages/k/k9s/_service index 474cf6e..46e71cf 100644 --- a/packages/k/k9s/_service +++ b/packages/k/k9s/_service @@ -3,7 +3,7 @@ https://github.com/derailed/k9s.git git .git - v0.27.2 + v0.27.3 @PARENT_TAG@ enable v(.*) diff --git a/packages/k/k9s/_servicedata b/packages/k/k9s/_servicedata index a5a1da6..7d1b240 100644 --- a/packages/k/k9s/_servicedata +++ b/packages/k/k9s/_servicedata @@ -1,4 +1,4 @@ https://github.com/derailed/k9s.git - 3794a61eaffb5ccbd68fe128f7216db005d70f6f \ No newline at end of file + 7c76691c389e4e7de29516932a304f7029307c6d \ No newline at end of file diff --git a/packages/k/k9s/k9s-0.27.2.tar.gz b/packages/k/k9s/k9s-0.27.2.tar.gz deleted file mode 120000 index 8284e28..0000000 --- a/packages/k/k9s/k9s-0.27.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeih7yy4qoyrbltjfosta7ghhmyobp4t6erlwxb22kecjyqnemfo4bu \ No newline at end of file diff --git a/packages/k/k9s/k9s-0.27.3.tar.gz b/packages/k/k9s/k9s-0.27.3.tar.gz new file mode 120000 index 0000000..b275d1a --- /dev/null +++ b/packages/k/k9s/k9s-0.27.3.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeifd6l7s27ac46sqwitzora44pz6vuxfobr6w6dfbwn5bi6rdugluq \ No newline at end of file diff --git a/packages/k/k9s/k9s.changes b/packages/k/k9s/k9s.changes index 10a32ee..b697235 100644 --- a/packages/k/k9s/k9s.changes +++ b/packages/k/k9s/k9s.changes @@ -1,4 +1,27 @@ ------------------------------------------------------------------- +Sun Feb 12 15:37:57 UTC 2023 - kastl@b1-systems.de + +- Update to version 0.27.3 (bsc#1208087, CVE-2023-25165): + * Release v0.27.3 (#1970) + * Add sort by pod count on node view (#1961) + * fix: Show meaningful error message when kubectl exec fails (#1966) + * set default sinceSeconds to 300 (#1965) + * Match ${XXX} environment variables (#1896) + * Bump github.com/cenkalti/backoff/v4 from 4.1.3 to 4.2.0 (#1957) + * Bump k8s.io/klog/v2 from 2.80.1 to 2.90.0 (#1958) + * Bump golang from 1.19.5-alpine3.16 to 1.20.0-alpine3.16 (#1956) + * Bump github.com/fatih/color from 1.13.0 to 1.14.1 (#1959) + * Added Nightfox theme (#1960) + * fix: Add missing help menu to gruvbox-dark skin (#1969) + * Bump helm.sh/helm/v3 from 3.11.0 to 3.11.1 (#1963) + * update docs + * fix: acessing clusters with private dns (#1903) + * Bump actions/setup-go from 3.3.1 to 3.5.0 (#1899) + * Bump helm.sh/helm/v3 from 3.10.1 to 3.11.0 (#1928) + * Bump github.com/rs/zerolog from 1.28.0 to 1.29.0 (#1942) +- BuildRequire go1.19 + +------------------------------------------------------------------- Wed Feb 01 14:33:22 UTC 2023 - kastl@b1-systems.de - Update to version 0.27.2: diff --git a/packages/k/k9s/k9s.spec b/packages/k/k9s/k9s.spec index 4a68d68..9d8ed43 100644 --- a/packages/k/k9s/k9s.spec +++ b/packages/k/k9s/k9s.spec @@ -17,14 +17,14 @@ Name: k9s -Version: 0.27.2 +Version: 0.27.3 Release: 0 Summary: Curses based terminal UI for Kubernetes clusters License: Apache-2.0 URL: https://github.com/derailed/k9s Source: %{name}-%{version}.tar.gz Source1: vendor.tar.gz -BuildRequires: golang(API) = 1.18 +BuildRequires: golang(API) = 1.19 ExcludeArch: s390 ExcludeArch: %{ix86} diff --git a/packages/k/k9s/vendor.tar.gz b/packages/k/k9s/vendor.tar.gz index 119e6d2..0b02f46 120000 --- a/packages/k/k9s/vendor.tar.gz +++ b/packages/k/k9s/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeig3oqnxbhpgu4dwj7lcjfwsd4tt7j2sxyzx4llx5yo2uu6qmuc4tu \ No newline at end of file +/ipfs/bafybeifkpvbd7ur64nzlfpmfwbo44pjor7dacvf4ny4ct22xzojd2ug2am \ No newline at end of file diff --git a/packages/l/lilypond/.files b/packages/l/lilypond/.files index 4cebde0..806c6dc 100644 Binary files a/packages/l/lilypond/.files and b/packages/l/lilypond/.files differ diff --git a/packages/l/lilypond/.rev b/packages/l/lilypond/.rev index fc7c32d..b2940f5 100644 --- a/packages/l/lilypond/.rev +++ b/packages/l/lilypond/.rev @@ -403,4 +403,12 @@ 1043278 + + fd66ff29a57177c4097590dda17c615d + 2.24.1 + + dimstar_suse + + 1064661 + diff --git a/packages/l/lilypond/add_dircategories_to_documentation.patch b/packages/l/lilypond/add_dircategories_to_documentation.patch index 9132248..7dceeac 100644 --- a/packages/l/lilypond/add_dircategories_to_documentation.patch +++ b/packages/l/lilypond/add_dircategories_to_documentation.patch @@ -5,8 +5,8 @@ Author: Julian Gilbey Origin: vendor Index: b/Documentation/en/contributor.texi =================================================================== ---- a/Documentation/en/contributor.texi 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/contributor.texi 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/en/contributor.texi 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/contributor.texi 2023-02-12 15:10:34.285859892 +0200 @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -21,8 +21,8 @@ Index: b/Documentation/en/contributor.texi @version{}. It discusses technical issues and policies that Index: b/Documentation/cs/learning.tely =================================================================== ---- a/Documentation/cs/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/cs/learning.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/cs/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/cs/learning.tely 2023-02-12 15:10:34.285859892 +0200 @@ -12,6 +12,11 @@ @settitle Příručka k učení se @afourpaper @@ -37,8 +37,8 @@ Index: b/Documentation/cs/learning.tely @version{}. Index: b/Documentation/cs/web.texi =================================================================== ---- a/Documentation/cs/web.texi 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/cs/web.texi 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/cs/web.texi 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/cs/web.texi 2023-02-12 15:10:34.285859892 +0200 @@ -50,7 +50,6 @@ License''. @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond --- the music typesetter @@ -49,8 +49,8 @@ Index: b/Documentation/cs/web.texi * Úryvky LilyPondu: (lilypond-snippets). Mnoho triků, rad a příkladů. Index: b/Documentation/de/essay.tely =================================================================== ---- a/Documentation/de/essay.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/de/essay.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/de/essay.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/de/essay.tely 2023-02-12 15:10:34.285859892 +0200 @@ -12,6 +12,11 @@ @documentlanguage de @afourpaper @@ -65,8 +65,8 @@ Index: b/Documentation/de/essay.tely @macro manualIntro Index: b/Documentation/de/extending.tely =================================================================== ---- a/Documentation/de/extending.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/de/extending.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/de/extending.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/de/extending.tely 2023-02-12 15:10:34.285859892 +0200 @@ -13,6 +13,11 @@ @documentlanguage de @afourpaper @@ -81,9 +81,9 @@ Index: b/Documentation/de/extending.tely @macro manualIntro Index: b/Documentation/de/learning.tely =================================================================== ---- a/Documentation/de/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/de/learning.tely 2022-12-04 12:06:37.146961396 +0200 -@@ -12,6 +12,11 @@ +--- a/Documentation/de/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/de/learning.tely 2023-02-12 15:10:34.285859892 +0200 +@@ -13,6 +13,11 @@ @settitle LilyPond Handbuch zum Lernen @afourpaper @@ -97,8 +97,8 @@ Index: b/Documentation/de/learning.tely @version{} zur Verfügung. Index: b/Documentation/de/notation.tely =================================================================== ---- a/Documentation/de/notation.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/de/notation.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/de/notation.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/de/notation.tely 2023-02-12 15:10:34.285859892 +0200 @@ -11,6 +11,11 @@ @setfilename lilypond.info @settitle LilyPond Benutzerhandbuch @@ -113,8 +113,8 @@ Index: b/Documentation/de/notation.tely @afourpaper Index: b/Documentation/de/usage.tely =================================================================== ---- a/Documentation/de/usage.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/de/usage.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/de/usage.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/de/usage.tely 2023-02-12 15:10:34.285859892 +0200 @@ -12,7 +12,17 @@ @settitle GNU LilyPond Programmbenutzung @afourpaper @@ -136,8 +136,8 @@ Index: b/Documentation/de/usage.tely Diese Datei erklärt, wie man die Programme, die mit LilyPond Index: b/Documentation/es/essay.tely =================================================================== ---- a/Documentation/es/essay.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/es/essay.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/es/essay.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/es/essay.tely 2023-02-12 15:10:34.285859892 +0200 @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -152,8 +152,8 @@ Index: b/Documentation/es/essay.tely @macro manualIntro Index: b/Documentation/es/extending.tely =================================================================== ---- a/Documentation/es/extending.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/es/extending.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/es/extending.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/es/extending.tely 2023-02-12 15:10:34.285859892 +0200 @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -168,8 +168,8 @@ Index: b/Documentation/es/extending.tely @macro manualIntro Index: b/Documentation/es/learning.tely =================================================================== ---- a/Documentation/es/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/es/learning.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/es/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/es/learning.tely 2023-02-12 15:10:34.285859892 +0200 @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -184,8 +184,8 @@ Index: b/Documentation/es/learning.tely @version{}. Index: b/Documentation/es/notation.tely =================================================================== ---- a/Documentation/es/notation.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/es/notation.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/es/notation.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/es/notation.tely 2023-02-12 15:10:34.285859892 +0200 @@ -13,6 +13,11 @@ @documentlanguage es @afourpaper @@ -200,8 +200,8 @@ Index: b/Documentation/es/notation.tely puede producir con LilyPond versión @version{}. Da por sentado que el Index: b/Documentation/en/essay.tely =================================================================== ---- a/Documentation/en/essay.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/essay.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/en/essay.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/essay.tely 2023-02-12 15:10:34.285859892 +0200 @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -216,8 +216,8 @@ Index: b/Documentation/en/essay.tely LilyPond version @version{}. Index: b/Documentation/es/usage.tely =================================================================== ---- a/Documentation/es/usage.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/es/usage.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/es/usage.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/es/usage.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,18 @@ @documentlanguage es @afourpaper @@ -239,8 +239,8 @@ Index: b/Documentation/es/usage.tely @macro manualIntro Index: b/Documentation/es/web.texi =================================================================== ---- a/Documentation/es/web.texi 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/es/web.texi 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/es/web.texi 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/es/web.texi 2023-02-12 15:10:34.289859722 +0200 @@ -53,20 +53,10 @@ Free Documentation License''. @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond: el tipografiador de música @@ -264,8 +264,8 @@ Index: b/Documentation/es/web.texi Index: b/Documentation/en/extending.tely =================================================================== ---- a/Documentation/en/extending.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/extending.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/en/extending.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/extending.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -280,8 +280,8 @@ Index: b/Documentation/en/extending.tely LilyPond version @version{}. Index: b/Documentation/fr/essay.tely =================================================================== ---- a/Documentation/fr/essay.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/fr/essay.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/fr/essay.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/fr/essay.tely 2023-02-12 15:10:34.289859722 +0200 @@ -16,6 +16,11 @@ @documentlanguage fr @afourpaper @@ -296,8 +296,8 @@ Index: b/Documentation/fr/essay.tely par ordinateur à l'aide de LilyPond version @version{}. Index: b/Documentation/fr/learning.tely =================================================================== ---- a/Documentation/fr/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/fr/learning.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/fr/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/fr/learning.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @afourpaper @@ -312,8 +312,8 @@ Index: b/Documentation/fr/learning.tely @version{}. Index: b/Documentation/fr/notation.tely =================================================================== ---- a/Documentation/fr/notation.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/fr/notation.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/fr/notation.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/fr/notation.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage fr @afourpaper @@ -328,8 +328,8 @@ Index: b/Documentation/fr/notation.tely @version{}. Sa lecture requiert une familiarité avec le contenu Index: b/Documentation/fr/usage.tely =================================================================== ---- a/Documentation/fr/usage.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/fr/usage.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/fr/usage.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/fr/usage.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,17 @@ @documentlanguage fr @afourpaper @@ -350,8 +350,8 @@ Index: b/Documentation/fr/usage.tely @macro manualIntro Index: b/Documentation/hu/learning.tely =================================================================== ---- a/Documentation/hu/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/hu/learning.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/hu/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/hu/learning.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage hu @afourpaper @@ -366,8 +366,8 @@ Index: b/Documentation/hu/learning.tely @macro manualIntro Index: b/Documentation/hu/web.texi =================================================================== ---- a/Documentation/hu/web.texi 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/hu/web.texi 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/hu/web.texi 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/hu/web.texi 2023-02-12 15:10:34.289859722 +0200 @@ -51,20 +51,11 @@ License''. @c expected to be found in lilypond/ subdirectory. @dircategory GNU LilyPond --- the music typesetter @@ -391,8 +391,8 @@ Index: b/Documentation/hu/web.texi Index: b/Documentation/it/learning.tely =================================================================== ---- a/Documentation/it/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/it/learning.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/it/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/it/learning.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage it @afourpaper @@ -407,8 +407,8 @@ Index: b/Documentation/it/learning.tely @version{}. Index: b/Documentation/it/usage.tely =================================================================== ---- a/Documentation/it/usage.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/it/usage.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/it/usage.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/it/usage.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,18 @@ @documentlanguage it @afourpaper @@ -430,8 +430,8 @@ Index: b/Documentation/it/usage.tely Index: b/Documentation/ja/learning.tely =================================================================== ---- a/Documentation/ja/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/ja/learning.tely 2022-12-04 12:06:37.146961396 +0200 +--- a/Documentation/ja/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/ja/learning.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage ja @afourpaper @@ -446,8 +446,8 @@ Index: b/Documentation/ja/learning.tely @end macro Index: b/Documentation/ja/notation.tely =================================================================== ---- a/Documentation/ja/notation.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/ja/notation.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/ja/notation.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/ja/notation.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage ja @afourpaper @@ -462,8 +462,8 @@ Index: b/Documentation/ja/notation.tely すべての記譜法についての参照を提供します。@c Index: b/Documentation/ja/usage.tely =================================================================== ---- a/Documentation/ja/usage.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/ja/usage.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/ja/usage.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/ja/usage.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,19 @@ @documentlanguage ja @afourpaper @@ -486,8 +486,8 @@ Index: b/Documentation/ja/usage.tely プログラムの実行方法について説明します。@c Index: b/Documentation/en/learning.tely =================================================================== ---- a/Documentation/en/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/learning.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/en/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/learning.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -502,8 +502,8 @@ Index: b/Documentation/en/learning.tely @version{}. Index: b/Documentation/en/music-glossary.tely =================================================================== ---- a/Documentation/en/music-glossary.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/music-glossary.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/en/music-glossary.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/music-glossary.tely 2023-02-12 15:10:34.289859722 +0200 @@ -6,6 +6,11 @@ @documentlanguage en @afourpaper @@ -518,8 +518,8 @@ Index: b/Documentation/en/music-glossary.tely terms used in the documentation manuals for LilyPond version Index: b/Documentation/nl/learning.tely =================================================================== ---- a/Documentation/nl/learning.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/nl/learning.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/nl/learning.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/nl/learning.tely 2023-02-12 15:10:34.289859722 +0200 @@ -19,6 +19,11 @@ @documentlanguage nl @afourpaper @@ -534,8 +534,8 @@ Index: b/Documentation/nl/learning.tely @version{}. Index: b/Documentation/en/notation.tely =================================================================== ---- a/Documentation/en/notation.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/notation.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/en/notation.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/notation.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,11 @@ @documentlanguage en @afourpaper @@ -550,8 +550,8 @@ Index: b/Documentation/en/notation.tely produced with LilyPond version @version{}. It assumes that Index: b/Documentation/en/snippets.tely =================================================================== ---- a/Documentation/en/snippets.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/snippets.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/en/snippets.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/snippets.tely 2023-02-12 15:10:34.289859722 +0200 @@ -6,6 +6,11 @@ @documentlanguage en @afourpaper @@ -566,8 +566,8 @@ Index: b/Documentation/en/snippets.tely @uref{https://lsr@/.di@/.unimi@/.it,LilyPond Snippet Repository} Index: b/Documentation/en/usage.tely =================================================================== ---- a/Documentation/en/usage.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/usage.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/en/usage.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/usage.tely 2023-02-12 15:10:34.289859722 +0200 @@ -13,6 +13,18 @@ @documentlanguage en @afourpaper @@ -589,8 +589,8 @@ Index: b/Documentation/en/usage.tely LilyPond version @version{}. In addition, it suggests some Index: b/Documentation/en/changes.tely =================================================================== ---- a/Documentation/en/changes.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/changes.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/en/changes.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/changes.tely 2023-02-12 15:10:34.289859722 +0200 @@ -53,6 +53,10 @@ run @command{convert-ly} directly from F environments with LilyPond support may provide a way to run @command{convert-ly} graphically.} @@ -604,8 +604,8 @@ Index: b/Documentation/en/changes.tely @unnumbered Major changes in LilyPond Index: b/Documentation/hu/usage.tely =================================================================== ---- a/Documentation/hu/usage.tely 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/hu/usage.tely 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/hu/usage.tely 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/hu/usage.tely 2023-02-12 15:10:34.289859722 +0200 @@ -15,6 +15,19 @@ @c translator: Harmath Dénes @@ -628,31 +628,10 @@ Index: b/Documentation/hu/usage.tely tartozó programokat futtatni, valamint tanácsokat ad azok hatékony Index: b/Documentation/en/web.texi =================================================================== ---- a/Documentation/en/web.texi 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/en/web.texi 2022-12-04 12:06:37.150961212 +0200 +--- a/Documentation/en/web.texi 2023-02-10 19:44:03.000000000 +0200 ++++ b/Documentation/en/web.texi 2023-02-12 15:10:34.289859722 +0200 @@ -1,3 +1,4 @@ + \input texinfo @c -*- coding: utf-8; mode: texinfo; -*- @ignore Translation of GIT committish: FILL-IN-HEAD-COMMITTISH -Index: b/Documentation/de/web.texi -=================================================================== ---- a/Documentation/de/web.texi 2022-11-27 14:28:56.000000000 +0200 -+++ b/Documentation/de/web.texi 2022-12-04 12:06:37.150961212 +0200 -@@ -52,16 +52,8 @@ License''. - @c expected to be found in lilypond/ subdirectory. - @dircategory LilyPond -- das Notensatzsystem - @direntry --* Neuerungen: (lilypond-changes). Neuerungen seit Version 2.20. --* Beitragen: (lilypond-contributor). Zu LilyPond beitragen. --* Aufsatz: (lilypond-essay). Die Philosophie hinter LilyPond. --* Extending: (lilypond-extending). Scheme in LilyPond benutzen. - * Interna: (lilypond-internals). Referenz für Anpassungen. --* Lernen: (lilypond-learning). Einführung. Hier starten. --* Glossar: (music-glossary). Begriffsübersetzungen aus dem Englischen. --* Notation: (lilypond-notation). Notationshandbuch. - * Schnipsel: (lilypond-snippets). Tricks, Tipps und Beispiele. --* Benutzung: (lilypond-usage). LilyPond installieren und benutzen. - * Webseite: (lilypond-web). Info-Version von lilypond.org. - @end direntry - diff --git a/packages/l/lilypond/lilypond-2.24.0-documentation.tar.xz b/packages/l/lilypond/lilypond-2.24.0-documentation.tar.xz deleted file mode 120000 index f2b72fb..0000000 --- a/packages/l/lilypond/lilypond-2.24.0-documentation.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeifarfowft5hmwznjoshibtavgyruumrnrgg7utuldsfv5yepblayy \ No newline at end of file diff --git a/packages/l/lilypond/lilypond-2.24.1-documentation.tar.xz b/packages/l/lilypond/lilypond-2.24.1-documentation.tar.xz new file mode 120000 index 0000000..71d76bb --- /dev/null +++ b/packages/l/lilypond/lilypond-2.24.1-documentation.tar.xz @@ -0,0 +1 @@ +/ipfs/bafybeie6n4ld3r3jvkdjxsxpqjt6agoq6cp5rghc24zbdhxqpgjswgva3a \ No newline at end of file diff --git a/packages/l/lilypond/lilypond-doc.changes b/packages/l/lilypond/lilypond-doc.changes index a9c5df2..a7b82e4 100644 --- a/packages/l/lilypond/lilypond-doc.changes +++ b/packages/l/lilypond/lilypond-doc.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Feb 12 13:28:17 UTC 2023 - Dave Plater + +- Update to release 2.24.1 + +------------------------------------------------------------------- Fri Dec 16 07:01:39 UTC 2022 - Dave Plater - Update to release 2.24.0 diff --git a/packages/l/lilypond/lilypond-doc.spec b/packages/l/lilypond/lilypond-doc.spec index 457b86e..09dca50 100644 --- a/packages/l/lilypond/lilypond-doc.spec +++ b/packages/l/lilypond/lilypond-doc.spec @@ -1,7 +1,7 @@ # # spec file for package lilypond-doc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ ExcludeArch: i586 ExcludeArch: i586 aarch64 ppc64le s390x %endif Name: lilypond-doc -Version: 2.24.0 +Version: 2.24.1 Release: 0 Summary: Documentation for the LilyPond Typesetter License: GFDL-1.3-only diff --git a/packages/l/lilypond/lilypond-v2.24.0.tar.bz2 b/packages/l/lilypond/lilypond-v2.24.0.tar.bz2 deleted file mode 120000 index ef6c5ab..0000000 --- a/packages/l/lilypond/lilypond-v2.24.0.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeieqehetf55zfnwd3ksgt4tmssbwjspjwpywidypbajj5a7xmu2fre \ No newline at end of file diff --git a/packages/l/lilypond/lilypond-v2.24.1.tar.bz2 b/packages/l/lilypond/lilypond-v2.24.1.tar.bz2 new file mode 120000 index 0000000..293e991 --- /dev/null +++ b/packages/l/lilypond/lilypond-v2.24.1.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeid46i7txcmyrft4klcf2fni4obm6oo7n2oyix5zsfaqusp7u6v52m \ No newline at end of file diff --git a/packages/l/lilypond/lilypond.changes b/packages/l/lilypond/lilypond.changes index 3b81b2e..b83633e 100644 --- a/packages/l/lilypond/lilypond.changes +++ b/packages/l/lilypond/lilypond.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Sun Feb 12 13:28:50 UTC 2023 - Dave Plater + +- Update to release 2.24.1 +- Upstream changes: + *Pitches improvements + *Rhythm improvements + *Expressive mark improvements + *Repeat improvements + *And many more see: + https://lilypond.org/doc/v2.24/Documentation/changes/index.html + for details + +------------------------------------------------------------------- Fri Dec 16 06:58:26 UTC 2022 - Dave Plater - Update to release 2.24.0 diff --git a/packages/l/lilypond/lilypond.spec b/packages/l/lilypond/lilypond.spec index a364729..c8bd3ff 100644 --- a/packages/l/lilypond/lilypond.spec +++ b/packages/l/lilypond/lilypond.spec @@ -1,7 +1,7 @@ # # spec file for package lilypond # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ ExcludeArch: i586 Name: lilypond -Version: 2.24.0 +Version: 2.24.1 Release: 0 Summary: A typesetting system for music notation License: GPL-3.0-or-later diff --git a/packages/n/nova/.files b/packages/n/nova/.files index 34d13fc..38c8f9e 100644 Binary files a/packages/n/nova/.files and b/packages/n/nova/.files differ diff --git a/packages/n/nova/.rev b/packages/n/nova/.rev index d253515..61a652f 100644 --- a/packages/n/nova/.rev +++ b/packages/n/nova/.rev @@ -111,4 +111,12 @@ 1064243 + + afe7539eaf63828f10d56be2b3314084 + 3.6.2 + + dimstar_suse + + 1064495 + diff --git a/packages/n/nova/.servicemark b/packages/n/nova/.servicemark index 2c0ab18..4af4199 100644 --- a/packages/n/nova/.servicemark +++ b/packages/n/nova/.servicemark @@ -1 +1 @@ -c55f86e7d5bb27e133d60fcc08cb0765 +6aaeb3f8964939b18845409d87e9b3de diff --git a/packages/n/nova/_service b/packages/n/nova/_service index 0fc557d..496dd21 100644 --- a/packages/n/nova/_service +++ b/packages/n/nova/_service @@ -3,9 +3,10 @@ https://github.com/FairwindsOps/nova git .git - 3.6.1 + v3.6.2 @PARENT_TAG@ enable + v(.*) nova @@ -15,6 +16,6 @@ gz - nova-3.6.1.tar.gz + nova-3.6.2.tar.gz diff --git a/packages/n/nova/_servicedata b/packages/n/nova/_servicedata index d2b48b4..ce91e0a 100644 --- a/packages/n/nova/_servicedata +++ b/packages/n/nova/_servicedata @@ -1,4 +1,4 @@ https://github.com/FairwindsOps/nova - e48142e01aeb6f9d67dded0fd805defff259277a \ No newline at end of file + a55e37fa76fe9012585dd896a25a1883cf1247c6 \ No newline at end of file diff --git a/packages/n/nova/nova-3.6.1.tar.gz b/packages/n/nova/nova-3.6.1.tar.gz deleted file mode 120000 index d5975c9..0000000 --- a/packages/n/nova/nova-3.6.1.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeietxn5aoowr2mrr5x4zqdhvd5brq7adsiv7wmwy227iirfiggqtma \ No newline at end of file diff --git a/packages/n/nova/nova-3.6.2.tar.gz b/packages/n/nova/nova-3.6.2.tar.gz new file mode 120000 index 0000000..93dee51 --- /dev/null +++ b/packages/n/nova/nova-3.6.2.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeienrsqpr7ku2diizzjsomuleb3uw6sakzjl253bcloovceqorwk3u \ No newline at end of file diff --git a/packages/n/nova/nova.changes b/packages/n/nova/nova.changes index f00d05e..0fc5ae1 100644 --- a/packages/n/nova/nova.changes +++ b/packages/n/nova/nova.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Feb 12 06:33:10 UTC 2023 - kastl@b1-systems.de + +- Update to version 3.6.2: + * Update alpine (#197) +- change _service file, as latest release is v3.6.2 (with a leading + "v"), not sure if this will stay this way... + +------------------------------------------------------------------- Fri Feb 10 06:13:35 UTC 2023 - kastl@b1-systems.de - Update to version 3.6.1: diff --git a/packages/n/nova/nova.spec b/packages/n/nova/nova.spec index 811b846..ea192d5 100644 --- a/packages/n/nova/nova.spec +++ b/packages/n/nova/nova.spec @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: nova -Version: 3.6.1 +Version: 3.6.2 Release: 0 Summary: Find outdated or deprecated Helm charts running in your cluster License: Apache-2.0 diff --git a/packages/n/nova/vendor.tar.gz b/packages/n/nova/vendor.tar.gz index 22a3e2e..cad08cd 120000 --- a/packages/n/nova/vendor.tar.gz +++ b/packages/n/nova/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeidd37nu6ukmfkcj2ccv77eizmowfyzwletaq5rsupbdayani6ttcq \ No newline at end of file +/ipfs/bafybeibqswnntemtba3tz4kp4mqovxagqposbzq3kpwmx5shshyqyqb4va \ No newline at end of file diff --git a/packages/o/okteto/.files b/packages/o/okteto/.files index 7fea3d9..2840dc3 100644 Binary files a/packages/o/okteto/.files and b/packages/o/okteto/.files differ diff --git a/packages/o/okteto/.rev b/packages/o/okteto/.rev index c2100fc..8c3d331 100644 --- a/packages/o/okteto/.rev +++ b/packages/o/okteto/.rev @@ -311,4 +311,12 @@ 1062289 + + 601aa90602c8a7d424b96e01c8e7c204 + 2.12.1 + + dimstar_suse + + 1064472 + diff --git a/packages/o/okteto/.servicemark b/packages/o/okteto/.servicemark index 4d0ccd4..dd83f0a 100644 --- a/packages/o/okteto/.servicemark +++ b/packages/o/okteto/.servicemark @@ -1 +1 @@ -69928b9dfa1b0febf68cafd355187923 +39c358629f0c923d94f2bc47ff81d491 diff --git a/packages/o/okteto/_service b/packages/o/okteto/_service index 93613c7..e70746f 100644 --- a/packages/o/okteto/_service +++ b/packages/o/okteto/_service @@ -3,10 +3,10 @@ https://github.com/okteto/okteto git .git - 2.12.0 + 2.12.1 @PARENT_TAG@ enable - 2.12.0 + 2.12.1 okteto @@ -16,6 +16,6 @@ gz - okteto-2.12.0.tar.gz + okteto-2.12.1.tar.gz diff --git a/packages/o/okteto/_servicedata b/packages/o/okteto/_servicedata index 694bdc0..dd681ab 100644 --- a/packages/o/okteto/_servicedata +++ b/packages/o/okteto/_servicedata @@ -1,4 +1,4 @@ https://github.com/okteto/okteto - 02efdb5ac915334ff61774a16e131433255cc2e4 \ No newline at end of file + b9b24d89b1a698e69241ad34da13afc1996f65e4 \ No newline at end of file diff --git a/packages/o/okteto/okteto-2.12.0.tar.gz b/packages/o/okteto/okteto-2.12.0.tar.gz deleted file mode 120000 index dd5a914..0000000 --- a/packages/o/okteto/okteto-2.12.0.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeidhp7kfiosnd7jdeeqrxz4zgowp6ucmkcklvwxrlp7jast6udnrgq \ No newline at end of file diff --git a/packages/o/okteto/okteto-2.12.1.tar.gz b/packages/o/okteto/okteto-2.12.1.tar.gz new file mode 120000 index 0000000..96fef56 --- /dev/null +++ b/packages/o/okteto/okteto-2.12.1.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeiagvmx2gl5crk5en3w7f5ku6ummwevokdku3kdgeln52bu4tyqa7a \ No newline at end of file diff --git a/packages/o/okteto/okteto.changes b/packages/o/okteto/okteto.changes index ea9304b..a49b56f 100644 --- a/packages/o/okteto/okteto.changes +++ b/packages/o/okteto/okteto.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Feb 12 06:31:17 UTC 2023 - kastl@b1-systems.de + +- Update to version 2.12.1: + * Wait for cronjobs to finish the execution of their jobs (#3351) (#3352) + +------------------------------------------------------------------- Tue Jan 31 15:04:26 UTC 2023 - kastl@b1-systems.de - Update to version 2.12.0: diff --git a/packages/o/okteto/okteto.spec b/packages/o/okteto/okteto.spec index e12801e..3f87143 100644 --- a/packages/o/okteto/okteto.spec +++ b/packages/o/okteto/okteto.spec @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: okteto -Version: 2.12.0 +Version: 2.12.1 Release: 0 Summary: Develop your applications directly in your Kubernetes Cluster License: Apache-2.0 diff --git a/packages/o/okteto/vendor.tar.gz b/packages/o/okteto/vendor.tar.gz index 6bfe67e..f1743cd 120000 --- a/packages/o/okteto/vendor.tar.gz +++ b/packages/o/okteto/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeicpuv6un6lzjctfzoyxv4dymwzib2dfw3jloccfefydicopyxt2x4 \ No newline at end of file +/ipfs/bafybeicszuozzeezzq5pdywoduzt2lbcl5oyuj6u4hcswbod7uwj5n5mx4 \ No newline at end of file diff --git a/packages/p/patterns-microos/.files b/packages/p/patterns-microos/.files index 3b352f7..9ffbc38 100644 Binary files a/packages/p/patterns-microos/.files and b/packages/p/patterns-microos/.files differ diff --git a/packages/p/patterns-microos/.rev b/packages/p/patterns-microos/.rev index c21bdca..8d7720e 100644 --- a/packages/p/patterns-microos/.rev +++ b/packages/p/patterns-microos/.rev @@ -599,4 +599,17 @@ Tue Jan 20 02:29:11 UTC 2021 - Syds Bearda <sydsb@opensuse.org> GNOME Desktop (boo#1205108) 1064003 + + a54715adf8d84707e4d9893407f0cd08 + 5.0 + + dimstar_suse + - Add thunderbolt device management to desktop-common (boo#1208150) + +- Add baloo5-file to kde pattern, missed as a recommended in + pattern, required for a number of desktop search functions + +- Remove redundant gnome-system-monitor (boo#1205108) + 1064386 + diff --git a/packages/p/patterns-microos/patterns-microos.changes b/packages/p/patterns-microos/patterns-microos.changes index a31a557..f8615f3 100644 --- a/packages/p/patterns-microos/patterns-microos.changes +++ b/packages/p/patterns-microos/patterns-microos.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Feb 11 12:33:19 UTC 2023 - Richard Brown + +- Add thunderbolt device management to desktop-common (boo#1208150) + +------------------------------------------------------------------- Thu Feb 9 12:18:23 UTC 2023 - Fabian Vogt - Comment out gtk4-metatheme-breeze until Plasma 5.27 @@ -22,6 +27,12 @@ Wed Feb 8 09:50:14 UTC 2023 - Richard Brown GNOME Desktop (boo#1205108) ------------------------------------------------------------------- +Wed Feb 1 20:28:08 UTC 2023 - Shawn Dunn + +- Add baloo5-file to kde pattern, missed as a recommended in + pattern, required for a number of desktop search functions + +------------------------------------------------------------------- Wed Jan 11 15:55:38 UTC 2023 - Luciano Santos - Add transactional-update-notifier to the microos_desktop_common @@ -39,7 +50,7 @@ Wed Jan 11 15:55:38 UTC 2023 - Luciano Santos ------------------------------------------------------------------- Fri Nov 25 12:33:10 UTC 2022 - Richard Brown -- Remove redundant gnome-system-monitor (boo#1205108) +- Remove redundant gnome-system-monitor (boo#1205108) ------------------------------------------------------------------- Fri Nov 18 00:26:15 UTC 2022 - Shawn Dunn diff --git a/packages/p/patterns-microos/patterns-microos.spec b/packages/p/patterns-microos/patterns-microos.spec index 6c93d33..902c57b 100644 --- a/packages/p/patterns-microos/patterns-microos.spec +++ b/packages/p/patterns-microos/patterns-microos.spec @@ -375,6 +375,9 @@ Requires: system-config-printer-common Requires: system-config-printer-dbus-service Requires: udev-configure-printer +# Add thunderbolt device management (boo#1208150) +Requires: bolt + # Common tools Requires: bash-completion Requires: bluez-firmware @@ -576,6 +579,8 @@ Requires: kgamma5 Requires: kwrited5 Requires: phonon4qt5-backend-gstreamer Requires: plasma-nm5 +# Manually pull in baloo5-file to better support desktop search functions/desktop integration +Requires: baloo5-file # For NetworkManager support of openVPN Connections Requires: NetworkManager-openvpn Requires: openvpn-auth-pam-plugin diff --git a/packages/p/patterns-xfce/.files b/packages/p/patterns-xfce/.files index 1b2ac7f..8aa0b58 100644 Binary files a/packages/p/patterns-xfce/.files and b/packages/p/patterns-xfce/.files differ diff --git a/packages/p/patterns-xfce/.rev b/packages/p/patterns-xfce/.rev index c21a579..17eb0a4 100644 --- a/packages/p/patterns-xfce/.rev +++ b/packages/p/patterns-xfce/.rev @@ -119,4 +119,12 @@ 966659 + + 65f330baff803d64519ede69fdcc0c33 + 20230212 + + dimstar_suse + + 1064426 + diff --git a/packages/p/patterns-xfce/patterns-xfce.changes b/packages/p/patterns-xfce/patterns-xfce.changes index 543a7ec..cfa8e20 100644 --- a/packages/p/patterns-xfce/patterns-xfce.changes +++ b/packages/p/patterns-xfce/patterns-xfce.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat Feb 11 17:59:44 UTC 2023 - Maurizio Galli + +- Replaced gnome-calculator with galculator since it better integrates + with Xfce look and feel. +- Do not recommend package-update-indicator on Tumbleweed. Only Leap + supports update method via PackageKit. + +------------------------------------------------------------------- Sun Apr 3 09:22:07 UTC 2022 - Maurizio Galli - Install blueman because blueberry is no longer available diff --git a/packages/p/patterns-xfce/patterns-xfce.spec b/packages/p/patterns-xfce/patterns-xfce.spec index a442497..6a78b0d 100644 --- a/packages/p/patterns-xfce/patterns-xfce.spec +++ b/packages/p/patterns-xfce/patterns-xfce.spec @@ -19,7 +19,7 @@ %bcond_with betatest Name: patterns-xfce -Version: 20210209 +Version: 20230212 Release: 0 Summary: Patterns for Installation (Xfce) License: MIT @@ -67,7 +67,7 @@ Recommends: parole Recommends: blueman Recommends: thunar-sendto-blueman Recommends: file-roller -Recommends: gnome-calculator +Recommends: galculator Recommends: gnome-disk-utility Recommends: gucharmap Recommends: lightdm @@ -94,8 +94,13 @@ Recommends: gdb Recommends: system-config-printer Recommends: system-config-printer-applet # bnc#537362 + +# Currently only Leap supports this update method via packagekit +%if 0%{?sle_version} >= 150400 && 0%{?is_opensuse} Recommends: gnome-packagekit Recommends: package-update-indicator +%endif + # bnc#537365 Recommends: gnome-keyring Recommends: gnome-keyring-pam diff --git a/packages/p/pgloader b/packages/p/pgloader index be22502..843a452 160000 --- a/packages/p/pgloader +++ b/packages/p/pgloader @@ -1 +1 @@ -Subproject commit be22502ab1592c3fa89d62d6528a6aaa9889aea3 +Subproject commit 843a452353761060458aaaab010af5cf6385a218 diff --git a/packages/p/plasma-branding-MicroOS/.files b/packages/p/plasma-branding-MicroOS/.files index 3f71a8d..f96575c 100644 Binary files a/packages/p/plasma-branding-MicroOS/.files and b/packages/p/plasma-branding-MicroOS/.files differ diff --git a/packages/p/plasma-branding-MicroOS/.rev b/packages/p/plasma-branding-MicroOS/.rev index b622fef..c297cea 100644 --- a/packages/p/plasma-branding-MicroOS/.rev +++ b/packages/p/plasma-branding-MicroOS/.rev @@ -7,4 +7,12 @@ 993310 + + 7605ed21745c2871f4c9c18b60c966b1 + 20230126 + + dimstar_suse + + 1064325 + diff --git a/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.changes b/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.changes index 0f7ca5c..074adc1 100644 --- a/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.changes +++ b/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 26 12:24:00 UTC 2023 - Syds Bearda + +- Correct the transactional-update reboot method for KDE Desktop +- 20230126 + +------------------------------------------------------------------- Thu Aug 4 17:25:55 UTC 2022 - Shawn Dunn - Add Conflicts: gnome-branding-MicroOS diff --git a/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.spec b/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.spec index 089139b..64cdbc4 100644 --- a/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.spec +++ b/packages/p/plasma-branding-MicroOS/plasma-branding-MicroOS.spec @@ -1,7 +1,7 @@ # # spec file for package plasma-branding-MicroOS # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2021 SUSE Software Solutions GmbH # # All modifications and additions to the file contributed by third parties @@ -26,12 +26,14 @@ Source2: mod-firstboot.desktop Source3: mod-firstboot BuildArch: noarch BuildRequires: flatpak +BuildRequires: transactional-update Requires: flatpak Requires: libqt5-qdbus Requires: kdialog +Requires: transactional-update Requires: sound-theme-freedesktop Conflicts: gnome-branding-MicroOS -Version: 20210427 +Version: 20230126 Release: 0 %description @@ -54,6 +56,12 @@ install -m0644 mod-firstboot.desktop %{buildroot}%{_sysconfdir}/skel/.config/aut install -d %{buildroot}%{_bindir} install -m0755 mod-firstboot %{buildroot}%{_bindir}/mod-firstboot +%post +sed -i 's/^#REBOOT_METHOD=auto/REBOOT_METHOD=notify/' %{_prefix}%{_sysconfdir}/transactional-update.conf + +%postun +sed -i 's/^REBOOT_METHOD=notify/#REBOOT_METHOD=auto/' %{_prefix}%{_sysconfdir}/transactional-update.conf + %files %license COPYING %dir %{_prefix}/share/microos-desktop diff --git a/packages/p/pluto/.files b/packages/p/pluto/.files index 593ff25..ccf096e 100644 Binary files a/packages/p/pluto/.files and b/packages/p/pluto/.files differ diff --git a/packages/p/pluto/.rev b/packages/p/pluto/.rev index ea4de68..390ce6b 100644 --- a/packages/p/pluto/.rev +++ b/packages/p/pluto/.rev @@ -183,4 +183,12 @@ 1064156 + + 852af3d0ab94ec249015529da1420e81 + 5.13.3 + + dimstar_suse + + 1064467 + diff --git a/packages/p/pluto/.servicemark b/packages/p/pluto/.servicemark index e4d4205..4efcd5e 100644 --- a/packages/p/pluto/.servicemark +++ b/packages/p/pluto/.servicemark @@ -1 +1 @@ -1012b0b31fc1318251d75bf77e6c36e6 +43b2ab0fcc95bc281261a9f1fe5e774b diff --git a/packages/p/pluto/_service b/packages/p/pluto/_service index 38e872f..d5b1a5c 100644 --- a/packages/p/pluto/_service +++ b/packages/p/pluto/_service @@ -3,7 +3,7 @@ https://github.com/FairwindsOps/pluto git .git - v5.13.2 + v5.13.3 @PARENT_TAG@ enable v(.*) @@ -16,6 +16,6 @@ gz - pluto-5.13.2.tar.gz + pluto-5.13.3.tar.gz diff --git a/packages/p/pluto/_servicedata b/packages/p/pluto/_servicedata index 84f0a2d..0cb04f3 100644 --- a/packages/p/pluto/_servicedata +++ b/packages/p/pluto/_servicedata @@ -1,4 +1,4 @@ https://github.com/FairwindsOps/pluto - b6ac6022c9755197b2920c3af0795b5b0e00ec3a \ No newline at end of file + 3d62079d42d9d8ab08562611b216c68e70e75d14 \ No newline at end of file diff --git a/packages/p/pluto/pluto-5.13.2.tar.gz b/packages/p/pluto/pluto-5.13.2.tar.gz deleted file mode 120000 index 932c59d..0000000 --- a/packages/p/pluto/pluto-5.13.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiaoezgjub7gyncqz65hcbs3intioeym2fj4zcrqqbxjsuspyzubm4 \ No newline at end of file diff --git a/packages/p/pluto/pluto-5.13.3.tar.gz b/packages/p/pluto/pluto-5.13.3.tar.gz new file mode 120000 index 0000000..f98c85d --- /dev/null +++ b/packages/p/pluto/pluto-5.13.3.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeibtxhv66slxbpda4v6ghp5hg4nhfsppehffgvhfizcpg7643eqg3a \ No newline at end of file diff --git a/packages/p/pluto/pluto.changes b/packages/p/pluto/pluto.changes index b08535b..6598dd5 100644 --- a/packages/p/pluto/pluto.changes +++ b/packages/p/pluto/pluto.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Feb 12 06:10:06 UTC 2023 - kastl@b1-systems.de + +- Update to version 5.13.3: + * fix : rules to load client configuration to connect to a kubernetes cluster (#419) + +------------------------------------------------------------------- Fri Feb 10 06:15:14 UTC 2023 - kastl@b1-systems.de - Update to version 5.13.2: @@ -8,7 +14,7 @@ Fri Feb 10 06:15:14 UTC 2023 - kastl@b1-systems.de Fri Feb 10 06:13:50 UTC 2023 - kastl@b1-systems.de - Update to version 5.13.1: - * update go modules (#450) + * update go modules (#450) (bsc#1208093, CVE-2023-25165) ------------------------------------------------------------------- Mon Feb 06 17:27:04 UTC 2023 - kastl@b1-systems.de diff --git a/packages/p/pluto/pluto.spec b/packages/p/pluto/pluto.spec index a39c17a..8df7a7d 100644 --- a/packages/p/pluto/pluto.spec +++ b/packages/p/pluto/pluto.spec @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: pluto -Version: 5.13.2 +Version: 5.13.3 Release: 0 Summary: A cli tool to help discover deprecated apiVersions in Kubernetes License: Apache-2.0 diff --git a/packages/p/pluto/vendor.tar.gz b/packages/p/pluto/vendor.tar.gz index 477cbe1..3f56bcd 120000 --- a/packages/p/pluto/vendor.tar.gz +++ b/packages/p/pluto/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeiahw4maeivrvtvidbp6ojk6wf5y6uujgtc2lqwz2gyx3hdfczrnau \ No newline at end of file +/ipfs/bafybeid7xudenph77ytgtgjhsvfwjll4emjn5sbseposcgaihup4rbsgzi \ No newline at end of file diff --git a/packages/p/proteus/.files b/packages/p/proteus/.files index 05c1d46..d4a99ef 100644 Binary files a/packages/p/proteus/.files and b/packages/p/proteus/.files differ diff --git a/packages/p/proteus/.rev b/packages/p/proteus/.rev index 4ea4c6c..077c14f 100644 --- a/packages/p/proteus/.rev +++ b/packages/p/proteus/.rev @@ -198,4 +198,13 @@ Automatic submission by obs-autosubmit 1038264 + + f76e403a5b8f16eee6e0361e81e06cba + 6.0.8 + + dimstar_suse + - Version 6.0.8 - Bugfix Release + + 1064684 + diff --git a/packages/p/proteus/.servicemark b/packages/p/proteus/.servicemark index e0caf97..afa4831 100644 --- a/packages/p/proteus/.servicemark +++ b/packages/p/proteus/.servicemark @@ -1 +1 @@ -616814be8dfb982a1aa7e72dc241e424 +ee966506dbf938958dcaa2ce9a79b9cc diff --git a/packages/p/proteus/proteus-6.0.7.tar.gz b/packages/p/proteus/proteus-6.0.7.tar.gz deleted file mode 120000 index 95c1ffc..0000000 --- a/packages/p/proteus/proteus-6.0.7.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreigmuepi2ldbmd24wuszphnf7rtxfvhtfwvl6vqldzhgff4qaljz3a \ No newline at end of file diff --git a/packages/p/proteus/proteus-6.0.7.tar.gz.asc b/packages/p/proteus/proteus-6.0.7.tar.gz.asc deleted file mode 100644 index 3252802..0000000 --- a/packages/p/proteus/proteus-6.0.7.tar.gz.asc +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmN2dI8ACgkQV09u/05H -dRcpMQf/S+q1NT8dCwcFbVZaYEM+OVCIZsPnMBC2NAr1LAhUx1muBAQhfA1XW2sB -JiplrcEZCpVbOu8nr3C39yEoLB2HlJFI0BeQRWIrIBYhZOTL699UmxJPSCS8o7RU -mb4dmQBRTL0MJZm4brxVcuc7CYJXzz4g+MxXBSz8bDBcIRiUxHpxG7SpIXgqFOXV -0SBwxjUVR5Y45yDBD455xNPvzAvDD/mTT16F9fV0Cm67rrSMCHmDMbUnGrZJVOe6 -M7TLNt1sMAxmS+X+Ljq/tYqA6aWcES+13HAWHHO0EvPZyGbTGfNk+9KZul9cLik5 -/2iFqOwQzr0+87Dng1LS+pfGcYp+aw== -=EYiH ------END PGP SIGNATURE----- diff --git a/packages/p/proteus/proteus-6.0.8.tar.gz b/packages/p/proteus/proteus-6.0.8.tar.gz new file mode 120000 index 0000000..95f6a89 --- /dev/null +++ b/packages/p/proteus/proteus-6.0.8.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreib77fziixpvnqksnbievvo2oogpl524grtq3wgzbuim3zgzswcqky \ No newline at end of file diff --git a/packages/p/proteus/proteus-6.0.8.tar.gz.asc b/packages/p/proteus/proteus-6.0.8.tar.gz.asc new file mode 100644 index 0000000..913b977 --- /dev/null +++ b/packages/p/proteus/proteus-6.0.8.tar.gz.asc @@ -0,0 +1,12 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmPgGRYACgkQV09u/05H +dReYcwgAi31XvBoB1w1Z4SmgpVxhkkoW4xIEWQTrU5fdImfKmosl3Qy8ngFX4tiH +imzGoFlbeiyimUeBGlCPlcPN/sTbWWu8jDAhl/icdP33NoMsPvac5IHvFTjXeU3f +mb57pxCVHUSaml2hDAzlbNVHlejSIIuV5Gox6/4NniLiSalI01lMxd+ciSLFKwip +drCTTOt73VVRLqTD07XImCLqVeKR4CuDi/QUtT4FgDvGKFKEzcQjQ2YH0uTcf+ON +fsVos7Okf6BldZYh0T3fI+2lIQDOXOg71q6ZVNRbvlxB1Fr3xTkZ/KV+FRSP1ssd +wzYC/p/xrrkJV3D299jJas1z145MGA== +=fVry +-----END PGP SIGNATURE----- diff --git a/packages/p/proteus/proteus.changes b/packages/p/proteus/proteus.changes index bc11043..dace6bb 100644 --- a/packages/p/proteus/proteus.changes +++ b/packages/p/proteus/proteus.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 17:37:34 UTC 2023 - Axel Braun + +- Version 6.0.8 - Bugfix Release + +------------------------------------------------------------------- Fri Nov 18 19:04:45 UTC 2022 - Axel Braun - Version 6.0.7 - Bugfix Release diff --git a/packages/p/proteus/proteus.spec b/packages/p/proteus/proteus.spec index a74a07a..3755735 100644 --- a/packages/p/proteus/proteus.spec +++ b/packages/p/proteus/proteus.spec @@ -1,7 +1,7 @@ # # spec file for package proteus # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2014-2021 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %define majorver 6.0 Name: proteus -Version: %{majorver}.7 +Version: %{majorver}.8 Release: 0 Summary: A library to access Tryton's modules like a client License: GPL-3.0-or-later diff --git a/packages/p/python-matplotlib/.files b/packages/p/python-matplotlib/.files index 7013e97..3629238 100644 Binary files a/packages/p/python-matplotlib/.files and b/packages/p/python-matplotlib/.files differ diff --git a/packages/p/python-matplotlib/.rev b/packages/p/python-matplotlib/.rev index c8cc5d6..b88f8d3 100644 --- a/packages/p/python-matplotlib/.rev +++ b/packages/p/python-matplotlib/.rev @@ -868,4 +868,12 @@ http://forums.opensuse.org/showthread.php/416182-Python-matplolib (forwarded req 1045049 + + 0d3313ba72f6d5b6d562ac9d7fad789e + 3.6.3 + + dimstar_suse + + 1064340 + diff --git a/packages/p/python-matplotlib/matplotlib-3.6.2.tar.gz b/packages/p/python-matplotlib/matplotlib-3.6.2.tar.gz deleted file mode 120000 index 7732412..0000000 --- a/packages/p/python-matplotlib/matplotlib-3.6.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeifskw27rordzaeyphuqthfk2qqsmlnlwignwxp63wlgx2re3c2nri \ No newline at end of file diff --git a/packages/p/python-matplotlib/matplotlib-3.6.3.tar.gz b/packages/p/python-matplotlib/matplotlib-3.6.3.tar.gz new file mode 120000 index 0000000..44cbf67 --- /dev/null +++ b/packages/p/python-matplotlib/matplotlib-3.6.3.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeie32nau3ztbcdk44qzjtns5oczabteddfsbxmxvon42y5m3lx4ahq \ No newline at end of file diff --git a/packages/p/python-matplotlib/python-matplotlib.changes b/packages/p/python-matplotlib/python-matplotlib.changes index a3637dd..f8f784f 100644 --- a/packages/p/python-matplotlib/python-matplotlib.changes +++ b/packages/p/python-matplotlib/python-matplotlib.changes @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Feb 8 18:31:43 UTC 2023 - Arun Persaud + +- update to version 3.6.3: + * Fix Artist removal from axes_grid1 Axes classes + * Fix inset_locator in subfigures + * Fix scatter on masked arrays with units + * Fix colorbar ticks with log norm contours + * Fix deprecation warnings in GTK4 backend + * Fix using relative paths in HTMLWriter + * Improve failure message from rcParams string validation for tuple + inputs + * Improve performance of QtAgg backends + * No longer modify pil_kwargs argument to imsave and savefig + +------------------------------------------------------------------- Thu Dec 22 15:40:39 UTC 2022 - Ben Greiner - Update to 3.6.2 diff --git a/packages/p/python-matplotlib/python-matplotlib.spec b/packages/p/python-matplotlib/python-matplotlib.spec index 4d81b47..147105f 100644 --- a/packages/p/python-matplotlib/python-matplotlib.spec +++ b/packages/p/python-matplotlib/python-matplotlib.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ ExclusiveArch: x86_64 aarch64 %bcond_with test %endif Name: python-matplotlib%{psuffix} -Version: 3.6.2 +Version: 3.6.3 Release: 0 Summary: Plotting Library for Python License: SUSE-Matplotlib @@ -37,11 +37,18 @@ Source1: matplotlib-mplsetup.cfg # Bundled version of freetype and qhull for testing purposes only Source98: http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz Source99: https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz +Recommends: ghostscript +Recommends: libxml2-tools +Recommends: poppler-tools +Recommends: python-certifi +Recommends: (%{python_flavor}-matplotlib-tk if tk) +Provides: python-matplotlib-gtk = %{version} +Obsoletes: python-matplotlib-gtk < %{version} # SECTION build -BuildRequires: %{python_module setuptools_scm >= 7} BuildRequires: %{python_module devel >= 3.8} BuildRequires: %{python_module numpy-devel >= 1.19} BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools_scm >= 7} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: c++_compiler @@ -57,23 +64,16 @@ BuildRequires: pkgconfig(libpng) >= 1.2 BuildRequires: pkgconfig(tcl) # /SECTION # SECTION runtime -Requires: python-contourpy >= 1.0.1 Requires: python-Cycler >= 0.10 Requires: python-FontTools >= 4.22.0 Requires: python-Pillow >= 6.2.0 +Requires: python-contourpy >= 1.0.1 Requires: python-kiwisolver >= 1.0.1 Requires: python-numpy >= 1.19 Requires: python-packaging >= 20.0 Requires: python-pyparsing > 2.2.1 Requires: python-python-dateutil >= 2.7 # /SECTION -Recommends: ghostscript -Recommends: libxml2-tools -Recommends: poppler-tools -Recommends: python-certifi -Recommends: (%{python_flavor}-matplotlib-tk if tk) -Provides: python-matplotlib-gtk = %{version} -Obsoletes: python-matplotlib-gtk < %{version} # SECTION test %if %{with test} BuildRequires: %{python_module matplotlib = %{version}} diff --git a/packages/p/python-pywayland/.files b/packages/p/python-pywayland/.files index cb3c188..c6416a4 100644 Binary files a/packages/p/python-pywayland/.files and b/packages/p/python-pywayland/.files differ diff --git a/packages/p/python-pywayland/.rev b/packages/p/python-pywayland/.rev index a0c6f27..e71b5c5 100644 --- a/packages/p/python-pywayland/.rev +++ b/packages/p/python-pywayland/.rev @@ -15,4 +15,12 @@ Automatic submission by obs-autosubmit 999525 + + 51a7fd60915bf2573e8d8cb5d5f61d04 + 0.4.15 + + dimstar_suse + Automatic submission by obs-autosubmit + 1064397 + diff --git a/packages/p/python-pywayland/python-pywayland.changes b/packages/p/python-pywayland/python-pywayland.changes index 3650ecc..310370e 100644 --- a/packages/p/python-pywayland/python-pywayland.changes +++ b/packages/p/python-pywayland/python-pywayland.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Sat Feb 4 15:10:50 UTC 2023 - Soc Virnyl Estela + +- Use pkg-config and %optflags to set CFLAGS. + +------------------------------------------------------------------- +Mon Jan 30 12:58:20 UTC 2023 - Soc Virnyl Estela + +- Update 0.4.15: + * Addressed CVE-2007-4559 + * Fix bug in protocols generated with latest version of wayland-protocols + * Bump version of wayland-protocols in release and in CI to 1.31 + +------------------------------------------------------------------- Sat Aug 20 07:06:08 UTC 2022 - Soc Virnyl Estela - Update to version 0.4.14: diff --git a/packages/p/python-pywayland/python-pywayland.spec b/packages/p/python-pywayland/python-pywayland.spec index 5afe5c3..104bb07 100644 --- a/packages/p/python-pywayland/python-pywayland.spec +++ b/packages/p/python-pywayland/python-pywayland.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_without test %define pyname pywayland Name: python-%{pyname} -Version: 0.4.14 +Version: 0.4.15 Release: 0 Summary: Python binding to the wayland library using cffi License: NCSA @@ -35,6 +35,7 @@ BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes +BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(wayland-client) >= 1.21 @@ -52,12 +53,12 @@ Python binding to the wayland library using cffi. %patch0 -p1 %build -export CFLAGS="-I/usr/include/wayland ${CFLAGS}" +export CFLAGS="%optflags $(pkg-config --cflags wayland-client)" %python_exec pywayland/ffi_build.py %python_build %install -export CFLAGS="-I/usr/include/wayland ${CFLAGS}" +export CFLAGS="%optflags $(pkg-config --cflags wayland-client)" %python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} @@ -66,9 +67,9 @@ export CFLAGS="-I/usr/include/wayland ${CFLAGS}" %if %{with test} %check +export CFLAGS="%optflags $(pkg-config --cflags wayland-client)" mkdir -p %{buildroot}/fake-xdg-runtime-dir export XDG_RUNTIME_DIR=%{buildroot}/fake-xdg-runtime-dir -export CFLAGS="-I/usr/include/wayland ${CFLAGS}" %python_exec -m pywayland.scanner %pytest -vv rm -rfv ${XDG_RUNTIME_DIR} diff --git a/packages/p/python-pywayland/pywayland-0.4.14.tar.gz b/packages/p/python-pywayland/pywayland-0.4.14.tar.gz deleted file mode 120000 index 7b45b83..0000000 --- a/packages/p/python-pywayland/pywayland-0.4.14.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreiajojrhopafxuwv5qvggj7jeyobbnvipbhnkh4e55hnejqjutqlfu \ No newline at end of file diff --git a/packages/p/python-pywayland/pywayland-0.4.15.tar.gz b/packages/p/python-pywayland/pywayland-0.4.15.tar.gz new file mode 120000 index 0000000..c2a27ef --- /dev/null +++ b/packages/p/python-pywayland/pywayland-0.4.15.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreif7h3ji3xykj62saoashean42xies5y4x4wf7hpb52xecnunv2enq \ No newline at end of file diff --git a/packages/p/python-pywlroots/.files b/packages/p/python-pywlroots/.files index 461160a..1927a0c 100644 Binary files a/packages/p/python-pywlroots/.files and b/packages/p/python-pywlroots/.files differ diff --git a/packages/p/python-pywlroots/.rev b/packages/p/python-pywlroots/.rev index ae897fb..95bbdd2 100644 --- a/packages/p/python-pywlroots/.rev +++ b/packages/p/python-pywlroots/.rev @@ -31,4 +31,14 @@ 1042355 + + d314b7addb9f94470d7b17cf2d8b89bb + 0.15.24 + + dimstar_suse + - Remove fix-include-paths.patch +- Use pkg-config and %optflags for CFLAGS. + + 1064439 + diff --git a/packages/p/python-pywlroots/fix-include-paths.patch b/packages/p/python-pywlroots/fix-include-paths.patch deleted file mode 100644 index 1f6f83f..0000000 --- a/packages/p/python-pywlroots/fix-include-paths.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./setup.py.orig 2022-07-13 00:24:21.798070153 +0800 -+++ ./setup.py 2022-07-13 08:29:07.921631859 +0800 -@@ -32,4 +32,4 @@ - - sys.path.insert(0, "wlroots") - --setup(**keywords_with_side_effects(sys.argv)) -+setup(**keywords_with_side_effects(sys.argv), include_dirs=["/usr/include/wayland", "/usr/include/libxkbcommon", "/usr/include/libinput", "/usr/include/libdrm", "/usr/include/pixman-1"]) diff --git a/packages/p/python-pywlroots/python-pywlroots.changes b/packages/p/python-pywlroots/python-pywlroots.changes index 9c48bd2..c2eb7e1 100644 --- a/packages/p/python-pywlroots/python-pywlroots.changes +++ b/packages/p/python-pywlroots/python-pywlroots.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Sun Feb 12 00:14:15 UTC 2023 - Soc Virnyl Estela + +- Remove fix-include-paths.patch + +------------------------------------------------------------------- +Sat Feb 4 15:21:44 UTC 2023 - Soc Virnyl Estela + +- Use pkg-config and %optflags for CFLAGS. + +------------------------------------------------------------------- Mon Dec 12 08:24:15 UTC 2022 - Michael Vetter - Fix build: pick up a compatible verison of wlroots boo#1206305 diff --git a/packages/p/python-pywlroots/python-pywlroots.spec b/packages/p/python-pywlroots/python-pywlroots.spec index e05ea54..c1c4b46 100644 --- a/packages/p/python-pywlroots/python-pywlroots.spec +++ b/packages/p/python-pywlroots/python-pywlroots.spec @@ -1,7 +1,7 @@ # # spec file for package python-pywlroots # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Group: Development/Languages/Python URL: https://github.com/flacjacket/pywlroots Source0: https://files.pythonhosted.org/packages/source/p/pywlroots/pywlroots-%{version}.tar.gz Source1: python-pywlroots-rpmlintrc -Patch0: fix-include-paths.patch +# Patch0: fix-include-paths.patch BuildRequires: %{python_module cffi} BuildRequires: %{python_module devel} BuildRequires: %{python_module distutils-extra} @@ -54,15 +54,15 @@ Python binding to the wlroots library using cffi. %prep %setup -q -n pywlroots-%{version} -%patch0 -p1 +#%%patch0 -p1 %build -export CFLAGS="-I/usr/include/wayland -I/usr/include/libdrm -I/usr/include/libxkbcommon -I/usr/include/pixman-1 -I/usr/include/libinput $CFLAGS" +export CFLAGS="%optflags $(pkg-config --cflags wayland-client xkbcommon pixman-1 libinput libdrm)" %python_exec wlroots/ffi_build.py %pyproject_wheel %install -export CFLAGS="-I/usr/include/wayland -I/usr/include/libdrm -I/usr/include/libxkbcommon -I/usr/include/pixman-1 -I/usr/include/libinput $CFLAGS" +export CFLAGS="%optflags $(pkg-config --cflags wayland-client xkbcommon pixman-1 libinput libdrm)" %python_exec wlroots/ffi_build.py %pyproject_install @@ -70,7 +70,7 @@ export CFLAGS="-I/usr/include/wayland -I/usr/include/libdrm -I/usr/include/libxk %if %{with test} %check -export CFLAGS="-I/usr/include/wayland -I/usr/include/libdrm -I/usr/include/libxkbcommon -I/usr/include/pixman-1 -I/usr/include/libinput $CFLAGS" +export CFLAGS="%optflags $(pkg-config --cflags wayland-client xkbcommon pixman-1 libinput libdrm)" %pytest -vv %endif diff --git a/packages/q/qbe/.files b/packages/q/qbe/.files index c479d0c..f17783c 100644 Binary files a/packages/q/qbe/.files and b/packages/q/qbe/.files differ diff --git a/packages/q/qbe/.rev b/packages/q/qbe/.rev index 52af114..45f7c06 100644 --- a/packages/q/qbe/.rev +++ b/packages/q/qbe/.rev @@ -7,4 +7,12 @@ I want to add qbe to openSUSE:Factory 1062561 + + 8c88124ac2106976009c58a2f3bcd0d4 + 1.1 + + dimstar_suse + Automatic submission by obs-autosubmit + 1064443 + diff --git a/packages/q/qbe/qbe-1.0.tar.xz b/packages/q/qbe/qbe-1.0.tar.xz deleted file mode 120000 index 98165ce..0000000 --- a/packages/q/qbe/qbe-1.0.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreibfp3zxe7cge6k7rzmzo4prqjzlo4v6xbkkvsvzpyh5u4gbg5c6bq \ No newline at end of file diff --git a/packages/q/qbe/qbe-1.1.tar.xz b/packages/q/qbe/qbe-1.1.tar.xz new file mode 120000 index 0000000..adea46d --- /dev/null +++ b/packages/q/qbe/qbe-1.1.tar.xz @@ -0,0 +1 @@ +/ipfs/bafkreid5bjj52qg7jadsvlrrpyi53xqv2guyazzrmdsrjyrvxhwkuhnrfq \ No newline at end of file diff --git a/packages/q/qbe/qbe.changes b/packages/q/qbe/qbe.changes index b45cbd9..864ddee 100644 --- a/packages/q/qbe/qbe.changes +++ b/packages/q/qbe/qbe.changes @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Sun Feb 5 03:51:45 UTC 2023 - Soc Virnyl Estela + +- Update to version 1.1: + * Improvements on performance and expressiveness + * support for Apple ARM-based hardware (arm64_apple target); + * support for thread-local storage; + * a new blit instruction to copy small aggregates; + * a new hlt instruction to flag non-termination; + * a new stack slot coalescing optimization. + +------------------------------------------------------------------- Tue Jan 31 12:08:13 UTC 2023 - Soc Virnyl Estela - Remove BuildRequires since c_compiler, glibc, and glibc-devel are diff --git a/packages/q/qbe/qbe.spec b/packages/q/qbe/qbe.spec index 5986179..41baff7 100644 --- a/packages/q/qbe/qbe.spec +++ b/packages/q/qbe/qbe.spec @@ -17,7 +17,7 @@ Name: qbe -Version: 1.0 +Version: 1.1 Release: 0 Summary: Small embeddable C compiler backend Group: Development/Languages/Other diff --git a/packages/q/qemu/.files b/packages/q/qemu/.files index 136a148..7fd3d9c 100644 Binary files a/packages/q/qemu/.files and b/packages/q/qemu/.files differ diff --git a/packages/q/qemu/.rev b/packages/q/qemu/.rev index e6a4c1b..e7cf18b 100644 --- a/packages/q/qemu/.rev +++ b/packages/q/qemu/.rev @@ -3260,4 +3260,37 @@ vhost-user-gpu-fix-leak-in-virgl_cmd_res.patch 1061672 + + e74ca9496d5ce8ade743ad014c97a375 + 7.1.0 + + dimstar_suse + - Fixed: bsc#1205847 (CVE-2022-4172), bsc#1203788 (CVE-2022-3165), + bsc#1205808 (CVE-2022-4144), bsc#1206527, bsc#1208139 +- Improved handling of: bsc#1202282 (jsc#PED-2592) +* Patches dropped: + pc-q35-Bump-max_cpus-to-1024.patch +* Patches added: + accel-abort-if-we-fail-to-load-the-accel.patch + bios-tables-test-add-test-for-number-of-.patch + bios-tables-test-teach-test-to-use-smbio.patch + dmg-warn-when-opening-dmg-images-contain.patch + hw-acpi-erst.c-Fix-memory-handling-issue.patch + hw-display-qxl-Avoid-buffer-overrun-in-q.patch + hw-display-qxl-Document-qxl_phys2virt.patch + hw-display-qxl-Have-qxl_log_command-Retu.patch + hw-display-qxl-Pass-requested-buffer-siz.patch + hw-smbios-add-core_count2-to-smbios-tabl.patch + hw-smbios-support-for-type-8-port-connec.patch + module-add-Error-arguments-to-module_loa.patch + module-removed-unused-function-argument-.patch + module-rename-module_load_one-to-module_.patch + openSUSE-pc-q35-Bump-max_cpus-to-1024.patch + s390x-tod-kvm-don-t-save-restore-the-TOD.patch + tests-acpi-allow-changes-for-core_count2.patch + tests-acpi-update-tables-for-new-core-co.patch + ui-vnc-clipboard-fix-integer-underflow-i.patch + + 1064332 + diff --git a/packages/q/qemu/APIC.core-count2 b/packages/q/qemu/APIC.core-count2 new file mode 100644 index 0000000..a255082 Binary files /dev/null and b/packages/q/qemu/APIC.core-count2 differ diff --git a/packages/q/qemu/DSDT.core-count2 b/packages/q/qemu/DSDT.core-count2 new file mode 100644 index 0000000..ca309f6 Binary files /dev/null and b/packages/q/qemu/DSDT.core-count2 differ diff --git a/packages/q/qemu/FACP.core-count2 b/packages/q/qemu/FACP.core-count2 new file mode 100644 index 0000000..31fa5dd Binary files /dev/null and b/packages/q/qemu/FACP.core-count2 differ diff --git a/packages/q/qemu/accel-abort-if-we-fail-to-load-the-accel.patch b/packages/q/qemu/accel-abort-if-we-fail-to-load-the-accel.patch new file mode 100644 index 0000000..b564d61 --- /dev/null +++ b/packages/q/qemu/accel-abort-if-we-fail-to-load-the-accel.patch @@ -0,0 +1,55 @@ +From: Claudio Fontana +Date: Thu, 29 Sep 2022 11:30:35 +0200 +Subject: accel: abort if we fail to load the accelerator plugin +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +if QEMU is configured with modules enabled, it is possible that the +load of an accelerator module will fail. +Exit in this case, relying on module_object_class_by_name to report +the specific load error if any. + +Signed-off-by: Claudio Fontana +Reviewed-by: Richard Henderson + +[claudio: changed abort() to exit(1)] +Reviewed-by: Philippe Mathieu-Daudé +Reviewed-by: Markus Armbruster +Message-Id: <20220929093035.4231-6-cfontana@suse.de> + +Signed-off-by: Paolo Bonzini +(cherry picked from commit 5141e9a23fc9a890d66a5700920a5ffd8885121f) +Resolves: bsc#1208139 +Signed-off-by: Dario Faggioli +--- + accel/accel-softmmu.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/accel/accel-softmmu.c b/accel/accel-softmmu.c +index 67276e4f522210baaf6a1c9090cd..f9cdafb148ac4281565e59d998cc 100644 +--- a/accel/accel-softmmu.c ++++ b/accel/accel-softmmu.c +@@ -66,6 +66,7 @@ void accel_init_ops_interfaces(AccelClass *ac) + { + const char *ac_name; + char *ops_name; ++ ObjectClass *oc; + AccelOpsClass *ops; + + ac_name = object_class_get_name(OBJECT_CLASS(ac)); +@@ -73,8 +74,13 @@ void accel_init_ops_interfaces(AccelClass *ac) + + ops_name = g_strdup_printf("%s" ACCEL_OPS_SUFFIX, ac_name); + ops = ACCEL_OPS_CLASS(module_object_class_by_name(ops_name)); ++ oc = module_object_class_by_name(ops_name); ++ if (!oc) { ++ error_report("fatal: could not load module for type '%s'", ops_name); ++ exit(1); ++ } + g_free(ops_name); +- ++ ops = ACCEL_OPS_CLASS(oc); + /* + * all accelerators need to define ops, providing at least a mandatory + * non-NULL create_vcpu_thread operation. diff --git a/packages/q/qemu/bios-tables-test-add-test-for-number-of-.patch b/packages/q/qemu/bios-tables-test-add-test-for-number-of-.patch new file mode 100644 index 0000000..f11acda --- /dev/null +++ b/packages/q/qemu/bios-tables-test-add-test-for-number-of-.patch @@ -0,0 +1,130 @@ +From: Julia Suvorova +Date: Tue, 11 Oct 2022 13:17:30 +0200 +Subject: bios-tables-test: add test for number of cores > 255 + +The new test is run with a large number of cpus and checks if the +core_count field in smbios_cpu_test (structure type 4) is correct. + +Choose q35 as it allows to run with -smp > 255. + +Signed-off-by: Julia Suvorova +Message-Id: <20220731162141.178443-5-jusual@redhat.com> +Message-Id: <20221011111731.101412-5-jusual@redhat.com> +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +Reviewed-by: Igor Mammedov +(cherry picked from commit 2d80b33843c71dbe5c250d712a1ccafafb2b3520) +References: bsc#1202282, jsc#PED-2592 +Signed-off-by: Dario Faggioli +--- + tests/qtest/bios-tables-test.c | 58 ++++++++++++++++++++++++++-------- + 1 file changed, 45 insertions(+), 13 deletions(-) + +diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c +index dcda3c508a77854415dad76998cc..29868a9c9486e0b18df5d96202ac 100644 +--- a/tests/qtest/bios-tables-test.c ++++ b/tests/qtest/bios-tables-test.c +@@ -92,6 +92,8 @@ typedef struct { + SmbiosEntryPoint smbios_ep_table; + uint16_t smbios_cpu_max_speed; + uint16_t smbios_cpu_curr_speed; ++ uint8_t smbios_core_count; ++ uint16_t smbios_core_count2; + uint8_t *required_struct_types; + int required_struct_types_len; + QTestState *qts; +@@ -631,29 +633,42 @@ static inline bool smbios_single_instance(uint8_t type) + } + } + +-static bool smbios_cpu_test(test_data *data, uint32_t addr) ++static void smbios_cpu_test(test_data *data, uint32_t addr, ++ SmbiosEntryPointType ep_type) + { +- uint16_t expect_speed[2]; +- uint16_t real; ++ uint8_t core_count, expected_core_count = data->smbios_core_count; ++ uint16_t speed, expected_speed[2]; ++ uint16_t core_count2, expected_core_count2 = data->smbios_core_count2; + int offset[2]; + int i; + + /* Check CPU speed for backward compatibility */ + offset[0] = offsetof(struct smbios_type_4, max_speed); + offset[1] = offsetof(struct smbios_type_4, current_speed); +- expect_speed[0] = data->smbios_cpu_max_speed ? : 2000; +- expect_speed[1] = data->smbios_cpu_curr_speed ? : 2000; ++ expected_speed[0] = data->smbios_cpu_max_speed ? : 2000; ++ expected_speed[1] = data->smbios_cpu_curr_speed ? : 2000; + + for (i = 0; i < 2; i++) { +- real = qtest_readw(data->qts, addr + offset[i]); +- if (real != expect_speed[i]) { +- fprintf(stderr, "Unexpected SMBIOS CPU speed: real %u expect %u\n", +- real, expect_speed[i]); +- return false; +- } ++ speed = qtest_readw(data->qts, addr + offset[i]); ++ g_assert_cmpuint(speed, ==, expected_speed[i]); + } + +- return true; ++ core_count = qtest_readb(data->qts, ++ addr + offsetof(struct smbios_type_4, core_count)); ++ ++ if (expected_core_count) { ++ g_assert_cmpuint(core_count, ==, expected_core_count); ++ } ++ ++ if (ep_type == SMBIOS_ENTRY_POINT_TYPE_64) { ++ core_count2 = qtest_readw(data->qts, ++ addr + offsetof(struct smbios_type_4, core_count2)); ++ ++ /* Core Count has reached its limit, checking Core Count 2 */ ++ if (expected_core_count == 0xFF && expected_core_count2) { ++ g_assert_cmpuint(core_count2, ==, expected_core_count2); ++ } ++ } + } + + static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type) +@@ -686,7 +701,7 @@ static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type) + set_bit(type, struct_bitmap); + + if (type == 4) { +- g_assert(smbios_cpu_test(data, addr)); ++ smbios_cpu_test(data, addr, ep_type); + } + + /* seek to end of unformatted string area of this struct ("\0\0") */ +@@ -908,6 +923,21 @@ static void test_acpi_q35_tcg(void) + free_test_data(&data); + } + ++static void test_acpi_q35_tcg_core_count2(void) ++{ ++ test_data data = { ++ .machine = MACHINE_Q35, ++ .variant = ".core-count2", ++ .required_struct_types = base_required_struct_types, ++ .required_struct_types_len = ARRAY_SIZE(base_required_struct_types), ++ .smbios_core_count = 0xFF, ++ .smbios_core_count2 = 275, ++ }; ++ ++ test_acpi_one("-machine smbios-entry-point-type=64 -smp 275", &data); ++ free_test_data(&data); ++} ++ + static void test_acpi_q35_tcg_bridge(void) + { + test_data data; +@@ -1876,6 +1906,8 @@ int main(int argc, char *argv[]) + if (has_kvm) { + qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic); + qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar); ++ qtest_add_func("acpi/q35/core-count2", ++ test_acpi_q35_tcg_core_count2); + } + qtest_add_func("acpi/q35/viot", test_acpi_q35_viot); + qtest_add_func("acpi/q35/cxl", test_acpi_q35_cxl); diff --git a/packages/q/qemu/bios-tables-test-teach-test-to-use-smbio.patch b/packages/q/qemu/bios-tables-test-teach-test-to-use-smbio.patch new file mode 100644 index 0000000..9cdbd96 --- /dev/null +++ b/packages/q/qemu/bios-tables-test-teach-test-to-use-smbio.patch @@ -0,0 +1,196 @@ +From: Julia Suvorova +Date: Tue, 11 Oct 2022 13:17:28 +0200 +Subject: bios-tables-test: teach test to use smbios 3.0 tables + +Introduce the 64-bit entry point. Since we no longer have a total +number of structures, stop checking for the new ones at the EOF +structure (type 127). + +Signed-off-by: Julia Suvorova +Reviewed-by: Igor Mammedov +Message-Id: <20220731162141.178443-3-jusual@redhat.com> +Message-Id: <20221011111731.101412-3-jusual@redhat.com> +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +(cherry picked from commit 33bff4a85a2e4ad94899ecb15b6a91c8b64a6dcf) +References: bsc#1202282, jsc#PED-2592 +Signed-off-by: Dario Faggioli +--- + tests/qtest/bios-tables-test.c | 100 +++++++++++++++++++++++++-------- + 1 file changed, 76 insertions(+), 24 deletions(-) + +diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c +index 7c5f736b513abbda7803afb2d28f..dcda3c508a77854415dad76998cc 100644 +--- a/tests/qtest/bios-tables-test.c ++++ b/tests/qtest/bios-tables-test.c +@@ -88,8 +88,8 @@ typedef struct { + uint64_t rsdp_addr; + uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */]; + GArray *tables; +- uint32_t smbios_ep_addr; +- struct smbios_21_entry_point smbios_ep_table; ++ uint64_t smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE__MAX]; ++ SmbiosEntryPoint smbios_ep_table; + uint16_t smbios_cpu_max_speed; + uint16_t smbios_cpu_curr_speed; + uint8_t *required_struct_types; +@@ -533,10 +533,9 @@ static void test_acpi_asl(test_data *data) + free_test_data(&exp_data); + } + +-static bool smbios_ep_table_ok(test_data *data) ++static bool smbios_ep2_table_ok(test_data *data, uint32_t addr) + { +- struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; +- uint32_t addr = data->smbios_ep_addr; ++ struct smbios_21_entry_point *ep_table = &data->smbios_ep_table.ep21; + + qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table)); + if (memcmp(ep_table->anchor_string, "_SM_", 4)) { +@@ -559,13 +558,29 @@ static bool smbios_ep_table_ok(test_data *data) + return true; + } + +-static void test_smbios_entry_point(test_data *data) ++static bool smbios_ep3_table_ok(test_data *data, uint64_t addr) ++{ ++ struct smbios_30_entry_point *ep_table = &data->smbios_ep_table.ep30; ++ ++ qtest_memread(data->qts, addr, ep_table, sizeof(*ep_table)); ++ if (memcmp(ep_table->anchor_string, "_SM3_", 5)) { ++ return false; ++ } ++ ++ if (acpi_calc_checksum((uint8_t *)ep_table, sizeof *ep_table)) { ++ return false; ++ } ++ ++ return true; ++} ++ ++static SmbiosEntryPointType test_smbios_entry_point(test_data *data) + { + uint32_t off; + + /* find smbios entry point structure */ + for (off = 0xf0000; off < 0x100000; off += 0x10) { +- uint8_t sig[] = "_SM_"; ++ uint8_t sig[] = "_SM_", sig3[] = "_SM3_"; + int i; + + for (i = 0; i < sizeof sig - 1; ++i) { +@@ -574,14 +589,30 @@ static void test_smbios_entry_point(test_data *data) + + if (!memcmp(sig, "_SM_", sizeof sig)) { + /* signature match, but is this a valid entry point? */ +- data->smbios_ep_addr = off; +- if (smbios_ep_table_ok(data)) { ++ if (smbios_ep2_table_ok(data, off)) { ++ data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_32] = off; ++ } ++ } ++ ++ for (i = 0; i < sizeof sig3 - 1; ++i) { ++ sig3[i] = qtest_readb(data->qts, off + i); ++ } ++ ++ if (!memcmp(sig3, "_SM3_", sizeof sig3)) { ++ if (smbios_ep3_table_ok(data, off)) { ++ data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64] = off; ++ /* found 64-bit entry point, no need to look for 32-bit one */ + break; + } + } + } + +- g_assert_cmphex(off, <, 0x100000); ++ /* found at least one entry point */ ++ g_assert_true(data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_32] || ++ data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64]); ++ ++ return data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64] ? ++ SMBIOS_ENTRY_POINT_TYPE_64 : SMBIOS_ENTRY_POINT_TYPE_32; + } + + static inline bool smbios_single_instance(uint8_t type) +@@ -625,16 +656,23 @@ static bool smbios_cpu_test(test_data *data, uint32_t addr) + return true; + } + +-static void test_smbios_structs(test_data *data) ++static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type) + { + DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) = { 0 }; +- struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; +- uint32_t addr = le32_to_cpu(ep_table->structure_table_address); +- int i, len, max_len = 0; ++ ++ SmbiosEntryPoint *ep_table = &data->smbios_ep_table; ++ int i = 0, len, max_len = 0; + uint8_t type, prv, crt; ++ uint64_t addr; ++ ++ if (ep_type == SMBIOS_ENTRY_POINT_TYPE_32) { ++ addr = le32_to_cpu(ep_table->ep21.structure_table_address); ++ } else { ++ addr = le64_to_cpu(ep_table->ep30.structure_table_address); ++ } + + /* walk the smbios tables */ +- for (i = 0; i < le16_to_cpu(ep_table->number_of_structures); i++) { ++ do { + + /* grab type and formatted area length from struct header */ + type = qtest_readb(data->qts, addr); +@@ -660,19 +698,33 @@ static void test_smbios_structs(test_data *data) + } + + /* keep track of max. struct size */ +- if (max_len < len) { ++ if (ep_type == SMBIOS_ENTRY_POINT_TYPE_32 && max_len < len) { + max_len = len; +- g_assert_cmpuint(max_len, <=, ep_table->max_structure_size); ++ g_assert_cmpuint(max_len, <=, ep_table->ep21.max_structure_size); + } + + /* start of next structure */ + addr += len; +- } + +- /* total table length and max struct size must match entry point values */ +- g_assert_cmpuint(le16_to_cpu(ep_table->structure_table_length), ==, +- addr - le32_to_cpu(ep_table->structure_table_address)); +- g_assert_cmpuint(le16_to_cpu(ep_table->max_structure_size), ==, max_len); ++ /* ++ * Until all structures have been scanned (ep21) ++ * or an EOF structure is found (ep30) ++ */ ++ } while (ep_type == SMBIOS_ENTRY_POINT_TYPE_32 ? ++ ++i < le16_to_cpu(ep_table->ep21.number_of_structures) : ++ type != 127); ++ ++ if (ep_type == SMBIOS_ENTRY_POINT_TYPE_32) { ++ /* ++ * Total table length and max struct size ++ * must match entry point values ++ */ ++ g_assert_cmpuint(le16_to_cpu(ep_table->ep21.structure_table_length), ==, ++ addr - le32_to_cpu(ep_table->ep21.structure_table_address)); ++ ++ g_assert_cmpuint(le16_to_cpu(ep_table->ep21.max_structure_size), ==, ++ max_len); ++ } + + /* required struct types must all be present */ + for (i = 0; i < data->required_struct_types_len; i++) { +@@ -756,8 +808,8 @@ static void test_acpi_one(const char *params, test_data *data) + * https://bugs.launchpad.net/qemu/+bug/1821884 + */ + if (!use_uefi) { +- test_smbios_entry_point(data); +- test_smbios_structs(data); ++ SmbiosEntryPointType ep_type = test_smbios_entry_point(data); ++ test_smbios_structs(data, ep_type); + } + + qtest_quit(data->qts); diff --git a/packages/q/qemu/bundles.tar.xz b/packages/q/qemu/bundles.tar.xz index 6ba4f4d..cd78199 120000 --- a/packages/q/qemu/bundles.tar.xz +++ b/packages/q/qemu/bundles.tar.xz @@ -1 +1 @@ -/ipfs/bafkreifocyqevwtiy2kialolezfjxtkvuh2kr7oux4ervtlbk4j44uxzui \ No newline at end of file +/ipfs/bafkreievuaiwi6wqo4l7dh75b47lk2r2ixd3x46zp57co2mmvkygrjasaa \ No newline at end of file diff --git a/packages/q/qemu/dmg-warn-when-opening-dmg-images-contain.patch b/packages/q/qemu/dmg-warn-when-opening-dmg-images-contain.patch new file mode 100644 index 0000000..8ada9c2 --- /dev/null +++ b/packages/q/qemu/dmg-warn-when-opening-dmg-images-contain.patch @@ -0,0 +1,46 @@ +From: Kevin Wolf +Date: Thu, 29 Sep 2022 11:30:34 +0200 +Subject: dmg: warn when opening dmg images containing blocks of unknown type + +Signed-off-by: Kevin Wolf +Signed-off-by: Claudio Fontana +Reviewed-by: Richard Henderson +Message-Id: <20220929093035.4231-5-cfontana@suse.de> +Signed-off-by: Paolo Bonzini +(cherry picked from commit 971974f0a9745a5163e1c825d38da03118054ae2) +Resolves: bsc#1208139 +Signed-off-by: Dario Faggioli +--- + block/dmg.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/block/dmg.c b/block/dmg.c +index 837f18aa20ff7ebb35f961a9626c..96f8c2d14f004d0901d72d00b551 100644 +--- a/block/dmg.c ++++ b/block/dmg.c +@@ -254,6 +254,25 @@ static int dmg_read_mish_block(BDRVDMGState *s, DmgHeaderState *ds, + for (i = s->n_chunks; i < s->n_chunks + chunk_count; i++) { + s->types[i] = buff_read_uint32(buffer, offset); + if (!dmg_is_known_block_type(s->types[i])) { ++ switch (s->types[i]) { ++ case UDBZ: ++ warn_report_once("dmg-bzip2 module is missing, accessing bzip2 " ++ "compressed blocks will result in I/O errors"); ++ break; ++ case ULFO: ++ warn_report_once("dmg-lzfse module is missing, accessing lzfse " ++ "compressed blocks will result in I/O errors"); ++ break; ++ case UDCM: ++ case UDLE: ++ /* Comments and last entry can be ignored without problems */ ++ break; ++ default: ++ warn_report_once("Image contains chunks of unknown type %x, " ++ "accessing them will result in I/O errors", ++ s->types[i]); ++ break; ++ } + chunk_count--; + i--; + offset += 40; diff --git a/packages/q/qemu/hw-acpi-erst.c-Fix-memory-handling-issue.patch b/packages/q/qemu/hw-acpi-erst.c-Fix-memory-handling-issue.patch new file mode 100644 index 0000000..1a3de63 --- /dev/null +++ b/packages/q/qemu/hw-acpi-erst.c-Fix-memory-handling-issue.patch @@ -0,0 +1,61 @@ +From: "Christian A. Ehrhardt" +Date: Mon, 24 Oct 2022 17:42:33 +0200 +Subject: hw/acpi/erst.c: Fix memory handling issues + +- Fix memset argument order: The second argument is + the value, the length goes last. +- Fix an integer overflow reported by Alexander Bulekov. + +Both issues allow the guest to overrun the host buffer +allocated for the ERST memory device. + +Cc: Eric DeVolder +Cc: qemu-stable@nongnu.org +Fixes: f7e26ffa590 ("ACPI ERST: support for ACPI ERST feature") +Tested-by: Alexander Bulekov +Signed-off-by: Christian A. Ehrhardt +Message-Id: <20221024154233.1043347-1-lk@c--e.de> +Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1268 +Reviewed-by: Alexander Bulekov +Reviewed-by: Eric DeVolder +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +(cherry picked from commit defb70980f6bed36100b74e84220f1764c0dd544) +Resolves: bsc#1205847 +Signed-off-by: Dario Faggioli +--- + hw/acpi/erst.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c +index df856b2669a6c198d0019b846e03..aefcc03ad6b68f2b3de7dfebf609 100644 +--- a/hw/acpi/erst.c ++++ b/hw/acpi/erst.c +@@ -635,7 +635,7 @@ static unsigned read_erst_record(ERSTDeviceState *s) + if (record_length < UEFI_CPER_RECORD_MIN_SIZE) { + rc = STATUS_FAILED; + } +- if ((s->record_offset + record_length) > exchange_length) { ++ if (record_length > exchange_length - s->record_offset) { + rc = STATUS_FAILED; + } + /* If all is ok, copy the record to the exchange buffer */ +@@ -684,7 +684,7 @@ static unsigned write_erst_record(ERSTDeviceState *s) + if (record_length < UEFI_CPER_RECORD_MIN_SIZE) { + return STATUS_FAILED; + } +- if ((s->record_offset + record_length) > exchange_length) { ++ if (record_length > exchange_length - s->record_offset) { + return STATUS_FAILED; + } + +@@ -716,7 +716,7 @@ static unsigned write_erst_record(ERSTDeviceState *s) + if (nvram) { + /* Write the record into the slot */ + memcpy(nvram, exchange, record_length); +- memset(nvram + record_length, exchange_length - record_length, 0xFF); ++ memset(nvram + record_length, 0xFF, exchange_length - record_length); + /* If a new record, increment the record_count */ + if (!record_found) { + uint32_t record_count; diff --git a/packages/q/qemu/hw-display-qxl-Avoid-buffer-overrun-in-q.patch b/packages/q/qemu/hw-display-qxl-Avoid-buffer-overrun-in-q.patch new file mode 100644 index 0000000..541007d --- /dev/null +++ b/packages/q/qemu/hw-display-qxl-Avoid-buffer-overrun-in-q.patch @@ -0,0 +1,108 @@ +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Mon, 28 Nov 2022 21:27:40 +0100 +Subject: hw/display/qxl: Avoid buffer overrun in qxl_phys2virt (CVE-2022-4144) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Have qxl_get_check_slot_offset() return false if the requested +buffer size does not fit within the slot memory region. + +Similarly qxl_phys2virt() now returns NULL in such case, and +qxl_dirty_one_surface() aborts. + +This avoids buffer overrun in the host pointer returned by +memory_region_get_ram_ptr(). + +Fixes: CVE-2022-4144 (out-of-bounds read) +Reported-by: Wenxu Yin (@awxylitol) +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1336 +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Stefan Hajnoczi +Message-Id: <20221128202741.4945-5-philmd@linaro.org> +(cherry picked from commit 6dbbf055148c6f1b7d8a3251a65bd6f3d1e1f622) +Resolves: bsc#1205808 +Fixes: CVE-2022-4144 +Signed-off-by: Dario Faggioli +--- + hw/display/qxl.c | 27 +++++++++++++++++++++++---- + hw/display/qxl.h | 2 +- + 2 files changed, 24 insertions(+), 5 deletions(-) + +diff --git a/hw/display/qxl.c b/hw/display/qxl.c +index 231d733250032a8ad93a1caa507d..0b21626aadead230847899be8069 100644 +--- a/hw/display/qxl.c ++++ b/hw/display/qxl.c +@@ -1424,11 +1424,13 @@ static void qxl_reset_surfaces(PCIQXLDevice *d) + + /* can be also called from spice server thread context */ + static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, +- uint32_t *s, uint64_t *o) ++ uint32_t *s, uint64_t *o, ++ size_t size_requested) + { + uint64_t phys = le64_to_cpu(pqxl); + uint32_t slot = (phys >> (64 - 8)) & 0xff; + uint64_t offset = phys & 0xffffffffffff; ++ uint64_t size_available; + + if (slot >= NUM_MEMSLOTS) { + qxl_set_guest_bug(qxl, "slot too large %d >= %d", slot, +@@ -1452,6 +1454,23 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, + slot, offset, qxl->guest_slots[slot].size); + return false; + } ++ size_available = memory_region_size(qxl->guest_slots[slot].mr); ++ if (qxl->guest_slots[slot].offset + offset >= size_available) { ++ qxl_set_guest_bug(qxl, ++ "slot %d offset %"PRIu64" > region size %"PRIu64"\n", ++ slot, qxl->guest_slots[slot].offset + offset, ++ size_available); ++ return false; ++ } ++ size_available -= qxl->guest_slots[slot].offset + offset; ++ if (size_requested > size_available) { ++ qxl_set_guest_bug(qxl, ++ "slot %d offset %"PRIu64" size %zu: " ++ "overrun by %"PRIu64" bytes\n", ++ slot, offset, size_requested, ++ size_requested - size_available); ++ return false; ++ } + + *s = slot; + *o = offset; +@@ -1471,7 +1490,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id, + offset = le64_to_cpu(pqxl) & 0xffffffffffff; + return (void *)(intptr_t)offset; + case MEMSLOT_GROUP_GUEST: +- if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset)) { ++ if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size)) { + return NULL; + } + ptr = memory_region_get_ram_ptr(qxl->guest_slots[slot].mr); +@@ -1937,9 +1956,9 @@ static void qxl_dirty_one_surface(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, + uint32_t slot; + bool rc; + +- rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset); +- assert(rc == true); + size = (uint64_t)height * abs(stride); ++ rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size); ++ assert(rc == true); + trace_qxl_surfaces_dirty(qxl->id, offset, size); + qxl_set_dirty(qxl->guest_slots[slot].mr, + qxl->guest_slots[slot].offset + offset, +diff --git a/hw/display/qxl.h b/hw/display/qxl.h +index bf03138ab477a2adc7bf23f4e662..7894bd5134e67742fbfcecb5b970 100644 +--- a/hw/display/qxl.h ++++ b/hw/display/qxl.h +@@ -157,7 +157,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL) + * + * Returns a host pointer to a buffer placed at offset @phys within the + * active slot @group_id of the PCI VGA RAM memory region associated with +- * the @qxl device. If the slot is inactive, or the offset is out ++ * the @qxl device. If the slot is inactive, or the offset + size are out + * of the memory region, returns NULL. + * + * Use with care; by the time this function returns, the returned pointer is diff --git a/packages/q/qemu/hw-display-qxl-Document-qxl_phys2virt.patch b/packages/q/qemu/hw-display-qxl-Document-qxl_phys2virt.patch new file mode 100644 index 0000000..2a999a5 --- /dev/null +++ b/packages/q/qemu/hw-display-qxl-Document-qxl_phys2virt.patch @@ -0,0 +1,49 @@ +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Mon, 28 Nov 2022 21:27:38 +0100 +Subject: hw/display/qxl: Document qxl_phys2virt() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed-by: Marc-André Lureau +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Stefan Hajnoczi +Message-Id: <20221128202741.4945-3-philmd@linaro.org> +(cherry picked from commit b1901de83a9456cde26fc755f71ca2b7b3ef50fc) +Resolves: bsc#1205808 +Fixes: CVE-2022-4144 +Signed-off-by: Dario Faggioli +--- + hw/display/qxl.h | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/hw/display/qxl.h b/hw/display/qxl.h +index e74de9579df3db6e3b6924b1a8c2..78b3a6c9ba8e3a598d6553867a6c 100644 +--- a/hw/display/qxl.h ++++ b/hw/display/qxl.h +@@ -147,6 +147,25 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL) + #define QXL_DEFAULT_REVISION (QXL_REVISION_STABLE_V12 + 1) + + /* qxl.c */ ++/** ++ * qxl_phys2virt: Get a pointer within a PCI VRAM memory region. ++ * ++ * @qxl: QXL device ++ * @phys: physical offset of buffer within the VRAM ++ * @group_id: memory slot group ++ * ++ * Returns a host pointer to a buffer placed at offset @phys within the ++ * active slot @group_id of the PCI VGA RAM memory region associated with ++ * the @qxl device. If the slot is inactive, or the offset is out ++ * of the memory region, returns NULL. ++ * ++ * Use with care; by the time this function returns, the returned pointer is ++ * not protected by RCU anymore. If the caller is not within an RCU critical ++ * section and does not hold the iothread lock, it must have other means of ++ * protecting the pointer, such as a reference to the region that includes ++ * the incoming ram_addr_t. ++ * ++ */ + void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); + void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) + G_GNUC_PRINTF(2, 3); diff --git a/packages/q/qemu/hw-display-qxl-Have-qxl_log_command-Retu.patch b/packages/q/qemu/hw-display-qxl-Have-qxl_log_command-Retu.patch new file mode 100644 index 0000000..4615ca9 --- /dev/null +++ b/packages/q/qemu/hw-display-qxl-Have-qxl_log_command-Retu.patch @@ -0,0 +1,53 @@ +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Mon, 28 Nov 2022 21:27:37 +0100 +Subject: hw/display/qxl: Have qxl_log_command Return early if no log_cmd + handler +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Only 3 command types are logged: no need to call qxl_phys2virt() +for the other types. Using different cases will help to pass +different structure sizes to qxl_phys2virt() in a pair of commits. + +Reviewed-by: Marc-André Lureau +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Stefan Hajnoczi +Message-Id: <20221128202741.4945-2-philmd@linaro.org> +(cherry picked from commit 61c34fc194b776ecadc39fb26b061331107e5599) +Resolves: bsc#1205808 +Fixes: CVE-2022-4144 +Signed-off-by: Dario Faggioli +--- + hw/display/qxl-logger.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/hw/display/qxl-logger.c b/hw/display/qxl-logger.c +index 68bfa47568025b292cf2f39e65a8..1bcf803db6dabe558aaf1a0df0cd 100644 +--- a/hw/display/qxl-logger.c ++++ b/hw/display/qxl-logger.c +@@ -247,6 +247,16 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + qxl_name(qxl_type, ext->cmd.type), + compat ? "(compat)" : ""); + ++ switch (ext->cmd.type) { ++ case QXL_CMD_DRAW: ++ break; ++ case QXL_CMD_SURFACE: ++ break; ++ case QXL_CMD_CURSOR: ++ break; ++ default: ++ goto out; ++ } + data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); + if (!data) { + return 1; +@@ -269,6 +279,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + qxl_log_cmd_cursor(qxl, data, ext->group_id); + break; + } ++out: + fprintf(stderr, "\n"); + return 0; + } diff --git a/packages/q/qemu/hw-display-qxl-Pass-requested-buffer-siz.patch b/packages/q/qemu/hw-display-qxl-Pass-requested-buffer-siz.patch new file mode 100644 index 0000000..8ca5a7c --- /dev/null +++ b/packages/q/qemu/hw-display-qxl-Pass-requested-buffer-siz.patch @@ -0,0 +1,212 @@ +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Mon, 28 Nov 2022 21:27:39 +0100 +Subject: hw/display/qxl: Pass requested buffer size to qxl_phys2virt() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Currently qxl_phys2virt() doesn't check for buffer overrun. +In order to do so in the next commit, pass the buffer size +as argument. + +For QXLCursor in qxl_render_cursor() -> qxl_cursor() we +verify the size of the chunked data ahead, checking we can +access 'sizeof(QXLCursor) + chunk->data_size' bytes. +Since in the SPICE_CURSOR_TYPE_MONO case the cursor is +assumed to fit in one chunk, no change are required. +In SPICE_CURSOR_TYPE_ALPHA the ahead read is handled in +qxl_unpack_chunks(). + +Signed-off-by: Philippe Mathieu-Daudé +Acked-by: Gerd Hoffmann +Signed-off-by: Stefan Hajnoczi +Message-Id: <20221128202741.4945-4-philmd@linaro.org> +(cherry picked from commit 8efec0ef8bbc1e75a7ebf6e325a35806ece9b39f) +Resolves: bsc#1205808 +Fixes: CVE-2022-4144 +Signed-off-by: Dario Faggioli +--- + hw/display/qxl-logger.c | 11 ++++++++--- + hw/display/qxl-render.c | 20 ++++++++++++++++---- + hw/display/qxl.c | 14 +++++++++----- + hw/display/qxl.h | 4 +++- + 4 files changed, 36 insertions(+), 13 deletions(-) + +diff --git a/hw/display/qxl-logger.c b/hw/display/qxl-logger.c +index 1bcf803db6dabe558aaf1a0df0cd..35c38f62525deb89f11fa7fda3a4 100644 +--- a/hw/display/qxl-logger.c ++++ b/hw/display/qxl-logger.c +@@ -106,7 +106,7 @@ static int qxl_log_image(PCIQXLDevice *qxl, QXLPHYSICAL addr, int group_id) + QXLImage *image; + QXLImageDescriptor *desc; + +- image = qxl_phys2virt(qxl, addr, group_id); ++ image = qxl_phys2virt(qxl, addr, group_id, sizeof(QXLImage)); + if (!image) { + return 1; + } +@@ -214,7 +214,8 @@ int qxl_log_cmd_cursor(PCIQXLDevice *qxl, QXLCursorCmd *cmd, int group_id) + cmd->u.set.position.y, + cmd->u.set.visible ? "yes" : "no", + cmd->u.set.shape); +- cursor = qxl_phys2virt(qxl, cmd->u.set.shape, group_id); ++ cursor = qxl_phys2virt(qxl, cmd->u.set.shape, group_id, ++ sizeof(QXLCursor)); + if (!cursor) { + return 1; + } +@@ -236,6 +237,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + { + bool compat = ext->flags & QXL_COMMAND_FLAG_COMPAT; + void *data; ++ size_t datasz; + int ret; + + if (!qxl->cmdlog) { +@@ -249,15 +251,18 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) + + switch (ext->cmd.type) { + case QXL_CMD_DRAW: ++ datasz = compat ? sizeof(QXLCompatDrawable) : sizeof(QXLDrawable); + break; + case QXL_CMD_SURFACE: ++ datasz = sizeof(QXLSurfaceCmd); + break; + case QXL_CMD_CURSOR: ++ datasz = sizeof(QXLCursorCmd); + break; + default: + goto out; + } +- data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, datasz); + if (!data) { + return 1; + } +diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c +index ca217004bf72e7d394ed7ee9c948..fcfd40c3ac1d622b6d27279e25be 100644 +--- a/hw/display/qxl-render.c ++++ b/hw/display/qxl-render.c +@@ -107,7 +107,9 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) + qxl->guest_primary.resized = 0; + qxl->guest_primary.data = qxl_phys2virt(qxl, + qxl->guest_primary.surface.mem, +- MEMSLOT_GROUP_GUEST); ++ MEMSLOT_GROUP_GUEST, ++ qxl->guest_primary.abs_stride ++ * height); + if (!qxl->guest_primary.data) { + goto end; + } +@@ -228,7 +230,8 @@ static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl, + if (offset == size) { + return; + } +- chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id); ++ chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id, ++ sizeof(QXLDataChunk) + chunk->data_size); + if (!chunk) { + return; + } +@@ -295,7 +298,8 @@ fail: + /* called from spice server thread context only */ + int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) + { +- QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, ++ sizeof(QXLCursorCmd)); + QXLCursor *cursor; + QEMUCursor *c; + +@@ -314,7 +318,15 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) + } + switch (cmd->type) { + case QXL_CURSOR_SET: +- cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id); ++ /* First read the QXLCursor to get QXLDataChunk::data_size ... */ ++ cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id, ++ sizeof(QXLCursor)); ++ if (!cursor) { ++ return 1; ++ } ++ /* Then read including the chunked data following QXLCursor. */ ++ cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id, ++ sizeof(QXLCursor) + cursor->chunk.data_size); + if (!cursor) { + return 1; + } +diff --git a/hw/display/qxl.c b/hw/display/qxl.c +index 5b10f697f1872751730114b73331..231d733250032a8ad93a1caa507d 100644 +--- a/hw/display/qxl.c ++++ b/hw/display/qxl.c +@@ -274,7 +274,8 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) + QXL_IO_MONITORS_CONFIG_ASYNC)); + } + +- cfg = qxl_phys2virt(qxl, qxl->guest_monitors_config, MEMSLOT_GROUP_GUEST); ++ cfg = qxl_phys2virt(qxl, qxl->guest_monitors_config, MEMSLOT_GROUP_GUEST, ++ sizeof(QXLMonitorsConfig)); + if (cfg != NULL && cfg->count == 1) { + qxl->guest_primary.resized = 1; + qxl->guest_head0_width = cfg->heads[0].width; +@@ -459,7 +460,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) + switch (le32_to_cpu(ext->cmd.type)) { + case QXL_CMD_SURFACE: + { +- QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, ++ sizeof(QXLSurfaceCmd)); + + if (!cmd) { + return 1; +@@ -494,7 +496,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) + } + case QXL_CMD_CURSOR: + { +- QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id); ++ QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, ++ sizeof(QXLCursorCmd)); + + if (!cmd) { + return 1; +@@ -1456,7 +1459,8 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, + } + + /* can be also called from spice server thread context */ +-void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id) ++void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id, ++ size_t size) + { + uint64_t offset; + uint32_t slot; +@@ -1964,7 +1968,7 @@ static void qxl_dirty_surfaces(PCIQXLDevice *qxl) + } + + cmd = qxl_phys2virt(qxl, qxl->guest_surfaces.cmds[i], +- MEMSLOT_GROUP_GUEST); ++ MEMSLOT_GROUP_GUEST, sizeof(QXLSurfaceCmd)); + assert(cmd); + assert(cmd->type == QXL_SURFACE_CMD_CREATE); + qxl_dirty_one_surface(qxl, cmd->u.surface_create.data, +diff --git a/hw/display/qxl.h b/hw/display/qxl.h +index 78b3a6c9ba8e3a598d6553867a6c..bf03138ab477a2adc7bf23f4e662 100644 +--- a/hw/display/qxl.h ++++ b/hw/display/qxl.h +@@ -153,6 +153,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL) + * @qxl: QXL device + * @phys: physical offset of buffer within the VRAM + * @group_id: memory slot group ++ * @size: size of the buffer + * + * Returns a host pointer to a buffer placed at offset @phys within the + * active slot @group_id of the PCI VGA RAM memory region associated with +@@ -166,7 +167,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL) + * the incoming ram_addr_t. + * + */ +-void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); ++void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id, ++ size_t size); + void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) + G_GNUC_PRINTF(2, 3); + diff --git a/packages/q/qemu/hw-smbios-add-core_count2-to-smbios-tabl.patch b/packages/q/qemu/hw-smbios-add-core_count2-to-smbios-tabl.patch new file mode 100644 index 0000000..c145da3 --- /dev/null +++ b/packages/q/qemu/hw-smbios-add-core_count2-to-smbios-tabl.patch @@ -0,0 +1,128 @@ +From: Julia Suvorova +Date: Tue, 11 Oct 2022 13:17:27 +0200 +Subject: hw/smbios: add core_count2 to smbios table type 4 + +In order to use the increased number of cpus, we need to bring smbios +tables in line with the SMBIOS 3.0 specification. This allows us to +introduce core_count2 which acts as a duplicate of core_count if we have +fewer cores than 256, and contains the actual core number per socket if +we have more. + +core_enabled2 and thread_count2 fields work the same way. + +Signed-off-by: Julia Suvorova +Reviewed-by: Igor Mammedov +Message-Id: <20220731162141.178443-2-jusual@redhat.com> +Message-Id: <20221011111731.101412-2-jusual@redhat.com> +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +(cherry picked from commit 05e27d74c7dc5318367521f020bf0d4a32228dcc) +References: bsc#1202282, jsc#PED-2592 +Signed-off-by: Dario Faggioli +--- + hw/smbios/smbios.c | 19 ++++++++++++++++--- + hw/smbios/smbios_build.h | 9 +++++++-- + include/hw/firmware/smbios.h | 12 ++++++++++++ + 3 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c +index 417d65471704ee6babaebb2ba02e..e55bca8e42c834508df820c05eb9 100644 +--- a/hw/smbios/smbios.c ++++ b/hw/smbios/smbios.c +@@ -711,8 +711,14 @@ static void smbios_build_type_3_table(void) + static void smbios_build_type_4_table(MachineState *ms, unsigned instance) + { + char sock_str[128]; ++ size_t tbl_len = SMBIOS_TYPE_4_LEN_V28; + +- SMBIOS_BUILD_TABLE_PRE(4, T4_BASE + instance, true); /* required */ ++ if (smbios_ep_type == SMBIOS_ENTRY_POINT_TYPE_64) { ++ tbl_len = SMBIOS_TYPE_4_LEN_V30; ++ } ++ ++ SMBIOS_BUILD_TABLE_PRE_SIZE(4, T4_BASE + instance, ++ true, tbl_len); /* required */ + + snprintf(sock_str, sizeof(sock_str), "%s%2x", type4.sock_pfx, instance); + SMBIOS_TABLE_SET_STR(4, socket_designation_str, sock_str); +@@ -739,8 +745,15 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance) + SMBIOS_TABLE_SET_STR(4, serial_number_str, type4.serial); + SMBIOS_TABLE_SET_STR(4, asset_tag_number_str, type4.asset); + SMBIOS_TABLE_SET_STR(4, part_number_str, type4.part); +- t->core_count = t->core_enabled = ms->smp.cores; +- t->thread_count = ms->smp.threads; ++ ++ t->core_count = (ms->smp.cores > 255) ? 0xFF : ms->smp.cores; ++ t->core_enabled = t->core_count; ++ ++ t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores); ++ ++ t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads; ++ t->thread_count2 = cpu_to_le16(ms->smp.threads); ++ + t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */ + t->processor_family2 = cpu_to_le16(0x01); /* Other */ + +diff --git a/hw/smbios/smbios_build.h b/hw/smbios/smbios_build.h +index 56b5a1e3f301b24a134141859076..351660024e6ecb599b88f4975042 100644 +--- a/hw/smbios/smbios_build.h ++++ b/hw/smbios/smbios_build.h +@@ -27,6 +27,11 @@ extern unsigned smbios_table_max; + extern unsigned smbios_table_cnt; + + #define SMBIOS_BUILD_TABLE_PRE(tbl_type, tbl_handle, tbl_required) \ ++ SMBIOS_BUILD_TABLE_PRE_SIZE(tbl_type, tbl_handle, tbl_required, \ ++ sizeof(struct smbios_type_##tbl_type))\ ++ ++#define SMBIOS_BUILD_TABLE_PRE_SIZE(tbl_type, tbl_handle, \ ++ tbl_required, tbl_len) \ + struct smbios_type_##tbl_type *t; \ + size_t t_off; /* table offset into smbios_tables */ \ + int str_index = 0; \ +@@ -39,12 +44,12 @@ extern unsigned smbios_table_cnt; + /* use offset of table t within smbios_tables */ \ + /* (pointer must be updated after each realloc) */ \ + t_off = smbios_tables_len; \ +- smbios_tables_len += sizeof(*t); \ ++ smbios_tables_len += tbl_len; \ + smbios_tables = g_realloc(smbios_tables, smbios_tables_len); \ + t = (struct smbios_type_##tbl_type *)(smbios_tables + t_off); \ + \ + t->header.type = tbl_type; \ +- t->header.length = sizeof(*t); \ ++ t->header.length = tbl_len; \ + t->header.handle = cpu_to_le16(tbl_handle); \ + } while (0) + +diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h +index e7d386f7c837b16f341aba22bcf8..7f3259a6300af0d7b8a359b879f5 100644 +--- a/include/hw/firmware/smbios.h ++++ b/include/hw/firmware/smbios.h +@@ -18,6 +18,8 @@ + + + #define SMBIOS_MAX_TYPE 127 ++#define offsetofend(TYPE, MEMBER) \ ++ (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER)) + + /* memory area description, used by type 19 table */ + struct smbios_phys_mem_area { +@@ -187,8 +189,18 @@ struct smbios_type_4 { + uint8_t thread_count; + uint16_t processor_characteristics; + uint16_t processor_family2; ++ /* SMBIOS spec 3.0.0, Table 21 */ ++ uint16_t core_count2; ++ uint16_t core_enabled2; ++ uint16_t thread_count2; + } QEMU_PACKED; + ++typedef enum smbios_type_4_len_ver { ++ SMBIOS_TYPE_4_LEN_V28 = offsetofend(struct smbios_type_4, ++ processor_family2), ++ SMBIOS_TYPE_4_LEN_V30 = offsetofend(struct smbios_type_4, thread_count2), ++} smbios_type_4_len_ver; ++ + /* SMBIOS type 8 - Port Connector Information */ + struct smbios_type_8 { + struct smbios_structure_header header; diff --git a/packages/q/qemu/hw-smbios-support-for-type-8-port-connec.patch b/packages/q/qemu/hw-smbios-support-for-type-8-port-connec.patch new file mode 100644 index 0000000..15a6d9e --- /dev/null +++ b/packages/q/qemu/hw-smbios-support-for-type-8-port-connec.patch @@ -0,0 +1,172 @@ +From: Hal Martin +Date: Fri, 12 Aug 2022 15:51:53 +0200 +Subject: hw/smbios: support for type 8 (port connector) + +PATCH v1: add support for SMBIOS type 8 to qemu +PATCH v2: incorporate patch v1 feedback and add smbios type=8 to qemu-options + +internal_reference: internal reference designator +external_reference: external reference designator +connector_type: hex value for port connector type (see SMBIOS 7.9.2) +port_type: hex value for port type (see SMBIOS 7.9.3) + +After studying various vendor implementationsi (Dell, Lenovo, MSI), +the value of internal connector type was hard-coded to 0x0 (None). + +Example usage: +-smbios type=8,internal_reference=JUSB1,external_reference=USB1,connector_type=0x12,port_type=0x10 \ +-smbios type=8,internal_reference=JAUD1,external_reference="Audio Jack",connector_type=0x1f,port_type=0x1d \ +-smbios type=8,internal_reference=LAN,external_reference=Ethernet,connector_type=0x0b,port_type=0x1f \ +-smbios type=8,internal_reference=PS2,external_reference=Mouse,connector_type=0x0f,port_type=0x0e \ +-smbios type=8,internal_reference=PS2,external_reference=Keyboard,connector_type=0x0f,port_type=0x0d + +Signed-off-by: Hal Martin + +Message-Id: <20220812135153.17859-1-hal.martin@gmail.com> +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +(cherry picked from commit fd8caa253c56ed126c09d3b9cc682753ff12218f) +References: bsc#1202282, jsc#PED-2592 +Signed-off-by: Dario Faggioli +--- + hw/smbios/smbios.c | 63 ++++++++++++++++++++++++++++++++++++ + include/hw/firmware/smbios.h | 10 ++++++ + qemu-options.hx | 2 ++ + 3 files changed, 75 insertions(+) + +diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c +index 59091c8454bf6d8d05c4c8313753..417d65471704ee6babaebb2ba02e 100644 +--- a/hw/smbios/smbios.c ++++ b/hw/smbios/smbios.c +@@ -111,6 +111,13 @@ static struct { + .processor_id = 0, + }; + ++struct type8_instance { ++ const char *internal_reference, *external_reference; ++ uint8_t connector_type, port_type; ++ QTAILQ_ENTRY(type8_instance) next; ++}; ++static QTAILQ_HEAD(, type8_instance) type8 = QTAILQ_HEAD_INITIALIZER(type8); ++ + static struct { + size_t nvalues; + char **values; +@@ -337,6 +344,29 @@ static const QemuOptDesc qemu_smbios_type4_opts[] = { + { /* end of list */ } + }; + ++static const QemuOptDesc qemu_smbios_type8_opts[] = { ++ { ++ .name = "internal_reference", ++ .type = QEMU_OPT_STRING, ++ .help = "internal reference designator", ++ }, ++ { ++ .name = "external_reference", ++ .type = QEMU_OPT_STRING, ++ .help = "external reference designator", ++ }, ++ { ++ .name = "connector_type", ++ .type = QEMU_OPT_NUMBER, ++ .help = "connector type", ++ }, ++ { ++ .name = "port_type", ++ .type = QEMU_OPT_NUMBER, ++ .help = "port type", ++ }, ++}; ++ + static const QemuOptDesc qemu_smbios_type11_opts[] = { + { + .name = "value", +@@ -718,6 +748,26 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance) + smbios_type4_count++; + } + ++static void smbios_build_type_8_table(void) ++{ ++ unsigned instance = 0; ++ struct type8_instance *t8; ++ ++ QTAILQ_FOREACH(t8, &type8, next) { ++ SMBIOS_BUILD_TABLE_PRE(8, T0_BASE + instance, true); ++ ++ SMBIOS_TABLE_SET_STR(8, internal_reference_str, t8->internal_reference); ++ SMBIOS_TABLE_SET_STR(8, external_reference_str, t8->external_reference); ++ /* most vendors seem to set this to None */ ++ t->internal_connector_type = 0x0; ++ t->external_connector_type = t8->connector_type; ++ t->port_type = t8->port_type; ++ ++ SMBIOS_BUILD_TABLE_POST; ++ instance++; ++ } ++} ++ + static void smbios_build_type_11_table(void) + { + char count_str[128]; +@@ -1030,6 +1080,7 @@ void smbios_get_tables(MachineState *ms, + smbios_build_type_4_table(ms, i); + } + ++ smbios_build_type_8_table(); + smbios_build_type_11_table(); + + #define MAX_DIMM_SZ (16 * GiB) +@@ -1381,6 +1432,18 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) + UINT16_MAX); + } + return; ++ case 8: ++ if (!qemu_opts_validate(opts, qemu_smbios_type8_opts, errp)) { ++ return; ++ } ++ struct type8_instance *t; ++ t = g_new0(struct type8_instance, 1); ++ save_opt(&t->internal_reference, opts, "internal_reference"); ++ save_opt(&t->external_reference, opts, "external_reference"); ++ t->connector_type = qemu_opt_get_number(opts, "connector_type", 0); ++ t->port_type = qemu_opt_get_number(opts, "port_type", 0); ++ QTAILQ_INSERT_TAIL(&type8, t, next); ++ return; + case 11: + if (!qemu_opts_validate(opts, qemu_smbios_type11_opts, errp)) { + return; +diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h +index 4b7ad77a44f0622dccda24e41eb6..e7d386f7c837b16f341aba22bcf8 100644 +--- a/include/hw/firmware/smbios.h ++++ b/include/hw/firmware/smbios.h +@@ -189,6 +189,16 @@ struct smbios_type_4 { + uint16_t processor_family2; + } QEMU_PACKED; + ++/* SMBIOS type 8 - Port Connector Information */ ++struct smbios_type_8 { ++ struct smbios_structure_header header; ++ uint8_t internal_reference_str; ++ uint8_t internal_connector_type; ++ uint8_t external_reference_str; ++ uint8_t external_connector_type; ++ uint8_t port_type; ++} QEMU_PACKED; ++ + /* SMBIOS type 11 - OEM strings */ + struct smbios_type_11 { + struct smbios_structure_header header; +diff --git a/qemu-options.hx b/qemu-options.hx +index 31c04f7eea0b2401249eee86ac3b..ba5a3226d7e5d3550583b0fe1e2b 100644 +--- a/qemu-options.hx ++++ b/qemu-options.hx +@@ -2548,6 +2548,8 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, + " [,asset=str][,part=str][,max-speed=%d][,current-speed=%d]\n" + " [,processor-id=%d]\n" + " specify SMBIOS type 4 fields\n" ++ "-smbios type=8[,external_reference=str][,internal_reference=str][,connector_type=%d][,port_type=%d]\n" ++ " specify SMBIOS type 8 fields\n" + "-smbios type=11[,value=str][,path=filename]\n" + " specify SMBIOS type 11 fields\n" + "-smbios type=17[,loc_pfx=str][,bank=str][,manufacturer=str][,serial=str]\n" diff --git a/packages/q/qemu/module-add-Error-arguments-to-module_loa.patch b/packages/q/qemu/module-add-Error-arguments-to-module_loa.patch new file mode 100644 index 0000000..210c908 --- /dev/null +++ b/packages/q/qemu/module-add-Error-arguments-to-module_loa.patch @@ -0,0 +1,698 @@ +From: Claudio Fontana +Date: Thu, 29 Sep 2022 11:30:33 +0200 +Subject: module: add Error arguments to module_load and module_load_qom + +improve error handling during module load, by changing: + +bool module_load(const char *prefix, const char *lib_name); +void module_load_qom(const char *type); + +to: + +int module_load(const char *prefix, const char *name, Error **errp); +int module_load_qom(const char *type, Error **errp); + +where the return value is: + + -1 on module load error, and errp is set with the error + 0 on module or one of its dependencies are not installed + 1 on module load success + 2 on module load success (module already loaded or built-in) + +module_load_qom_one has been introduced in: + +commit 28457744c345 ("module: qom module support"), which built on top of +module_load_one, but discarded the bool return value. Restore it. + +Adapt all callers to emit errors, or ignore them, or fail hard, +as appropriate in each context. + +Replace the previous emission of errors via fprintf in _some_ error +conditions with Error and error_report, so as to emit to the appropriate +target. + +A memory leak is also fixed as part of the module_load changes. + +audio: when attempting to load an audio module, report module load errors. +Note that still for some callers, a single issue may generate multiple +error reports, and this could be improved further. +Regarding the audio code itself, audio_add() seems to ignore errors, +and this should probably be improved. + +block: when attempting to load a block module, report module load errors. +For the code paths that already use the Error API, take advantage of those +to report module load errors into the Error parameter. +For the other code paths, we currently emit the error, but this could be +improved further by adding Error parameters to all possible code paths. + +console: when attempting to load a display module, report module load errors. + +qdev: when creating a new qdev Device object (DeviceState), report load errors. + If a module cannot be loaded to create that device, now abort execution + (if no CONFIG_MODULE) or exit (if CONFIG_MODULE). + +qom/object.c: when initializing a QOM object, or looking up class_by_name, + report module load errors. + +qtest: when processing the "module_load" qtest command, report errors + in the load of the module. + +Signed-off-by: Claudio Fontana +Reviewed-by: Richard Henderson +Message-Id: <20220929093035.4231-4-cfontana@suse.de> +Signed-off-by: Paolo Bonzini +(cherry picked from commit c551fb0b53db5d9a1f0116e8cce12f994605c9ea) +Resolves: bsc#1208139 +Signed-off-by: Dario Faggioli +--- + audio/audio.c | 16 ++-- + block.c | 20 +++-- + block/dmg.c | 14 +++- + hw/core/qdev.c | 17 +++- + include/qemu/module.h | 37 +++++++-- + qom/object.c | 18 +++- + softmmu/qtest.c | 8 +- + ui/console.c | 18 +++- + util/module.c | 189 +++++++++++++++++++++++------------------- + 9 files changed, 224 insertions(+), 113 deletions(-) + +diff --git a/audio/audio.c b/audio/audio.c +index 9e2609707d7f4adecfb6e9f45670..cdbcaa8603cc661332e4906f8a37 100644 +--- a/audio/audio.c ++++ b/audio/audio.c +@@ -72,20 +72,24 @@ void audio_driver_register(audio_driver *drv) + audio_driver *audio_driver_lookup(const char *name) + { + struct audio_driver *d; ++ Error *local_err = NULL; ++ int rv; + + QLIST_FOREACH(d, &audio_drivers, next) { + if (strcmp(name, d->name) == 0) { + return d; + } + } +- +- audio_module_load(name); +- QLIST_FOREACH(d, &audio_drivers, next) { +- if (strcmp(name, d->name) == 0) { +- return d; ++ rv = audio_module_load(name, &local_err); ++ if (rv > 0) { ++ QLIST_FOREACH(d, &audio_drivers, next) { ++ if (strcmp(name, d->name) == 0) { ++ return d; ++ } + } ++ } else if (rv < 0) { ++ error_report_err(local_err); + } +- + return NULL; + } + +diff --git a/block.c b/block.c +index 72c7f6d47d590657472b036a5847..7a94739aedc5eeac349a917f9864 100644 +--- a/block.c ++++ b/block.c +@@ -464,12 +464,18 @@ BlockDriver *bdrv_find_format(const char *format_name) + /* The driver isn't registered, maybe we need to load a module */ + for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) { + if (!strcmp(block_driver_modules[i].format_name, format_name)) { +- block_module_load(block_driver_modules[i].library_name); ++ Error *local_err = NULL; ++ int rv = block_module_load(block_driver_modules[i].library_name, ++ &local_err); ++ if (rv > 0) { ++ return bdrv_do_find_format(format_name); ++ } else if (rv < 0) { ++ error_report_err(local_err); ++ } + break; + } + } +- +- return bdrv_do_find_format(format_name); ++ return NULL; + } + + static int bdrv_format_is_whitelisted(const char *format_name, bool read_only) +@@ -976,12 +982,16 @@ BlockDriver *bdrv_find_protocol(const char *filename, + for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) { + if (block_driver_modules[i].protocol_name && + !strcmp(block_driver_modules[i].protocol_name, protocol)) { +- block_module_load(block_driver_modules[i].library_name); ++ int rv = block_module_load(block_driver_modules[i].library_name, errp); ++ if (rv > 0) { ++ drv1 = bdrv_do_find_protocol(protocol); ++ } else if (rv < 0) { ++ return NULL; ++ } + break; + } + } + +- drv1 = bdrv_do_find_protocol(protocol); + if (!drv1) { + error_setg(errp, "Unknown protocol '%s'", protocol); + } +diff --git a/block/dmg.c b/block/dmg.c +index 007b8d9996d61be8370699f3d81f..837f18aa20ff7ebb35f961a9626c 100644 +--- a/block/dmg.c ++++ b/block/dmg.c +@@ -445,9 +445,17 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags, + if (!bs->file) { + return -EINVAL; + } +- +- block_module_load("dmg-bz2"); +- block_module_load("dmg-lzfse"); ++ /* ++ * NB: if uncompress submodules are absent, ++ * ie block_module_load return value == 0, the function pointers ++ * dmg_uncompress_bz2 and dmg_uncompress_lzfse will be NULL. ++ */ ++ if (block_module_load("dmg-bz2", errp) < 0) { ++ return -EINVAL; ++ } ++ if (block_module_load("dmg-lzfse", errp) < 0) { ++ return -EINVAL; ++ } + + s->n_chunks = 0; + s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL; +diff --git a/hw/core/qdev.c b/hw/core/qdev.c +index 25dfc08468011b2d63f032526919..0145501904473864167a11481d94 100644 +--- a/hw/core/qdev.c ++++ b/hw/core/qdev.c +@@ -147,8 +147,21 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp) + + DeviceState *qdev_new(const char *name) + { +- if (!object_class_by_name(name)) { +- module_load_qom(name); ++ ObjectClass *oc = object_class_by_name(name); ++#ifdef CONFIG_MODULES ++ if (!oc) { ++ int rv = module_load_qom(name, &error_fatal); ++ if (rv > 0) { ++ oc = object_class_by_name(name); ++ } else { ++ error_report("could not find a module for type '%s'", name); ++ exit(1); ++ } ++ } ++#endif ++ if (!oc) { ++ error_report("unknown type '%s'", name); ++ abort(); + } + return DEVICE(object_new(name)); + } +diff --git a/include/qemu/module.h b/include/qemu/module.h +index b7911ce7916148ba9c3245878350..c37ce74b16ffe57550fab68b0f2d 100644 +--- a/include/qemu/module.h ++++ b/include/qemu/module.h +@@ -61,16 +61,43 @@ typedef enum { + #define fuzz_target_init(function) module_init(function, \ + MODULE_INIT_FUZZ_TARGET) + #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION) +-#define block_module_load(lib) module_load("block-", lib) +-#define ui_module_load(lib) module_load("ui-", lib) +-#define audio_module_load(lib) module_load("audio-", lib) ++#define block_module_load(lib, errp) module_load("block-", lib, errp) ++#define ui_module_load(lib, errp) module_load("ui-", lib, errp) ++#define audio_module_load(lib, errp) module_load("audio-", lib, errp) + + void register_module_init(void (*fn)(void), module_init_type type); + void register_dso_module_init(void (*fn)(void), module_init_type type); + + void module_call_init(module_init_type type); +-bool module_load(const char *prefix, const char *lib_name); +-void module_load_qom(const char *type); ++ ++/* ++ * module_load: attempt to load a module from a set of directories ++ * ++ * directories searched are: ++ * - getenv("QEMU_MODULE_DIR") ++ * - get_relocated_path(CONFIG_QEMU_MODDIR); ++ * - /var/run/qemu/${version_dir} ++ * ++ * prefix: a subsystem prefix, or the empty string ("audio-", ..., "") ++ * name: name of the module ++ * errp: error to set in case the module is found, but load failed. ++ * ++ * Return value: -1 on error (errp set if not NULL). ++ * 0 if module or one of its dependencies are not installed, ++ * 1 if the module is found and loaded, ++ * 2 if the module is already loaded, or module is built-in. ++ */ ++int module_load(const char *prefix, const char *name, Error **errp); ++ ++/* ++ * module_load_qom: attempt to load a module to provide a QOM type ++ * ++ * type: the type to be provided ++ * errp: error to set. ++ * ++ * Return value: as per module_load. ++ */ ++int module_load_qom(const char *type, Error **errp); + void module_load_qom_all(void); + void module_allow_arch(const char *arch); + +diff --git a/qom/object.c b/qom/object.c +index 4f834f3bf66c6672138d9bfc9e55..45da07980a19d1db754961bcc377 100644 +--- a/qom/object.c ++++ b/qom/object.c +@@ -526,8 +526,13 @@ void object_initialize(void *data, size_t size, const char *typename) + + #ifdef CONFIG_MODULES + if (!type) { +- module_load_qom(typename); +- type = type_get_by_name(typename); ++ int rv = module_load_qom(typename, &error_fatal); ++ if (rv > 0) { ++ type = type_get_by_name(typename); ++ } else { ++ error_report("missing object type '%s'", typename); ++ exit(1); ++ } + } + #endif + if (!type) { +@@ -1033,8 +1038,13 @@ ObjectClass *module_object_class_by_name(const char *typename) + oc = object_class_by_name(typename); + #ifdef CONFIG_MODULES + if (!oc) { +- module_load_qom(typename); +- oc = object_class_by_name(typename); ++ Error *local_err = NULL; ++ int rv = module_load_qom(typename, &local_err); ++ if (rv > 0) { ++ oc = object_class_by_name(typename); ++ } else if (rv < 0) { ++ error_report_err(local_err); ++ } + } + #endif + return oc; +diff --git a/softmmu/qtest.c b/softmmu/qtest.c +index fc5b733c630035785732610c920c..36e28609ffa2fb977d05f115a4d8 100644 +--- a/softmmu/qtest.c ++++ b/softmmu/qtest.c +@@ -753,12 +753,18 @@ static void qtest_process_command(CharBackend *chr, gchar **words) + qtest_sendf(chr, "OK %"PRIi64"\n", + (int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)); + } else if (strcmp(words[0], "module_load") == 0) { ++ Error *local_err = NULL; ++ int rv; + g_assert(words[1] && words[2]); + + qtest_send_prefix(chr); +- if (module_load(words[1], words[2])) { ++ rv = module_load(words[1], words[2], &local_err); ++ if (rv > 0) { + qtest_sendf(chr, "OK\n"); + } else { ++ if (rv < 0) { ++ error_report_err(local_err); ++ } + qtest_sendf(chr, "FAIL\n"); + } + } else if (qtest_enabled() && strcmp(words[0], "clock_set") == 0) { +diff --git a/ui/console.c b/ui/console.c +index 4913c55684cb9b9d8c8ab0df5b22..4e53c3c71b2f94d1e2644d5b6ed3 100644 +--- a/ui/console.c ++++ b/ui/console.c +@@ -2632,7 +2632,11 @@ bool qemu_display_find_default(DisplayOptions *opts) + + for (i = 0; i < (int)ARRAY_SIZE(prio); i++) { + if (dpys[prio[i]] == NULL) { +- ui_module_load(DisplayType_str(prio[i])); ++ Error *local_err = NULL; ++ int rv = ui_module_load(DisplayType_str(prio[i]), &local_err); ++ if (rv < 0) { ++ error_report_err(local_err); ++ } + } + if (dpys[prio[i]] == NULL) { + continue; +@@ -2650,7 +2654,11 @@ void qemu_display_early_init(DisplayOptions *opts) + return; + } + if (dpys[opts->type] == NULL) { +- ui_module_load(DisplayType_str(opts->type)); ++ Error *local_err = NULL; ++ int rv = ui_module_load(DisplayType_str(opts->type), &local_err); ++ if (rv < 0) { ++ error_report_err(local_err); ++ } + } + if (dpys[opts->type] == NULL) { + error_report("Display '%s' is not available.", +@@ -2680,7 +2688,11 @@ void qemu_display_help(void) + printf("none\n"); + for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) { + if (!dpys[idx]) { +- ui_module_load(DisplayType_str(idx)); ++ Error *local_err = NULL; ++ int rv = ui_module_load(DisplayType_str(idx), &local_err); ++ if (rv < 0) { ++ error_report_err(local_err); ++ } + } + if (dpys[idx]) { + printf("%s\n", DisplayType_str(dpys[idx]->type)); +diff --git a/util/module.c b/util/module.c +index ad89cd50dc2a03ea6f8431849137..32e263163c75dfa8e93ca67c739d 100644 +--- a/util/module.c ++++ b/util/module.c +@@ -21,6 +21,7 @@ + #include "qemu/module.h" + #include "qemu/cutils.h" + #include "qemu/config-file.h" ++#include "qapi/error.h" + #ifdef CONFIG_MODULE_UPGRADES + #include "qemu-version.h" + #endif +@@ -144,25 +145,22 @@ static bool module_check_arch(const QemuModinfo *modinfo) + return true; + } + +-static int module_load_file(const char *fname, bool export_symbols) ++/* ++ * module_load_dso: attempt to load an existing dso file ++ * ++ * fname: full pathname of the file to load ++ * export_symbols: if true, add the symbols to the global name space ++ * errp: error to set. ++ * ++ * Return value: true on success, false on error, and errp will be set. ++ */ ++static bool module_load_dso(const char *fname, bool export_symbols, ++ Error **errp) + { + GModule *g_module; + void (*sym)(void); +- const char *dsosuf = CONFIG_HOST_DSOSUF; +- int len = strlen(fname); +- int suf_len = strlen(dsosuf); + ModuleEntry *e, *next; +- int ret, flags; +- +- if (len <= suf_len || strcmp(&fname[len - suf_len], dsosuf)) { +- /* wrong suffix */ +- ret = -EINVAL; +- goto out; +- } +- if (access(fname, F_OK)) { +- ret = -ENOENT; +- goto out; +- } ++ int flags; + + assert(QTAILQ_EMPTY(&dso_init_list)); + +@@ -172,46 +170,38 @@ static int module_load_file(const char *fname, bool export_symbols) + } + g_module = g_module_open(fname, flags); + if (!g_module) { +- fprintf(stderr, "Failed to open module: %s\n", +- g_module_error()); +- ret = -EINVAL; +- goto out; ++ error_setg(errp, "failed to open module: %s", g_module_error()); ++ return false; + } + if (!g_module_symbol(g_module, DSO_STAMP_FUN_STR, (gpointer *)&sym)) { +- fprintf(stderr, "Failed to initialize module: %s\n", +- fname); +- /* Print some info if this is a QEMU module (but from different build), +- * this will make debugging user problems easier. */ ++ error_setg(errp, "failed to initialize module: %s", fname); ++ /* ++ * Print some info if this is a QEMU module (but from different build), ++ * this will make debugging user problems easier. ++ */ + if (g_module_symbol(g_module, "qemu_module_dummy", (gpointer *)&sym)) { +- fprintf(stderr, +- "Note: only modules from the same build can be loaded.\n"); ++ error_append_hint(errp, ++ "Only modules from the same build can be loaded.\n"); + } + g_module_close(g_module); +- ret = -EINVAL; +- } else { +- QTAILQ_FOREACH(e, &dso_init_list, node) { +- e->init(); +- register_module_init(e->init, e->type); +- } +- ret = 0; ++ return false; + } + ++ QTAILQ_FOREACH(e, &dso_init_list, node) { ++ e->init(); ++ register_module_init(e->init, e->type); ++ } + trace_module_load_module(fname); + QTAILQ_FOREACH_SAFE(e, &dso_init_list, node, next) { + QTAILQ_REMOVE(&dso_init_list, e, node); + g_free(e); + } +-out: +- return ret; ++ return true; + } +-#endif + +-bool module_load(const char *prefix, const char *lib_name) ++int module_load(const char *prefix, const char *name, Error **errp) + { +- bool success = false; +- +-#ifdef CONFIG_MODULES +- char *fname = NULL; ++ int rv = -1; + #ifdef CONFIG_MODULE_UPGRADES + char *version_dir; + #endif +@@ -219,34 +209,52 @@ bool module_load(const char *prefix, const char *lib_name) + char *dirs[5]; + char *module_name; + int i = 0, n_dirs = 0; +- int ret; + bool export_symbols = false; + static GHashTable *loaded_modules; + const QemuModinfo *modinfo; + const char **sl; + + if (!g_module_supported()) { +- fprintf(stderr, "Module is not supported by system.\n"); +- return false; ++ error_setg(errp, "%s", "this platform does not support GLib modules"); ++ return -1; + } + + if (!loaded_modules) { + loaded_modules = g_hash_table_new(g_str_hash, g_str_equal); + } + +- module_name = g_strdup_printf("%s%s", prefix, lib_name); ++ /* allocate all resources managed by the out: label here */ ++ module_name = g_strdup_printf("%s%s", prefix, name); + + if (g_hash_table_contains(loaded_modules, module_name)) { + g_free(module_name); +- return true; ++ return 2; /* module already loaded */ + } + g_hash_table_add(loaded_modules, module_name); + ++ search_dir = getenv("QEMU_MODULE_DIR"); ++ if (search_dir != NULL) { ++ dirs[n_dirs++] = g_strdup_printf("%s", search_dir); ++ } ++ dirs[n_dirs++] = get_relocated_path(CONFIG_QEMU_MODDIR); ++ ++#ifdef CONFIG_MODULE_UPGRADES ++ version_dir = g_strcanon(g_strdup(QEMU_PKGVERSION), ++ G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "+-.~", ++ '_'); ++ dirs[n_dirs++] = g_strdup_printf("/var/run/qemu/%s", version_dir); ++#endif ++ assert(n_dirs <= ARRAY_SIZE(dirs)); ++ ++ /* end of resources managed by the out: label */ ++ + for (modinfo = module_info; modinfo->name != NULL; modinfo++) { + if (modinfo->arch) { + if (strcmp(modinfo->name, module_name) == 0) { + if (!module_check_arch(modinfo)) { +- return false; ++ error_setg(errp, "module arch does not match: " ++ "expected '%s', got '%s'", module_arch, modinfo->arch); ++ goto out; + } + } + } +@@ -254,7 +262,11 @@ bool module_load(const char *prefix, const char *lib_name) + if (strcmp(modinfo->name, module_name) == 0) { + /* we depend on other module(s) */ + for (sl = modinfo->deps; *sl != NULL; sl++) { +- module_load("", *sl); ++ int subrv = module_load("", *sl, errp); ++ if (subrv <= 0) { ++ rv = subrv; ++ goto out; ++ } + } + } else { + for (sl = modinfo->deps; *sl != NULL; sl++) { +@@ -267,58 +279,52 @@ bool module_load(const char *prefix, const char *lib_name) + } + } + +- search_dir = getenv("QEMU_MODULE_DIR"); +- if (search_dir != NULL) { +- dirs[n_dirs++] = g_strdup_printf("%s", search_dir); +- } +- dirs[n_dirs++] = get_relocated_path(CONFIG_QEMU_MODDIR); +- +-#ifdef CONFIG_MODULE_UPGRADES +- version_dir = g_strcanon(g_strdup(QEMU_PKGVERSION), +- G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "+-.~", +- '_'); +- dirs[n_dirs++] = g_strdup_printf("/var/run/qemu/%s", version_dir); +-#endif +- +- assert(n_dirs <= ARRAY_SIZE(dirs)); +- + for (i = 0; i < n_dirs; i++) { +- fname = g_strdup_printf("%s/%s%s", +- dirs[i], module_name, CONFIG_HOST_DSOSUF); +- ret = module_load_file(fname, export_symbols); +- g_free(fname); +- fname = NULL; +- /* Try loading until loaded a module file */ +- if (!ret) { +- success = true; +- break; ++ char *fname = g_strdup_printf("%s/%s%s", ++ dirs[i], module_name, CONFIG_HOST_DSOSUF); ++ int ret = access(fname, F_OK); ++ if (ret != 0 && (errno == ENOENT || errno == ENOTDIR)) { ++ /* ++ * if we don't find the module in this dir, try the next one. ++ * If we don't find it in any dir, that can be fine too: user ++ * did not install the module. We will return 0 in this case ++ * with no error set. ++ */ ++ g_free(fname); ++ continue; ++ } else if (ret != 0) { ++ /* most common is EACCES here */ ++ error_setg_errno(errp, errno, "error trying to access %s", fname); ++ } else if (module_load_dso(fname, export_symbols, errp)) { ++ rv = 1; /* module successfully loaded */ + } ++ g_free(fname); ++ goto out; + } ++ rv = 0; /* module not found */ + +- if (!success) { ++out: ++ if (rv <= 0) { + g_hash_table_remove(loaded_modules, module_name); + g_free(module_name); + } +- + for (i = 0; i < n_dirs; i++) { + g_free(dirs[i]); + } +- +-#endif +- return success; ++ return rv; + } + +-#ifdef CONFIG_MODULES +- + static bool module_loaded_qom_all; + +-void module_load_qom(const char *type) ++int module_load_qom(const char *type, Error **errp) + { + const QemuModinfo *modinfo; + const char **sl; ++ int rv = 0; + + if (!type) { +- return; ++ error_setg(errp, "%s", "type is NULL"); ++ return -1; + } + + trace_module_lookup_object_type(type); +@@ -331,15 +337,24 @@ void module_load_qom(const char *type) + } + for (sl = modinfo->objs; *sl != NULL; sl++) { + if (strcmp(type, *sl) == 0) { +- module_load("", modinfo->name); ++ if (rv > 0) { ++ error_setg(errp, "multiple modules providing '%s'", type); ++ return -1; ++ } ++ rv = module_load("", modinfo->name, errp); ++ if (rv < 0) { ++ return rv; ++ } + } + } + } ++ return rv; + } + + void module_load_qom_all(void) + { + const QemuModinfo *modinfo; ++ Error *local_err = NULL; + + if (module_loaded_qom_all) { + return; +@@ -352,7 +367,9 @@ void module_load_qom_all(void) + if (!module_check_arch(modinfo)) { + continue; + } +- module_load("", modinfo->name); ++ if (module_load("", modinfo->name, &local_err) < 0) { ++ error_report_err(local_err); ++ } + } + module_loaded_qom_all = true; + } +@@ -368,7 +385,10 @@ void qemu_load_module_for_opts(const char *group) + } + for (sl = modinfo->opts; *sl != NULL; sl++) { + if (strcmp(group, *sl) == 0) { +- module_load("", modinfo->name); ++ Error *local_err = NULL; ++ if (module_load("", modinfo->name, &local_err) < 0) { ++ error_report_err(local_err); ++ } + } + } + } +@@ -378,7 +398,8 @@ void qemu_load_module_for_opts(const char *group) + + void module_allow_arch(const char *arch) {} + void qemu_load_module_for_opts(const char *group) {} +-void module_load_qom(const char *type) {} ++int module_load(const char *prefix, const char *name, Error **errp) { return 2; } ++int module_load_qom(const char *type, Error **errp) { return 2; } + void module_load_qom_all(void) {} + + #endif diff --git a/packages/q/qemu/module-removed-unused-function-argument-.patch b/packages/q/qemu/module-removed-unused-function-argument-.patch new file mode 100644 index 0000000..aabc123 --- /dev/null +++ b/packages/q/qemu/module-removed-unused-function-argument-.patch @@ -0,0 +1,144 @@ +From: Claudio Fontana +Date: Thu, 29 Sep 2022 11:30:31 +0200 +Subject: module: removed unused function argument "mayfail" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +mayfail is always passed as false for every invocation throughout the program. +It controls whether to printf or not to printf an error on +g_module_open failure. + +Remove this unused argument. + +Signed-off-by: Claudio Fontana +Reviewed-by: Richard Henderson +Reviewed-by: Philippe Mathieu-Daudé +Message-Id: <20220929093035.4231-2-cfontana@suse.de> +Signed-off-by: Paolo Bonzini +(cherry picked from commit 2106106d80489fb9b10cd3ccfaec811988e797cb) +Resolves: bsc#1208139 +Signed-off-by: Dario Faggioli +--- + include/qemu/module.h | 8 ++++---- + softmmu/qtest.c | 2 +- + util/module.c | 20 +++++++++----------- + 3 files changed, 14 insertions(+), 16 deletions(-) + +diff --git a/include/qemu/module.h b/include/qemu/module.h +index bd73607104c951a34512a156cff0..8c012bbe038d3c67ccc7f0795287 100644 +--- a/include/qemu/module.h ++++ b/include/qemu/module.h +@@ -61,15 +61,15 @@ typedef enum { + #define fuzz_target_init(function) module_init(function, \ + MODULE_INIT_FUZZ_TARGET) + #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION) +-#define block_module_load_one(lib) module_load_one("block-", lib, false) +-#define ui_module_load_one(lib) module_load_one("ui-", lib, false) +-#define audio_module_load_one(lib) module_load_one("audio-", lib, false) ++#define block_module_load_one(lib) module_load_one("block-", lib) ++#define ui_module_load_one(lib) module_load_one("ui-", lib) ++#define audio_module_load_one(lib) module_load_one("audio-", lib) + + void register_module_init(void (*fn)(void), module_init_type type); + void register_dso_module_init(void (*fn)(void), module_init_type type); + + void module_call_init(module_init_type type); +-bool module_load_one(const char *prefix, const char *lib_name, bool mayfail); ++bool module_load_one(const char *prefix, const char *lib_name); + void module_load_qom_one(const char *type); + void module_load_qom_all(void); + void module_allow_arch(const char *arch); +diff --git a/softmmu/qtest.c b/softmmu/qtest.c +index f8acef2628d33760906e7b7b890a..76eb7bac563ea9608e1272f923cc 100644 +--- a/softmmu/qtest.c ++++ b/softmmu/qtest.c +@@ -756,7 +756,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words) + g_assert(words[1] && words[2]); + + qtest_send_prefix(chr); +- if (module_load_one(words[1], words[2], false)) { ++ if (module_load_one(words[1], words[2])) { + qtest_sendf(chr, "OK\n"); + } else { + qtest_sendf(chr, "FAIL\n"); +diff --git a/util/module.c b/util/module.c +index 8ddb0e18f517809282ffb45a0a14..8563edd6267cc6e2fbea2cb61e65 100644 +--- a/util/module.c ++++ b/util/module.c +@@ -144,7 +144,7 @@ static bool module_check_arch(const QemuModinfo *modinfo) + return true; + } + +-static int module_load_file(const char *fname, bool mayfail, bool export_symbols) ++static int module_load_file(const char *fname, bool export_symbols) + { + GModule *g_module; + void (*sym)(void); +@@ -172,10 +172,8 @@ static int module_load_file(const char *fname, bool mayfail, bool export_symbols + } + g_module = g_module_open(fname, flags); + if (!g_module) { +- if (!mayfail) { +- fprintf(stderr, "Failed to open module: %s\n", +- g_module_error()); +- } ++ fprintf(stderr, "Failed to open module: %s\n", ++ g_module_error()); + ret = -EINVAL; + goto out; + } +@@ -208,7 +206,7 @@ out: + } + #endif + +-bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) ++bool module_load_one(const char *prefix, const char *lib_name) + { + bool success = false; + +@@ -256,7 +254,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) + if (strcmp(modinfo->name, module_name) == 0) { + /* we depend on other module(s) */ + for (sl = modinfo->deps; *sl != NULL; sl++) { +- module_load_one("", *sl, false); ++ module_load_one("", *sl); + } + } else { + for (sl = modinfo->deps; *sl != NULL; sl++) { +@@ -287,7 +285,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) + for (i = 0; i < n_dirs; i++) { + fname = g_strdup_printf("%s/%s%s", + dirs[i], module_name, CONFIG_HOST_DSOSUF); +- ret = module_load_file(fname, mayfail, export_symbols); ++ ret = module_load_file(fname, export_symbols); + g_free(fname); + fname = NULL; + /* Try loading until loaded a module file */ +@@ -333,7 +331,7 @@ void module_load_qom_one(const char *type) + } + for (sl = modinfo->objs; *sl != NULL; sl++) { + if (strcmp(type, *sl) == 0) { +- module_load_one("", modinfo->name, false); ++ module_load_one("", modinfo->name); + } + } + } +@@ -354,7 +352,7 @@ void module_load_qom_all(void) + if (!module_check_arch(modinfo)) { + continue; + } +- module_load_one("", modinfo->name, false); ++ module_load_one("", modinfo->name); + } + module_loaded_qom_all = true; + } +@@ -370,7 +368,7 @@ void qemu_load_module_for_opts(const char *group) + } + for (sl = modinfo->opts; *sl != NULL; sl++) { + if (strcmp(group, *sl) == 0) { +- module_load_one("", modinfo->name, false); ++ module_load_one("", modinfo->name); + } + } + } diff --git a/packages/q/qemu/module-rename-module_load_one-to-module_.patch b/packages/q/qemu/module-rename-module_load_one-to-module_.patch new file mode 100644 index 0000000..32af250 --- /dev/null +++ b/packages/q/qemu/module-rename-module_load_one-to-module_.patch @@ -0,0 +1,249 @@ +From: Claudio Fontana +Date: Thu, 29 Sep 2022 11:30:32 +0200 +Subject: module: rename module_load_one to module_load +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Claudio Fontana +Reviewed-by: Philippe Mathieu-Daudé +Reviewed-by: Richard Henderson +Message-Id: <20220929093035.4231-3-cfontana@suse.de> +Signed-off-by: Paolo Bonzini +(cherry picked from commit dbc0e80553c067f56cb236d9de2cd0d50f3c6131) +Resolves: bsc#1208139 +Signed-off-by: Dario Faggioli +--- + audio/audio.c | 2 +- + block.c | 4 ++-- + block/dmg.c | 4 ++-- + hw/core/qdev.c | 2 +- + include/qemu/module.h | 10 +++++----- + qom/object.c | 4 ++-- + softmmu/qtest.c | 2 +- + ui/console.c | 6 +++--- + util/module.c | 14 +++++++------- + 9 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/audio/audio.c b/audio/audio.c +index a02f3ce5c6192542544c9c8017b1..9e2609707d7f4adecfb6e9f45670 100644 +--- a/audio/audio.c ++++ b/audio/audio.c +@@ -79,7 +79,7 @@ audio_driver *audio_driver_lookup(const char *name) + } + } + +- audio_module_load_one(name); ++ audio_module_load(name); + QLIST_FOREACH(d, &audio_drivers, next) { + if (strcmp(name, d->name) == 0) { + return d; +diff --git a/block.c b/block.c +index bc85f46eed690321657cf1de5d27..72c7f6d47d590657472b036a5847 100644 +--- a/block.c ++++ b/block.c +@@ -464,7 +464,7 @@ BlockDriver *bdrv_find_format(const char *format_name) + /* The driver isn't registered, maybe we need to load a module */ + for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) { + if (!strcmp(block_driver_modules[i].format_name, format_name)) { +- block_module_load_one(block_driver_modules[i].library_name); ++ block_module_load(block_driver_modules[i].library_name); + break; + } + } +@@ -976,7 +976,7 @@ BlockDriver *bdrv_find_protocol(const char *filename, + for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) { + if (block_driver_modules[i].protocol_name && + !strcmp(block_driver_modules[i].protocol_name, protocol)) { +- block_module_load_one(block_driver_modules[i].library_name); ++ block_module_load(block_driver_modules[i].library_name); + break; + } + } +diff --git a/block/dmg.c b/block/dmg.c +index 98db18d82a0e56e340db4373d967..007b8d9996d61be8370699f3d81f 100644 +--- a/block/dmg.c ++++ b/block/dmg.c +@@ -446,8 +446,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags, + return -EINVAL; + } + +- block_module_load_one("dmg-bz2"); +- block_module_load_one("dmg-lzfse"); ++ block_module_load("dmg-bz2"); ++ block_module_load("dmg-lzfse"); + + s->n_chunks = 0; + s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL; +diff --git a/hw/core/qdev.c b/hw/core/qdev.c +index 0806d8fcaaaca5a1566c1791bd14..25dfc08468011b2d63f032526919 100644 +--- a/hw/core/qdev.c ++++ b/hw/core/qdev.c +@@ -148,7 +148,7 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp) + DeviceState *qdev_new(const char *name) + { + if (!object_class_by_name(name)) { +- module_load_qom_one(name); ++ module_load_qom(name); + } + return DEVICE(object_new(name)); + } +diff --git a/include/qemu/module.h b/include/qemu/module.h +index 8c012bbe038d3c67ccc7f0795287..b7911ce7916148ba9c3245878350 100644 +--- a/include/qemu/module.h ++++ b/include/qemu/module.h +@@ -61,16 +61,16 @@ typedef enum { + #define fuzz_target_init(function) module_init(function, \ + MODULE_INIT_FUZZ_TARGET) + #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION) +-#define block_module_load_one(lib) module_load_one("block-", lib) +-#define ui_module_load_one(lib) module_load_one("ui-", lib) +-#define audio_module_load_one(lib) module_load_one("audio-", lib) ++#define block_module_load(lib) module_load("block-", lib) ++#define ui_module_load(lib) module_load("ui-", lib) ++#define audio_module_load(lib) module_load("audio-", lib) + + void register_module_init(void (*fn)(void), module_init_type type); + void register_dso_module_init(void (*fn)(void), module_init_type type); + + void module_call_init(module_init_type type); +-bool module_load_one(const char *prefix, const char *lib_name); +-void module_load_qom_one(const char *type); ++bool module_load(const char *prefix, const char *lib_name); ++void module_load_qom(const char *type); + void module_load_qom_all(void); + void module_allow_arch(const char *arch); + +diff --git a/qom/object.c b/qom/object.c +index d34608558e9e5e53f4b363774f06..4f834f3bf66c6672138d9bfc9e55 100644 +--- a/qom/object.c ++++ b/qom/object.c +@@ -526,7 +526,7 @@ void object_initialize(void *data, size_t size, const char *typename) + + #ifdef CONFIG_MODULES + if (!type) { +- module_load_qom_one(typename); ++ module_load_qom(typename); + type = type_get_by_name(typename); + } + #endif +@@ -1033,7 +1033,7 @@ ObjectClass *module_object_class_by_name(const char *typename) + oc = object_class_by_name(typename); + #ifdef CONFIG_MODULES + if (!oc) { +- module_load_qom_one(typename); ++ module_load_qom(typename); + oc = object_class_by_name(typename); + } + #endif +diff --git a/softmmu/qtest.c b/softmmu/qtest.c +index 76eb7bac563ea9608e1272f923cc..fc5b733c630035785732610c920c 100644 +--- a/softmmu/qtest.c ++++ b/softmmu/qtest.c +@@ -756,7 +756,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words) + g_assert(words[1] && words[2]); + + qtest_send_prefix(chr); +- if (module_load_one(words[1], words[2])) { ++ if (module_load(words[1], words[2])) { + qtest_sendf(chr, "OK\n"); + } else { + qtest_sendf(chr, "FAIL\n"); +diff --git a/ui/console.c b/ui/console.c +index 765892f84f1c3bb6335887bc4889..4913c55684cb9b9d8c8ab0df5b22 100644 +--- a/ui/console.c ++++ b/ui/console.c +@@ -2632,7 +2632,7 @@ bool qemu_display_find_default(DisplayOptions *opts) + + for (i = 0; i < (int)ARRAY_SIZE(prio); i++) { + if (dpys[prio[i]] == NULL) { +- ui_module_load_one(DisplayType_str(prio[i])); ++ ui_module_load(DisplayType_str(prio[i])); + } + if (dpys[prio[i]] == NULL) { + continue; +@@ -2650,7 +2650,7 @@ void qemu_display_early_init(DisplayOptions *opts) + return; + } + if (dpys[opts->type] == NULL) { +- ui_module_load_one(DisplayType_str(opts->type)); ++ ui_module_load(DisplayType_str(opts->type)); + } + if (dpys[opts->type] == NULL) { + error_report("Display '%s' is not available.", +@@ -2680,7 +2680,7 @@ void qemu_display_help(void) + printf("none\n"); + for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) { + if (!dpys[idx]) { +- ui_module_load_one(DisplayType_str(idx)); ++ ui_module_load(DisplayType_str(idx)); + } + if (dpys[idx]) { + printf("%s\n", DisplayType_str(dpys[idx]->type)); +diff --git a/util/module.c b/util/module.c +index 8563edd6267cc6e2fbea2cb61e65..ad89cd50dc2a03ea6f8431849137 100644 +--- a/util/module.c ++++ b/util/module.c +@@ -206,7 +206,7 @@ out: + } + #endif + +-bool module_load_one(const char *prefix, const char *lib_name) ++bool module_load(const char *prefix, const char *lib_name) + { + bool success = false; + +@@ -254,7 +254,7 @@ bool module_load_one(const char *prefix, const char *lib_name) + if (strcmp(modinfo->name, module_name) == 0) { + /* we depend on other module(s) */ + for (sl = modinfo->deps; *sl != NULL; sl++) { +- module_load_one("", *sl); ++ module_load("", *sl); + } + } else { + for (sl = modinfo->deps; *sl != NULL; sl++) { +@@ -312,7 +312,7 @@ bool module_load_one(const char *prefix, const char *lib_name) + + static bool module_loaded_qom_all; + +-void module_load_qom_one(const char *type) ++void module_load_qom(const char *type) + { + const QemuModinfo *modinfo; + const char **sl; +@@ -331,7 +331,7 @@ void module_load_qom_one(const char *type) + } + for (sl = modinfo->objs; *sl != NULL; sl++) { + if (strcmp(type, *sl) == 0) { +- module_load_one("", modinfo->name); ++ module_load("", modinfo->name); + } + } + } +@@ -352,7 +352,7 @@ void module_load_qom_all(void) + if (!module_check_arch(modinfo)) { + continue; + } +- module_load_one("", modinfo->name); ++ module_load("", modinfo->name); + } + module_loaded_qom_all = true; + } +@@ -368,7 +368,7 @@ void qemu_load_module_for_opts(const char *group) + } + for (sl = modinfo->opts; *sl != NULL; sl++) { + if (strcmp(group, *sl) == 0) { +- module_load_one("", modinfo->name); ++ module_load("", modinfo->name); + } + } + } +@@ -378,7 +378,7 @@ void qemu_load_module_for_opts(const char *group) + + void module_allow_arch(const char *arch) {} + void qemu_load_module_for_opts(const char *group) {} +-void module_load_qom_one(const char *type) {} ++void module_load_qom(const char *type) {} + void module_load_qom_all(void) {} + + #endif diff --git a/packages/q/qemu/openSUSE-pc-q35-Bump-max_cpus-to-1024.patch b/packages/q/qemu/openSUSE-pc-q35-Bump-max_cpus-to-1024.patch new file mode 100644 index 0000000..5e0f665 --- /dev/null +++ b/packages/q/qemu/openSUSE-pc-q35-Bump-max_cpus-to-1024.patch @@ -0,0 +1,37 @@ +From: Dario Faggioli +Date: Wed, 16 Nov 2022 13:24:36 +0100 +Subject: [openSUSE] pc: q35: Bump max_cpus to 1024 + +And use the new limit for machine version 7.1 too. +Keep the old limit of 288 for machine versions 7.0 and earlier. + +Signed-off-by: Dario Faggioli +(cherry picked from commit +https://lore.kernel.org/qemu-devel/166876173513.24238.8968021290016401421.stgit@tumbleweed.Wayrath/) +References: bsc#1202282, jsc#PED-2592 +Signed-off-by: Dario Faggioli +--- + hw/i386/pc_q35.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c +index 2e5dae9a89faaf0d9c285b030ed7..6875e27b508cccd6891e2db58b68 100644 +--- a/hw/i386/pc_q35.c ++++ b/hw/i386/pc_q35.c +@@ -367,7 +367,7 @@ static void pc_q35_machine_options(MachineClass *m) + machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); +- m->max_cpus = 288; ++ m->max_cpus = 1024; + } + + static void pc_q35_7_1_machine_options(MachineClass *m) +@@ -388,6 +388,7 @@ static void pc_q35_7_0_machine_options(MachineClass *m) + pc_q35_7_1_machine_options(m); + m->alias = NULL; + pcmc->enforce_amd_1tb_hole = false; ++ m->max_cpus = 288; + compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); + compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); + } diff --git a/packages/q/qemu/pc-q35-Bump-max_cpus-to-1024.patch b/packages/q/qemu/pc-q35-Bump-max_cpus-to-1024.patch deleted file mode 100644 index 23ee1ce..0000000 --- a/packages/q/qemu/pc-q35-Bump-max_cpus-to-1024.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Dario Faggioli -Date: Wed, 16 Nov 2022 13:24:36 +0100 -Subject: pc: q35: Bump max_cpus to 1024 - -References: jsc#PED-2592 -Git-commit: 0000000000000000000000000000000000000000 - -And use the new limit for machine version 7.1 too. -Keep the old limit of 288 for machine versions 7.0 and earlier. - -Signed-off-by: Dario Faggioli ---- - hw/i386/pc_q35.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c -index 2e5dae9a89faaf0d9c285b030ed7..6875e27b508cccd6891e2db58b68 100644 ---- a/hw/i386/pc_q35.c -+++ b/hw/i386/pc_q35.c -@@ -367,7 +367,7 @@ static void pc_q35_machine_options(MachineClass *m) - machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); - machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); - machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); -- m->max_cpus = 288; -+ m->max_cpus = 1024; - } - - static void pc_q35_7_1_machine_options(MachineClass *m) -@@ -388,6 +388,7 @@ static void pc_q35_7_0_machine_options(MachineClass *m) - pc_q35_7_1_machine_options(m); - m->alias = NULL; - pcmc->enforce_amd_1tb_hole = false; -+ m->max_cpus = 288; - compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); - compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); - } diff --git a/packages/q/qemu/qemu.changes b/packages/q/qemu/qemu.changes index a688f74..0f8480b 100644 --- a/packages/q/qemu/qemu.changes +++ b/packages/q/qemu/qemu.changes @@ -1,4 +1,33 @@ ------------------------------------------------------------------- +Fri Feb 10 12:12:28 UTC 2023 - Dario Faggioli + +- Fixed: bsc#1205847 (CVE-2022-4172), bsc#1203788 (CVE-2022-3165), + bsc#1205808 (CVE-2022-4144), bsc#1206527, bsc#1208139 +- Improved handling of: bsc#1202282 (jsc#PED-2592) +* Patches dropped: + pc-q35-Bump-max_cpus-to-1024.patch +* Patches added: + accel-abort-if-we-fail-to-load-the-accel.patch + bios-tables-test-add-test-for-number-of-.patch + bios-tables-test-teach-test-to-use-smbio.patch + dmg-warn-when-opening-dmg-images-contain.patch + hw-acpi-erst.c-Fix-memory-handling-issue.patch + hw-display-qxl-Avoid-buffer-overrun-in-q.patch + hw-display-qxl-Document-qxl_phys2virt.patch + hw-display-qxl-Have-qxl_log_command-Retu.patch + hw-display-qxl-Pass-requested-buffer-siz.patch + hw-smbios-add-core_count2-to-smbios-tabl.patch + hw-smbios-support-for-type-8-port-connec.patch + module-add-Error-arguments-to-module_loa.patch + module-removed-unused-function-argument-.patch + module-rename-module_load_one-to-module_.patch + openSUSE-pc-q35-Bump-max_cpus-to-1024.patch + s390x-tod-kvm-don-t-save-restore-the-TOD.patch + tests-acpi-allow-changes-for-core_count2.patch + tests-acpi-update-tables-for-new-core-co.patch + ui-vnc-clipboard-fix-integer-underflow-i.patch + +------------------------------------------------------------------- Fri Jan 27 12:14:01 UTC 2023 - Dario Faggioli - Refactor building and installing SeaBIOS docs diff --git a/packages/q/qemu/qemu.spec b/packages/q/qemu/qemu.spec index 5564ec6..93e8090 100644 --- a/packages/q/qemu/qemu.spec +++ b/packages/q/qemu/qemu.spec @@ -152,6 +152,9 @@ Source14: 50-seabios-256k.json Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc Source201: DSDT.pcie +Source202: APIC.core-count2 +Source203: DSDT.core-count2 +Source204: FACP.core-count2 Source300: bundles.tar.xz Source301: update_git.sh Source302: config.sh @@ -194,15 +197,33 @@ Patch00030: linux-user-remove-conditionals-for-many-.patch Patch00031: meson-enforce-a-minimum-Linux-kernel-hea.patch Patch00032: linux-user-drop-conditionals-for-obsolet.patch Patch00033: block-io_uring-revert-Use-io_uring_regis.patch -Patch00034: pc-q35-Bump-max_cpus-to-1024.patch -Patch00035: configure-Add-Wno-gnu-variable-sized-typ.patch -Patch00036: Update-linux-headers-to-v6.0-rc4.patch -Patch00037: s390x-pci-add-routine-to-get-host-functi.patch -Patch00038: s390x-pci-enable-for-load-store-interpre.patch -Patch00039: s390x-pci-don-t-fence-interpreted-device.patch -Patch00040: s390x-pci-enable-adapter-event-notificat.patch -Patch00041: s390x-pci-let-intercept-devices-have-sep.patch -Patch00042: s390x-pci-reflect-proper-maxstbl-for-gro.patch +Patch00034: hw-smbios-support-for-type-8-port-connec.patch +Patch00035: hw-smbios-add-core_count2-to-smbios-tabl.patch +Patch00036: openSUSE-pc-q35-Bump-max_cpus-to-1024.patch +Patch00037: bios-tables-test-teach-test-to-use-smbio.patch +Patch00038: tests-acpi-allow-changes-for-core_count2.patch +Patch00039: bios-tables-test-add-test-for-number-of-.patch +Patch00040: tests-acpi-update-tables-for-new-core-co.patch +Patch00041: configure-Add-Wno-gnu-variable-sized-typ.patch +Patch00042: Update-linux-headers-to-v6.0-rc4.patch +Patch00043: s390x-pci-add-routine-to-get-host-functi.patch +Patch00044: s390x-pci-enable-for-load-store-interpre.patch +Patch00045: s390x-pci-don-t-fence-interpreted-device.patch +Patch00046: s390x-pci-enable-adapter-event-notificat.patch +Patch00047: s390x-pci-let-intercept-devices-have-sep.patch +Patch00048: s390x-pci-reflect-proper-maxstbl-for-gro.patch +Patch00049: module-removed-unused-function-argument-.patch +Patch00050: module-rename-module_load_one-to-module_.patch +Patch00051: module-add-Error-arguments-to-module_loa.patch +Patch00052: dmg-warn-when-opening-dmg-images-contain.patch +Patch00053: accel-abort-if-we-fail-to-load-the-accel.patch +Patch00054: s390x-tod-kvm-don-t-save-restore-the-TOD.patch +Patch00055: hw-display-qxl-Have-qxl_log_command-Retu.patch +Patch00056: hw-display-qxl-Document-qxl_phys2virt.patch +Patch00057: hw-display-qxl-Pass-requested-buffer-siz.patch +Patch00058: hw-display-qxl-Avoid-buffer-overrun-in-q.patch +Patch00059: ui-vnc-clipboard-fix-integer-underflow-i.patch +Patch00060: hw-acpi-erst.c-Fix-memory-handling-issue.patch # Patches applied in roms/seabios/: Patch01000: openSUSE-switch-to-python3-as-needed.patch Patch01001: openSUSE-build-enable-cross-compilation-.patch @@ -2318,6 +2339,10 @@ cd %blddir # If that patch is removed, the following line needs to go as well. cp %{SOURCE201} %{srcdir}/tests/data/acpi/microvm/ +# Patch 'tests/acpi: update tables for new core count test' requires some new +# binaries to be introcuded too. Let's copy them in place as well +cp %{SOURCE202} %{SOURCE203} %{SOURCE204} %{srcdir}/tests/data/acpi/q35/ + %if 0%{?qemu_user_space_build} # Seccomp is not supported by linux-user emulation echo 'int main (void) { return 0; }' > %{srcdir}/tests/unit/test-seccomp.c diff --git a/packages/q/qemu/qemu.spec.in b/packages/q/qemu/qemu.spec.in index bea1638..d393aa5 100644 --- a/packages/q/qemu/qemu.spec.in +++ b/packages/q/qemu/qemu.spec.in @@ -152,6 +152,9 @@ Source14: 50-seabios-256k.json Source15: 60-seabios-128k.json Source200: qemu-rpmlintrc Source201: DSDT.pcie +Source202: APIC.core-count2 +Source203: DSDT.core-count2 +Source204: FACP.core-count2 Source300: bundles.tar.xz Source301: update_git.sh Source302: config.sh @@ -2251,6 +2254,10 @@ cd %blddir # If that patch is removed, the following line needs to go as well. cp %{SOURCE201} %{srcdir}/tests/data/acpi/microvm/ +# Patch 'tests/acpi: update tables for new core count test' requires some new +# binaries to be introcuded too. Let's copy them in place as well +cp %{SOURCE202} %{SOURCE203} %{SOURCE204} %{srcdir}/tests/data/acpi/q35/ + %if 0%{?qemu_user_space_build} # Seccomp is not supported by linux-user emulation echo 'int main (void) { return 0; }' > %{srcdir}/tests/unit/test-seccomp.c diff --git a/packages/q/qemu/s390x-tod-kvm-don-t-save-restore-the-TOD.patch b/packages/q/qemu/s390x-tod-kvm-don-t-save-restore-the-TOD.patch new file mode 100644 index 0000000..c0886e8 --- /dev/null +++ b/packages/q/qemu/s390x-tod-kvm-don-t-save-restore-the-TOD.patch @@ -0,0 +1,56 @@ +From: Nico Boehr +Date: Wed, 12 Oct 2022 14:32:29 +0200 +Subject: s390x/tod-kvm: don't save/restore the TOD in PV guests + +Under PV, the guest's TOD clock is under control of the ultravisor and the +hypervisor cannot change it. + +With upcoming kernel changes[1], the Linux kernel will reject QEMU's +request to adjust the guest's clock in this case, so don't attempt to set +the clock. + +This avoids the following warning message on save/restore of a PV guest: + +warning: Unable to set KVM guest TOD clock: Operation not supported + +[1] https://lore.kernel.org/all/20221011160712.928239-2-nrb@linux.ibm.com/ + +Fixes: c3347ed0d2ee ("s390x: protvirt: Support unpack facility") +Signed-off-by: Nico Boehr +Message-Id: <20221012123229.1196007-1-nrb@linux.ibm.com> +[thuth: Add curly braces] +Signed-off-by: Thomas Huth +(cherry picked from commit 38621181ae3cbec62e3490fbc14f6ac01642d07a) +Resolves: bsc#1206527 +Signed-off-by: Dario Faggioli +--- + hw/s390x/tod-kvm.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/hw/s390x/tod-kvm.c b/hw/s390x/tod-kvm.c +index 9d0cbfbce2bf56b3593d712bd082..e2202dae2dc203a2848a3d0faaaf 100644 +--- a/hw/s390x/tod-kvm.c ++++ b/hw/s390x/tod-kvm.c +@@ -13,6 +13,7 @@ + #include "qemu/module.h" + #include "sysemu/runstate.h" + #include "hw/s390x/tod.h" ++#include "hw/s390x/pv.h" + #include "kvm/kvm_s390x.h" + + static void kvm_s390_get_tod_raw(S390TOD *tod, Error **errp) +@@ -84,6 +85,14 @@ static void kvm_s390_tod_vm_state_change(void *opaque, bool running, + S390TODState *td = opaque; + Error *local_err = NULL; + ++ /* ++ * Under PV, the clock is under ultravisor control, hence we cannot restore ++ * it on resume. ++ */ ++ if (s390_is_pv()) { ++ return; ++ } ++ + if (running && td->stopped) { + /* Set the old TOD when running the VM - start the TOD clock. */ + kvm_s390_set_tod_raw(&td->base, &local_err); diff --git a/packages/q/qemu/tests-acpi-allow-changes-for-core_count2.patch b/packages/q/qemu/tests-acpi-allow-changes-for-core_count2.patch new file mode 100644 index 0000000..5a6b320 --- /dev/null +++ b/packages/q/qemu/tests-acpi-allow-changes-for-core_count2.patch @@ -0,0 +1,38 @@ +From: Julia Suvorova +Date: Tue, 11 Oct 2022 13:17:29 +0200 +Subject: tests/acpi: allow changes for core_count2 test + +Signed-off-by: Julia Suvorova +Message-Id: <20220731162141.178443-4-jusual@redhat.com> +Message-Id: <20221011111731.101412-4-jusual@redhat.com> +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +Acked-by: Igor Mammedov +(cherry picked from commit 159a0da5b0bd660f8a70bca4e3c2bd4c863eaf1a) +References: bsc#1202282, jsc#PED-2592 +Signed-off-by: Dario Faggioli +--- + tests/data/acpi/q35/APIC.core-count2 | 0 + tests/data/acpi/q35/DSDT.core-count2 | 0 + tests/data/acpi/q35/FACP.core-count2 | 0 + tests/qtest/bios-tables-test-allowed-diff.h | 3 +++ + 4 files changed, 3 insertions(+) + +diff --git a/tests/data/acpi/q35/APIC.core-count2 b/tests/data/acpi/q35/APIC.core-count2 +new file mode 100644 +index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 +diff --git a/tests/data/acpi/q35/DSDT.core-count2 b/tests/data/acpi/q35/DSDT.core-count2 +new file mode 100644 +index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 +diff --git a/tests/data/acpi/q35/FACP.core-count2 b/tests/data/acpi/q35/FACP.core-count2 +new file mode 100644 +index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 +diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h +index dfb8523c8bf457c471cea8d860ef..e81dc67a2e52bc6553494325d248 100644 +--- a/tests/qtest/bios-tables-test-allowed-diff.h ++++ b/tests/qtest/bios-tables-test-allowed-diff.h +@@ -1 +1,4 @@ + /* List of comma-separated changed AML files to ignore */ ++"tests/data/acpi/q35/APIC.core-count2", ++"tests/data/acpi/q35/DSDT.core-count2", ++"tests/data/acpi/q35/FACP.core-count2", diff --git a/packages/q/qemu/tests-acpi-update-tables-for-new-core-co.patch b/packages/q/qemu/tests-acpi-update-tables-for-new-core-co.patch new file mode 100644 index 0000000..ce7bbea --- /dev/null +++ b/packages/q/qemu/tests-acpi-update-tables-for-new-core-co.patch @@ -0,0 +1,128 @@ +From: Julia Suvorova +Date: Tue, 11 Oct 2022 13:17:31 +0200 +Subject: tests/acpi: update tables for new core count test + +Changes in the tables (for 275 cores): +FACP: ++ Use APIC Cluster Model (V4) : 1 + +APIC: ++[02Ch 0044 1] Subtable Type : 00 [Processor Local APIC] ++[02Dh 0045 1] Length : 08 ++[02Eh 0046 1] Processor ID : 00 ++[02Fh 0047 1] Local Apic ID : 00 ++[030h 0048 4] Flags (decoded below) : 00000001 ++ Processor Enabled : 1 +... ++ ++[81Ch 2076 1] Subtable Type : 00 [Processor Local APIC] ++[81Dh 2077 1] Length : 08 ++[81Eh 2078 1] Processor ID : FE ++[81Fh 2079 1] Local Apic ID : FE ++[820h 2080 4] Flags (decoded below) : 00000001 ++ Processor Enabled : 1 ++ Runtime Online Capable : 0 ++ ++[824h 2084 1] Subtable Type : 09 [Processor Local x2APIC] ++[825h 2085 1] Length : 10 ++[826h 2086 2] Reserved : 0000 ++[828h 2088 4] Processor x2Apic ID : 000000FF ++[82Ch 2092 4] Flags (decoded below) : 00000001 ++ Processor Enabled : 1 ++[830h 2096 4] Processor UID : 000000FF +... + +DSDT: ++ Processor (C001, 0x01, 0x00000000, 0x00) ++ { ++ Method (_STA, 0, Serialized) // _STA: Status ++ { ++ Return (CSTA (One)) ++ } ++ ++ Name (_MAT, Buffer (0x08) // _MAT: Multiple APIC Table Entry ++ { ++ 0x00, 0x08, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00 // ........ ++ }) ++ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 ++ { ++ CEJ0 (One) ++ } ++ ++ Method (_OST, 3, Serialized) // _OST: OSPM Status Indication ++ { ++ COST (One, Arg0, Arg1, Arg2) ++ } ++ } +... ++ Processor (C0FE, 0xFE, 0x00000000, 0x00) ++ { ++ Method (_STA, 0, Serialized) // _STA: Status ++ { ++ Return (CSTA (0xFE)) ++ } ++ ++ Name (_MAT, Buffer (0x08) // _MAT: Multiple APIC Table Entry ++ { ++ 0x00, 0x08, 0xFE, 0xFE, 0x01, 0x00, 0x00, 0x00 // ........ ++ }) ++ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 ++ { ++ CEJ0 (0xFE) ++ } ++ ++ Method (_OST, 3, Serialized) // _OST: OSPM Status Indication ++ { ++ COST (0xFE, Arg0, Arg1, Arg2) ++ } ++ } ++ ++ Device (C0FF) ++ { ++ Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID ++ Name (_UID, 0xFF) // _UID: Unique ID ++ Method (_STA, 0, Serialized) // _STA: Status ++ { ++ Return (CSTA (0xFF)) ++ } ++ ++ Name (_MAT, Buffer (0x10) // _MAT: Multiple APIC Table Entry ++ { ++ /* 0000 */ 0x09, 0x10, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, // ........ ++ /* 0008 */ 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 // ........ ++ }) ++ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9 ++ { ++ CEJ0 (0xFF) ++ } ++ ++ Method (_OST, 3, Serialized) // _OST: OSPM Status Indication ++ { ++ COST (0xFF, Arg0, Arg1, Arg2) ++ } ++ } ++ +... + +Signed-off-by: Julia Suvorova +Message-Id: <20220731162141.178443-6-jusual@redhat.com> +Message-Id: <20221011111731.101412-6-jusual@redhat.com> +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +(cherry picked from commit b22fbc5bcb6bd2412889f2c48a29c86880a30552) +[Moved the updated binaries directly in RPM sources] +References: bsc#1202282, jsc#PED-2592 +Signed-off-by: Dario Faggioli +--- + tests/qtest/bios-tables-test-allowed-diff.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h +index e81dc67a2e52bc6553494325d248..dfb8523c8bf457c471cea8d860ef 100644 +--- a/tests/qtest/bios-tables-test-allowed-diff.h ++++ b/tests/qtest/bios-tables-test-allowed-diff.h +@@ -1,4 +1 @@ + /* List of comma-separated changed AML files to ignore */ +-"tests/data/acpi/q35/APIC.core-count2", +-"tests/data/acpi/q35/DSDT.core-count2", +-"tests/data/acpi/q35/FACP.core-count2", diff --git a/packages/q/qemu/ui-vnc-clipboard-fix-integer-underflow-i.patch b/packages/q/qemu/ui-vnc-clipboard-fix-integer-underflow-i.patch new file mode 100644 index 0000000..57e9f7a --- /dev/null +++ b/packages/q/qemu/ui-vnc-clipboard-fix-integer-underflow-i.patch @@ -0,0 +1,53 @@ +From: Mauro Matteo Cascella +Date: Sun, 25 Sep 2022 22:45:11 +0200 +Subject: ui/vnc-clipboard: fix integer underflow in vnc_client_cut_text_ext + +Extended ClientCutText messages start with a 4-byte header. If len < 4, +an integer underflow occurs in vnc_client_cut_text_ext. The result is +used to decompress data in a while loop in inflate_buffer, leading to +CPU consumption and denial of service. Prevent this by checking dlen in +protocol_client_msg. + +Fixes: CVE-2022-3165 +Fixes: 0bf41cab93e5 ("ui/vnc: clipboard support") +Reported-by: TangPeng +Signed-off-by: Mauro Matteo Cascella +Message-Id: <20220925204511.1103214-1-mcascell@redhat.com> +Signed-off-by: Gerd Hoffmann +(cherry picked from commit d307040b18bfcb1393b910f1bae753d5c12a4dc7) +Resolves: bsc#1203788 +Signed-off-by: Dario Faggioli +--- + ui/vnc.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/ui/vnc.c b/ui/vnc.c +index 6a05d061479e3bc38148e4647426..acb3629cd8e2643ff82e72d958dc 100644 +--- a/ui/vnc.c ++++ b/ui/vnc.c +@@ -2442,8 +2442,8 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) + if (len == 1) { + return 8; + } ++ uint32_t dlen = abs(read_s32(data, 4)); + if (len == 8) { +- uint32_t dlen = abs(read_s32(data, 4)); + if (dlen > (1 << 20)) { + error_report("vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.", dlen); +@@ -2456,8 +2456,13 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) + } + + if (read_s32(data, 4) < 0) { +- vnc_client_cut_text_ext(vs, abs(read_s32(data, 4)), +- read_u32(data, 8), data + 12); ++ if (dlen < 4) { ++ error_report("vnc: malformed payload (header less than 4 bytes)" ++ " in extended clipboard pseudo-encoding."); ++ vnc_client_error(vs); ++ break; ++ } ++ vnc_client_cut_text_ext(vs, dlen, read_u32(data, 8), data + 12); + break; + } + vnc_client_cut_text(vs, read_u32(data, 4), data + 8); diff --git a/packages/r/rescue/.files b/packages/r/rescue/.files index cb706b0..977e1f6 100644 Binary files a/packages/r/rescue/.files and b/packages/r/rescue/.files differ diff --git a/packages/r/rescue/.rev b/packages/r/rescue/.rev index f250ab7..1f9c608 100644 --- a/packages/r/rescue/.rev +++ b/packages/r/rescue/.rev @@ -15,4 +15,12 @@ 885059 + + af2e2b264cb86a2d89176bd5b94f2abf + 1.0.5 + + dimstar_suse + + 1064695 + diff --git a/packages/r/rescue/Rescue_1.0.4.zip b/packages/r/rescue/Rescue_1.0.4.zip deleted file mode 120000 index 87fd625..0000000 --- a/packages/r/rescue/Rescue_1.0.4.zip +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiafl6c4dsolba5trebrd3cf2gzdhfx4nl3m5vaq62dtupshinlaxq \ No newline at end of file diff --git a/packages/r/rescue/Rescue_1.0.5.zip b/packages/r/rescue/Rescue_1.0.5.zip new file mode 120000 index 0000000..a4e8594 --- /dev/null +++ b/packages/r/rescue/Rescue_1.0.5.zip @@ -0,0 +1 @@ +/ipfs/bafybeihp7pgk2wi5ko2lvx4x3micthitr7bzwyt73gz4mzjhllodggxggi \ No newline at end of file diff --git a/packages/r/rescue/rescue.changes b/packages/r/rescue/rescue.changes index 0e17d92..067452a 100644 --- a/packages/r/rescue/rescue.changes +++ b/packages/r/rescue/rescue.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 10 18:58:53 UTC 2023 - Dirk Müller + +- update to 1.0.5: + * Grasshopper update (2.9) to fix font loading deadlock on startup + +------------------------------------------------------------------- Sat Apr 10 22:58:27 UTC 2021 - Ferdinand Thiessen - Update to 1.0.4: diff --git a/packages/r/rescue/rescue.spec b/packages/r/rescue/rescue.spec index 532a0dd..7f52281 100644 --- a/packages/r/rescue/rescue.spec +++ b/packages/r/rescue/rescue.spec @@ -1,7 +1,7 @@ # # spec file for package rescue # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: rescue -Version: 1.0.4 +Version: 1.0.5 Release: 0 Summary: Action Adventure in Space License: GPL-3.0-or-later Group: Amusements/Games/Strategy/Other -URL: http://rescue.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/Rescue_%{version}.zip +URL: https://rescue.sourceforge.net/ +Source0: https://downloads.sourceforge.net/%{name}/Rescue_%{version}.zip Source1: %{name}.sh Source2: %{name}.desktop BuildRequires: dos2unix diff --git a/packages/r/rssguard/.files b/packages/r/rssguard/.files index dc47438..f22fe10 100644 Binary files a/packages/r/rssguard/.files and b/packages/r/rssguard/.files differ diff --git a/packages/r/rssguard/.rev b/packages/r/rssguard/.rev index 5eb6a12..04a7d50 100644 --- a/packages/r/rssguard/.rev +++ b/packages/r/rssguard/.rev @@ -406,4 +406,12 @@ 1037359 + + 80253687f0402f946aa2cebfaab00aec + 4.3.2 + + dimstar_suse + + 1064496 + diff --git a/packages/r/rssguard/rssguard-4.2.5.tar.gz b/packages/r/rssguard/rssguard-4.2.5.tar.gz deleted file mode 120000 index 50f7ff1..0000000 --- a/packages/r/rssguard/rssguard-4.2.5.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeia2ulj5g5kc7pdiux2bmvhnwo3yf3yvks3bfc74tzdgcyss7wdz5m \ No newline at end of file diff --git a/packages/r/rssguard/rssguard-4.3.2.tar.gz b/packages/r/rssguard/rssguard-4.3.2.tar.gz new file mode 120000 index 0000000..6158c4f --- /dev/null +++ b/packages/r/rssguard/rssguard-4.3.2.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeif3k7a6qvwckuerxwwjjz5427jpgrydja7oysefkfurpeo23brqii \ No newline at end of file diff --git a/packages/r/rssguard/rssguard.changes b/packages/r/rssguard/rssguard.changes index e5b4213..f397362 100644 --- a/packages/r/rssguard/rssguard.changes +++ b/packages/r/rssguard/rssguard.changes @@ -1,4 +1,92 @@ ------------------------------------------------------------------- +Wed Feb 8 20:35:40 UTC 2023 - Jaime Marquínez Ferrándiz + +- Update to version 4.3.2: + + Added: + - Display total number of underlying feeds/categories in account's tooltip + in feed list. (gh#martinrotter/rssguard#881) + - Press "CTRL+F" when article script textbox is highlighted in "Article + filters" dialog to allow for text searching. (gh#martinrotter/rssguard#889) + - Filtering option in article list toolbar are now inclusive with checkbox + like appearance. You can now thus select multiple filtering conditions + and if article meets atleast one of them, it is displayed. (gh#martinrotter/rssguard#468) + - WebEngine disk cache now can be disabled in settings. If it is "disabled" + then RSS Guard will use memory-based cache which is automatically + destroyed when RSS Guard exits. (gh#martinrotter/rssguard#725) + - Help spoilers now can display HTML help with clickable hyperlinks. + - Skins are now able to load custom TTF and OTF fonts and also skins now + are able to specify application-wide font. You can see sample usage of + this feature in sample skin. + + Fixed: + - Fixed crash when importing OPML files. + - Fixed looooong-standing hidden bug which could cause that labels + DEassigned from filters were not synchronized back to feed service if + supported. + - Enhanced information about "resources" in "About" dialog. +- Update to version 4.3.1: + + Fixed: + - Reverted to Qt 6.3 for Windows 10+ builds due to some regressions AGAIN. + - Fixed TT-RSS icons downloading when obtaining list of feeds/folders. + - RSS Guard now converts all placeholders (for example "%data%") to native + path folder separators. +- Update to version 4.3.0: + + Added: + - Massive update for feed fetching mechanism. It is now very parallelized + and performance gain should be brutal. On my development PC with 4 cores + (Intel i5) I observed 800 % performance boost. Note that this feature + required huge number of changes on source code so there could be some + corner case regressions or not so polished situations. File bug report + when that happens. Also, number of threads used by this feature is + configurable via --threads command line switch. This parallelization + approach will also be applied to some other parts of application in the + future, particularly for some massive batched network operations in some + plugin - TT-RSS, Greader or Gmail - which will result in massive + performance boost too. + - RSS Guard is now available on Flathub in two distinct variants - "full" + and "lite" (same as "nonwebengine"). + - Suffix ".xml" is also accepted for OPML 2.0 files. + - Brutal speed enhancements when importing OPML 2.0 files. Whole + functionality is now properly parallelized and performance boost is + potentially massive, depending on number of your CPU cores/threads. + - Qt 6 bumped to 6.4.2 version - this fixes some regressions. + + Fixed: + - Some random Mac OS X crash. (gh#martinrotter/rssguard#866) +- Update to version 4.2.6: + + Added: + - Bunch of premade sample article filters added to "Article filters" window. + - Placeholders in external tools definitions can be now arbitrarily placed. + - Article RSS enclosures can now be added from within article filters. + - Added customizable skin color for feeds with NEW articles. So now it is + possible to distinguish between NEW and UNREAD (but old) articles. (gh#martinrotter/rssguard#850) + - Added application debug log dialog. See "Help" menu for more. + - Too big fetched feed icons are now automatically scaled down to fixed + size (48x48). + - Now it is possible to run post-process script when importing OPML. (gh#martinrotter/rssguard#848) + - Now it is possible to change "User-Agent" HTTP header. (gh#martinrotter/rssguard#835) + - Added now column into article list which shows labels for each article. (gh#martinrotter/rssguard#768) + - Now it is possible to "suppress" feed. Suppressed feeds do not trigger + notifications. (gh#martinrotter/rssguard#745) + + Fixed: + - HTML detection on the QTextBrowser viewer is now more precise. (gh#martinrotter/rssguard#813) + - Article decoding for Nextcloud News works better. (gh#martinrotter/rssguard#814) + - Inoreader built-in API tokens are removed, because they were abused. + - Default AdBlock lists now have corrected URL addresses. + - Fixed full-article scraper "scrape-full-articles.py". + - Do some preparations and code cleanups for adding "lite" RSS Guard + variant to Flathub. + - Nextcloud News plugin processes "mediaThumbnail" and "mediaDescription" + when parsing articles. (gh#martinrotter/rssguard#831) + - Avoid appending empty RSS enclosures to articles. (gh#martinrotter/rssguard#832) + - AppImage reverted to Qt 5 as Qt 6 support in AppImage generator is very + very buggy. + - All dialogs where icons/images are selected now load their "formats" + dynamically to support all possible image formats correctly. (gh#martinrotter/rssguard#834) This + effectivelly adds "webp" and other formats on systems where it is + supported. + - Fixed crash. (gh#martinrotter/rssguard#849) + - Enable smooth-scrolling by default. (gh#martinrotter/rssguard#793) + +------------------------------------------------------------------- Mon Nov 21 13:15:53 UTC 2022 - Dominique Leuenberger - Update to version 4.2.5: diff --git a/packages/r/rssguard/rssguard.spec b/packages/r/rssguard/rssguard.spec index a03b598..ed4eab2 100644 --- a/packages/r/rssguard/rssguard.spec +++ b/packages/r/rssguard/rssguard.spec @@ -1,7 +1,7 @@ # # spec file for package rssguard # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define libver 4_2_5 +%define libver 4_3_2 Name: rssguard -Version: 4.2.5 +Version: 4.3.2 Release: 0 Summary: RSS/ATOM/RDF feed reader License: AGPL-3.0-or-later AND GPL-3.0-only @@ -68,7 +68,6 @@ Shared library for %{name} to be used by external plugins. %prep %autosetup -p1 # remove executable bit -chmod -x resources/desktop/com.github.rssguard.appdata.xml find src/librssguard -name "*.h" -exec chmod -x {} \; %build @@ -79,7 +78,6 @@ find src/librssguard -name "*.h" -exec chmod -x {} \; %cmake_install # install autostart mkdir -pv %{buildroot}%{_datadir}/autostart -install -m0644 resources/desktop/com.github.%{name}.desktop.autostart -t %{buildroot}%{_datadir}/autostart %fdupes -s %{buildroot} %post -n lib%{name}-%{libver} -p /sbin/ldconfig @@ -91,10 +89,9 @@ install -m0644 resources/desktop/com.github.%{name}.desktop.autostart -t %{build %dir %{_datadir}/autostart %dir %{_datadir}/metainfo %{_bindir}/%{name} -%{_datadir}/applications/com.github.%{name}.desktop -%{_datadir}/autostart/com.github.%{name}.desktop.autostart -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/metainfo/com.github.%{name}.appdata.xml +%{_datadir}/applications/io.github.martinrotter.%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/io.github.martinrotter.%{name}.png +%{_datadir}/metainfo/io.github.martinrotter.%{name}.metainfo.xml %files -n librssguard-devel %{_includedir}/lib%{name} diff --git a/packages/t/tryton/.files b/packages/t/tryton/.files index f02b74a..fe32a13 100644 Binary files a/packages/t/tryton/.files and b/packages/t/tryton/.files differ diff --git a/packages/t/tryton/.rev b/packages/t/tryton/.rev index 09c4db3..fe2743c 100644 --- a/packages/t/tryton/.rev +++ b/packages/t/tryton/.rev @@ -87,4 +87,12 @@ Automatic submission by obs-autosubmit 1060527 + + 50d1b9916ead8aa808f4dbe4faab2cd6 + 6.0.24 + + dimstar_suse + bugfix version + 1064679 + diff --git a/packages/t/tryton/.servicemark b/packages/t/tryton/.servicemark index 949e9db..cf7af2f 100644 --- a/packages/t/tryton/.servicemark +++ b/packages/t/tryton/.servicemark @@ -1 +1 @@ -5cac006ce40214a14a90ba5f0b1d0409 +00e58f67347c97c69606a268f088c8e2 diff --git a/packages/t/tryton/tryton-6.0.23.tar.gz b/packages/t/tryton/tryton-6.0.23.tar.gz deleted file mode 120000 index db25aac..0000000 --- a/packages/t/tryton/tryton-6.0.23.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeic7tgjlgxtx2jlwlft5vrpjgwocmrbsjjcifup6nvl3pbnyg35m5y \ No newline at end of file diff --git a/packages/t/tryton/tryton-6.0.24.tar.gz b/packages/t/tryton/tryton-6.0.24.tar.gz new file mode 120000 index 0000000..ba3e4c3 --- /dev/null +++ b/packages/t/tryton/tryton-6.0.24.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeihrey6llbdknhmhskghxuiwa3mt74ci3uosuyuo7mdy6g4igpf264 \ No newline at end of file diff --git a/packages/t/tryton/tryton.changes b/packages/t/tryton/tryton.changes index 78cb5a7..e856316 100644 --- a/packages/t/tryton/tryton.changes +++ b/packages/t/tryton/tryton.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 17:37:14 UTC 2023 - Axel Braun + +- Version 6.0.24 - Bugfix Release + +------------------------------------------------------------------- Mon Jan 16 21:18:40 UTC 2023 - Axel Braun - Version 6.0.23 - Bugfix Release diff --git a/packages/t/tryton/tryton.spec b/packages/t/tryton/tryton.spec index 4eb102a..018ab4f 100644 --- a/packages/t/tryton/tryton.spec +++ b/packages/t/tryton/tryton.spec @@ -19,7 +19,7 @@ %define majorver 6.0 Name: tryton -Version: %{majorver}.23 +Version: %{majorver}.24 Release: 0 Summary: The client of the Tryton application platform License: GPL-3.0-or-later diff --git a/packages/t/trytond/.files b/packages/t/trytond/.files index 125b640..1e0c829 100644 Binary files a/packages/t/trytond/.files and b/packages/t/trytond/.files differ diff --git a/packages/t/trytond/.rev b/packages/t/trytond/.rev index 3e6f574..2bd01c6 100644 --- a/packages/t/trytond/.rev +++ b/packages/t/trytond/.rev @@ -638,4 +638,13 @@ Automatic submission by obs-autosubmit 1060528 + + 06663ae9e963f8a24a37f7d6c0460d71 + 6.0.27 + + dimstar_suse + - Version 6.0.27 - Bugfix Release + + 1064693 + diff --git a/packages/t/trytond/.servicemark b/packages/t/trytond/.servicemark index 733691a..7991dc0 100644 --- a/packages/t/trytond/.servicemark +++ b/packages/t/trytond/.servicemark @@ -1 +1 @@ -7ec12c2e873efe5ba194af607a339410 +08effd98c96f4c708d61cb7c8bf8ed6a diff --git a/packages/t/trytond/trytond-6.0.26.tar.gz b/packages/t/trytond/trytond-6.0.26.tar.gz deleted file mode 120000 index b38f61b..0000000 --- a/packages/t/trytond/trytond-6.0.26.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeidq2gn2iktzbxg3njq53a4vada3l67hyiluzt7uicsms3kjoxrdty \ No newline at end of file diff --git a/packages/t/trytond/trytond-6.0.26.tar.gz.asc b/packages/t/trytond/trytond-6.0.26.tar.gz.asc deleted file mode 100644 index fc1d29f..0000000 --- a/packages/t/trytond/trytond-6.0.26.tar.gz.asc +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmPEOQQACgkQV09u/05H -dRegmAf+OvgY1Mba4p4X4c4Sm2pE5VyKea2aSr5UMlXctxrSn4sYa1yzECEv48gN -PfMdh8Mkt+G796G9izOZlx1umWLnSvLTEOApJLYfRClRH2GY5A2EgQ45qTih6Zfc -tYkokz3FJE4hjNmrPOuzQXiHKPMvzDFli7JWyTdOHtakVv5iuUXbbP8BK8UlVMe3 -HN5bmqRE2SJeWCQrAq1VfTUf1b4TKfX5DDXE3Gg4G8Oc1VydHv5sp9GRM5USxfmX -2ZeObrhvOryNJfbY716CwssbTc9Ti/pqaGsw1aCTaSpWzGXZtnVxBBgawp/Hu7lA -2I6uRykB96C+F9sb1q0uxCZkLjYUjw== -=F5Jk ------END PGP SIGNATURE----- diff --git a/packages/t/trytond/trytond-6.0.27.tar.gz b/packages/t/trytond/trytond-6.0.27.tar.gz new file mode 120000 index 0000000..eaaabba --- /dev/null +++ b/packages/t/trytond/trytond-6.0.27.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeicckmyx5iavuic6crrcgq4wl7ti5zvfn5ouq3bgoirdkdvy4vzf7q \ No newline at end of file diff --git a/packages/t/trytond/trytond-6.0.27.tar.gz.asc b/packages/t/trytond/trytond-6.0.27.tar.gz.asc new file mode 100644 index 0000000..62687cd --- /dev/null +++ b/packages/t/trytond/trytond-6.0.27.tar.gz.asc @@ -0,0 +1,12 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmPgFo4ACgkQV09u/05H +dRfj+Qf9ERTUFZkJT/DYphet7D7iooqg2vG/8p2a9C5p+q9+NfWuONKSVMSAddQ+ +wDGiokFejqFa1Vc07eSL+tJQb+BTwSSoobU0zRYq9rNMAs5Ezak+J0OjDG8fRi7F +qB9qZLiKp94+0POqhteGQWw/mYIBbvFI8wAMdCU766bO4dj1axm0lTZNToXC4hTe +/F2y1coc3ebhUxT8moJ/z2btC77dsP+Y0NAN9BIYIAmO4Nme2W9Hvw5J83q8ieyl +OmpZGM3YLEf78SuHxx1xFOem55yZPVVOs6unSiZxDPyGjBvPiHRK2v53sH/JL5/Y +VFFze+mQmV8jRlchVcyESDeUhcwHzQ== +=tx+t +-----END PGP SIGNATURE----- diff --git a/packages/t/trytond/trytond.changes b/packages/t/trytond/trytond.changes index 07879d3..60af5bc 100644 --- a/packages/t/trytond/trytond.changes +++ b/packages/t/trytond/trytond.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 17:36:41 UTC 2023 - Axel Braun + +- Version 6.0.27 - Bugfix Release + +------------------------------------------------------------------- Mon Jan 16 21:18:26 UTC 2023 - Axel Braun - Version 6.0.26 - Bugfix Release diff --git a/packages/t/trytond/trytond.spec b/packages/t/trytond/trytond.spec index 1b10663..0d895c3 100644 --- a/packages/t/trytond/trytond.spec +++ b/packages/t/trytond/trytond.spec @@ -20,7 +20,7 @@ %define majorver 6.0 %define base_name tryton Name: trytond -Version: %{majorver}.26 +Version: %{majorver}.27 Release: 0 Summary: An Enterprise Resource Planning (ERP) system License: GPL-3.0-or-later diff --git a/packages/t/trytond_account/.files b/packages/t/trytond_account/.files index be5d281..00e8d96 100644 Binary files a/packages/t/trytond_account/.files and b/packages/t/trytond_account/.files differ diff --git a/packages/t/trytond_account/.rev b/packages/t/trytond_account/.rev index 480e751..233ddcd 100644 --- a/packages/t/trytond_account/.rev +++ b/packages/t/trytond_account/.rev @@ -342,4 +342,12 @@ bugfix version 997703 + + 897954364bca2ccc86e6ced8a2f5895d + 6.0.14 + + dimstar_suse + removing 5.0 series files + 1064663 + diff --git a/packages/t/trytond_account/.servicemark b/packages/t/trytond_account/.servicemark index c882476..9a2e623 100644 --- a/packages/t/trytond_account/.servicemark +++ b/packages/t/trytond_account/.servicemark @@ -1 +1 @@ -504d7f93253a3ab4019ea8d7873b5f51 +74c2481fa8223e6113134e02bae2409b diff --git a/packages/t/trytond_account/trytond_account-6.0.13.tar.gz b/packages/t/trytond_account/trytond_account-6.0.13.tar.gz deleted file mode 120000 index 45ec864..0000000 --- a/packages/t/trytond_account/trytond_account-6.0.13.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiepy7cisysw67oagwtrkvwodmsoy4bh7rtlxqjlizs6kw6drg7rwu \ No newline at end of file diff --git a/packages/t/trytond_account/trytond_account-6.0.13.tar.gz.asc b/packages/t/trytond_account/trytond_account-6.0.13.tar.gz.asc deleted file mode 100644 index aea376e..0000000 --- a/packages/t/trytond_account/trytond_account-6.0.13.tar.gz.asc +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmL9Y1YACgkQV09u/05H -dRcFRAf9GWVVZqfRlcrcj8Q6qjPxBdRdu3xfQTkHjiosxXk2i6EDzaJX9Md4YpdB -eUAxu6GD87Ze1KeJ1K9eTIt6fkGUkGT9yhs66Y239jwLD8nz1xGiRNoV0nplO434 -6XoedV4wWN1cMm1kZMv6Of2cphvoY7p8v80fd/kNY1HXH3HHeHw1SQa3PrCrWIqN -cO6jPx+Erkya7PjpKZCF17VeDQ2/W2UCJzVKCaD9BM/ddI17BtiFKPxO9YiRRk+x -PX8wmdxbuZhp7BvOM9+O83mP855e4iLvgZ9npCaX/Oclja0NMYaZ8XwZ3DOh97eH -/EkmndEjrGBvsyC4MtQdWanBO0N3nw== -=YovH ------END PGP SIGNATURE----- diff --git a/packages/t/trytond_account/trytond_account-6.0.14.tar.gz b/packages/t/trytond_account/trytond_account-6.0.14.tar.gz new file mode 120000 index 0000000..8fbf0d6 --- /dev/null +++ b/packages/t/trytond_account/trytond_account-6.0.14.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeigw7n6twlkfqjkcek6wxs4xe6f7metig6xknpy3fmxou77j4rgvga \ No newline at end of file diff --git a/packages/t/trytond_account/trytond_account-6.0.14.tar.gz.asc b/packages/t/trytond_account/trytond_account-6.0.14.tar.gz.asc new file mode 100644 index 0000000..1d586f7 --- /dev/null +++ b/packages/t/trytond_account/trytond_account-6.0.14.tar.gz.asc @@ -0,0 +1,12 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmPgILkACgkQV09u/05H +dReaGAf/ZlHARASoQF/FjNP21wUSPqHpWbOCzoy03nWzlF6XZ2mckvvxTUeUQHWl +60Kj95KghDN+EYb27Ah+JbEnRTwGrEH0FfyX72M7c2I25O/v3mHFQFEj4+SPOrRE +YVe1YEkAT3wPsExGALEP0fBlNeS+Tu3rAzg3mC3grLdmzXb1MnDph6j8CJZ2sKWd +s6F5Gjy73AiQMyeaPPBYCXLoaxgxwaUgi3Qm702Dw1W/+PXZPTMuLemH01FacebM +yWMaZmwpyKZK3nloNA6Qrb5vZbWA8lHY7vET5M9xd+UhpGI1whFhfaJi5n2vDGD5 +Yj4aLYRhYQd0r7BSFwccFRvA59e+KA== +=f/cT +-----END PGP SIGNATURE----- diff --git a/packages/t/trytond_account/trytond_account.changes b/packages/t/trytond_account/trytond_account.changes index 9a1309b..76bf733 100644 --- a/packages/t/trytond_account/trytond_account.changes +++ b/packages/t/trytond_account/trytond_account.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 17:36:22 UTC 2023 - Axel Braun + +- Version 6.0.14 - Bugfix Release + +------------------------------------------------------------------- Thu Aug 18 09:24:33 UTC 2022 - Axel Braun - Version 6.0.13 - Bugfix Release diff --git a/packages/t/trytond_account/trytond_account.spec b/packages/t/trytond_account/trytond_account.spec index f2468a8..ec2e1fd 100644 --- a/packages/t/trytond_account/trytond_account.spec +++ b/packages/t/trytond_account/trytond_account.spec @@ -18,7 +18,7 @@ %define majorver 6.0 Name: trytond_account -Version: %{majorver}.13 +Version: %{majorver}.14 Release: 0 Summary: The "account" module for the Tryton ERP system License: GPL-3.0+ diff --git a/packages/t/trytond_account_invoice/.files b/packages/t/trytond_account_invoice/.files index caca627..6dacfbb 100644 Binary files a/packages/t/trytond_account_invoice/.files and b/packages/t/trytond_account_invoice/.files differ diff --git a/packages/t/trytond_account_invoice/.rev b/packages/t/trytond_account_invoice/.rev index 5433bc3..4500075 100644 --- a/packages/t/trytond_account_invoice/.rev +++ b/packages/t/trytond_account_invoice/.rev @@ -194,4 +194,13 @@ bugfix version 993357 + + 7bd8e687422262c217036d605e8e04f0 + 6.0.8 + + dimstar_suse + - Version 6.0.8 - Bugfix Release + + 1064662 + diff --git a/packages/t/trytond_account_invoice/.servicemark b/packages/t/trytond_account_invoice/.servicemark index 2817c6a..ba52a7e 100644 --- a/packages/t/trytond_account_invoice/.servicemark +++ b/packages/t/trytond_account_invoice/.servicemark @@ -1 +1 @@ -c6c8e91d0034529b1b0d24bb4cc316c0 +95f173d75852e49ce7162f4e1a6fbd19 diff --git a/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.7.tar.gz b/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.7.tar.gz deleted file mode 120000 index 457d171..0000000 --- a/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.7.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreig7gxiqajvwyyvxw42u6o5cei3eqq7u672oyipwwd64dfb3vr6ony \ No newline at end of file diff --git a/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.7.tar.gz.asc b/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.7.tar.gz.asc deleted file mode 100644 index 01b1a27..0000000 --- a/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.7.tar.gz.asc +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmLq8OsACgkQV09u/05H -dRcpCAf+I+cxqvBVRWYCvwsnUUyedtcsolUCEaMmUWXDwEJjOStEaB080RYPKgzB -zrFy0E/nDVSD8//ycPExm/P5PTMEZ/LoUi4cMkyOPzeOTE3C4XRXuXJ60ijtaEti -6zZQSkGyUKFiZLZHTQJc+1WGQNi0i+dfUMknFWmt+lh7xeuJXlve2zmqjUYkE59I -q0R2tke0YWExUWZH9qBW6ZK3lEumZiEEqWTxwz1jFhbrpMR0mQLoZxpIIp3VXug8 -48LpieVJQZA5t7rs+8dGs26MS2aIdAGQLqh1Ze2aPQVOHza8LaAVBQ4EKv8jgFGe -shcwVzf3TpvpUiayjMOjJ6QWrYEHhw== -=QafU ------END PGP SIGNATURE----- diff --git a/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.8.tar.gz b/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.8.tar.gz new file mode 120000 index 0000000..c625868 --- /dev/null +++ b/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.8.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreih7qu6ydovtdynmzsxvs6oeytn7uuxj342xnw2bzhp6wtv5anup7e \ No newline at end of file diff --git a/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.8.tar.gz.asc b/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.8.tar.gz.asc new file mode 100644 index 0000000..67de6fa --- /dev/null +++ b/packages/t/trytond_account_invoice/trytond_account_invoice-6.0.8.tar.gz.asc @@ -0,0 +1,12 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmPgHxwACgkQV09u/05H +dReGNAf/eOtjFXkRR14ZKajtXrknHWoM9uB5IioDFgNdhQj3CyjKu0jD/8Rwj4MD +Bk4xdegGZlDUh+dJWDklawUoqfh4wN+shUbszRgBKwlzSlis50x8pLGdLGxrFJZQ +RQrttBj7Hm8UBCtuCcfF2+nXjsEECMh/vOB+zMRXw3FX8z4nUyKwouOWgKnyr9wZ +N0kjT81o8R4wTvaKdZVTx1siMl/LrIgeHOJ5BUWKnF0/CEoxeIUQ0uQYXXs03rTr +BMfcCLwadlOVMncSsVnzHVxCMMqxnhQcIRN7b2vg5D5+7zfAqYX1n8KtUulf5RpH +Bm/Zfxx1ntfYRXRvm/c8MZnhbmt2sw== +=Sk9s +-----END PGP SIGNATURE----- diff --git a/packages/t/trytond_account_invoice/trytond_account_invoice.changes b/packages/t/trytond_account_invoice/trytond_account_invoice.changes index 53bf4bc..a79ecfa 100644 --- a/packages/t/trytond_account_invoice/trytond_account_invoice.changes +++ b/packages/t/trytond_account_invoice/trytond_account_invoice.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 17:36:06 UTC 2023 - Axel Braun + +- Version 6.0.8 - Bugfix Release + +------------------------------------------------------------------- Thu Aug 4 13:28:42 UTC 2022 - Axel Braun - Version 6.0.7 - Bugfix Release diff --git a/packages/t/trytond_account_invoice/trytond_account_invoice.keyring b/packages/t/trytond_account_invoice/trytond_account_invoice.keyring index 86b4ad7..1008a89 100644 --- a/packages/t/trytond_account_invoice/trytond_account_invoice.keyring +++ b/packages/t/trytond_account_invoice/trytond_account_invoice.keyring @@ -14,124 +14,124 @@ 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 @@ -142,177 +142,44 @@ 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 -gw33KnZxeB1s3zR0tqAFbMiE3AmXOk0SIq9O8N3USu1y5Rx+2EWsnG/zCr9qmo0T -zSbRs7nlht45Bqpc9qfCy6ZAhMXioV9dPNS5Ks7ptlXI/KPnzQjXIstXNokC5QQY -AQgADwUCVOCIEQIbAgUJAeEzgADKCRBv9Qr+A0iRML8gBBkRCABmBQJU4IgRXxSA -AAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9wZW5wZ3AuZmlmdGhob3JzZW1h -bi5uZXQ2NjkwRjMzNkFGOEVCMUNBMEU4RjQ5MzJEQTYyQzFGQjRDNUEyODU1AAoJ -ENpiwftMWihVypABAPqcuF+W4D+kJu9hfw0iSEe/mKPBb+psiu6sc+DUO1pdAP9o -IICFihOdlol3DJtdLbXP+CpEF7LxkSjnKUYyoM8hyLS1D/0elCJIOD7JU5k3mDQI -H7HyhPYANC9MG4Y4fbB8/P+LCshbPVhmk54FSLDuysSdwJPQKs623uMcZmuLS6gQ -ULFVntV44Gd/AwyFeeIFyylUHDAD52s5ZGG7gQVp69jYWOX8uXKCeedJz0+DUarw -w7OX42QYZ+BPY3lAfqxjeEsTUMM4KjHXPOpVygpKzCuE0gbBVlpLS0kTcPLbHW1W -Qp66OAvMx3oEYvYmUNPFkI1vhmmFhpg7uxSTx6dM25H1KHmgKCJTx7oHwUxCvYqV -DItQaaT2uCWasPx8OB7j5FxIG89+hoVKPo3gSWrX37cqLOHDod2e9XM6cNrSyOk/ -OiThb2gSc8A4f0JxdlW1VXbpZj6eBdA4teLSqPWzbJPy00REbh2WOqMqRgmMPle9 -rhbDAPfOeLJ1yk0vS57nrCW9oy73Ftrprmd6eEJKX/UPt1hwJdqWISSosyJrCR9u -CnqXcrZkTq0cSfAYwzP/KLHHbwUG+OZ5VrB8ryfI/SXTvfeF5ZGyXfkziSdL7pcv -+k7K62hrok+F7Asz4bMO3dAmuAMX+RJGve7JLRAWYo/cDHfeWrbmE/aamBAGr+hH -V7HoSlziWIPtWihqNSNBOrlVQGFvLp4taHfgYCO8EIBfWN6DiLSK3BEyx+k8t/hF -MZG8xDK+qz1tlkYak0IEzHg+47kDLgRWviSIEQgA/TRS8Ajg/OqhxyG5O23bSIQ3 -XIH8eoXMzqRKXb4S/9dUUhrsZWNHWRH+E1Z6OQNHSPaisnEbhZogcEzhEF154ZAy -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 -=wmme +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 +o6gpfk7rYtA= +=Wn5f -----END PGP PUBLIC KEY BLOCK----- diff --git a/packages/t/trytond_account_invoice/trytond_account_invoice.spec b/packages/t/trytond_account_invoice/trytond_account_invoice.spec index 639560a..41ff43d 100644 --- a/packages/t/trytond_account_invoice/trytond_account_invoice.spec +++ b/packages/t/trytond_account_invoice/trytond_account_invoice.spec @@ -1,7 +1,7 @@ # # spec file for package trytond_account_invoice # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2017-2021 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %define majorver 6.0 Name: trytond_account_invoice -Version: %{majorver}.7 +Version: %{majorver}.8 Release: 0 Summary: The "account_invoice" module for the Tryton ERP system License: GPL-3.0-only diff --git a/packages/t/trytond_stock_supply/.files b/packages/t/trytond_stock_supply/.files index 82deabd..82417e5 100644 Binary files a/packages/t/trytond_stock_supply/.files and b/packages/t/trytond_stock_supply/.files differ diff --git a/packages/t/trytond_stock_supply/.rev b/packages/t/trytond_stock_supply/.rev index 7db13be..ba0db0f 100644 --- a/packages/t/trytond_stock_supply/.rev +++ b/packages/t/trytond_stock_supply/.rev @@ -145,4 +145,13 @@ Automatic submission by obs-autosubmit 982125 + + c4de47755a5dc87d3cdc84b4a1883f7e + 6.0.4 + + dimstar_suse + - Version 6.0.4 - Bugfix Release + + 1064664 + diff --git a/packages/t/trytond_stock_supply/.servicemark b/packages/t/trytond_stock_supply/.servicemark index 348e9ac..58638aa 100644 --- a/packages/t/trytond_stock_supply/.servicemark +++ b/packages/t/trytond_stock_supply/.servicemark @@ -1 +1 @@ -d1a481c2289c552fcd9629d1210db496 +fc0660c6b4f10a65bcccfee23f27f9d8 diff --git a/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.3.tar.gz b/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.3.tar.gz deleted file mode 120000 index b8bac1a..0000000 --- a/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.3.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreidcjw7ur5m2ixkvcb6xvbuqvajnwdbr3yoeblzhyccqa2dg2u2xua \ No newline at end of file diff --git a/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.3.tar.gz.asc b/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.3.tar.gz.asc deleted file mode 100644 index 912bdae..0000000 --- a/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.3.tar.gz.asc +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmKaQK0ACgkQV09u/05H -dRc/pAf5AV6iocuUCioGAtZixuGOnKlnn5sqyLcFsgVK5qMQuP/89htebCbKfV08 -/q4GSeZIlWwALr/qryOShoyxySR9vv0+5eSL4PqbtGwVwJJtHxa0XuYFoCmi/tzQ -4HwW7tyBobAVdXUlqAAm04QXwkUpEjrGgQNC8ZRDvZnoFrqz9vt+V8Zny1MtS8Sd -H/9TxSwcwCF4YGm8byVb6rYRtHqOWBHSu4xc8dk9+R3+UHZpvMfy5sQPsm7ZcIFl -+7u9yoyFUmGEeYgPVGeN8L0K5Z1rAyYwD7J/QwZJQ7JN5RfBDW6mJa8pLN7q4SuN -vn4LcC5EQ4Hz0ab/6YL8uIypOwbDIA== -=Meux ------END PGP SIGNATURE----- diff --git a/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.4.tar.gz b/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.4.tar.gz new file mode 120000 index 0000000..beb0a56 --- /dev/null +++ b/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.4.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreid7kzgbptkx7cxelreonp2k3saf6di63f5wy2nklxgjtywbiikqau \ No newline at end of file diff --git a/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.4.tar.gz.asc b/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.4.tar.gz.asc new file mode 100644 index 0000000..3952142 --- /dev/null +++ b/packages/t/trytond_stock_supply/trytond_stock_supply-6.0.4.tar.gz.asc @@ -0,0 +1,12 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEzBAABCgAdFiEEdP/VdIYNMe45RAljV09u/05HdRcFAmPgGlgACgkQV09u/05H +dRfbuQf/U/7GYP2oudYVSXxuT3MEzleVDtaqfWHBaV/OHIpDKyOiLZg5KihV/czg +9Ye9ur6xNgE8o9YqQqr1wXMewmxAzQmUsx17w1sTx5z3ny3R+ZbvNL13TK1fconv +RJIqkFuwvzd0jCaiMpdzRCOSt8Tz8RQCGtGsrIzCAh4jaZ+PDnHLlfsZ/Qv+YNq3 +VRHUOyxaaDV6ZHpvWoCUvCXw3BfS7OjBeQVQaOlwEZK+dBIUWaurhxb2wWy25sHh +F75qdFO5BySJA+BECs+5hDvhKsgD9ccvAz8GBFr7ZfUQ12MwkDT2rQ8r/CEBqQU0 +RS88MjnMrhfkjyWcl83YEag0RBUZHQ== +=9prZ +-----END PGP SIGNATURE----- diff --git a/packages/t/trytond_stock_supply/trytond_stock_supply.changes b/packages/t/trytond_stock_supply/trytond_stock_supply.changes index 977a1ae..4cf4ac0 100644 --- a/packages/t/trytond_stock_supply/trytond_stock_supply.changes +++ b/packages/t/trytond_stock_supply/trytond_stock_supply.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 17:35:24 UTC 2023 - Axel Braun + +- Version 6.0.4 - Bugfix Release + +------------------------------------------------------------------- Sat Jun 4 08:09:28 UTC 2022 - Axel Braun - Version 6.0.3 - Bugfix Release diff --git a/packages/t/trytond_stock_supply/trytond_stock_supply.keyring b/packages/t/trytond_stock_supply/trytond_stock_supply.keyring index 86b4ad7..1008a89 100644 --- a/packages/t/trytond_stock_supply/trytond_stock_supply.keyring +++ b/packages/t/trytond_stock_supply/trytond_stock_supply.keyring @@ -14,124 +14,124 @@ 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 @@ -142,177 +142,44 @@ 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 -gw33KnZxeB1s3zR0tqAFbMiE3AmXOk0SIq9O8N3USu1y5Rx+2EWsnG/zCr9qmo0T -zSbRs7nlht45Bqpc9qfCy6ZAhMXioV9dPNS5Ks7ptlXI/KPnzQjXIstXNokC5QQY -AQgADwUCVOCIEQIbAgUJAeEzgADKCRBv9Qr+A0iRML8gBBkRCABmBQJU4IgRXxSA -AAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9wZW5wZ3AuZmlmdGhob3JzZW1h -bi5uZXQ2NjkwRjMzNkFGOEVCMUNBMEU4RjQ5MzJEQTYyQzFGQjRDNUEyODU1AAoJ -ENpiwftMWihVypABAPqcuF+W4D+kJu9hfw0iSEe/mKPBb+psiu6sc+DUO1pdAP9o -IICFihOdlol3DJtdLbXP+CpEF7LxkSjnKUYyoM8hyLS1D/0elCJIOD7JU5k3mDQI -H7HyhPYANC9MG4Y4fbB8/P+LCshbPVhmk54FSLDuysSdwJPQKs623uMcZmuLS6gQ -ULFVntV44Gd/AwyFeeIFyylUHDAD52s5ZGG7gQVp69jYWOX8uXKCeedJz0+DUarw -w7OX42QYZ+BPY3lAfqxjeEsTUMM4KjHXPOpVygpKzCuE0gbBVlpLS0kTcPLbHW1W -Qp66OAvMx3oEYvYmUNPFkI1vhmmFhpg7uxSTx6dM25H1KHmgKCJTx7oHwUxCvYqV -DItQaaT2uCWasPx8OB7j5FxIG89+hoVKPo3gSWrX37cqLOHDod2e9XM6cNrSyOk/ -OiThb2gSc8A4f0JxdlW1VXbpZj6eBdA4teLSqPWzbJPy00REbh2WOqMqRgmMPle9 -rhbDAPfOeLJ1yk0vS57nrCW9oy73Ftrprmd6eEJKX/UPt1hwJdqWISSosyJrCR9u -CnqXcrZkTq0cSfAYwzP/KLHHbwUG+OZ5VrB8ryfI/SXTvfeF5ZGyXfkziSdL7pcv -+k7K62hrok+F7Asz4bMO3dAmuAMX+RJGve7JLRAWYo/cDHfeWrbmE/aamBAGr+hH -V7HoSlziWIPtWihqNSNBOrlVQGFvLp4taHfgYCO8EIBfWN6DiLSK3BEyx+k8t/hF -MZG8xDK+qz1tlkYak0IEzHg+47kDLgRWviSIEQgA/TRS8Ajg/OqhxyG5O23bSIQ3 -XIH8eoXMzqRKXb4S/9dUUhrsZWNHWRH+E1Z6OQNHSPaisnEbhZogcEzhEF154ZAy -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 -=wmme +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 +o6gpfk7rYtA= +=Wn5f -----END PGP PUBLIC KEY BLOCK----- diff --git a/packages/t/trytond_stock_supply/trytond_stock_supply.spec b/packages/t/trytond_stock_supply/trytond_stock_supply.spec index db60aa9..c7577da 100644 --- a/packages/t/trytond_stock_supply/trytond_stock_supply.spec +++ b/packages/t/trytond_stock_supply/trytond_stock_supply.spec @@ -1,7 +1,7 @@ # # spec file for package trytond_stock_supply # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2014-2021 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %define majorver 6.0 Name: trytond_stock_supply -Version: %{majorver}.3 +Version: %{majorver}.4 Release: 0 Summary: The Stock Supply module for the Tryton ERP system License: GPL-3.0-only diff --git a/packages/v/vale/.files b/packages/v/vale/.files index 87f67e7..7c79376 100644 Binary files a/packages/v/vale/.files and b/packages/v/vale/.files differ diff --git a/packages/v/vale/.rev b/packages/v/vale/.rev index 3ccd9e5..5468f47 100644 --- a/packages/v/vale/.rev +++ b/packages/v/vale/.rev @@ -138,4 +138,20 @@ * chore: use `docker buildx` (forwarded request 1059441 from jfkw) 1059449 + + c6817e588f0bae90f01d1dbf09a6d5b0 + 2.23.0 + + dimstar_suse + - Update to version 2.23.0: + * fix: create `lintTxt` + * chore: update go.mod + * feat: add `--filter` + * feat: Add pre-commit support (#558) + * chore: update runner name + * Add `perf` workflow + * docs: fix typos (#553) + * chore: set version for Docker (forwarded request 1064423 from jfkw) + 1064425 + diff --git a/packages/v/vale/.servicemark b/packages/v/vale/.servicemark index afeb262..378ec8b 100644 --- a/packages/v/vale/.servicemark +++ b/packages/v/vale/.servicemark @@ -1 +1 @@ -a2ba99993fe5ef2d9c5014f39f3c24d7 +7a2aaf77f5729261535f67c06b3e929f diff --git a/packages/v/vale/_service b/packages/v/vale/_service index 7ca20ff..acb19c7 100644 --- a/packages/v/vale/_service +++ b/packages/v/vale/_service @@ -3,7 +3,7 @@ https://github.com/errata-ai/vale.git git .git - v2.22.0 + v2.23.0 @PARENT_TAG@ enable v(.*) diff --git a/packages/v/vale/_servicedata b/packages/v/vale/_servicedata index 19f2f3a..5710049 100644 --- a/packages/v/vale/_servicedata +++ b/packages/v/vale/_servicedata @@ -1,4 +1,4 @@ https://github.com/errata-ai/vale.git - 2cb118a3dbf6442d4fe4b4bdfb737d9359253f6d \ No newline at end of file + 6832233da6bf7ea8cee2d8e2e5add414c50bd187 \ No newline at end of file diff --git a/packages/v/vale/vale-2.22.0.tar.gz b/packages/v/vale/vale-2.22.0.tar.gz deleted file mode 120000 index 9b738e2..0000000 --- a/packages/v/vale/vale-2.22.0.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeidkjjqm6qyc2exuqpnsxi3v44jl6tg27mzbpalk3coavzeuhajkre \ No newline at end of file diff --git a/packages/v/vale/vale-2.23.0.tar.gz b/packages/v/vale/vale-2.23.0.tar.gz new file mode 120000 index 0000000..a7e8855 --- /dev/null +++ b/packages/v/vale/vale-2.23.0.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeiapde7sbwe3lnwjm6ikalahmj4grp2swxxkabjb43s66sir32qd7e \ No newline at end of file diff --git a/packages/v/vale/vale.changes b/packages/v/vale/vale.changes index fe29e90..33933d1 100644 --- a/packages/v/vale/vale.changes +++ b/packages/v/vale/vale.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Sat Feb 11 19:41:44 UTC 2023 - jkowalczyk@suse.com + +- Update to version 2.23.0: + * fix: create `lintTxt` + * chore: update go.mod + * feat: add `--filter` + * feat: Add pre-commit support (#558) + * chore: update runner name + * Add `perf` workflow + * docs: fix typos (#553) + * chore: set version for Docker + +------------------------------------------------------------------- Wed Jan 18 20:03:10 UTC 2023 - jkowalczyk@suse.com - Update to version 2.22.0: diff --git a/packages/v/vale/vale.spec b/packages/v/vale/vale.spec index b98d5d9..12a7740 100644 --- a/packages/v/vale/vale.spec +++ b/packages/v/vale/vale.spec @@ -20,7 +20,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: vale -Version: 2.22.0 +Version: 2.23.0 Release: 0 Summary: CLI tool to lint prose text with syntax awareneness and extensible markup format support License: MIT diff --git a/packages/v/vale/vendor.tar.gz b/packages/v/vale/vendor.tar.gz index 891c581..5dbe999 120000 --- a/packages/v/vale/vendor.tar.gz +++ b/packages/v/vale/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeid2gycyurlwtpuq454n7js5m4dyggzuwy4a3pctnpw54matyfe2w4 \ No newline at end of file +/ipfs/bafybeicqkjiogkalekzm74cuxis5j5jomtjrxnwsmuviwt7jnifjoyjquy \ No newline at end of file diff --git a/packages/w/wyrmsun/.files b/packages/w/wyrmsun/.files index 7dffc5b..7277646 100644 Binary files a/packages/w/wyrmsun/.files and b/packages/w/wyrmsun/.files differ diff --git a/packages/w/wyrmsun/.rev b/packages/w/wyrmsun/.rev index 0c90f43..6dabf00 100644 --- a/packages/w/wyrmsun/.rev +++ b/packages/w/wyrmsun/.rev @@ -172,4 +172,14 @@ 974179 + + 9aafdd68c62f9180077fbb7259d2f61c + 5.3.6 + + dimstar_suse + - update to 5.3.6: + * https://github.com/Andrettin/Wyrmsun/compare/v5.3.5...v5.3.6 + + 1061668 + diff --git a/packages/w/wyrmsun/Wyrmsun-5.3.5.tar.gz b/packages/w/wyrmsun/Wyrmsun-5.3.5.tar.gz deleted file mode 120000 index c77bf31..0000000 --- a/packages/w/wyrmsun/Wyrmsun-5.3.5.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeigbzjproimwqg6ebs5hvjsp3gg6x366gbyw57iz5lxoqqabr23lfy \ No newline at end of file diff --git a/packages/w/wyrmsun/Wyrmsun-5.3.6.tar.gz b/packages/w/wyrmsun/Wyrmsun-5.3.6.tar.gz new file mode 120000 index 0000000..028a549 --- /dev/null +++ b/packages/w/wyrmsun/Wyrmsun-5.3.6.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeibdrrc3catud446wz2xmtjruwv5fh7fjocgyzznmelvtewuhuao3q \ No newline at end of file diff --git a/packages/w/wyrmsun/wyrmsun.changes b/packages/w/wyrmsun/wyrmsun.changes index 555b99c..62637e1 100644 --- a/packages/w/wyrmsun/wyrmsun.changes +++ b/packages/w/wyrmsun/wyrmsun.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 6 16:03:40 UTC 2022 - Dirk Müller + +- update to 5.3.6: + * https://github.com/Andrettin/Wyrmsun/compare/v5.3.5...v5.3.6 + +------------------------------------------------------------------- Sun May 1 10:57:21 UTC 2022 - Ferdinand Thiessen - Update to 5.3.5 diff --git a/packages/w/wyrmsun/wyrmsun.spec b/packages/w/wyrmsun/wyrmsun.spec index f235dd9..caeb256 100644 --- a/packages/w/wyrmsun/wyrmsun.spec +++ b/packages/w/wyrmsun/wyrmsun.spec @@ -17,7 +17,7 @@ Name: wyrmsun -Version: 5.3.5 +Version: 5.3.6 Release: 0 Summary: Strategy game based on history, mythology and fiction License: CC-BY-SA-3.0 AND GPL-2.0-only diff --git a/packages/x/xfce4-notifyd/.files b/packages/x/xfce4-notifyd/.files index ad7d625..abb0691 100644 Binary files a/packages/x/xfce4-notifyd/.files and b/packages/x/xfce4-notifyd/.files differ diff --git a/packages/x/xfce4-notifyd/.rev b/packages/x/xfce4-notifyd/.rev index c83232e..5c7e39e 100644 --- a/packages/x/xfce4-notifyd/.rev +++ b/packages/x/xfce4-notifyd/.rev @@ -409,4 +409,12 @@ * Translation Updates (forwarded request 1062605 from manfred-h) 1062958 + + c71d8fdf8d4db8087970f1af4b1477b8 + 0.8.0 + + dimstar_suse + + 1064406 + diff --git a/packages/x/xfce4-notifyd/xfce4-notifyd-0.7.3.tar.bz2 b/packages/x/xfce4-notifyd/xfce4-notifyd-0.7.3.tar.bz2 deleted file mode 120000 index c451d53..0000000 --- a/packages/x/xfce4-notifyd/xfce4-notifyd-0.7.3.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeighy3ykkbvdbzp5gvtmd2kuc6nf72fkpck3sow45seykq6dwtpble \ No newline at end of file diff --git a/packages/x/xfce4-notifyd/xfce4-notifyd-0.8.0.tar.bz2 b/packages/x/xfce4-notifyd/xfce4-notifyd-0.8.0.tar.bz2 new file mode 120000 index 0000000..de312fe --- /dev/null +++ b/packages/x/xfce4-notifyd/xfce4-notifyd-0.8.0.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeiberpcgum7nilyfrpobrdb3syy5zntubxtrn46kh5v4vjypxpupje \ No newline at end of file diff --git a/packages/x/xfce4-notifyd/xfce4-notifyd.changes b/packages/x/xfce4-notifyd/xfce4-notifyd.changes index d3f0dc9..584f1f5 100644 --- a/packages/x/xfce4-notifyd/xfce4-notifyd.changes +++ b/packages/x/xfce4-notifyd/xfce4-notifyd.changes @@ -1,4 +1,49 @@ ------------------------------------------------------------------- +Sat Feb 11 08:50:33 UTC 2023 - Manfred Hollstein + +- Update to 0.8.0: + * Notification windows don't need to be override-redirect + * Reposition notifications when workarea changes + * Add setting to allow ignoring app-specified expire timeout + * Add setting to never expire notifications + * Update log viewer in settings when log changes on disk + * Fix one more unnecessary full count of unread messages + * Update log entry icons when marking all read + * Remove unused var + * Use new unread emblem for icons in log + * Stop checking if there are unread notifications as often + * Improve the panel icon when there are unread notifications + * Make the log max size a little friendlier + * Remove warning about high log size limit + * Add ability to mark individual log entries read + * Add emblem to icon of unread messages in log + * Make migrating the old log file more robust + * Remove bool returns from the log write functions + * Improve unread handling + * Make max-log-size option work again + * Add missing finalize for 'delete all' sqlite statement + * Implement progressive loading for log viewer + * Move log viewer to its own widget/file + * Add options for what to do when opening the plugin menu + * Add option to only show unread notifications in plugin menu + * Reduce some error-checking boilerplate + * Glade-ify the plugin settings dialog + * Queue writes to sqlite database + * settings: don't bail if libnotify init fails + * Fix deprecated unitless font-size in ZOMG-PONIES! theme + * Rearrange settings dialog + * Add ability to delete individual log entries + * Update my copyright & email + * Add timestamp formatting options + * Clean up extraneous things in settings glade file + * Add "Mark All Read" button to settings and panel plugin + * Move notification log to sqlite + * Set default debug based on git/not-git + * Remove configure.ac from gitignore + * Eliminate need for pre-processed configure.ac.in + * Translation Updates + +------------------------------------------------------------------- Thu Feb 2 08:55:38 UTC 2023 - Manfred Hollstein - Update to 0.7.3: diff --git a/packages/x/xfce4-notifyd/xfce4-notifyd.spec b/packages/x/xfce4-notifyd/xfce4-notifyd.spec index 9ac1aa4..9cfa696 100644 --- a/packages/x/xfce4-notifyd/xfce4-notifyd.spec +++ b/packages/x/xfce4-notifyd/xfce4-notifyd.spec @@ -17,27 +17,29 @@ Name: xfce4-notifyd -Version: 0.7.3 +Version: 0.8.0 Release: 0 Summary: Simple Notification Daemon for Xfce License: GPL-2.0-only Group: System/Daemons URL: https://docs.xfce.org/apps/notifyd/start -Source: https://archive.xfce.org/src/apps/xfce4-notifyd/0.7/%{name}-%{version}.tar.bz2 +Source: https://archive.xfce.org/src/apps/xfce4-notifyd/0.8/%{name}-%{version}.tar.bz2 Source1: %{name}.xml Source100: %{name}-rpmlintrc BuildRequires: exo-tools BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xfce4-dev-tools -BuildRequires: pkgconfig(gio-2.0) >= 2.56.0 -BuildRequires: pkgconfig(gio-unix-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.68.0 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.68.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.68.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.22 BuildRequires: pkgconfig(libnotify) >= 0.7.0 BuildRequires: pkgconfig(libxfce4panel-2.0) >= 4.12.0 BuildRequires: pkgconfig(libxfce4ui-2) >= 4.12.0 BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.12.0 BuildRequires: pkgconfig(libxfconf-0) >= 4.10.0 +BuildRequires: pkgconfig(sqlite3) >= 3.34 Requires: libnotify-tools Requires: xfce4-notifyd-branding = %{version}-%{release} Recommends: %{name}-lang = %{version}-%{release} @@ -91,6 +93,7 @@ rm -rf %{buildroot} %{_bindir}/xfce4-notifyd-config %{_datadir}/applications/xfce4-notifyd-config.desktop %{_datadir}/icons/hicolor/*/apps/org.xfce.notification.* +%{_datadir}/icons/hicolor/scalable/status/org.xfce.notification.* %{_datadir}/icons/hicolor/scalable/status/notification-*symbolic.svg %dir %{_datadir}/themes/* %dir %{_datadir}/themes/*/xfce-notify-4.0 diff --git a/packages/x/xfce4-power-manager/.files b/packages/x/xfce4-power-manager/.files index 294b188..9f86981 100644 Binary files a/packages/x/xfce4-power-manager/.files and b/packages/x/xfce4-power-manager/.files differ diff --git a/packages/x/xfce4-power-manager/.rev b/packages/x/xfce4-power-manager/.rev index 449623f..8c450ae 100644 --- a/packages/x/xfce4-power-manager/.rev +++ b/packages/x/xfce4-power-manager/.rev @@ -832,4 +832,12 @@ 1045219 + + 84311c139e29726a350f08f1f186332c + 4.18.1 + + dimstar_suse + + 1064404 + diff --git a/packages/x/xfce4-power-manager/xfce4-power-manager-4.18.0.tar.bz2 b/packages/x/xfce4-power-manager/xfce4-power-manager-4.18.0.tar.bz2 deleted file mode 120000 index f919c63..0000000 --- a/packages/x/xfce4-power-manager/xfce4-power-manager-4.18.0.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeieawiqnwejctwfv3obxk3myty6okfst5ij6oe7b5nziln33oej7du \ No newline at end of file diff --git a/packages/x/xfce4-power-manager/xfce4-power-manager-4.18.1.tar.bz2 b/packages/x/xfce4-power-manager/xfce4-power-manager-4.18.1.tar.bz2 new file mode 120000 index 0000000..1ea4603 --- /dev/null +++ b/packages/x/xfce4-power-manager/xfce4-power-manager-4.18.1.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeia3tbnszsn2axvyedivxbahuwxxc5kdvmjf2agefe5cbl5q5wq76a \ No newline at end of file diff --git a/packages/x/xfce4-power-manager/xfce4-power-manager.changes b/packages/x/xfce4-power-manager/xfce4-power-manager.changes index 8a7d528..398c15b 100644 --- a/packages/x/xfce4-power-manager/xfce4-power-manager.changes +++ b/packages/x/xfce4-power-manager/xfce4-power-manager.changes @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Feb 10 10:48:04 UTC 2023 - Manfred Hollstein + +- Update to version 4.18.1 + * Update copyright year + * Use XfceScreensaver from Libxfce4ui (!33) + * screensaver: Fall back on lock command if D-Bus call failed (#142, !24) + * panel-plugin: Properly disconnect signal handler + * build: Fix autotools warnings + * Fix management of source ids + * panel-plugin: Add missing ref on image + * Fix blurriness in icons when UI scale factor > 1 (!30) + * Translation Updates + +------------------------------------------------------------------- Thu Dec 22 14:01:48 UTC 2022 - Manfred Hollstein - Update to version 4.18.0 diff --git a/packages/x/xfce4-power-manager/xfce4-power-manager.spec b/packages/x/xfce4-power-manager/xfce4-power-manager.spec index e949a18..17520a8 100644 --- a/packages/x/xfce4-power-manager/xfce4-power-manager.spec +++ b/packages/x/xfce4-power-manager/xfce4-power-manager.spec @@ -1,7 +1,7 @@ # # spec file for package xfce4-power-manager # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define panel_version 4.12.0 %bcond_with git Name: xfce4-power-manager -Version: 4.18.0 +Version: 4.18.1 Release: 0 Summary: Power Management for the Xfce Desktop Environment License: GPL-2.0-or-later @@ -42,7 +42,7 @@ BuildRequires: pkgconfig(gthread-2.0) >= 2.66 BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 BuildRequires: pkgconfig(libnotify) >= 0.4.1 BuildRequires: pkgconfig(libxfce4panel-2.0) >= %{panel_version} -BuildRequires: pkgconfig(libxfce4ui-2) >= 4.12.0 +BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.2 BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.12.0 BuildRequires: pkgconfig(libxfconf-0) >= 4.12.0 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100 diff --git a/packages/x/xfce4-session/.files b/packages/x/xfce4-session/.files index ac62d06..98d8951 100644 Binary files a/packages/x/xfce4-session/.files and b/packages/x/xfce4-session/.files differ diff --git a/packages/x/xfce4-session/.rev b/packages/x/xfce4-session/.rev index 26c45e7..ce4b29b 100644 --- a/packages/x/xfce4-session/.rev +++ b/packages/x/xfce4-session/.rev @@ -766,4 +766,12 @@ Update to Xfce 4.18 (forwarded request 1045030 from mauriziogalli) 1045210 + + c9472c5af9b6e1cd58b23be1e2b27d61 + 4.18.1 + + dimstar_suse + + 1064405 + diff --git a/packages/x/xfce4-session/xfce4-session-4.18.0.tar.bz2 b/packages/x/xfce4-session/xfce4-session-4.18.0.tar.bz2 deleted file mode 120000 index eaba66a..0000000 --- a/packages/x/xfce4-session/xfce4-session-4.18.0.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeieavguvlaebnl6liozxnzqw2xsogausu7qt4opt37nh4j3jenrrbe \ No newline at end of file diff --git a/packages/x/xfce4-session/xfce4-session-4.18.1.tar.bz2 b/packages/x/xfce4-session/xfce4-session-4.18.1.tar.bz2 new file mode 120000 index 0000000..7c1b1c8 --- /dev/null +++ b/packages/x/xfce4-session/xfce4-session-4.18.1.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeigwrpcqqm2kambg7esgt35onz63g3xximuukf7kosmyvvlemogble \ No newline at end of file diff --git a/packages/x/xfce4-session/xfce4-session-adapt-session-scripts-git.patch b/packages/x/xfce4-session/xfce4-session-adapt-session-scripts-git.patch index f8c4f88..07bf35e 100644 --- a/packages/x/xfce4-session/xfce4-session-adapt-session-scripts-git.patch +++ b/packages/x/xfce4-session/xfce4-session-adapt-session-scripts-git.patch @@ -1,43 +1,17 @@ diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in --- a/scripts/startxfce4.in 2019-05-13 13:08:40.936637683 +0800 +++ b/scripts/startxfce4.in 2019-05-13 13:16:44.378397419 +0800 -@@ -66,13 +66,22 @@ - - if test "x$XDG_DATA_DIRS" = "x" +@@ -76,6 +76,10 @@ then -- if test "x@_datadir_@" = "x/usr/local/share" -o "x@_datadir_@" = "x/usr/share"; then -+ if test "x@_datadir_@" = "x/usr/local/share" -o test "x@_datadir_@" = "x/usr/share"; then - XDG_DATA_DIRS="/usr/local/share:/usr/share" - else - XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share" - fi - else -+ case $XDG_DATA_DIRS in -+ *:@_datadir_@:*) -+ ;; -+ *) XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@" -+ esac -+fi + fi +if test -d "@_datadir_@/xfce" +then -+ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS" - fi ++ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS" ++fi export XDG_DATA_DIRS -@@ -84,7 +93,12 @@ - XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg" - fi - else -+ case $XDG_CONFIG_DIRS in -+ *:@_sysconfdir_@/xdg:*) -+ ;; -+ *) - XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg" -+esac - fi - export XDG_CONFIG_DIRS - + if test "x$XDG_CONFIG_DIRS" = "x" diff -rub a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in --- a/scripts/xinitrc.in.in 2019-05-13 13:08:40.936637683 +0800 +++ b/scripts/xinitrc.in.in 2019-05-13 13:20:51.177252943 +0800 diff --git a/packages/x/xfce4-session/xfce4-session-adapt-session-scripts.patch b/packages/x/xfce4-session/xfce4-session-adapt-session-scripts.patch index 29b4dba..1700879 100644 --- a/packages/x/xfce4-session/xfce4-session-adapt-session-scripts.patch +++ b/packages/x/xfce4-session/xfce4-session-adapt-session-scripts.patch @@ -1,43 +1,17 @@ diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in --- a/scripts/startxfce4.in 2016-05-03 05:02:14.000000000 +0800 +++ b/scripts/startxfce4.in 2019-05-20 18:52:01.014092674 +0800 -@@ -66,13 +66,22 @@ - - if test "x$XDG_DATA_DIRS" = "x" +@@ -76,6 +76,10 @@ then -- if test "x@_datadir_@" = "x/usr/local/share" -o "x@_datadir_@" = "x/usr/share"; then -+ if test "x@_datadir_@" = "x/usr/local/share" -o test "x@_datadir_@" = "x/usr/share"; then - XDG_DATA_DIRS="/usr/local/share:/usr/share" - else - XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share" - fi - else -+ case $XDG_DATA_DIRS in -+ *:@_datadir_@:*) -+ ;; -+ *) XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@" -+esac -+fi + fi +if test -d "@_datadir_@/xfce" +then -+ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS" - fi ++ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS" ++fi export XDG_DATA_DIRS -@@ -84,7 +93,12 @@ - XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg" - fi - else -+ case $XDG_CONFIG_DIRS in -+ *:@_sysconfdir_@/xdg:*) -+ ;; -+ *) - XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg" -+ esac - fi - export XDG_CONFIG_DIRS - + if test "x$XDG_CONFIG_DIRS" = "x" diff -rub a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in --- a/scripts/xinitrc.in.in 2019-05-11 04:05:58.000000000 +0800 +++ b/scripts/xinitrc.in.in 2019-05-20 18:55:49.566603360 +0800 diff --git a/packages/x/xfce4-session/xfce4-session.changes b/packages/x/xfce4-session/xfce4-session.changes index 4734bab..41a6841 100644 --- a/packages/x/xfce4-session/xfce4-session.changes +++ b/packages/x/xfce4-session/xfce4-session.changes @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Fri Feb 10 12:27:40 UTC 2023 - Manfred Hollstein + +- Update to version 4.18.1 + * Update copyright year + * Fix bus name acquisition/ownership (#54, !34) + * Use XfceScreensaver from Libxfce4ui (!35) + * build: Fix previous commit + * build: Fix autotools warnings + * Avoid duplicating directories in the tail of $XDG_* envs (#111, !21) + * settings: Fix memory leak + * libxfsm: Fix wrong return value + * Fix memory leaks when opening xfce4-session-settings + * Fix blurry session snapshots (!33) + * Fix blurry icons in autostart tab when UI scale > 1 (!33) + * build: Fix GTK deprecation warnings (!32) + * build: Fix some other GDK deprecation warnings (!32) + * build: Fix gdk_error_trap_push/pop() deprecation warnings (!32) + * build: Let xdt-depends.m4 macros set GLib macros (!32) + * build: Remove GDK_VERSION_MIN_REQUIRED/MAX_ALLOWED (!32) + * Make use of translations for run hooks (Fixes #156) + * Translation Updates +- Regenerate xfce4-session-adapt-session-scripts-git.patch and + xfce4-session-adapt-session-scripts.patch +- Remove two stray comments about add-light-locker-support patches + +------------------------------------------------------------------- Thu Dec 22 13:18:02 UTC 2022 - Manfred Hollstein - Update to version 4.18.0 diff --git a/packages/x/xfce4-session/xfce4-session.spec b/packages/x/xfce4-session/xfce4-session.spec index c2b9f5c..3701970 100644 --- a/packages/x/xfce4-session/xfce4-session.spec +++ b/packages/x/xfce4-session/xfce4-session.spec @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2020-2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with git Name: xfce4-session -Version: 4.18.0 +Version: 4.18.1 Release: 0 Summary: Xfce Session Manager License: GPL-2.0-only @@ -28,11 +28,9 @@ Source0: https://archive.xfce.org/src/xfce/xfce4-session/4.18/%{name}-%{v %if %{with git} # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts-git.patch bnc#789057 maurizio.galli@gmail.com-- Adapt upstream sessions script to openSUSE. Patch0: xfce4-session-adapt-session-scripts-git.patch -# PATCH-FIX-OPENSUSE add-light-locker-support.patch maurizio.galli@gmail.com -- add light-locker to xflock4 script. %else # PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE. Patch1: xfce4-session-adapt-session-scripts.patch -# PATCH-FIX-OPENSUSE add-light-locker-support.patch -- add light-locker to xflock4 script. %endif BuildRequires: fdupes BuildRequires: iceauth @@ -49,7 +47,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0 BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libwnck-3.0) >= 3.10 BuildRequires: pkgconfig(libxfce4panel-2.0) -BuildRequires: pkgconfig(libxfce4ui-2) >= 4.15.1 +BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.2 BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.15.2 BuildRequires: pkgconfig(libxfconf-0) >= 4.12.0 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102 @@ -62,14 +60,14 @@ Requires: xfconf # bnc#845264 Requires: iceauth Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: %{name}-doc = %{version} Recommends: %{name}-lang = %{version} # minimal packages for an Xfce session Recommends: xfwm4 -Recommends: xfdesktop Recommends: thunar Recommends: xfce4-panel +Recommends: xfdesktop # xfce4-about needs to be dragged at a low level Recommends: libxfce4ui-tools Obsoletes: libxfsm-4_6-0 < %{version} diff --git a/packages/x/xfce4-settings/.files b/packages/x/xfce4-settings/.files index 1e2a4f4..f4eb918 100644 Binary files a/packages/x/xfce4-settings/.files and b/packages/x/xfce4-settings/.files differ diff --git a/packages/x/xfce4-settings/.rev b/packages/x/xfce4-settings/.rev index 497ebf0..298e9c6 100644 --- a/packages/x/xfce4-settings/.rev +++ b/packages/x/xfce4-settings/.rev @@ -469,4 +469,12 @@ 1045188 + + 04f058d54be097840d7d101614450ba4 + 4.18.2 + + dimstar_suse + + 1064407 + diff --git a/packages/x/xfce4-settings/xfce4-settings-4.18.1.tar.bz2 b/packages/x/xfce4-settings/xfce4-settings-4.18.1.tar.bz2 deleted file mode 120000 index 8469f4c..0000000 --- a/packages/x/xfce4-settings/xfce4-settings-4.18.1.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeie2emm2rbh6ixqo52swjak4jrnfczn32e6ggmcy2e6cyoqvydxmje \ No newline at end of file diff --git a/packages/x/xfce4-settings/xfce4-settings-4.18.2.tar.bz2 b/packages/x/xfce4-settings/xfce4-settings-4.18.2.tar.bz2 new file mode 120000 index 0000000..369f920 --- /dev/null +++ b/packages/x/xfce4-settings/xfce4-settings-4.18.2.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafybeiftjohj4fqsvgicbl6zjryny6b44whplkjgllvrxro2glr7jzw5mu \ No newline at end of file diff --git a/packages/x/xfce4-settings/xfce4-settings.changes b/packages/x/xfce4-settings/xfce4-settings.changes index faa753b..c964e48 100644 --- a/packages/x/xfce4-settings/xfce4-settings.changes +++ b/packages/x/xfce4-settings/xfce4-settings.changes @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Sat Feb 11 09:32:38 UTC 2023 - Manfred Hollstein + +- Update to version 4.18.2 + * Update copyright year + * mime-settings: Increase dialog size (!96) + * display: fix blurry 'help' indicator on output (#400, !95) + * display: fix blurry icon in profiles treeview + * display: fix blurry icons in minimal display settings dialog + * mime: fix blurry icons in default app menus + * mouse: fix blurriness in cursor theme previews + * appearance: fix blurry subpixel antialias icons + * appearance: fix blurry icon theme previews + * xfsettingsd: Make xsettings.xml well-formed (Fixes #431, !94) + * xfsettingsd: Remove duplicated config line (Fixes #425) + * Translation Updates + +------------------------------------------------------------------- Thu Dec 22 15:07:26 UTC 2022 - Maurizio Galli - Update to version 4.18.1 diff --git a/packages/x/xfce4-settings/xfce4-settings.spec b/packages/x/xfce4-settings/xfce4-settings.spec index 02fc54d..285305b 100644 --- a/packages/x/xfce4-settings/xfce4-settings.spec +++ b/packages/x/xfce4-settings/xfce4-settings.spec @@ -1,7 +1,7 @@ # # spec file for package xfce4-settings # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_with git Name: xfce4-settings -Version: 4.18.1 +Version: 4.18.2 Release: 0 Summary: Tools for Managing Xfce Settings License: GPL-2.0-only AND GPL-2.0-or-later @@ -28,16 +28,17 @@ URL: https://docs.xfce.org/xfce/xfce4-settings/start Source: https://archive.xfce.org/src/xfce/xfce4-settings/4.18/%{name}-%{version}.tar.bz2 BuildRequires: intltool BuildRequires: update-desktop-files -BuildRequires: pkgconfig(exo-2) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(garcon-1) -BuildRequires: pkgconfig(glib-2.0) >= 2.50.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 +BuildRequires: pkgconfig(exo-2) >= 0.11.0 +BuildRequires: pkgconfig(fontconfig) >= 2.6.0 +BuildRequires: pkgconfig(garcon-1) >= 0.1.10 +BuildRequires: pkgconfig(glib-2.0) >= 2.66.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libxfce4kbd-private-3) >= 4.12.0 BuildRequires: pkgconfig(libxfce4ui-2) >= 4.17.0 -BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.17.0 -BuildRequires: pkgconfig(libxfconf-0) >= 4.13 +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.17.2 +BuildRequires: pkgconfig(libxfconf-0) >= 4.13.0 BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(x11) diff --git a/packages/y/yast2-iscsi-client/.files b/packages/y/yast2-iscsi-client/.files index c2f3138..c5fd2ed 100644 Binary files a/packages/y/yast2-iscsi-client/.files and b/packages/y/yast2-iscsi-client/.files differ diff --git a/packages/y/yast2-iscsi-client/.rev b/packages/y/yast2-iscsi-client/.rev index 9378e04..c847ae6 100644 --- a/packages/y/yast2-iscsi-client/.rev +++ b/packages/y/yast2-iscsi-client/.rev @@ -1376,4 +1376,12 @@ submit new version 4.5.6 1032934 + + 9f4a7e640730465c21f3e85f27cdae85 + 4.5.7 + + dimstar_suse + submit new version 4.5.7 + 1064310 + diff --git a/packages/y/yast2-iscsi-client/yast2-iscsi-client-4.5.6.tar.bz2 b/packages/y/yast2-iscsi-client/yast2-iscsi-client-4.5.6.tar.bz2 deleted file mode 120000 index b001580..0000000 --- a/packages/y/yast2-iscsi-client/yast2-iscsi-client-4.5.6.tar.bz2 +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreidv6osgl77s7t7zk7bavjefz4ueo367csaole6gkz6ub5ztbm2pey \ No newline at end of file diff --git a/packages/y/yast2-iscsi-client/yast2-iscsi-client-4.5.7.tar.bz2 b/packages/y/yast2-iscsi-client/yast2-iscsi-client-4.5.7.tar.bz2 new file mode 120000 index 0000000..85fcb5b --- /dev/null +++ b/packages/y/yast2-iscsi-client/yast2-iscsi-client-4.5.7.tar.bz2 @@ -0,0 +1 @@ +/ipfs/bafkreieubkihgvzg7dbczcvr3tjkno32z4epu234m6bzpa7tbs4ojuus2e \ No newline at end of file diff --git a/packages/y/yast2-iscsi-client/yast2-iscsi-client.changes b/packages/y/yast2-iscsi-client/yast2-iscsi-client.changes index 1aad02b..ea06fea 100644 --- a/packages/y/yast2-iscsi-client/yast2-iscsi-client.changes +++ b/packages/y/yast2-iscsi-client/yast2-iscsi-client.changes @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Thu Feb 10 16:29:34 UTC 2023 - Ancor Gonzalez Sosa + +- Expose all core functionality from IscsiClientLib, with options + to suppress usage of pop-ups (related t gh#yast/d-installer#402). + +------------------------------------------------------------------- +Fri Feb 10 15:41:21 UTC 2023 - Ancor Gonzalez Sosa + +- Finish client: copy the content of both /etc/iscsi and + /var/lib/iscsi (bsc#1207374). +- Finish client: never enable both the iscsid socket and the + service (partial fix for bsc#1207839). +- 4.5.7 + +------------------------------------------------------------------- Wed Nov 2 17:03:48 UTC 2022 - Stefan Hundhammer - Call external commands without path (bsc#1204959) diff --git a/packages/y/yast2-iscsi-client/yast2-iscsi-client.spec b/packages/y/yast2-iscsi-client/yast2-iscsi-client.spec index cda0b8a..3945a9d 100644 --- a/packages/y/yast2-iscsi-client/yast2-iscsi-client.spec +++ b/packages/y/yast2-iscsi-client/yast2-iscsi-client.spec @@ -1,7 +1,7 @@ # # spec file for package yast2-iscsi-client # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 4.5.6 +Version: 4.5.7 Release: 0 Summary: YaST2 - iSCSI Client Configuration License: GPL-2.0-only @@ -28,8 +28,8 @@ BuildRequires: update-desktop-files # Yast2::Systemd::Socket BuildRequires: yast2 >= 4.1.3 # needed for test of finish client which include installation/misc -BuildRequires: yast2-devtools >= 4.4.0 BuildRequires: yast2-installation +BuildRequires: yast2-devtools >= 4.4.0 BuildRequires: yast2-packager BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec)